update model to use parent_id

Bump laravel/framework from 10.30.0 to 10.30.1

.gitignore

@@ -26,7 +26,7 @@ storage/*.key
 Homestead.yaml
 Homestead.json
 /.vagrant
-.phpunit.result.cache
+/.phpunit.cache
 
 ### macOS ###
 # General
@@ -237,11 +237,22 @@ dist/
 ### This Project ###
 /public/uploads
 /public/build
-# /public/tinymce
 *.key
 
+### TinyMCE ###
+/public/tinymce
+!/public/tinymce/skins/ui/stemmech/
+
 ### Synk ###
 .dccache
 
 ### TempCodeRunner ###
-tempCodeRunnerFile.*
+tempCodeRunnerFile.*
+
+### PHPUnit ###
+.phpunit.result.cache
+.gitignore
+
+### Codesniffer ###
+phpcs.phar
+phpcbf.phar

.ls-lint.yml

@@ -0,0 +1,14 @@
+ls:
+    resources/js/store:
+        .ts: pascalcase
+    "*":
+        .js: camelcase
+        .ts: camelcase
+        .vue: pascalcase
+        .dir: snakecase
+        .type.ts: camelcase
+ignore:
+    - node_modules
+    - vendor
+    - public/build
+    - public/tinymce

.prettierrc.json

@@ -1,4 +1,5 @@
 {
     "bracketSameLine": true,
-    "tabWidth": 4
+    "tabWidth": 4,
+    "htmlWhitespaceSensitivity": "css"
 }

.vscode/settings.json

@@ -16,5 +16,6 @@
         // "editor.defaultFormatter": "bmewburn.vscode-intelephense-client"
         "editor.defaultFormatter": "wongjn.php-sniffer"
     },
-    "cSpell.words": ["TIMESTAMPDIFF"]
+    "phpSniffer.autoDetect": true,
+    "phpSniffer.run": "onSave"
 }

README.md

@@ -1,66 +1,3 @@
-<p align="center"><a href="https://laravel.com" target="_blank"><img src="https://raw.githubusercontent.com/laravel/art/master/logo-lockup/5%20SVG/2%20CMYK/1%20Full%20Color/laravel-logolockup-cmyk-red.svg" width="400" alt="Laravel Logo"></a></p>
+# TODO
 
-<p align="center">
-<a href="https://travis-ci.org/laravel/framework"><img src="https://travis-ci.org/laravel/framework.svg" alt="Build Status"></a>
-<a href="https://packagist.org/packages/laravel/framework"><img src="https://img.shields.io/packagist/dt/laravel/framework" alt="Total Downloads"></a>
-<a href="https://packagist.org/packages/laravel/framework"><img src="https://img.shields.io/packagist/v/laravel/framework" alt="Latest Stable Version"></a>
-<a href="https://packagist.org/packages/laravel/framework"><img src="https://img.shields.io/packagist/l/laravel/framework" alt="License"></a>
-</p>
-
-## About Laravel
-
-Laravel is a web application framework with expressive, elegant syntax. We believe development must be an enjoyable and creative experience to be truly fulfilling. Laravel takes the pain out of development by easing common tasks used in many web projects, such as:
-
-- [Simple, fast routing engine](https://laravel.com/docs/routing).
-- [Powerful dependency injection container](https://laravel.com/docs/container).
-- Multiple back-ends for [session](https://laravel.com/docs/session) and [cache](https://laravel.com/docs/cache) storage.
-- Expressive, intuitive [database ORM](https://laravel.com/docs/eloquent).
-- Database agnostic [schema migrations](https://laravel.com/docs/migrations).
-- [Robust background job processing](https://laravel.com/docs/queues).
-- [Real-time event broadcasting](https://laravel.com/docs/broadcasting).
-
-Laravel is accessible, powerful, and provides tools required for large, robust applications.
-
-## Learning Laravel
-
-Laravel has the most extensive and thorough [documentation](https://laravel.com/docs) and video tutorial library of all modern web application frameworks, making it a breeze to get started with the framework.
-
-You may also try the [Laravel Bootcamp](https://bootcamp.laravel.com), where you will be guided through building a modern Laravel application from scratch.
-
-If you don't feel like reading, [Laracasts](https://laracasts.com) can help. Laracasts contains over 2000 video tutorials on a range of topics including Laravel, modern PHP, unit testing, and JavaScript. Boost your skills by digging into our comprehensive video library.
-
-## Laravel Sponsors
-
-We would like to extend our thanks to the following sponsors for funding Laravel development. If you are interested in becoming a sponsor, please visit the Laravel [Patreon page](https://patreon.com/taylorotwell).
-
-### Premium Partners
-
-- **[Vehikl](https://vehikl.com/)**
-- **[Tighten Co.](https://tighten.co)**
-- **[Kirschbaum Development Group](https://kirschbaumdevelopment.com)**
-- **[64 Robots](https://64robots.com)**
-- **[Cubet Techno Labs](https://cubettech.com)**
-- **[Cyber-Duck](https://cyber-duck.co.uk)**
-- **[Many](https://www.many.co.uk)**
-- **[Webdock, Fast VPS Hosting](https://www.webdock.io/en)**
-- **[DevSquad](https://devsquad.com)**
-- **[Curotec](https://www.curotec.com/services/technologies/laravel/)**
-- **[OP.GG](https://op.gg)**
-- **[WebReinvent](https://webreinvent.com/?utm_source=laravel&utm_medium=github&utm_campaign=patreon-sponsors)**
-- **[Lendio](https://lendio.com)**
-
-## Contributing
-
-Thank you for considering contributing to the Laravel framework! The contribution guide can be found in the [Laravel documentation](https://laravel.com/docs/contributions).
-
-## Code of Conduct
-
-In order to ensure that the Laravel community is welcoming to all, please review and abide by the [Code of Conduct](https://laravel.com/docs/contributions#code-of-conduct).
-
-## Security Vulnerabilities
-
-If you discover a security vulnerability within Laravel, please send an e-mail to Taylor Otwell via [taylor@laravel.com](mailto:taylor@laravel.com). All security vulnerabilities will be promptly addressed.
-
-## License
-
-The Laravel framework is open-sourced software licensed under the [MIT license](https://opensource.org/licenses/MIT).
+- Add Model JS helper (ie for confirmation to delete): https://jackwhiting.co.uk/posts/creating-a-modal-with-tailwind-and-alpine/

app.old/Conductors/AnalyticsConductor.php

@@ -2,16 +2,7 @@
 
 namespace App\Conductors;
 
-use App\Models\Media;
-use App\Models\User;
-use Carbon\Carbon;
-use Illuminate\Contracts\Container\BindingResolutionException;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\InvalidCastException;
-use Illuminate\Database\Eloquent\MissingAttributeException;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Http\Request;
-use LogicException;
 
 class AnalyticsConductor extends Conductor
 {
@@ -19,20 +10,14 @@ class AnalyticsConductor extends Conductor
      * The Model Class
      * @var string
      */
-    protected $class = '\App\Models\Analytics';
-
-    /**
-     * The default sorting field
-     * @var string
-     */
-    protected $sort = 'created_at';
+    protected $class = \App\Models\AnalyticsSession::class;
 
     /**
      * The default includes to include in a request.
      *
      * @var array
      */
-    protected $includes = ['duration'];
+    protected $includes = ['requests.type','requests.path'];
 
 
     /**
@@ -41,8 +26,9 @@ class AnalyticsConductor extends Conductor
      * @param Model $model The model.
      * @return boolean Allow model to be visible.
      */
-    public static function viewable(Model $model)
+    public static function viewable(Model $model): bool
     {
+        /** @var \App\Models\User */
         $user = auth()->user();
         return ($user !== null && $user->hasPermission('admin/analytics') === true);
     }
@@ -52,7 +38,7 @@ class AnalyticsConductor extends Conductor
      *
      * @return boolean Allow creating model.
      */
-    public static function creatable()
+    public static function creatable(): bool
     {
         return true;
     }
@@ -63,8 +49,9 @@ class AnalyticsConductor extends Conductor
      * @param Model $model The model.
      * @return boolean Allow updating model.
      */
-    public static function updatable(Model $model)
+    public static function updatable(Model $model): bool
     {
+        /** @var \App\Models\User */
         $user = auth()->user();
         return ($user !== null && $user->hasPermission('admin/analytics') === true);
     }
@@ -75,8 +62,9 @@ class AnalyticsConductor extends Conductor
      * @param Model $model The model.
      * @return boolean Allow deleting model.
      */
-    public static function destroyable(Model $model)
+    public static function destroyable(Model $model): bool
     {
+        /** @var \App\Models\User */
         $user = auth()->user();
         return ($user !== null && $user->hasPermission('admin/analytics') === true);
     }

app.old/Conductors/ArticleConductor.php

@@ -11,6 +11,7 @@ use Illuminate\Database\Eloquent\InvalidCastException;
 use Illuminate\Database\Eloquent\MissingAttributeException;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Cache;
 use LogicException;
 
 class ArticleConductor extends Conductor
@@ -19,7 +20,7 @@ class ArticleConductor extends Conductor
      * The Model Class
      * @var string
      */
-    protected $class = '\App\Models\Article';
+    protected $class = \App\Models\Article::class;
 
     /**
      * The default sorting field
@@ -32,7 +33,7 @@ class ArticleConductor extends Conductor
      *
      * @var string[]
      */
-    protected $includes = ['attachments', 'user'];
+    protected $includes = ['attachments', 'user', 'gallery'];
 
 
     /**
@@ -41,8 +42,9 @@ class ArticleConductor extends Conductor
      * @param Builder $builder The builder in use.
      * @return void
      */
-    public function scope(Builder $builder)
+    public function scope(Builder $builder): void
     {
+        /** @var \App\Models\User */
         $user = auth()->user();
         if ($user === null || $user->hasPermission('admin/articles') === false) {
             $builder
@@ -56,9 +58,10 @@ class ArticleConductor extends Conductor
      * @param Model $model The model.
      * @return boolean Allow model to be visible.
      */
-    public static function viewable(Model $model)
+    public static function viewable(Model $model): bool
     {
         if (Carbon::parse($model->publish_at)->isFuture() === true) {
+            /** @var \App\Models\User */
             $user = auth()->user();
             if ($user === null || $user->hasPermission('admin/articles') === false) {
                 return false;
@@ -73,8 +76,9 @@ class ArticleConductor extends Conductor
      *
      * @return boolean Allow creating model.
      */
-    public static function creatable()
+    public static function creatable(): bool
     {
+        /** @var \App\Models\User */
         $user = auth()->user();
         return ($user !== null && $user->hasPermission('admin/articles') === true);
     }
@@ -85,8 +89,9 @@ class ArticleConductor extends Conductor
      * @param Model $model The model.
      * @return boolean Allow updating model.
      */
-    public static function updatable(Model $model)
+    public static function updatable(Model $model): bool
     {
+        /** @var \App\Models\User */
         $user = auth()->user();
         return ($user !== null && $user->hasPermission('admin/articles') === true);
     }
@@ -97,8 +102,9 @@ class ArticleConductor extends Conductor
      * @param Model $model The model.
      * @return boolean Allow deleting model.
      */
-    public static function destroyable(Model $model)
+    public static function destroyable(Model $model): bool
     {
+        /** @var \App\Models\User */
         $user = auth()->user();
         return ($user !== null && $user->hasPermission('admin/articles') === true);
     }
@@ -109,7 +115,7 @@ class ArticleConductor extends Conductor
      * @param array $data The model data to transform.
      * @return array The transformed model.
      */
-    public function transformFinal(array $data)
+    public function transformFinal(array $data): array
     {
         unset($data['user_id']);
         return $data;
@@ -123,11 +129,24 @@ class ArticleConductor extends Conductor
      */
     public function includeAttachments(Model $model)
     {
-        return $model->attachments()->get()->map(function ($attachment) {
+        return $model->getAttachments()->map(function ($attachment) {
             return MediaConductor::includeModel(request(), 'attachments', $attachment->media);
         });
     }
 
+    /**
+     * Include Gallery Field.
+     *
+     * @param Model $model Them model.
+     * @return mixed The model result.
+     */
+    public function includeGallery(Model $model)
+    {
+        return $model->getGallery()->map(function ($item) {
+            return MediaConductor::includeModel(request(), 'gallery', $item->media);
+        });
+    }
+
     /**
      * Include User Field.
      *
@@ -136,17 +155,27 @@ class ArticleConductor extends Conductor
      */
     public function includeUser(Model $model)
     {
-        return UserConductor::includeModel(request(), 'user', User::find($model['user_id']));
+        $cacheKey = "user:{$model['user_id']}";
+        $user = Cache::remember($cacheKey, now()->addDays(28), function () use ($model) {
+            return User::find($model['user_id']);
+        });
+
+        return UserConductor::includeModel(request(), 'user', $user);
     }
 
     /**
      * Transform the Hero field.
      *
      * @param mixed $value The current value.
-     * @return array The new value.
+     * @return array|null The new value.
      */
-    public function transformHero(mixed $value)
+    public function transformHero(mixed $value): array|null
     {
-        return MediaConductor::includeModel(request(), 'hero', Media::find($value));
+        $cacheKey = "media:{$value}";
+        $media = Cache::remember($cacheKey, now()->addDays(28), function () use ($value) {
+            return Media::find($value);
+        });
+
+        return MediaConductor::includeModel(request(), 'hero', $media);
     }
 }

app.old/Conductors/Conductor.php

@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Str;
 
 class Conductor
@@ -81,7 +81,7 @@ class Conductor
      * @param string $string The string to split.
      * @return array The split string.
      */
-    private function splitString(string $string)
+    private function splitString(string $string): array
     {
         $parts = [];
         $start = 0;
@@ -145,7 +145,7 @@ class Conductor
      * @param array|null $limitFields A list of fields to limit the filter request to.
      * @return void
      */
-    private function filter(Request $request, array|null $limitFields = null)
+    private function filter(Request $request, array|null $limitFields = null): void
     {
         if (is_array($limitFields) === true && count($limitFields) === 0) {
             $limitFields = null;
@@ -164,14 +164,18 @@ class Conductor
             ) {
                 $value = trim($value);
                 $operator = '';
-                $join = 'OR';
+                $join = 'AND';
 
                 // Check if value has a operator and remove it if it's a number
-                if (preg_match('/^(!?=|[<>]=?|<>|!)([^=!<>].*)*$/', $value, $matches) > 0) {
+                if (preg_match('/^(!?=|[<>]=?|<>|!|\|)([^=!<>].*)*$/', $value, $matches) > 0) {
                     $operator = $matches[1];
                     $value = ($matches[2] ?? '');
                 }
 
+                if (strlen($value) === 0 && ($operator !== '==' && $operator !== '!=')) {
+                    continue;
+                }
+
                 switch ($operator) {
                     case '=':
                         $operator = '==';
@@ -182,15 +186,23 @@ class Conductor
                         break;
                     case '>':
                     case '<':
+                    case '|':
+                        $separatorPos = strpos($value, '|');
+                        if ($separatorPos !== false) {
+                            $operator = '==';
+                            $valueList = explode('|', $value);
+                            foreach ($valueList as $valueItem) {
+                                $this->appendFilter($field, $operator, $valueItem, 'OR');
+                            }
+                            continue 2;
+                        }
+                        break;
                     case '>=':
                     case '<=':
                     case '!=':
                         break;
                     case '<>':
-                        $separatorPos = strpos($value, '|');
-                        if ($separatorPos === false) {
-                            $operator = '!=';
-                        }
+                        $operator = '!=';
                         break;
                     default:
                         $operator = 'LIKE';
@@ -213,13 +225,47 @@ class Conductor
      *
      * @return void
      */
-    final public function applyFilters()
+    final public function applyFilters(): void
     {
         $parseFunc = function ($filterArray, $query) use (&$parseFunc) {
             $item = null;
             $result = null;
             $join = 'AND';
 
+            $relationFilter = [];
+
+            $buildWhereFunc = function ($query, $field, $operator, $value, $join) {
+                if ($join === 'OR') {
+                    if ($operator === '<>') {
+                        $separatorPos = strpos($value, '|');
+                        if ($separatorPos !== false) {
+                            $query->orWhereBetween(
+                                $field,
+                                [substr($value, 0, $separatorPos), substr($value, ($separatorPos + 1))]
+                            );
+                        } else {
+                            $query->orWhere($field, '!=', $value);
+                        }
+                    } else {
+                        $query->orWhere($field, $operator, $value);
+                    }
+                } else {
+                    if ($operator === '<>') {
+                        $separatorPos = strpos($value, '|');
+                        if ($separatorPos !== false) {
+                            $query->whereBetween(
+                                $field,
+                                [substr($value, 0, $separatorPos), substr($value, ($separatorPos + 1))]
+                            );
+                        } else {
+                            $query->where($field, '!=', $value);
+                        }
+                    } else {
+                        $query->where($field, $operator, $value);
+                    }
+                }//end if
+            };
+
             if (gettype($query) === 'array') {
                 $item = $query;
             }
@@ -243,81 +289,72 @@ class Conductor
                             }
                         }
                     } else {
-                        list($field, $operator, $value) = $condition;
-
-                        if ($item !== null) {
-                            if (array_key_exists($field, $item) === true) {
-                                switch ($operator) {
-                                    case '==':
-                                        $currentResult = ($item[$field] == $value);
-                                        break;
-                                    case 'NOT LIKE':
-                                        $currentResult = (stripos($item[$field], substr($value, 1, -1)) === false);
-                                        break;
-                                    case '>':
-                                        $currentResult = ($item[$field] > $value);
-                                        break;
-                                    case '<':
-                                        $currentResult = ($item[$field] < $value);
-                                        break;
-                                    case '>=':
-                                        $currentResult = ($item[$field] >= $value);
-                                        break;
-                                    case '<=':
-                                        $currentResult = ($item[$field] <= $value);
-                                        break;
-                                    case '!=':
-                                        $currentResult = ($item[$field] != $value);
-                                        break;
-                                    case '<>':
-                                        $separatorPos = strpos($value, '|');
-                                        if ($separatorPos !== false) {
-                                            $fieldInt = intval($item[$field]);
-                                            $currentResult = (
-                                                $fieldInt > intVal(
-                                                    substr($value, 0, $separatorPos)
-                                                ) && $fieldInt < intVal(substr($value, ($separatorPos + 1))));
-                                        } else {
-                                            $currentResult = ($item[$field] != $value);
-                                        }
-                                        break;
-                                    case 'LIKE':
-                                        $currentResult = (stripos($item[$field], substr($value, 1, -1)) !== false);
-                                        break;
-                                }//end switch
-                            }//end if
-                        } else {
-                            if ($operator === '==') {
-                                $operator = '=';
+                        if (count($condition) < 3 && $condition[0] !== '') {
+                            if (count($condition) < 2) {
+                                $condition[1] = 'LIKE';
                             }
+                            $condition[2] = '%';
+                        }
 
-                            if ($join === 'OR') {
-                                if ($operator === '<>') {
-                                    $separatorPos = strpos($value, '|');
-                                    if ($separatorPos !== false) {
-                                        $query->orWhereBetween(
-                                            $field,
-                                            [substr($value, 0, $separatorPos), substr($value, ($separatorPos + 1))]
-                                        );
-                                    } else {
-                                        $query->orWhere($field, '!=', $value);
-                                    }
-                                } else {
-                                    $query->orWhere($field, $operator, $value);
-                                }
+                        if (count($condition) === 3) {
+                            list($field, $operator, $value) = $condition;
+
+                            if ($item !== null) {
+                                if (array_key_exists($field, $item) === true) {
+                                    switch ($operator) {
+                                        case '==':
+                                            $currentResult = ($item[$field] == $value);
+                                            break;
+                                        case 'NOT LIKE':
+                                            $currentResult = (stripos($item[$field], substr($value, 1, -1)) === false);
+                                            break;
+                                        case '>':
+                                            $currentResult = ($item[$field] > $value);
+                                            break;
+                                        case '<':
+                                            $currentResult = ($item[$field] < $value);
+                                            break;
+                                        case '>=':
+                                            $currentResult = ($item[$field] >= $value);
+                                            break;
+                                        case '<=':
+                                            $currentResult = ($item[$field] <= $value);
+                                            break;
+                                        case '!=':
+                                            $currentResult = ($item[$field] != $value);
+                                            break;
+                                        case '<>':
+                                            $separatorPos = strpos($value, '|');
+                                            if ($separatorPos !== false) {
+                                                $fieldInt = intval($item[$field]);
+                                                $currentResult = (
+                                                    $fieldInt > intVal(
+                                                        substr($value, 0, $separatorPos)
+                                                    ) && $fieldInt < intVal(substr($value, ($separatorPos + 1))));
+                                            } else {
+                                                $currentResult = ($item[$field] != $value);
+                                            }
+                                            break;
+                                        case 'LIKE':
+                                            $currentResult = (stripos($item[$field], substr($value, 1, -1)) !== false);
+                                            break;
+                                    }//end switch
+                                }//end if
                             } else {
-                                if ($operator === '<>') {
-                                    $separatorPos = strpos($value, '|');
-                                    if ($separatorPos !== false) {
-                                        $query->whereBetween(
-                                            $field,
-                                            [substr($value, 0, $separatorPos), substr($value, ($separatorPos + 1))]
-                                        );
-                                    } else {
-                                        $query->where($field, '!=', $value);
+                                if ($operator === '==') {
+                                    $operator = '=';
+                                }
+
+                                $relationSplit = strpos($field, '.');
+                                if ($relationSplit !== false) {
+                                    $relation = substr($field, 0, $relationSplit);
+                                    $field = substr($field, ($relationSplit + 1));
+
+                                    if (method_exists($this->class, $relation) === true) {
+                                        $relationFilter[$relation][] = [$field, $operator, $value, $join];
                                     }
                                 } else {
-                                    $query->where($field, $operator, $value);
+                                    $buildWhereFunc($query, $field, $operator, $value, $join);
                                 }
                             }//end if
                         }//end if
@@ -341,6 +378,14 @@ class Conductor
                 }//end if
             }//end foreach
 
+            foreach ($relationFilter as $relation => $conditions) {
+                $query->whereHas($relation, function ($subQuery) use ($buildWhereFunc, $conditions) {
+                    foreach ($conditions as $condition) {
+                        $buildWhereFunc($subQuery, $condition[0], $condition[1], $condition[2], $condition[3]);
+                    }
+                });
+            }
+
             return $result;
         };
 
@@ -365,7 +410,7 @@ class Conductor
      * @param Request $request The request data.
      * @return array The processed and transformed collection | the total rows found.
      */
-    final public static function request(Request $request)
+    final public static function request(Request $request): array
     {
         $conductor_class = get_called_class();
         $conductor = new $conductor_class();
@@ -418,7 +463,7 @@ class Conductor
                 return substr($field, 0, strpos($field, '.'));
             }
             return $field;
-        }, explode(',', $request->input('fields')));
+        }, explode(',', $request->input('fields', '')));
         if ($limitFields === null) {
             $limitFields = $fields;
         } else {
@@ -457,7 +502,7 @@ class Conductor
      * @param Collection $collection The collection.
      * @return array The processed and transformed model data.
      */
-    final public static function collection(Request $request, Collection $collection)
+    final public static function collection(Request $request, Collection $collection): array
     {
         $conductor_class = get_called_class();
         $conductor = new $conductor_class();
@@ -505,7 +550,7 @@ class Conductor
      * @param array|null $limitFields Limit the request to these fields.
      * @return Builder
      */
-    public static function filterQuery(Builder $query, Request $request, array|null $limitFields = null)
+    public static function filterQuery(Builder $query, Request $request, array|null $limitFields = null): Builder
     {
         $conductor_class = get_called_class();
         $conductor = new $conductor_class();
@@ -523,9 +568,9 @@ class Conductor
      * @param Request    $request The request data.
      * @param string     $key     The key prefix to use.
      * @param Model|null $model   The model.
-     * @return array The processed and transformed model data.
+     * @return array|null The processed and transformed model data.
      */
-    final public static function includeModel(Request $request, string $key, mixed $model)
+    final public static function includeModel(Request $request, string $key, mixed $model): array|null
     {
         $fields = [];
 
@@ -551,9 +596,9 @@ class Conductor
      *
      * @param mixed      $fields The fields to show.
      * @param Model|null $model  The model.
-     * @return array The processed and transformed model data.
+     * @return array|null The processed and transformed model data.
      */
-    final public static function model(mixed $fields, mixed $model)
+    final public static function model(mixed $fields, mixed $model): array|null
     {
         if ($model === null) {
             return null;
@@ -562,6 +607,7 @@ class Conductor
         $conductor_class = get_called_class();
         $conductor = new $conductor_class();
 
+        $requestIncludes = [];
         $modelFields = $conductor->fields(new $conductor->class());
 
         // Limit fields
@@ -606,7 +652,7 @@ class Conductor
      *
      * @return integer The current collection count.
      */
-    final public function count()
+    final public function count(): int
     {
         if ($this->query !== null) {
             return $this->query->count();
@@ -621,7 +667,7 @@ class Conductor
      * @param mixed $fields A field name or array of field names to sort. Supports prefix of +/- to change direction.
      * @return void
      */
-    final public function sort(mixed $fields = null)
+    final public function sort(mixed $fields = null): void
     {
         $collectionSort = [];
 
@@ -700,7 +746,7 @@ class Conductor
      * @param array $includes The list of includes to include.
      * @return void
      */
-    final public function applyIncludes(Model $model, array $includes)
+    final public function applyIncludes(Model $model, array $includes): void
     {
         foreach ($includes as $include) {
             $includeMethodName = 'include' . Str::studly($include);
@@ -720,7 +766,7 @@ class Conductor
      * @param array $fields An array of field names.
      * @return void
      */
-    final public function limitFields(array $fields)
+    final public function limitFields(array $fields): void
     {
         if (empty($fields) !== true) {
             $this->query->select(array_diff($fields, $this->includes));
@@ -735,8 +781,11 @@ class Conductor
      * @param string     $outerJoin   The join for this filter group.
      * @return void
      */
-    final public function appendFilterString(string $rawFilter, array|null $limitFields = null, string $outerJoin = 'OR')
-    {
+    final public function appendFilterString(
+        string $rawFilter,
+        array|null $limitFields = null,
+        string $outerJoin = 'AND'
+    ): void {
         if ($rawFilter === '') {
             return;
         }
@@ -773,8 +822,10 @@ class Conductor
                             $field = substr($field, 1, -1);
                         }
 
-                        $set = &$value;
-                        continue;
+                        if ($set !== $value) {
+                            $set = &$value;
+                            continue;
+                        }
                     } elseif (($char === ')' && $string[($i + 1)] === ',') || $char === ',') {
                         if ($value === null) {
                             $tokens[] = $field;
@@ -849,7 +900,7 @@ class Conductor
      * @param string $join     The join to append.
      * @return void
      */
-    final public function appendFilter(string $field, string $operator, string $value, string $join = 'OR')
+    final public function appendFilter(string $field, string $operator, string $value, string $join = 'OR'): void
     {
         if (count($this->filterArray) !== 0) {
             $this->filterArray[] = $join;
@@ -863,8 +914,9 @@ class Conductor
      * @param Builder $builder The builder in use.
      * @return void
      */
-    public function scope(Builder $builder)
+    public function scope(Builder $builder): void
     {
+        // empty
     }
 
     /**
@@ -873,14 +925,28 @@ class Conductor
      * @param Model $model The model in question.
      * @return array The array of field names.
      */
-    public function fields(Model $model)
+    public function fields(Model $model): array
     {
-        $visibleFields = $model->getVisible();
-        if (empty($visibleFields) === true) {
-            $visibleFields = $model->getConnection()
-                ->getSchemaBuilder()
-                ->getColumnListing($model->getTable());
-        }
+        $visibleFields = Cache::remember(
+            "model:{$model->getTable()}:visible",
+            now()->addDays(28),
+            function () use ($model) {
+                $fields = $model->getVisible();
+                if (empty($fields) === true) {
+                    $fields = Cache::remember(
+                        "schema:{$model->getTable()}:columns",
+                        now()->addDays(28),
+                        function () use ($model) {
+                            return $model->getConnection()
+                            ->getSchemaBuilder()
+                            ->getColumnListing($model->getTable());
+                        }
+                    );
+                }
+
+                return $fields;
+            }
+        );
 
         $appends = $model->getAppends();
         if (is_array($appends) === true) {
@@ -900,7 +966,7 @@ class Conductor
      * @param Model $model The model to transform.
      * @return array The transformed model.
      */
-    protected function transformModel(Model $model)
+    protected function transformModel(Model $model): array
     {
         $result = $this->transform($model);
         foreach ($result as $key => $value) {
@@ -920,7 +986,7 @@ class Conductor
      * @param Model $model The model to transform.
      * @return array The transformed model.
      */
-    public function transform(Model $model)
+    public function transform(Model $model): array
     {
         $result = $model->toArray();
 
@@ -939,7 +1005,7 @@ class Conductor
      * @param array $data The model array to transform.
      * @return array The transformed model.
      */
-    public function transformFinal(array $data)
+    public function transformFinal(array $data): array
     {
         return $data;
     }
@@ -950,7 +1016,7 @@ class Conductor
      * @param Model $model The model in question.
      * @return boolean Is the model viewable.
      */
-    public static function viewable(Model $model)
+    public static function viewable(Model $model): bool
     {
         return true;
     }
@@ -960,7 +1026,7 @@ class Conductor
      *
      * @return boolean Is the model creatable.
      */
-    public static function creatable()
+    public static function creatable(): bool
     {
         return true;
     }
@@ -971,7 +1037,7 @@ class Conductor
      * @param Model $model The model in question.
      * @return boolean Is the model updatable.
      */
-    public static function updatable(Model $model)
+    public static function updatable(Model $model): bool
     {
         return true;
     }
@@ -982,7 +1048,7 @@ class Conductor
      * @param Model $model The model in question.
      * @return boolean Is the model destroyable.
      */
-    public static function destroyable(Model $model)
+    public static function destroyable(Model $model): bool
     {
         return true;
     }

app.old/Conductors/EventConductor.php

@@ -7,6 +7,7 @@ use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\InvalidCastException;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\Cache;
 
 class EventConductor extends Conductor
 {
@@ -14,7 +15,7 @@ class EventConductor extends Conductor
      * The Model Class
      * @var string
      */
-    protected $class = '\App\Models\Event';
+    protected $class = \App\Models\Event::class;
 
     /**
      * The default sorting field
@@ -35,8 +36,9 @@ class EventConductor extends Conductor
      * @param Builder $builder The builder in use.
      * @return void
      */
-    public function scope(Builder $builder)
+    public function scope(Builder $builder): void
     {
+        /** @var \App\Models\User */
         $user = auth()->user();
         if ($user === null || $user->hasPermission('admin/events') === false) {
             $builder
@@ -51,9 +53,10 @@ class EventConductor extends Conductor
      * @param Model $model The model.
      * @return boolean Allow model to be visible.
      */
-    public static function viewable(Model $model)
+    public static function viewable(Model $model): bool
     {
         if (strtolower($model->status) === 'draft' || Carbon::parse($model->publish_at)->isFuture() === true) {
+            /** @var \App\Models\User */
             $user = auth()->user();
             if ($user === null || $user->hasPermission('admin/events') === false) {
                 return false;
@@ -68,8 +71,9 @@ class EventConductor extends Conductor
      *
      * @return boolean Allow creating model.
      */
-    public static function creatable()
+    public static function creatable(): bool
     {
+        /** @var \App\Models\User */
         $user = auth()->user();
         return ($user !== null && $user->hasPermission('admin/events') === true);
     }
@@ -80,8 +84,9 @@ class EventConductor extends Conductor
      * @param Model $model The model.
      * @return boolean Allow updating model.
      */
-    public static function updatable(Model $model)
+    public static function updatable(Model $model): bool
     {
+        /** @var \App\Models\User */
         $user = auth()->user();
         return ($user !== null && $user->hasPermission('admin/events') === true);
     }
@@ -92,8 +97,9 @@ class EventConductor extends Conductor
      * @param Model $model The model.
      * @return boolean Allow deleting model.
      */
-    public static function destroyable(Model $model)
+    public static function destroyable(Model $model): bool
     {
+        /** @var \App\Models\User */
         $user = auth()->user();
         return ($user !== null && $user->hasPermission('admin/events') === true);
     }
@@ -106,10 +112,11 @@ class EventConductor extends Conductor
      */
     public function includeAttachments(Model $model)
     {
+        /** @var \App\Models\User */
         $user = auth()->user();
 
-        return $model->attachments()->get()->map(function ($attachment) use ($user) {
-            if ($attachment->private === false || ($user !== null && ($user->hasPermission('admin/events') === true || $attachment->users->contains($user) === true))) {
+        return $model->getAttachments()->map(function ($attachment) use ($user) {
+            if ($attachment->private === false || ($user !== null && $user->hasPermission('admin/events') === true)) {
                 return MediaConductor::includeModel(request(), 'attachments', $attachment->media);
             }
         });
@@ -119,10 +126,15 @@ class EventConductor extends Conductor
      * Transform the Hero field.
      *
      * @param mixed $value The current value.
-     * @return array The new value.
+     * @return array|null The new value.
      */
-    public function transformHero(mixed $value)
+    public function transformHero(mixed $value): array|null
     {
-        return MediaConductor::includeModel(request(), 'hero', Media::find($value));
+        $cacheKey = "media:{$value}";
+        $media = Cache::remember($cacheKey, now()->addDays(28), function () use ($value) {
+            return Media::find($value);
+        });
+
+        return MediaConductor::includeModel(request(), 'hero', $media);
     }
 }

app.old/Conductors/MediaConductor.php

@@ -2,9 +2,11 @@
 
 namespace App\Conductors;
 
+use App\Models\MediaJob;
+use App\Models\User;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Foundation\Auth\User;
+use Illuminate\Support\Facades\Cache;
 
 class MediaConductor extends Conductor
 {
@@ -12,7 +14,7 @@ class MediaConductor extends Conductor
      * The Model Class
      * @var string
      */
-    protected $class = '\App\Models\Media';
+    protected $class = \App\Models\Media::class;
 
     /**
      * The default sorting field
@@ -25,16 +27,16 @@ class MediaConductor extends Conductor
      *
      * @var string[]
      */
-    protected $includes = ['user'];
+    protected $includes = ['user', 'jobs'];
 
     /**
      * The default filters to use in a request.
      *
      * @var array
      */
-    protected $defaultFilters = [
-        'status' => 'OK'
-    ];
+    // protected $defaultFilters = [
+    //     'status' => 'OK'
+    // ];
 
 
     /**
@@ -43,13 +45,14 @@ class MediaConductor extends Conductor
      * @param Model $model The model in question.
      * @return array The array of field names.
      */
-    public function fields(Model $model)
+    public function fields(Model $model): array
     {
         $fields = parent::fields($model);
 
+        /** @var \App\Models\User */
         $user = auth()->user();
         if ($user === null || $user->hasPermission('admin/media') === false) {
-            $fields = arrayRemoveItem($fields, ['permission', 'storage']);
+            $fields = arrayRemoveItem($fields, ['security_data', 'storage']);
         }
 
         return $fields;
@@ -61,13 +64,21 @@ class MediaConductor extends Conductor
      * @param Builder $builder The builder in use.
      * @return void
      */
-    public function scope(Builder $builder)
+    public function scope(Builder $builder): void
     {
         $user = auth()->user();
         if ($user === null) {
-            $builder->where('permission', '');
+            $builder->where('security_type', '')
+            ->orWhere('security_type', 'password');
         } else {
-            $builder->where('permission', '')->orWhereIn('permission', $user->permissions);
+            $builder->where(function ($query) use ($user) {
+                $query->where('security_type', '')
+                    ->orWhere('security_type', 'password')
+                    ->orWhere(function ($subquery) use ($user) {
+                        $subquery->where('security_type', 'permission')
+                            ->whereIn('security_data', $user->permissions);
+                    });
+            });
         }
     }
 
@@ -77,13 +88,16 @@ class MediaConductor extends Conductor
      * @param Model $model The model.
      * @return boolean Allow model to be visible.
      */
-    public static function viewable(Model $model)
+    public static function viewable(Model $model): bool
     {
-        if ($model->permission !== '') {
+        if (strcasecmp('permission', $model->security_type) === 0) {
+            /** @var \App\Models\User */
             $user = auth()->user();
-            if ($user === null || $user->hasPermission($model->permission) === false) {
+            if ($user === null || $user->hasPermission($model->security_data) === false) {
                 return false;
             }
+        } elseif ($model->security_type !== '' && strcasecmp('password', $model->security_type) !== 0) {
+            return false;
         }
 
         return true;
@@ -94,7 +108,7 @@ class MediaConductor extends Conductor
      *
      * @return boolean Allow creating model.
      */
-    public static function creatable()
+    public static function creatable(): bool
     {
         $user = auth()->user();
         return ($user !== null);
@@ -106,10 +120,12 @@ class MediaConductor extends Conductor
      * @param Model $model The model.
      * @return boolean Allow updating model.
      */
-    public static function updatable(Model $model)
+    public static function updatable(Model $model): bool
     {
+        /** @var \App\Models\User */
         $user = auth()->user();
-        return ($user !== null && (strcasecmp($model->user_id, $user->id) === 0 || $user->hasPermission('admin/media') === true));
+        return ($user !== null && (strcasecmp($model->user_id, $user->id) === 0 ||
+            $user->hasPermission('admin/media') === true));
     }
 
     /**
@@ -118,8 +134,9 @@ class MediaConductor extends Conductor
      * @param Model $model The model.
      * @return boolean Allow deleting model.
      */
-    public static function destroyable(Model $model)
+    public static function destroyable(Model $model): bool
     {
+        /** @var \App\Models\User */
         $user = auth()->user();
         return ($user !== null && ($model->user_id === $user->id || $user->hasPermission('admin/media') === true));
     }
@@ -130,7 +147,7 @@ class MediaConductor extends Conductor
      * @param array $data The model data to transform.
      * @return array The transformed model.
      */
-    public function transformFinal(array $data)
+    public function transformFinal(array $data): array
     {
         unset($data['user_id']);
         return $data;
@@ -144,6 +161,24 @@ class MediaConductor extends Conductor
      */
     public function includeUser(Model $model)
     {
-        return UserConductor::includeModel(request(), 'user', User::find($model['user_id']));
+        $user = Cache::remember("user:{$model['user_id']}", now()->addDays(28), function () use ($model) {
+            return User::find($model['user_id']);
+        });
+
+        return UserConductor::includeModel(request(), 'user', $user);
+    }
+
+    /**
+     * Include job models in Media
+     *
+     * @param Model $model The reference model.
+     * @return mixed
+     */
+    public function includeJobs(Model $model)
+    {
+        $jobs = $model->jobs()
+            ->select(['id','created_at','updated_at','user_id','status','status_text','progress'])
+            ->orderBy('created_at', 'desc')->get();
+        return $jobs;
     }
 }

app.old/Conductors/MediaJobConductor.php

@@ -0,0 +1,76 @@
+<?php
+
+namespace App\Conductors;
+
+use App\Models\MediaJob;
+use App\Models\User;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\Cache;
+
+class MediaJobConductor extends Conductor
+{
+    /**
+     * The Model Class
+     * @var string
+     */
+    protected $class = \App\Models\MediaJob::class;
+
+    /**
+     * The default sorting field
+     * @var string
+     */
+    protected $sort = 'created_at';
+
+    /**
+     * The included fields
+     *
+     * @var string[]
+     */
+    protected $includes = ['user'];
+
+
+    /**
+     * Return if the current model is creatable.
+     *
+     * @return boolean Allow creating model.
+     */
+    public static function creatable(): bool
+    {
+        return false;
+    }
+
+    /**
+     * Return if the current model is updatable.
+     *
+     * @param Model $model The model.
+     * @return boolean Allow updating model.
+     */
+    public static function updatable(Model $model): bool
+    {
+        return false;
+    }
+
+    /**
+     * Return if the current model is destroyable.
+     *
+     * @param Model $model The model.
+     * @return boolean Allow deleting model.
+     */
+    public static function destroyable(Model $model): bool
+    {
+        return false;
+    }
+
+    /**
+     * Transform the final model data
+     *
+     * @param array $data The model data to transform.
+     * @return array The transformed model.
+     */
+    public function transformFinal(array $data): array
+    {
+        unset($data['user_id']);
+        return $data;
+    }
+}

app.old/Conductors/ShortlinkConductor.php

@@ -2,9 +2,7 @@
 
 namespace App\Conductors;
 
-use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Foundation\Auth\User;
 
 class ShortlinkConductor extends Conductor
 {
@@ -12,7 +10,7 @@ class ShortlinkConductor extends Conductor
      * The Model Class
      * @var string
      */
-    protected $class = '\App\Models\Shortlink';
+    protected $class = \App\Models\Shortlink::class;
 
     /**
      * The default sorting field
@@ -26,8 +24,9 @@ class ShortlinkConductor extends Conductor
      *
      * @return boolean Allow creating model.
      */
-    public static function creatable()
+    public static function creatable(): bool
     {
+        /** @var \App\Models\User */
         $user = auth()->user();
         return ($user !== null && $user->hasPermission('admin/shortlinks') === true);
     }
@@ -38,8 +37,9 @@ class ShortlinkConductor extends Conductor
      * @param Model $model The model.
      * @return boolean Allow updating model.
      */
-    public static function updatable(Model $model)
+    public static function updatable(Model $model): bool
     {
+        /** @var \App\Models\User */
         $user = auth()->user();
         return ($user !== null && $user->hasPermission('admin/shortlinks') === true);
     }
@@ -50,8 +50,9 @@ class ShortlinkConductor extends Conductor
      * @param Model $model The model.
      * @return boolean Allow deleting model.
      */
-    public static function destroyable(Model $model)
+    public static function destroyable(Model $model): bool
     {
+        /** @var \App\Models\User */
         $user = auth()->user();
         return ($user !== null && $user->hasPermission('admin/shortlinks') === true);
     }

app.old/Conductors/SubscriptionConductor.php

@@ -10,7 +10,7 @@ class SubscriptionConductor extends Conductor
      * The Model Class
      * @var string
      */
-    protected $class = '\App\Models\Subscription';
+    protected $class = \App\Models\Subscription::class;
 
 
     /**
@@ -19,10 +19,14 @@ class SubscriptionConductor extends Conductor
      * @param Model $model The model.
      * @return boolean Allow updating model.
      */
-    public static function updatable(Model $model)
+    public static function updatable(Model $model): bool
     {
+        /** @var \App\Models\User */
         $user = auth()->user();
-        return ($user !== null && ((strcasecmp($model->email, $user->email) === 0 && $user->email_verified_at !== null) || $user->hasPermission('admin/subscriptions') === true));
+        return ($user !== null && (
+            (strcasecmp($model->email, $user->email) === 0 && $user->email_verified_at !== null) ||
+            $user->hasPermission('admin/subscriptions') === true
+        ));
     }
 
     /**
@@ -31,9 +35,11 @@ class SubscriptionConductor extends Conductor
      * @param Model $model The model.
      * @return boolean Allow deleting model.
      */
-    public static function destroyable(Model $model)
+    public static function destroyable(Model $model): bool
     {
+        /** @var \App\Models\User */
         $user = auth()->user();
-        return ($user !== null && ((strcasecmp($model->email, $user->email) === 0 && $user->email_verified_at !== null) || $user->hasPermission('admin/subscriptions') === true));
+        return ($user !== null && ((strcasecmp($model->email, $user->email) === 0 &&
+        $user->email_verified_at !== null) || $user->hasPermission('admin/subscriptions') === true));
     }
 }

app.old/Conductors/UserConductor.php

@@ -10,7 +10,7 @@ class UserConductor extends Conductor
      * The Model Class
      * @var string
      */
-    protected $class = '\App\Models\User';
+    protected $class = \App\Models\User::class;
 
 
     /**
@@ -19,8 +19,9 @@ class UserConductor extends Conductor
      * @param Model $model The model.
      * @return string[] The fields visible.
      */
-    public function fields(Model $model)
+    public function fields(Model $model): array
     {
+        /** @var \App\Models\User */
         $user = auth()->user();
         if ($user === null || $user->hasPermission('admin/users') === false) {
             return ['id', 'display_name'];
@@ -35,18 +36,24 @@ class UserConductor extends Conductor
      * @param Model $model The model to transform.
      * @return array The transformed model.
      */
-    public function transform(Model $model)
+    public function transform(Model $model): array
     {
+        /** @var \App\Models\User */
         $user = auth()->user();
         $data = $model->toArray();
+        $limit = $this->fields($model);
 
-        if ($user === null || ($user->hasPermission('admin/users') === false && strcasecmp($user->id, $model->id) !== 0)) {
-            $fields = ['id', 'display_name'];
-            $data = arrayLimitKeys($data, $fields);
+        if (
+            $user === null || (
+            $user->hasPermission('admin/users') === false && strcasecmp($user->id, $model->id) !== 0
+            )
+        ) {
+            $limit = ['id', 'display_name'];
         } else {
             $data['permissions'] = $user->permissions;
         }
 
+        $data = arrayLimitKeys($data, $limit);
         return $data;
     }
 
@@ -56,8 +63,9 @@ class UserConductor extends Conductor
      * @param Model $model The model.
      * @return boolean Allow updating model.
      */
-    public static function updatable(Model $model)
+    public static function updatable(Model $model): bool
     {
+        /** @var \App\Models\User */
         $user = auth()->user();
         if ($user !== null) {
             return ($user->hasPermission('admin/users') === true || strcasecmp($user->id, $model->id) === 0);
@@ -72,8 +80,9 @@ class UserConductor extends Conductor
      * @param Model $model The model.
      * @return boolean Allow deleting model.
      */
-    public static function destroyable(Model $model)
+    public static function destroyable(Model $model): bool
     {
+        /** @var \App\Models\User */
         $user = auth()->user();
         return ($user !== null && $user->hasPermission('admin/users') === true);
     }

app.old/Console/Commands/CleanupTempFiles.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Storage;
+
+class CleanupTempFiles extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'app:cleanup-temp-files';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Delete temporary files that are older that 1 day';
+
+
+    /**
+     * Execute the console command.
+     *
+     * @return void
+     */
+    public function handle(): void
+    {
+        $keepTime = (1 * 24 * 60 * 60); // 1 Day
+        $currentTimeStamp = time();
+        $deletedFileCount = 0;
+
+        foreach (glob(storage_path('app/tmp/*')) as $filename) {
+            $fileModifiedTimeStamp = filemtime($filename);
+            if (($currentTimeStamp - $fileModifiedTimeStamp) > $keepTime) {
+                unlink($filename);
+                $deletedFileCount++;
+            }
+        }
+
+        $this->comment('Deleted ' . $deletedFileCount . ' files');
+    }
+}

app.old/Console/Commands/RemoveStaleMediaJobs.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\MediaJob;
+use Illuminate\Console\Command;
+
+class RemoveStaleMediaJobs extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'app:remove-stale-media-jobs';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Remove media_jobs that have not been modified for 48 hours';
+
+
+    /**
+     * Execute the console command.
+     *
+     * @return void
+     */
+    public function handle(): void
+    {
+        $threshold = now()->subHours(48);
+
+        $staleJobs = MediaJob::where('updated_at', '<=', $threshold)->get();
+
+        foreach ($staleJobs as $job) {
+            $job->delete();
+        }
+
+        $this->info(count($staleJobs) . ' stale media_jobs removed.');
+    }
+}

app.old/Console/Kernel.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Console;
+
+use Illuminate\Console\Scheduling\Schedule;
+use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
+
+class Kernel extends ConsoleKernel
+{
+    /**
+     * Define the application's command schedule.
+     *
+     * @param  \Illuminate\Console\Scheduling\Schedule $schedule The schedule.
+     * @return void
+     */
+    protected function schedule(Schedule $schedule): void
+    {
+        // $schedule->command('inspire')->hourly();
+        $schedule->command('app:cleanup-temp-files')->everyThirtyMinutes();
+        $schedule->command('app:remove-stale-media-jobs')->everyThirtyMinutes();
+    }
+
+    /**
+     * Register the commands for the application.
+     *
+     * @return void
+     */
+    protected function commands(): void
+    {
+        $this->load(__DIR__ . '/Commands');
+
+        require base_path('routes/console.php');
+    }
+}

app.old/Enum/Enum.php

@@ -58,6 +58,8 @@ class Enum
     /**
      * Returns a message from the enum subclass
      *
+     * @param integer $messageIndex   The message index to retrieve.
+     * @param string  $defaultMessage Message to use if index does not exist.
      * @return string
      */
     public static function getMessage(int $messageIndex, string $defaultMessage = 'Unknown'): string

app.old/Exceptions/Handler.php

@@ -0,0 +1,98 @@
+<?php
+
+namespace App\Exceptions;
+
+use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Throwable;
+use PDOException;
+use Symfony\Component\ErrorHandler\ErrorRenderer\HtmlErrorRenderer;
+use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Mail;
+use Symfony\Component\ErrorHandler\Exception\FlattenException;
+
+class Handler extends ExceptionHandler
+{
+    /**
+     * A list of the inputs that are never flashed to the session on validation exceptions.
+     *
+     * @var array<int, string>
+     */
+    protected $dontFlash = [
+        'current_password',
+        'password',
+        'password_confirmation',
+    ];
+
+
+    /**
+     * Register the exception handling callbacks for the application.
+     *
+     * @return void
+     */
+    public function register(): void
+    {
+        // $this->renderable(function (HttpException $e, $request) {
+        //     if ($request->is('api/*')) {
+        //         $message = $e->getMessage();
+        //         if ($message === '') {
+        //             $message = HttpResponseCodes::$statusTexts[$e->getStatusCode()];
+        //         }
+
+        //         return response()->json([
+        //             'message' => $message
+        //         ], $e->getStatusCode());
+        //     }
+        // });
+
+        $this->renderable(function (NotFoundHttpException $e, $request) {
+            if ($request->is('api/*') === true) {
+                return response()->json([
+                    'message' => 'Resource not found'
+                ], 404);
+            }
+        });
+
+        $this->renderable(function (PDOException $e, $request) {
+            if ($request->is('api/*') === true) {
+                return response()->json([
+                    'message' => 'The server is currently unavailable'
+                ], 503);
+            }
+        });
+
+        $this->reportable(function (Throwable $e) {
+            if ($this->shouldReport($e) === true) {
+                if (App::runningUnitTests() === false) {
+                    $this->sendEmail($e);
+                }
+            }
+        });
+    }
+
+    /**
+     * Send email
+     *
+     * @param Throwable $exception Throwable object.
+     * @return void
+     */
+    public function sendEmail(Throwable $exception)
+    {
+        try {
+            $e = FlattenException::createFromThrowable($exception);
+            $handler = new HtmlErrorRenderer(true);
+            $css = $handler->getStylesheet();
+            $content = $handler->getBody($e);
+
+            Mail::send('emails.exception', compact('css', 'content'), function ($message) {
+                $message
+                ->to('webmaster@stemmechanics.com.au')
+                ->subject('Exception Generated')
+                ;
+            });
+        } catch (Throwable $ex) {
+            Log::error($ex);
+        }
+    }
+}

app.old/Filters/SubscriptionFilter.php

@@ -11,7 +11,7 @@ class SubscriptionFilter extends FilterAbstract
      *
      * @var mixed
      */
-    protected $class = '\App\Models\Subscription';
+    protected $class = \App\Models\Subscription::class;
 
 
     /**

app.old/Helpers/Array.php

@@ -38,3 +38,41 @@ function arrayLimitKeys(array $arr, array $keys): array
 {
     return array_intersect_key($arr, array_flip($keys));
 }
+
+/**
+ * Return an array value or default value if it does not exist
+ *
+ * @param string $key   The key value to return if exists.
+ * @param array  $arr   The array to check.
+ * @param mixed  $value The value to return if key does not exist.
+ * @return mixed
+ */
+function arrayDefaultValue(string $key, array $arr, mixed $value): mixed
+{
+    if (array_key_exists($key, $arr) === true) {
+        return $arr[$key];
+    }
+
+    return $value;
+}
+
+/**
+ * Return if an item exists in an array, case insensitive
+ *
+ * @param string $val The value to check.
+ * @param array  $arr The array to check.
+ * @return boolean
+ */
+function existsInArray(string $val, array $arr): bool
+{
+    $exists = false;
+
+    foreach ($arr as $el) {
+        if (strcasecmp($val, $el) === 0) {
+            $exists = true;
+            break;
+        }
+    }
+
+    return $exists;
+}

app.old/Helpers/Temp.php

@@ -0,0 +1,92 @@
+<?php
+
+/* Temp File Helper Functions */
+
+
+/**
+ * Generate a temporary file path.
+ *
+ * @param string $extension The file extension to use.
+ * @param string $part      The file part number.
+ * @return string The filtered array.
+ */
+function generateTempFilePath(string $extension = '', string $part = ''): string
+{
+    $temporaryDir = storage_path('app/tmp');
+    if (is_dir($temporaryDir) === false) {
+        mkdir($temporaryDir, 0777, true);
+    }
+
+    return $temporaryDir . DIRECTORY_SEPARATOR . uniqid('upload_', true) . ($extension !== '' ? ".{$extension}" : '') .
+    ($part !== '' ? ".part-{$part}" : '');
+}
+
+/**
+ * Get Temp file information
+ *
+ * @param string $filePath The temp file name.
+ * @return array The temp file name details.
+ */
+function tempFileInfo(string $filePath): array
+{
+    $part = '';
+
+    // Extract the part if it's present
+    if (preg_match('/\.part-(\d+)$/', $filePath, $matches) !== false) {
+        $part = $matches[1];
+        $filePath = substr($filePath, 0, -strlen($matches[0]));
+    }
+
+    $info = pathinfo($filePath);
+
+    $directory = $info['dirname'];
+    $name = $info['filename'];
+    $extension = '';
+
+    // If there's an extension, separate it
+    if (isset($info['extension']) === true) {
+        $extension = $info['extension'];
+    }
+
+    return [
+        'dirname' => $directory,
+        'basename' => $name . ($extension !== '' ? ".{$extension}" : ''),
+        'filename' => $name,
+        'extension' => $extension,
+        'part' => $part,
+    ];
+}
+
+/**
+ * Check a temporary file exists.
+ *
+ * @param string $dir       The file parent directory.
+ * @param string $name      The file name.
+ * @param string $extension The file extension to use.
+ * @param string $part      The file part number.
+ * @return boolean If the file exists.
+ */
+function tempFileExists(string $dir, string $name, string $extension = '', string $part = ''): bool
+{
+    $filename = constructTempFileName($dir, $name, $extension, $part);
+    $exists = file_exists($filename);
+
+    return $exists;
+}
+
+/**
+ * Construct the temp file name based on the information
+ *
+ * @param string $dir       The file parent directory.
+ * @param string $name      The file name.
+ * @param string $extension The file extension to use.
+ * @param string $part      The file part number.
+ * @return string The file path.
+ */
+function constructTempFileName(string $dir, string $name, string $extension = '', string $part = ''): string
+{
+    $filename = $dir . DIRECTORY_SEPARATOR . $name . ($extension !== '' ? ".{$extension}" : '') .
+    ($part !== "" ? ".part-{$part}" : '');
+
+    return $filename;
+}

app.old/Helpers/TypeValue.php

@@ -0,0 +1,27 @@
+<?php
+
+/* Type Value Helper Functions */
+
+
+/**
+ * Is value true
+ *
+ * @param mixed $value Value to check.
+ * @return boolean
+ */
+function isTrue(mixed $value): bool
+{
+    if (is_bool($value) === true && $value === true) {
+        return true;
+    }
+
+    if (is_numeric($value) === true && intval($value) === 1) {
+        return true;
+    }
+
+    if (is_string($value) === true && in_array(strtolower($value), ['true', '1'], true) === true) {
+        return true;
+    }
+
+    return false;
+}

app.old/Http/Controllers/Api/AnalyticsController.php

@@ -0,0 +1,121 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use App\Conductors\AnalyticsConductor;
+use App\Enum\HttpResponseCodes;
+use App\Http\Requests\AnalyticsRequest;
+use App\Models\AnalyticsItemRequest;
+use App\Models\AnalyticsSession;
+use Illuminate\Http\Request;
+
+class AnalyticsController extends ApiController
+{
+    /**
+     * AnalyticsController constructor.
+     */
+    public function __construct()
+    {
+        $this->middleware('auth:sanctum')
+            ->only([
+                'index',
+                'update',
+                'delete'
+            ]);
+    }
+
+    /**
+     * Display a listing of the resource.
+     *
+     * @param \Illuminate\Http\Request $request The endpoint request.
+     * @return \Illuminate\Http\Response
+     */
+    public function index(Request $request)
+    {
+        if ($request->user() !== null && $request->user()?->hasPermission('admin/analytics') === true) {
+            $request->rename([
+                'type' => 'requests.type',
+                'path' => 'requests.path'
+            ]);
+
+            list($collection, $total) = AnalyticsConductor::request($request);
+
+            return $this->respondAsResource(
+                $collection,
+                ['resourceName' => 'session',
+                    'isCollection' => true,
+                    'appendData' => ['total' => $total]
+                ]
+            );
+        }//end if
+
+        return $this->respondForbidden();
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @param \Illuminate\Http\Request     $request The endpoint request.
+     * @param  \App\Models\AnalyticsSession $session The analytics session.
+     * @return \Illuminate\Http\Response
+     */
+    public function show(Request $request, AnalyticsSession $session)
+    {
+        if ($request->user() !== null && $request->user()?->hasPermission('admin/analytics') === true) {
+            $session->load(['requests' => function ($query) {
+                $query->select('session_id', 'type', 'path', 'created_at');
+            }
+            ]);
+
+            foreach ($session->requests as $requestItem) {
+                $requestItem->makeHidden('session_id');
+            }
+
+            return $this->respondAsResource(
+                $session,
+                ['resourceName' => 'session']
+            );
+        }
+
+        return $this->respondForbidden();
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param \App\Http\Requests\AnalyticsRequest $request The user request.
+     * @return \Illuminate\Http\Response
+     */
+    public function store(AnalyticsRequest $request)
+    {
+        if (AnalyticsConductor::creatable() === true) {
+            $analytics = null;
+            $user = $request->user();
+
+            $data = [
+                'type' => $request->input('type'),
+                'path' => $request->input('path', ''),
+                'useragent' => $request->userAgent(),
+                'ip' => $request->ip()
+            ];
+
+            if (
+                $user !== null &&
+                $user->hasPermission('admin/analytics') === true &&
+                $request->has('session') === true
+            ) {
+                $data['session_id'] = $request->input('session_id');
+                $analytics = AnalyticsItemRequest::create($data);
+            } else {
+                $analytics = AnalyticsItemRequest::create($data);
+            }
+
+            return $this->respondAsResource(
+                AnalyticsConductor::model($request, $analytics),
+                ['respondCode' => HttpResponseCodes::HTTP_CREATED]
+            );
+        } else {
+            return $this->respondForbidden();
+        }//end if
+    }
+}

app.old/Http/Controllers/Api/ApiController.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers\Api;
 
+use Illuminate\Http\JsonResponse;
 use App\Enum\HttpResponseCodes;
 use App\Http\Controllers\Controller;
 use Illuminate\Database\Eloquent\Model;
@@ -23,10 +24,13 @@ class ApiController extends Controller
      * @param array   $data        Response data.
      * @param integer $respondCode Response status code.
      * @param array   $headers     Response headers.
-     * @return \Illuminate\Http\JsonResponse
+     * @return JsonResponse
      */
-    public function respondJson(array $data, int $respondCode = HttpResponseCodes::HTTP_OK, array $headers = [])
-    {
+    public function respondJson(
+        array $data,
+        int $respondCode = HttpResponseCodes::HTTP_OK,
+        array $headers = []
+    ): JsonResponse {
         return response()->json($data, $respondCode, $headers);
     }
 
@@ -34,10 +38,11 @@ class ApiController extends Controller
      * Return forbidden message
      *
      * @param string $message Response message.
-     * @return \Illuminate\Http\JsonResponse
+     * @return JsonResponse
      */
-    public function respondForbidden(string $message = 'You do not have permission to access the resource.')
-    {
+    public function respondForbidden(
+        string $message = 'You do not have permission to access the resource.'
+    ): JsonResponse {
         return response()->json(['message' => $message], HttpResponseCodes::HTTP_FORBIDDEN);
     }
 
@@ -45,9 +50,9 @@ class ApiController extends Controller
      * Return forbidden message
      *
      * @param string $message Response message.
-     * @return \Illuminate\Http\JsonResponse
+     * @return JsonResponse
      */
-    public function respondNotFound(string $message = 'The resource was not found.')
+    public function respondNotFound(string $message = 'The resource was not found.'): JsonResponse
     {
         return response()->json(['message' => $message], HttpResponseCodes::HTTP_NOT_FOUND);
     }
@@ -56,49 +61,74 @@ class ApiController extends Controller
      * Return too large message
      *
      * @param string $message Response message.
-     * @return \Illuminate\Http\JsonResponse
+     * @return JsonResponse
      */
-    public function respondTooLarge(string $message = 'The request entity is too large.')
+    public function respondTooLarge(string $message = 'The request entity is too large.'): JsonResponse
     {
         return response()->json(['message' => $message], HttpResponseCodes::HTTP_REQUEST_ENTITY_TOO_LARGE);
     }
 
     /**
-     * Return no content
-     * @return \Illuminate\Http\JsonResponse
+     * Return no content.
+     *
+     * @return JsonResponse
      */
-    public function respondNoContent()
+    public function respondNoContent(): JsonResponse
     {
         return response()->json([], HttpResponseCodes::HTTP_NO_CONTENT);
     }
 
     /**
-     * Return created
-     * @return \Illuminate\Http\JsonResponse
+     * Return no content
+     *
+     * @return JsonResponse
      */
-    public function respondCreated()
+    public function respondNotImplemented(): JsonResponse
+    {
+        return response()->json([], HttpResponseCodes::HTTP_NOT_IMPLEMENTED);
+    }
+
+    /**
+     * Return created.
+     *
+     * @return JsonResponse
+     */
+    public function respondCreated(): JsonResponse
     {
         return response()->json([], HttpResponseCodes::HTTP_CREATED);
     }
 
     /**
-     * Return accepted
-     * @return \Illuminate\Http\JsonResponse
+     * Return accepted.
+     *
+     * @return JsonResponse
      */
-    public function respondAccepted()
+    public function respondAccepted(): JsonResponse
     {
         return response()->json([], HttpResponseCodes::HTTP_ACCEPTED);
     }
 
+    /**
+     * Return server error.
+     *
+     * @return JsonResponse
+     */
+    public function respondServerError(): JsonResponse
+    {
+        return response()->json([], HttpResponseCodes::HTTP_INTERNAL_SERVER_ERROR);
+    }
+
     /**
      * Return single error message
      *
      * @param string  $message      Error message.
      * @param integer $responseCode Resource code.
-     * @return \Illuminate\Http\JsonResponse
+     * @return JsonResponse
      */
-    public function respondError(string $message, int $responseCode = HttpResponseCodes::HTTP_UNPROCESSABLE_ENTITY)
-    {
+    public function respondError(
+        string $message,
+        int $responseCode = HttpResponseCodes::HTTP_UNPROCESSABLE_ENTITY
+    ): JsonResponse {
         return response()->json([
             'message' => $message
         ], $responseCode);
@@ -109,10 +139,12 @@ class ApiController extends Controller
      *
      * @param array   $errors       Error messages.
      * @param integer $responseCode Resource code.
-     * @return \Illuminate\Http\JsonResponse
+     * @return JsonResponse
      */
-    public function respondWithErrors(array $errors, int $responseCode = HttpResponseCodes::HTTP_UNPROCESSABLE_ENTITY)
-    {
+    public function respondWithErrors(
+        array $errors,
+        int $responseCode = HttpResponseCodes::HTTP_UNPROCESSABLE_ENTITY
+    ): JsonResponse {
         $keys = array_keys($errors);
         $error = $errors[$keys[0]];
 
@@ -130,18 +162,20 @@ class ApiController extends Controller
     /**
      * Return resource data
      *
-     * @param array|Model|Collection $data    Resource data.
-     * @param array                  $options Respond options.
-     * @return \Illuminate\Http\JsonResponse
+     * @param array|Model|Collection $data         Resource data.
+     * @param array                  $options      Respond options.
+     * @param callable|null          $validationFn Optional validation function to check the data before responding.
+     * @return JsonResponse
      */
     protected function respondAsResource(
         mixed $data,
         array $options = [],
         $validationFn = null
-    ) {
-        $isCollection = $options['isCollection'] ?? false;
-        $appendData = $options['appendData'] ?? null;
-        $resourceName = $options['resourceName'] ?? null;
+    ): JsonResponse {
+        $isCollection = ($options['isCollection'] ?? false);
+        $appendData = ($options['appendData'] ?? null);
+        $resourceName = ($options['resourceName'] ?? '');
+        $transformResourceName = ($options['transformResourceName'] ?? true);
         $respondCode = ($options['respondCode'] ?? HttpResponseCodes::HTTP_OK);
 
         if ($data === null || ($data instanceof Collection && $data->count() === 0)) {
@@ -155,11 +189,11 @@ class ApiController extends Controller
             }
         }
 
-        if (is_null($resourceName) === true || empty($resourceName) === true) {
+        if (empty($resourceName) === true) {
             $resourceName = $this->resourceName;
         }
 
-        if (is_null($resourceName) === true || empty($resourceName) === true) {
+        if (empty($resourceName) === true) {
             $resourceName = get_class($this);
             $resourceName = substr($resourceName, (strrpos($resourceName, '\\') + 1));
             $resourceName = substr($resourceName, 0, strpos($resourceName, 'Controller'));
@@ -172,15 +206,14 @@ class ApiController extends Controller
         } elseif (is_array($data) === true) {
             $dataArray = $data;
         } elseif ($data instanceof Model) {
-            $is_multiple = false;
             $dataArray = $data->toArray();
         }
 
         $resource = [];
         if ($isCollection === true) {
-            $resource = [Str::plural($resourceName) => $dataArray];
+            $resource = [$transformResourceName === true ? Str::plural($resourceName) : $resourceName => $dataArray];
         } else {
-            $resource = [Str::singular($resourceName) => $dataArray];
+            $resource = [$transformResourceName === true ? Str::singular($resourceName) : $resourceName => $dataArray];
         }
 
         if ($appendData !== null) {
@@ -189,4 +222,22 @@ class ApiController extends Controller
 
         return response()->json($resource, $respondCode);
     }
+
+    /**
+     * Get the Controller Model Class name.
+     *
+     * @return string
+     */
+    public function getModelClass(): string
+    {
+        $controllerClass = static::class;
+
+        $modelName = 'App\\Models\\' . Str::replaceLast('Controller', '', Str::afterLast($controllerClass, '\\'));
+
+        if (class_exists($modelName) === false) {
+            return $modelName;
+        }
+
+        return $modelName;
+    }
 }

app.old/Http/Controllers/Api/ArticleController.php

@@ -0,0 +1,139 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use App\Conductors\MediaConductor;
+use App\Conductors\ArticleConductor;
+use App\Enum\HttpResponseCodes;
+use App\Http\Requests\ArticleRequest;
+use App\Models\Media;
+use App\Models\Article;
+use App\Traits\HasAttachments;
+use App\Traits\HasGallery;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ArticleController extends ApiController
+{
+    use HasAttachments;
+    use HasGallery;
+
+
+    /**
+     * ApplicationController constructor.
+     */
+    public function __construct()
+    {
+        $this->middleware('auth:sanctum')
+            ->only([
+                'store',
+                'update',
+                'delete'
+            ]);
+    }
+
+    /**
+     * Display a listing of the resource.
+     *
+     * @param \Illuminate\Http\Request $request The endpoint request.
+     * @return \Illuminate\Http\Response
+     */
+    public function index(Request $request)
+    {
+        list($collection, $total) = ArticleConductor::request($request);
+
+        return $this->respondAsResource(
+            $collection,
+            ['isCollection' => true,
+                'appendData' => ['total' => $total]
+            ]
+        );
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @param \Illuminate\Http\Request $request The endpoint request.
+     * @param  \App\Models\Article      $article The article model.
+     * @return \Illuminate\Http\Response
+     */
+    public function show(Request $request, Article $article)
+    {
+        if (ArticleConductor::viewable($article) === true) {
+            return $this->respondAsResource(ArticleConductor::model($request, $article));
+        }
+
+        return $this->respondForbidden();
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param \App\Http\Requests\ArticleRequest $request The user request.
+     * @return \Illuminate\Http\Response
+     */
+    public function store(ArticleRequest $request)
+    {
+        if (ArticleConductor::creatable() === true) {
+            $article = Article::create($request->except(['attachments', 'gallery']));
+
+            if ($request->has('attachments') === true) {
+                $article->addAttachments($request->get('attachments'));
+            }
+
+            if ($request->has('gallery') === true) {
+                $article->galleryAddMany($request->get('gallery'));
+            }
+
+            return $this->respondAsResource(
+                ArticleConductor::model($request, $article),
+                ['respondCode' => HttpResponseCodes::HTTP_CREATED]
+            );
+        } else {
+            return $this->respondForbidden();
+        }//end if
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \App\Http\Requests\ArticleRequest $request The article update request.
+     * @param  \App\Models\Article               $article The specified article.
+     * @return \Illuminate\Http\Response
+     */
+    public function update(ArticleRequest $request, Article $article)
+    {
+        if (ArticleConductor::updatable($article) === true) {
+            if ($request->has('attachments') === true) {
+                $article->deleteAttachments();
+                $article->addAttachments($request->get('attachments'));
+            }
+
+            if ($request->has('gallery') === true) {
+                $article->gallery()->delete();
+                $article->galleryAddMany($request->get('gallery'));
+            }
+
+            $article->update($request->except(['attachments', 'gallery']));
+            return $this->respondAsResource(ArticleConductor::model($request, $article));
+        }
+
+        return $this->respondForbidden();
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  \App\Models\Article $article The specified article.
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy(Article $article)
+    {
+        if (ArticleConductor::destroyable($article) === true) {
+            $article->delete();
+            return $this->respondNoContent();
+        } else {
+            return $this->respondForbidden();
+        }
+    }
+}

app.old/Http/Controllers/Api/AuthController.php

@@ -33,7 +33,7 @@ class AuthController extends ApiController
      * @param Request $request Current request data.
      * @return JsonResponse
      */
-    public function me(Request $request)
+    public function me(Request $request): JsonResponse
     {
         $user = $request->user()->makeVisible(['permissions']);
         return $this->respondAsResource($user);
@@ -49,7 +49,11 @@ class AuthController extends ApiController
     {
         $user = User::where('email', '=', $request->input('email'))->first();
 
-        if ($user !== null && strlen($user->password) > 0 && Hash::check($request->input('password'), $user->password) === true) {
+        if (
+            $user !== null &&
+            strlen($user->password) > 0 &&
+            Hash::check($request->input('password'), $user->password) === true
+        ) {
             if ($user->email_verified_at === null) {
                 return $this->respondWithErrors([
                     'email' => 'Email address has not been verified.'
@@ -89,7 +93,7 @@ class AuthController extends ApiController
      * @param Request $request Current request data.
      * @return JsonResponse
      */
-    public function logout(Request $request)
+    public function logout(Request $request): JsonResponse
     {
         $user = $request->user();
 

app.old/Http/Controllers/Api/EventController.php

@@ -10,7 +10,10 @@ use App\Conductors\UserConductor;
 use App\Http\Requests\EventRequest;
 use App\Models\Media;
 use App\Models\User;
+use Illuminate\Contracts\Container\BindingResolutionException;
+use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use Illuminate\Http\Response;
 
 class EventController extends ApiController
 {
@@ -66,7 +69,12 @@ class EventController extends ApiController
     public function store(EventRequest $request)
     {
         if (EventConductor::creatable() === true) {
-            $event = Event::create($request->all());
+            $event = Event::create($request->except(['attachments']));
+
+            if ($request->has('attachments') === true) {
+                $event->addAttachments($request->get('attachments'));
+            }
+
             return $this->respondAsResource(
                 EventConductor::model($request, $event),
                 ['respondCode' => HttpResponseCodes::HTTP_CREATED]
@@ -86,7 +94,12 @@ class EventController extends ApiController
     public function update(EventRequest $request, Event $event)
     {
         if (EventConductor::updatable($event) === true) {
-            $event->update($request->all());
+            if ($request->has('attachments') === true) {
+                $event->deleteAttachments();
+                $event->addAttachments($request->get('attachments'));
+            }
+
+            $event->update($request->except(['attachments']));
             return $this->respondAsResource(EventConductor::model($request, $event));
         }
 
@@ -110,128 +123,12 @@ class EventController extends ApiController
     }
 
     /**
-     * Get a list of attachments related to this model.
-     *
-     * @param Request $request The user request.
-     * @param Event   $event   The event model.
-     * @return JsonResponse Returns the event attachments.
-     */
-    public function getAttachments(Request $request, Event $event)
-    {
-        if (EventConductor::viewable($event) === true) {
-            $medium = $event->attachments->map(function ($attachment) {
-                return $attachment->media;
-            });
-
-            return $this->respondAsResource(MediaConductor::collection($request, $medium), ['isCollection' => true, 'resourceName' => 'attachment']);
-        }
-
-        return $this->respondForbidden();
-    }
-
-    /**
-     * Store an attachment related to this model.
-     *
-     * @param Request $request The user request.
-     * @param Event   $event   The event model.
-     * @return JsonResponse The response.
-     */
-    public function storeAttachment(Request $request, Event $event)
-    {
-        if (EventConductor::updatable($event) === true) {
-            if ($request->has("medium") === true && Media::find($request->medium) !== null) {
-                $event->attachments()->create(['media_id' => $request->medium]);
-                return $this->respondCreated();
-            }
-
-            return $this->respondWithErrors(['media' => 'The media ID was not found']);
-        }
-
-        return $this->respondForbidden();
-    }
-
-    /**
-     * Update/replace attachments related to this model.
-     *
-     * @param Request $request The user request.
-     * @param Event   $event   The related model.
+     * List users of Event
+     * @param Request $request The HTTP request.
+     * @param Event   $event   Event model.
      * @return JsonResponse
      */
-    public function updateAttachments(Request $request, Event $event)
-    {
-        if (EventConductor::updatable($event) === true) {
-            $mediaIds = $request->attachments;
-            if (is_array($mediaIds) === false) {
-                $mediaIds = explode(',', $request->attachments);
-            }
-
-            $mediaIds = array_map('trim', $mediaIds); // trim each media ID
-            $attachments = $event->attachments;
-
-            // Delete attachments that are not in $mediaIds
-            foreach ($attachments as $attachment) {
-                if (in_array($attachment->media_id, $mediaIds) === false) {
-                    $attachment->delete();
-                }
-            }
-
-            // Create new attachments for media IDs that are not already in $article->attachments()
-            foreach ($mediaIds as $mediaId) {
-                $found = false;
-
-                foreach ($attachments as $attachment) {
-                    if ($attachment->media_id === $mediaId) {
-                        $found = true;
-                        break;
-                    }
-                }
-
-                if ($found === false) {
-                    $event->attachments()->create(['media_id' => $mediaId]);
-                }
-            }
-
-            return $this->respondNoContent();
-        }//end if
-
-        return $this->respondForbidden();
-    }
-
-    /**
-     * Delete a specific related attachment.
-     *
-     * @param Request $request The user request.
-     * @param Event   $event   The model.
-     * @param Media   $medium  The attachment medium.
-     * @return JsonResponse
-     */
-    public function deleteAttachment(Request $request, Event $event, Media $medium)
-    {
-        if (EventConductor::updatable($event) === true) {
-            $attachments = $event->attachments;
-            $deleted = false;
-
-            foreach ($attachments as $attachment) {
-                if ($attachment->media_id === $medium->id) {
-                    $attachment->delete();
-                    $deleted = true;
-                    break;
-                }
-            }
-
-            if ($deleted === true) {
-                // Attachment was deleted successfully
-                return $this->respondNoContent();
-            } else {
-                // Attachment with matching media ID was not found
-                return $this->respondNotFound();
-            }
-        }
-
-        return $this->respondForbidden();
-    }
-
-    public function userList(Request $request, Event $event)
+    public function userList(Request $request, Event $event): JsonResponse
     {
         $authUser = $request->user();
         $eventUsers = $event->users;
@@ -247,16 +144,28 @@ class EventController extends ApiController
                     });
                 }
 
-                return $this->respondAsResource(UserConductor::collection($request, $eventUsers), ['isCollection' => true, 'resourceName' => 'users']);
+                return $this->respondAsResource(
+                    UserConductor::collection($request, $eventUsers),
+                    [
+                        'isCollection' => true,
+                        'resourceName' => 'users'
+                    ]
+                );
             }
 
             return $this->respondNotFound();
-        }
+        }//end if
 
         return $this->respondForbidden();
     }
 
-    public function userAdd(Request $request, Event $event)
+    /**
+     * Add user to Event
+     * @param Request $request The HTTP request.
+     * @param Event   $event   Event model.
+     * @return JsonResponse
+     */
+    public function userAdd(Request $request, Event $event): JsonResponse
     {
         $authUser = $request->user();
         if ($authUser !== null && $authUser->hasPermission('admin/events') === true) {
@@ -288,12 +197,26 @@ class EventController extends ApiController
         return $this->respondForbidden();
     }
 
-    public function userUpdate(Request $request, Event $event)
+    /**
+     * Update user
+     * @param Request $request The HTTP request.
+     * @param Event   $event   Event model.
+     * @return void
+     */
+    public function userUpdate(Request $request, Event $event): void
     {
         // only admin/events permitted
     }
 
-    public function userDelete(Request $request, Event $event, User $user)
+    /**
+     * Delete user from event
+     *
+     * @param Request $request The HTTP request.
+     * @param Event   $event   Event model.
+     * @param User    $user    User model.
+     * @return JsonResponse
+     */
+    public function userDelete(Request $request, Event $event, User $user): JsonResponse
     {
         $authUser = $request->user();
         if ($authUser !== null && $authUser->hasPermission('admin/events') === true) {

app.old/Http/Controllers/Api/InfoController.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use App\Enum\HttpResponseCodes;
+use App\Models\Media;
+use Illuminate\Http\Request;
+
+class InfoController extends ApiController
+{
+    /**
+     * Display a listing of the resource.
+     *
+     * @param \Illuminate\Http\Request $request The endpoint request.
+     * @return \Illuminate\Http\Response
+     */
+    public function index(Request $request)
+    {
+        $info = [
+            "version" => "1.0.0",
+            "max_upload_size" => Media::getMaxUploadSize()
+        ];
+
+        return $this->respondJson($info);
+    }
+}

app.old/Http/Controllers/Api/LogController.php

@@ -45,7 +45,12 @@ class LogController extends ApiController
 
                     $before = $request->get('before');
                     if ($before !== null) {
-                        $before = preg_split("/([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})/", $before, -1, (PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY));
+                        $before = preg_split(
+                            "/([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})/",
+                            $before,
+                            -1,
+                            (PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY)
+                        );
                         if (count($before) !== 6) {
                             $before = null;
                         }
@@ -53,7 +58,12 @@ class LogController extends ApiController
 
                     $after = $request->get('after');
                     if ($after !== null) {
-                        $after = preg_split("/([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})/", $after, -1, (PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY));
+                        $after = preg_split(
+                            "/([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})/",
+                            $after,
+                            -1,
+                            (PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY)
+                        );
                         if (count($after) !== 6) {
                             $after = null;
                         }
@@ -77,30 +87,59 @@ class LogController extends ApiController
                                 $logContent = file_get_contents($logFile['path']);
                             }
 
-                            $logArray = preg_split("/(\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}: (?:(?!\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}: )[\s\S])*)/", $logContent, -1, (PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY));
+                            $logArray = preg_split(
+                                // phpcs:ignore Generic.Files.LineLength.TooLong
+                                "/(\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}: (?:(?!\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}: )[\s\S])*)/",
+                                $logContent,
+                                -1,
+                                (PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY)
+                            );
 
                             $logContent = '';
                             $logLineCount = 0;
                             $logLineSkip = false;
                             foreach (array_reverse($logArray) as $logLine) {
-                                $lineDate = preg_split("/^([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2}): /", $logLine, -1, (PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY));
+                                $lineDate = preg_split(
+                                    "/^([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2}): /",
+                                    $logLine,
+                                    -1,
+                                    (PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY)
+                                );
                                 if (count($lineDate) >= 6) {
                                     $logLineSkip = false;
 
                                     // Is line before
-                                    if ($before !== null && ($lineDate[0] > $before[0] || $lineDate[1] > $before[1] || $lineDate[2] > $before[2] || $lineDate[3] > $before[3] || $lineDate[4] > $before[4] || $lineDate[5] > $before[5])) {
+                                    if (
+                                        $before !== null && (
+                                        $lineDate[0] > $before[0] ||
+                                        $lineDate[1] > $before[1] ||
+                                        $lineDate[2] > $before[2] ||
+                                        $lineDate[3] > $before[3] ||
+                                        $lineDate[4] > $before[4] ||
+                                        $lineDate[5] > $before[5]
+                                        )
+                                    ) {
                                         $logLineSkip = true;
                                         continue;
                                     }
 
                                     // Is line after
-                                    if ($after !== null && ($after[0] > $lineDate[0] || $after[1] > $lineDate[1] || $after[2] > $lineDate[2] || $after[3] > $lineDate[3] || $after[4] > $lineDate[4] || $after[5] > $lineDate[5])) {
+                                    if (
+                                        $after !== null && (
+                                        $after[0] > $lineDate[0] ||
+                                        $after[1] > $lineDate[1] ||
+                                        $after[2] > $lineDate[2] ||
+                                        $after[3] > $lineDate[3] ||
+                                        $after[4] > $lineDate[4] ||
+                                        $after[5] > $lineDate[5]
+                                        )
+                                    ) {
                                         $logLineSkip = true;
                                         continue;
                                     }
 
                                     $logLineCount += 1;
-                                }
+                                }//end if
 
                                 if ($logLineCount > $lines) {
                                     break;

app.old/Http/Controllers/Api/MediaController.php

@@ -0,0 +1,443 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use App\Conductors\MediaConductor;
+use App\Conductors\MediaJobConductor;
+use App\Enum\HttpResponseCodes;
+use App\Http\Requests\MediaRequest;
+use App\Models\Media;
+use App\Models\MediaJob;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Http\Response;
+use Illuminate\Http\UploadedFile;
+use Illuminate\Support\Carbon;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Storage;
+use Laravel\Sanctum\PersonalAccessToken;
+
+class MediaController extends ApiController
+{
+    /**
+     * ApplicationController constructor.
+     */
+    public function __construct()
+    {
+        $this->middleware('auth:sanctum')
+        ->only(['store','update','destroy']);
+    }
+
+    /**
+     * Display a listing of the resource.
+     *
+     * @param \Illuminate\Http\Request $request The endpoint request.
+     * @return \Illuminate\Http\Response
+     */
+    public function index(Request $request)
+    {
+        list($collection, $total) = MediaConductor::request($request);
+
+        return $this->respondAsResource(
+            $collection,
+            ['isCollection' => true,
+                'appendData' => ['total' => $total]
+            ],
+            function ($options) {
+                return $options['total'] === 0;
+            }
+        );
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @param \Illuminate\Http\Request $request The endpoint request.
+     * @param  \App\Models\Media        $medium  The request media.
+     * @return \Illuminate\Http\Response
+     */
+    public function show(Request $request, Media $medium)
+    {
+        if (MediaConductor::viewable($medium) === true) {
+            return $this->respondAsResource(MediaConductor::model($request, $medium));
+        }
+
+        return $this->respondForbidden();
+    }
+
+    /**
+     * Store a new media resource
+     *
+     * @param  \App\Http\Requests\MediaRequest $request The uploaded media.
+     * @return \Illuminate\Http\Response
+     */
+    public function store(MediaRequest $request)
+    {
+        // allowed to create a media item
+        if (MediaConductor::creatable() === false) {
+            return $this->respondForbidden();
+        }
+
+        // check for file
+        $file = $request->file('file');
+        if ($file === null) {
+            return $this->respondWithErrors(['file' => 'The browser did not upload the file correctly to the server.']);
+        }
+
+        return $this->storeOrUpdate($request, null);
+    }
+
+    /**
+     * Update the media resource in storage.
+     *
+     * @param  \App\Http\Requests\MediaRequest $request The update request.
+     * @param  \App\Models\Media               $medium  The specified media.
+     * @return \Illuminate\Http\Response
+     */
+    public function update(MediaRequest $request, Media $medium)
+    {
+        // allowed to update a media item
+        if (MediaConductor::updatable($medium) === false) {
+            return $this->respondForbidden();
+        }
+
+        return $this->storeOrUpdate($request, $medium);
+    }
+
+    /**
+     * Store a new media resource
+     *
+     * @param  \App\Http\Requests\MediaRequest $request The uploaded media.
+     * @param  \App\Models\Media|null          $medium  The specified media.
+     * @return \Illuminate\Http\Response
+     */
+    public function storeOrUpdate(MediaRequest $request, Media|null $medium)
+    {
+        $file = $request->file('file');
+        if ($file !== null) {
+            // validate file object
+            if ($file->isValid() !== true) {
+                switch ($file->getError()) {
+                    case UPLOAD_ERR_INI_SIZE:
+                    case UPLOAD_ERR_FORM_SIZE:
+                        return $this->respondTooLarge();
+                    case UPLOAD_ERR_PARTIAL:
+                        return $this->respondWithErrors([$file => 'The file upload was interrupted.']);
+                    default:
+                        return $this->respondWithErrors(
+                            [$file => 'An error occurred uploading the file to the server.']
+                        );
+                }
+            }
+
+            if ($file->getSize() > Media::getMaxUploadSize()) {
+                return $this->respondTooLarge();
+            }
+        }
+
+        // create/get media job
+        $mediaJob = null;
+        $data = [];
+
+        if ($request->missing('job_id') === true) {
+            /** @var \App\Models\User */
+            $user = auth()->user();
+
+            $mediaJob = new MediaJob();
+            $mediaJob->user_id = $user->id;
+            if ($medium !== null) {
+                $mediaJob->media_id = $medium->id;
+            }
+
+            if ($request->has('title') === true || $file !== null) {
+                $data['title'] = $request->get('title', '');
+            }
+
+            if ($request->has('name') === true || $file !== null) {
+                $data['name'] = (
+                    $request->has('chunk') === true ? $request->get('name', '') : $file->getClientOriginalName()
+                );
+            }
+
+            if ($file !== null) {
+                $data['size'] = $request->has('chunk') === true ? intval($request->get('size', 0)) : $file->getSize();
+                $data['mime_type'] = (
+                    $request->has('chunk') === true ? $request->get('mime_type', '') : $file->getMimeType()
+                );
+            }
+
+            if ($request->has('storage') === true || $file !== null) {
+                $data['storage'] = $request->get('storage', '');
+            }
+
+            if ($request->has('security_type') === true || $file !== null) {
+                $data['security']['type'] = $request->get('security_type', '');
+                $data['security']['data'] = $request->get('security_data', '');
+
+                if ($data['security']['type'] === '') {
+                    $data['security']['data'] = '';
+                }
+
+                if ($medium === null || strcasecmp($data['security']['type'], $medium->security_type) !== 0) {
+                    if ($request->has('storage') === false) {
+                        $mime_type = $request->get('mime_type', $medium === null ? '' : $medium->mime_type);
+                        $data['storage'] = Media::recommendedStorage($mime_type, $data['security']['type']);
+                    }
+                }
+            }
+
+            if (
+                array_key_exists('storage', $data) === true && (
+                    array_key_exists('security', $data) === true &&
+                    array_key_exists('type', $data['security']) === true
+                ) &&
+                array_key_exists('mime_type', $data) === true &&
+                $data['mime_type'] !== ""
+            ) {
+                    $error = Media::verifyStorage($data['mime_type'], $data['security']['type'], $data['storage']);
+                    // Log::error($data['mime_type'] . ' - ' . $data['security']['type'] . ' - ' . $data['storage']);
+                switch ($error) {
+                    case Media::STORAGE_VALID:
+                        break;
+                    case Media::STORAGE_MIME_MISSING:
+                        return $this->respondWithErrors(['mime_type' => 'The file type is required.']);
+                    case Media::STORAGE_NOT_FOUND:
+                        return $this->respondWithErrors(['storage' => 'Storage was not found.']);
+                    case Media::STORAGE_INVALID_SECURITY:
+                        return $this->respondWithErrors(
+                            ['storage' => 'Storage invalid for this security requirement.']
+                        );
+                    default:
+                        return $this->respondWithErrors(['storage' => 'Storage verification error occurred.']);
+                }
+            }
+
+            if ($request->has('transform') === true) {
+                $transform = [];
+
+                foreach (explode(',', $request->get('transform', '')) as $value) {
+                    if (is_string($value) === true) {
+                        if (preg_match('/^rotate-(-?\d+)$/', $value, $matches) !== false) {
+                            $transform['rotate'] = $matches[1];
+                        } elseif (preg_match('/^flip-([vh]|vh|hv)$/', $value, $matches) !== false) {
+                            $transform['flip'] = $matches[1];
+                        } elseif (preg_match('/^crop-(\d+)-(\d+)$/', $value, $matches) !== false) {
+                            $transform['crop'] = ['width' => $matches[1], 'height' => $matches[2]];
+                        } elseif (preg_match('/^crop-(\d+)-(\d+)-(\d+)-(\d+)$/', $value, $matches) !== false) {
+                            $transform['crop'] = [
+                                'width' => $matches[1],
+                                'height' => $matches[2],
+                                'x' => $matches[3],
+                                'y' => $matches[4]
+                            ];
+                        }
+                    }
+                }
+
+                if (count($transform) > 0) {
+                    $data['transform'] = $transform;
+                }
+            }//end if
+
+            $mediaJob->setStatusWaiting();
+        } else {
+            $mediaJob = MediaJob::find($request->get('job_id'));
+            if ($mediaJob === null || $mediaJob->exists() === false) {
+                $this->respondNotFound();
+            }
+
+            $data = json_decode($mediaJob->data, true);
+            if ($data === null) {
+                Log::error(`{$mediaJob->id} contains no data`);
+                return $this->respondServerError();
+            }
+
+            if (array_key_exists('name', $data) === false) {
+                Log::error(`{$mediaJob->id} data does not contain the name key`);
+                return $this->respondServerError();
+            }
+        }//end if
+
+        if ($mediaJob === null) {
+            Log::error(`media job does not exist`);
+            return $this->respondServerError();
+        }
+
+        // save uploaded file
+        if ($file !== null) {
+            if ($data['name'] === '') {
+                Log::error(`filename does not exist`);
+                return $this->respondServerError();
+            }
+
+            $temporaryFilePath = generateTempFilePath(
+                pathinfo($data['name'], PATHINFO_EXTENSION),
+                $request->get('chunk', '')
+            );
+            copy($file->path(), $temporaryFilePath);
+
+            if ($request->has('chunk') === true) {
+                $data['chunks'][$request->get('chunk', '1')] = $temporaryFilePath;
+                $data['chunk_count'] = $request->get('chunk_count', 1);
+            } else {
+                $data['file'] = $temporaryFilePath;
+            }
+        }
+
+        $mediaJob->data = json_encode($data, true);
+        $mediaJob->save();
+        $mediaJob->process();
+
+        return $this->respondAsResource(
+            MediaJobConductor::model($request, $mediaJob),
+            ['resourceName' => 'media_job', 'respondCode' => HttpResponseCodes::HTTP_ACCEPTED]
+        );
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  \App\Models\Media $medium Specified media file.
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy(Media $medium)
+    {
+        if (MediaConductor::destroyable($medium) === true) {
+            $medium->delete();
+            return $this->respondNoContent();
+        }
+
+        return $this->respondForbidden();
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @param \Illuminate\Http\Request $request The endpoint request.
+     * @param  \App\Models\Media        $media   Specified media.
+     * @return \Illuminate\Http\Response
+     */
+    public function download(Request $request, Media $media): Response
+    {
+        $headers = [];
+
+        /* Check file exists */
+        if (Storage::disk($media->storage)->exists($media->name) === false) {
+            return $this->respondNotFound();
+        }
+
+        $updated_at = Carbon::parse(Storage::disk($media->storage)->lastModified($media->name));
+
+        $headerPragma = 'no-cache';
+        $headerCacheControl = 'max-age=0, must-revalidate';
+        $headerExpires = $updated_at->toRfc2822String();
+
+        /* construct user if can */
+        $user = $request->user();
+        if ($user === null && $request->has('token') === true) {
+            $accessToken = PersonalAccessToken::findToken(urldecode($request->input('token')));
+
+            if (
+                $accessToken !== null && (config('sanctum.expiration') === null ||
+                $accessToken->created_at->lte(now()->subMinutes(config('sanctum.expiration'))) === false)
+            ) {
+                $user = $accessToken->tokenable;
+            }
+        }
+
+        if ($media->security_type === '') {
+            /* no security */
+            $headerPragma = 'public';
+            $headerExpires = $updated_at->addMonth()->toRfc2822String();
+        } elseif (strcasecmp('password', $media->security_type) === 0) {
+            /* password */
+            if (
+                ($user === null || $user->hasPermission('admin/media') === false) &&
+                ($request->has('password') === false || $request->get('password') !== $media->security_data)
+            ) {
+                    return $this->respondForbidden();
+            }
+        } elseif (strcasecmp('permission', $media->security_type) === 0) {
+            /* permission */
+            if (
+                $user === null || (
+                    $user->hasPermission('admin/media') === false &&
+                    $user->hasPermission($media->security_data) === false
+                )
+            ) {
+                    return $this->respondForbidden();
+            }
+        }//end if
+
+        // deepcode ignore InsecureHash: Browsers expect Etag to be a md5 hash
+        $headerEtag = md5($updated_at->format('U'));
+        $headerLastModified = $updated_at->toRfc2822String();
+
+        $headers = [
+            'Cache-Control' => $headerCacheControl,
+            'Content-Disposition' => sprintf('inline; filename="%s"', basename($media->name)),
+            'Etag' => $headerEtag,
+            'Expires' => $headerExpires,
+            'Last-Modified' => $headerLastModified,
+            'Pragma' => $headerPragma,
+        ];
+
+        $server = request()->server;
+
+        $requestModifiedSince = $server->has('HTTP_IF_MODIFIED_SINCE') &&
+        $server->get('HTTP_IF_MODIFIED_SINCE') === $headerLastModified;
+
+        $requestNoneMatch = $server->has('HTTP_IF_NONE_MATCH') &&
+        $server->get('HTTP_IF_NONE_MATCH') === $headerEtag;
+
+        if ($requestModifiedSince === true || $requestNoneMatch === true) {
+            return response()->make('', 304, $headers);
+        }
+
+        $headers['Content-Type'] = Storage::disk($media->storage)->mimeType($media->name);
+        $headers['Content-Length'] = Storage::disk($media->storage)->size($media->name);
+        $headers['Content-Disposition'] = 'attachment; filename="' . basename($media->name) . '"';
+
+        $stream = Storage::disk($media->storage)->readStream($media->name);
+        return response()->stream(
+            function () use ($stream) {
+                while (ob_get_level() > 0) {
+                    ob_end_flush();
+                }
+                fpassthru($stream);
+            },
+            200,
+            $headers
+        );
+    }
+
+    /**
+     * Validate a File item in a request is valid
+     *
+     * @param UploadedFile $file     The file to validate.
+     * @param string       $errorKey The error key to use.
+     * @return JsonResponse|null
+     */
+    private function validateFileObject(UploadedFile $file, string $errorKey = 'file'): JsonResponse|null
+    {
+        if ($file->isValid() !== true) {
+            switch ($file->getError()) {
+                case UPLOAD_ERR_INI_SIZE:
+                case UPLOAD_ERR_FORM_SIZE:
+                    return $this->respondTooLarge();
+                case UPLOAD_ERR_PARTIAL:
+                    return $this->respondWithErrors([$errorKey => 'The file upload was interrupted.']);
+                default:
+                    return $this->respondWithErrors(
+                        [$errorKey => 'An error occurred uploading the file to the server.']
+                    );
+            }
+        }
+
+        if ($file->getSize() > Media::getMaxUploadSize()) {
+            return $this->respondTooLarge();
+        }
+
+        return null;
+    }
+}

app.old/Http/Controllers/Api/MediaJobController.php

@@ -0,0 +1,52 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use App\Conductors\MediaJobConductor;
+use App\Http\Controllers\Api\ApiController;
+use App\Models\MediaJob;
+use Illuminate\Http\Request;
+
+class MediaJobController extends ApiController
+{
+    /**
+     * Display a listing of the resource.
+     *
+     * @param \Illuminate\Http\Request $request The endpoint request.
+     * @return \Illuminate\Http\Response
+     */
+    public function index(Request $request)
+    {
+        list($collection, $total) = MediaJobConductor::request($request);
+
+        return $this->respondAsResource(
+            $collection,
+            ['isCollection' => true,
+                'appendData' => ['total' => $total],
+                'resourceName' => 'media_job'
+            ],
+            function ($options) {
+                return $options['total'] === 0;
+            }
+        );
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @param \Illuminate\Http\Request $request  The endpoint request.
+     * @param  \App\Models\MediaJob     $mediaJob The request media job.
+     * @return \Illuminate\Http\Response
+     */
+    public function show(Request $request, MediaJob $mediaJob)
+    {
+        if (MediaJobConductor::viewable($mediaJob) === true) {
+            return $this->respondAsResource(
+                MediaJobConductor::model($request, $mediaJob),
+                ['resourceName' => 'media_job']
+            );
+        }
+
+        return $this->respondForbidden();
+    }
+}

app.old/Http/Controllers/Api/OCRController.php

@@ -101,7 +101,10 @@ class OCRController extends ApiController
             $tesseractImageFilterFunc = function ($filter, $options = null) use ($curlResult, $curlSize, $ocr) {
                 $result = '';
                 $img = imagecreatefromstring($curlResult);
-                if ($img !== false && (($options !== null && imagefilter($img, $filter, $options) === true) || ($options === null && imagefilter($img, $filter) === true))) {
+                if (
+                    $img !== false && (($options !== null && imagefilter($img, $filter, $options) === true) ||
+                    ($options === null && imagefilter($img, $filter) === true))
+                ) {
                     ob_start();
                     imagepng($img);
                     $imgData = ob_get_contents();

app.old/Http/Controllers/Api/ShortlinkController.php

@@ -2,17 +2,11 @@
 
 namespace App\Http\Controllers\Api;
 
-use App\Conductors\MediaConductor;
 use App\Conductors\ShortlinkConductor;
 use App\Enum\HttpResponseCodes;
-use App\Http\Requests\MediaRequest;
 use App\Http\Requests\ShortlinkRequest;
-use App\Models\Media;
 use App\Models\Shortlink;
 use Illuminate\Http\Request;
-use Illuminate\Support\Carbon;
-use Illuminate\Support\Facades\Log;
-use Laravel\Sanctum\PersonalAccessToken;
 
 class ShortlinkController extends ApiController
 {
@@ -85,8 +79,8 @@ class ShortlinkController extends ApiController
     /**
      * Update the media resource in storage.
      *
-     * @param  \App\Http\Requests\ShortlinkRequest $request The update request.
-     * @param  \App\Models\Shortlink               $medium  The specified shortlink.
+     * @param  \App\Http\Requests\ShortlinkRequest $request   The update request.
+     * @param  \App\Models\Shortlink               $shortlink The specified shortlink.
      * @return \Illuminate\Http\Response
      */
     public function update(ShortlinkRequest $request, Shortlink $shortlink)
@@ -102,7 +96,7 @@ class ShortlinkController extends ApiController
     /**
      * Remove the specified resource from storage.
      *
-     * @param  \App\Models\Shortlink $medium Specified shortlink.
+     * @param  \App\Models\Shortlink $shortlink Specified shortlink.
      * @return \Illuminate\Http\Response
      */
     public function destroy(Shortlink $shortlink)

app.old/Http/Controllers/Api/UserController.php

@@ -73,7 +73,10 @@ class UserController extends ApiController
     {
         if (UserConductor::creatable() === true) {
             $user = User::create($request->all());
-            return $this->respondAsResource(UserConductor::model($request, $user), ['respondCode' => HttpResponseCodes::HTTP_CREATED]);
+            return $this->respondAsResource(
+                UserConductor::model($request, $user),
+                ['respondCode' => HttpResponseCodes::HTTP_CREATED]
+            );
         } else {
             return $this->respondForbidden();
         }
@@ -145,9 +148,9 @@ class UserController extends ApiController
      * Register a new user
      *
      * @param \App\Http\Requests\UserRegisterRequest $request The register user request.
-     * @return \Illuminate\Http\Response
+     * @return JsonResponse
      */
-    public function register(UserRegisterRequest $request)
+    public function register(UserRegisterRequest $request): JsonResponse
     {
         try {
             $userData = $request->only([
@@ -286,9 +289,9 @@ class UserController extends ApiController
      * Resend a new verify email
      *
      * @param \App\Http\Requests\UserResendVerifyEmailRequest $request The resend verify email request.
-     * @return \Illuminate\Http\Response
+     * @return JsonResponse
      */
-    public function resendVerifyEmail(UserResendVerifyEmailRequest $request)
+    public function resendVerifyEmail(UserResendVerifyEmailRequest $request): JsonResponse
     {
         UserCode::clearExpired();
 
@@ -342,9 +345,13 @@ class UserController extends ApiController
      * @param User    $user    The specified user.
      * @return JsonResponse
      */
-    public function eventList(Request $request, User $user)
+    public function eventList(Request $request, User $user): JsonResponse
     {
-        if ($request->user() !== null && ($request->user() === $user || $request->user()->hasPermission('admin/events') === true)) {
+        if (
+            $request->user() !== null && (
+            $request->user() === $user || $request->user()->hasPermission('admin/events') === true
+            )
+        ) {
             $collection = $user->events;
             $total = $collection->count();
 

app.old/Http/Controllers/Controller.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
+use Illuminate\Foundation\Validation\ValidatesRequests;
+use Illuminate\Routing\Controller as BaseController;
+
+class Controller extends BaseController
+{
+    use AuthorizesRequests;
+    use ValidatesRequests;
+}

app.old/Http/Kernel.php

@@ -0,0 +1,73 @@
+<?php
+
+namespace App\Http;
+
+use Illuminate\Foundation\Http\Kernel as HttpKernel;
+
+class Kernel extends HttpKernel
+{
+    /**
+     * The application's global HTTP middleware stack.
+     *
+     * These middleware are run during every request to your application.
+     *
+     * @var array<int, class-string|string>
+     */
+    protected $middleware = [
+        // \App\Http\Middleware\TrustHosts::class,
+        \App\Http\Middleware\TrustProxies::class,
+        \Illuminate\Http\Middleware\HandleCors::class,
+        \App\Http\Middleware\PreventRequestsDuringMaintenance::class,
+        \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
+        // \App\Http\Middleware\TrimStrings::class,
+        // \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
+    ];
+
+    /**
+     * The application's route middleware groups.
+     *
+     * @var array<string, array<int, class-string|string>>
+     */
+    protected $middlewareGroups = [
+        'web' => [
+            \App\Http\Middleware\EncryptCookies::class,
+            \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
+            \Illuminate\Session\Middleware\StartSession::class,
+            \Illuminate\View\Middleware\ShareErrorsFromSession::class,
+            \App\Http\Middleware\VerifyCsrfToken::class,
+            \Illuminate\Routing\Middleware\SubstituteBindings::class,
+        ],
+
+        'api' => [
+            // \Laravel\Sanctum\Http\Middleware\EnsureFrontendRequestsAreStateful::class,
+            \Illuminate\Routing\Middleware\ThrottleRequests::class . ':api',
+            \Illuminate\Routing\Middleware\SubstituteBindings::class,
+            // \App\Http\Middleware\ForceJsonResponse::class,
+            \App\Http\Middleware\UnmangleRequest::class,
+            'useSanctumGuard',
+            \App\Http\Middleware\LogRequest::class,
+        ],
+    ];
+
+    /**
+     * The application's middleware aliases.
+     *
+     * Aliases may be used to conveniently assign middleware to routes and groups.
+     *
+     * @var array<string, class-string|string>
+     */
+    protected $middlewareAliases = [
+        'auth' => \App\Http\Middleware\Authenticate::class,
+        'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
+        'auth.session' => \Illuminate\Session\Middleware\AuthenticateSession::class,
+        'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class,
+        'can' => \Illuminate\Auth\Middleware\Authorize::class,
+        'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
+        'unmangle' => \App\Http\Middleware\UnmangleRequest::class,
+        'password.confirm' => \Illuminate\Auth\Middleware\RequirePassword::class,
+        'signed' => \App\Http\Middleware\ValidateSignature::class,
+        'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
+        'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
+        'useSanctumGuard' => \App\Http\Middleware\UseSanctumGuard::class
+    ];
+}

app.old/Http/Middleware/Authenticate.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Illuminate\Auth\Middleware\Authenticate as Middleware;
+
+class Authenticate extends Middleware
+{
+    /**
+     * Get the path the user should be redirected to when they are not authenticated.
+     *
+     * @param  mixed $request Request.
+     * @return ?string
+     */
+    protected function redirectTo(mixed $request): ?string
+    {
+        if ($request->expectsJson() === false) {
+            return route('login');
+        }
+
+        return null;
+    }
+}

app.old/Http/Middleware/EncryptCookies.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Illuminate\Cookie\Middleware\EncryptCookies as Middleware;
+
+class EncryptCookies extends Middleware
+{
+    /**
+     * The names of the cookies that should not be encrypted.
+     *
+     * @var array<int, string>
+     */
+    protected $except = [
+        //
+    ];
+}

app.old/Http/Middleware/ForceJsonResponse.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Middleware;
 
+use Symfony\Component\HttpFoundation\Response;
 use Closure;
 use Illuminate\Http\Request;
 
@@ -10,11 +11,9 @@ class ForceJsonResponse
     /**
      * Handle an incoming request.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @param  \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse)  $next
-     * @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse
      */
-    public function handle(Request $request, Closure $next)
+    public function handle(Request $request, Closure $next): Response
     {
         $request->headers->set('Accept', 'application/json');
         return $next($request);

app.old/Http/Middleware/LogRequest.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use App\Models\AnalyticsItemRequest;
+use Symfony\Component\HttpFoundation\Response;
+use Closure;
+use Illuminate\Http\Request;
+
+class LogRequest
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param Illuminate\Http\Request $request HTTP Request.
+     * @param  \Closure                $next    Closure.
+     * @return Symfony\Component\HttpFoundation\Response
+     */
+    public function handle(Request $request, Closure $next): Response
+    {
+        // Make it an after middleware
+        $response = $next($request);
+
+        try {
+            AnalyticsItemRequest::create([
+                'type' => 'apirequest',
+                'path' => $request->path(),
+            ]);
+
+            return $response;
+        } catch (\Error $e) {
+            report($e);
+            return $response;
+        }
+    }
+}

app.old/Http/Middleware/PreventRequestsDuringMaintenance.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Illuminate\Foundation\Http\Middleware\PreventRequestsDuringMaintenance as Middleware;
+
+class PreventRequestsDuringMaintenance extends Middleware
+{
+    /**
+     * The URIs that should be reachable while maintenance mode is enabled.
+     *
+     * @var array<int, string>
+     */
+    protected $except = [
+        //
+    ];
+}

app.old/Http/Middleware/RedirectIfAuthenticated.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Symfony\Component\HttpFoundation\Response;
+use App\Providers\RouteServiceProvider;
+use Closure;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+
+class RedirectIfAuthenticated
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  Request     $request   Request.
+     * @param  \Closure    $next      Closure.
+     * @param  string|null ...$guards Guards.
+     * @return Response
+     */
+    public function handle(Request $request, Closure $next, string ...$guards): Response
+    {
+        $guards = empty($guards) === true ? [null] : $guards;
+
+        foreach ($guards as $guard) {
+            if (Auth::guard($guard)->check() === true) {
+                return redirect(RouteServiceProvider::HOME);
+            }
+        }
+
+        return $next($request);
+    }
+}

app.old/Http/Middleware/TrimStrings.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Illuminate\Foundation\Http\Middleware\TrimStrings as Middleware;
+
+class TrimStrings extends Middleware
+{
+    /**
+     * The names of the attributes that should not be trimmed.
+     *
+     * @var array<int, string>
+     */
+    protected $except = [
+        'current_password',
+        'password',
+        'password_confirmation',
+    ];
+}

app.old/Http/Middleware/TrustHosts.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Illuminate\Http\Middleware\TrustHosts as Middleware;
+
+class TrustHosts extends Middleware
+{
+    /**
+     * Get the host patterns that should be trusted.
+     *
+     * @return array<int, string|null>
+     */
+    public function hosts(): array
+    {
+        return [
+            $this->allSubdomainsOfApplicationUrl(),
+        ];
+    }
+}

app.old/Http/Middleware/TrustProxies.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Illuminate\Http\Middleware\TrustProxies as Middleware;
+use Illuminate\Http\Request;
+
+class TrustProxies extends Middleware
+{
+    /**
+     * The trusted proxies for this application.
+     *
+     * @var array<int, string>|string|null
+     */
+    protected $proxies;
+
+    /**
+     * The headers that should be used to detect proxies.
+     *
+     * @var integer
+     */
+    // @codingStandardsIgnoreStart
+    protected $headers = (Request::HEADER_X_FORWARDED_FOR | Request::HEADER_X_FORWARDED_HOST | Request::HEADER_X_FORWARDED_PORT | Request::HEADER_X_FORWARDED_PROTO | Request::HEADER_X_FORWARDED_AWS_ELB);
+    // @codingStandardsIgnoreEnd
+}

app.old/Http/Middleware/UnmangleRequest.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Symfony\Component\HttpFoundation\Response;
+use App\Providers\RouteServiceProvider;
+use Closure;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+
+class UnmangleRequest
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  Request     $request   Request.
+     * @param  \Closure    $next      Next.
+     * @param  string|null ...$guards Guards.
+     * @return Response response.
+     */
+    public function handle(Request $request, Closure $next, string ...$guards): Response
+    {
+        if (isset($_SERVER['QUERY_STRING']) === true) {
+            $params = $request->all();
+
+            $string = $_SERVER['QUERY_STRING'];
+            $parts = explode('&', $string);
+            foreach ($parts as $part) {
+                $key = $part;
+                $splitPos = strpos($key, '=');
+                if ($splitPos !== false) {
+                    $key = urldecode(substr($key, 0, $splitPos));
+                }
+
+                $replace_key = str_replace('.', '_', $key);
+                if (strpos($key, '.') !== false && array_key_exists($replace_key, $params) === true) {
+                    $params[$key] = $params[$replace_key];
+                    unset($params[$replace_key]);
+                }
+            }
+
+            $request->replace($params);
+        }//end if
+
+        return $next($request);
+    }
+}

app.old/Http/Middleware/UseSanctumGuard.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Symfony\Component\HttpFoundation\Response;
+use Closure;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+
+class UseSanctumGuard
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param Request  $request Request object.
+     * @param  \Closure $next    Closure object.
+     * @return Response
+     */
+    public function handle(Request $request, Closure $next): Response
+    {
+        Auth::shouldUse('sanctum');
+        return $next($request);
+    }
+}

app.old/Http/Middleware/ValidateSignature.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Illuminate\Routing\Middleware\ValidateSignature as Middleware;
+
+class ValidateSignature extends Middleware
+{
+    /**
+     * The names of the query string parameters that should be ignored.
+     *
+     * @var array<int, string>
+     */
+    protected $except = [
+        // 'fbclid',
+        // 'utm_campaign',
+        // 'utm_content',
+        // 'utm_medium',
+        // 'utm_source',
+        // 'utm_term',
+    ];
+}

app.old/Http/Middleware/VerifyCsrfToken.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken as Middleware;
+
+class VerifyCsrfToken extends Middleware
+{
+    /**
+     * The URIs that should be excluded from CSRF verification.
+     *
+     * @var array<int, string>
+     */
+    protected $except = [
+        //
+    ];
+}

app.old/Http/Requests/AnalyticsRequest.php

@@ -11,7 +11,7 @@ class AnalyticsRequest extends BaseRequest
      *
      * @return array<string, mixed>
      */
-    public function postRules()
+    public function postRules(): array
     {
         return [
             'type' => 'required|string',
@@ -23,7 +23,7 @@ class AnalyticsRequest extends BaseRequest
      *
      * @return array<string, mixed>
      */
-    public function putRules()
+    public function putRules(): array
     {
         return [
             'type' => 'string',

app.old/Http/Requests/ArticleRequest.php

@@ -11,7 +11,7 @@ class ArticleRequest extends BaseRequest
      *
      * @return array<string, mixed>
      */
-    public function postRules()
+    public function postRules(): array
     {
         return [
             'slug' => 'required|string|min:6|unique:articles',
@@ -28,7 +28,7 @@ class ArticleRequest extends BaseRequest
      *
      * @return array<string, mixed>
      */
-    public function putRules()
+    public function putRules(): array
     {
         return [
             'slug' => [

app.old/Http/Requests/AuthLoginRequest.php

@@ -11,7 +11,7 @@ class AuthLoginRequest extends FormRequest
      *
      * @return array<string, mixed>
      */
-    public function rules()
+    public function rules(): array
     {
         return [
             'email' => 'required|string|min:6|max:255',

app.old/Http/Requests/BaseRequest.php

@@ -12,11 +12,15 @@ class BaseRequest extends FormRequest
      *
      * @return boolean
      */
-    public function authorize()
+    public function authorize(): bool
     {
         if (request()->isMethod('post') === true && method_exists($this, 'postAuthorize') === true) {
             return $this->postAuthorize();
-        } elseif ((request()->isMethod('put') === true || request()->isMethod('patch') === true) && method_exists($this, 'putAuthorize') === true) {
+        } elseif (
+            (
+            request()->isMethod('put') === true || request()->isMethod('patch') === true
+            ) && method_exists($this, 'putAuthorize') === true
+        ) {
             return $this->putAuthorize();
         } elseif (request()->isMethod('delete') === true && method_exists($this, 'destroyAuthorize') === true) {
             return $this->deleteAuthorize();
@@ -30,7 +34,7 @@ class BaseRequest extends FormRequest
      *
      * @return array<string, mixed>
      */
-    public function rules()
+    public function rules(): array
     {
         $rules = [];
 
@@ -40,7 +44,11 @@ class BaseRequest extends FormRequest
 
         if (method_exists($this, 'postRules') === true && request()->isMethod('post') === true) {
             $rules = $this->mergeRules($rules, $this->postRules());
-        } elseif (method_exists($this, 'putRules') === true && (request()->isMethod('put') === true || request()->isMethod('patch') === true)) {
+        } elseif (
+            method_exists($this, 'putRules') === true && (
+            request()->isMethod('put') === true || request()->isMethod('patch') === true
+            )
+        ) {
             $rules = $this->mergeRules($rules, $this->putRules());
         } elseif (method_exists($this, 'destroyRules') === true && request()->isMethod('delete') === true) {
             $rules = $this->mergeRules($rules, $this->destroyRules());
@@ -56,7 +64,7 @@ class BaseRequest extends FormRequest
      * @param array $collection2 The second collection of rules to merge.
      * @return array
      */
-    private function mergeRules(array $collection1, array $collection2)
+    private function mergeRules(array $collection1, array $collection2): array
     {
         $rules = [];
 

app.old/Http/Requests/ContactSendRequest.php

@@ -12,7 +12,7 @@ class ContactSendRequest extends FormRequest
      *
      * @return array<string, mixed>
      */
-    public function rules()
+    public function rules(): array
     {
         return [
             'name' => 'required|max:255',

app.old/Http/Requests/EventRequest.php

@@ -11,7 +11,7 @@ class EventRequest extends BaseRequest
      *
      * @return array<string, mixed>
      */
-    public function baseRules()
+    public function baseRules(): array
     {
         return [
             'title'             => 'min:6',
@@ -23,7 +23,7 @@ class EventRequest extends BaseRequest
             'end_at'            => 'date|after:start_date',
             'publish_at'        => 'date|nullable',
             'status' => [
-                Rule::in(['draft', 'soon', 'open', 'closed', 'cancelled']),
+                Rule::in(['draft', 'soon', 'open', 'closed', 'cancelled', 'scheduled', 'full']),
             ],
             'registration_type' => [
                 Rule::in(['none', 'email', 'link', 'message']),
@@ -34,6 +34,7 @@ class EventRequest extends BaseRequest
                 Rule::when(strcasecmp('message', $this->attributes->get('registration_type')) == 0, 'required|message'),
             ],
             'hero'              => 'uuid|exists:media,id',
+            'location_url'      => 'sometimes|string|max:255',
         ];
     }
 
@@ -42,7 +43,7 @@ class EventRequest extends BaseRequest
      *
      * @return array<string, mixed>
      */
-    protected function postRules()
+    protected function postRules(): array
     {
         return [
             'title'             => 'required',

app.old/Http/Requests/MediaRequest.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Http\Requests;
+
+use Illuminate\Validation\Rule;
+
+class MediaRequest extends BaseRequest
+{
+    /**
+     * POST request rules
+     *
+     * @return array
+     */
+    public function postRules(): array
+    {
+        return [
+            'job_id' => [
+                Rule::requiredIf(function () {
+                    return request()->has('chunk') && request('chunk') != 1;
+                }),
+                'string',
+            ],
+            'name' => [
+                Rule::requiredIf(function () {
+                    return request()->has('chunk') && request('chunk') == 1;
+                }),
+                'string',
+            ],
+            'chunk' => 'required_with:chunk_count|integer|min:1|max:999|lte:chunk_count',
+            'chunk_count' => 'required_with:chunk|integer|min:1',
+        ];
+    }
+}

app.old/Http/Requests/ShortlinkRequest.php

@@ -11,7 +11,7 @@ class ShortlinkRequest extends BaseRequest
      *
      * @return array<string, mixed>
      */
-    public function postRules()
+    public function postRules(): array
     {
         return [
             'code' => 'required|string|max:255|min:2|unique:shortlinks',
@@ -24,7 +24,7 @@ class ShortlinkRequest extends BaseRequest
      *
      * @return array<string, mixed>
      */
-    public function putRules()
+    public function putRules(): array
     {
         $shortlink = $this->route('shortlink');
 

app.old/Http/Requests/SubscriptionRequest.php

@@ -11,7 +11,7 @@ class SubscriptionRequest extends BaseRequest
      *
      * @return array<string, mixed>
      */
-    public function postRules()
+    public function postRules(): array
     {
         return [
             'email' => 'required|email|unique:subscriptions',
@@ -24,7 +24,7 @@ class SubscriptionRequest extends BaseRequest
      *
      * @return array<string, mixed>
      */
-    public function destroyRules()
+    public function destroyRules(): array
     {
         return [
             'email' => 'required|email',
@@ -37,7 +37,7 @@ class SubscriptionRequest extends BaseRequest
      *
      * @return array
      */
-    public function messages()
+    public function messages(): array
     {
         return [
             'email.unique' => 'This email address has already subscribed',

app.old/Http/Requests/UserForgotPasswordRequest.php

@@ -12,7 +12,7 @@ class UserForgotPasswordRequest extends FormRequest
      *
      * @return array<string, mixed>
      */
-    public function rules()
+    public function rules(): array
     {
         return [
             'email' => 'required|exists:users,email',

app.old/Http/Requests/UserRegisterRequest.php

@@ -12,7 +12,7 @@ class UserRegisterRequest extends FormRequest
      *
      * @return array<string, mixed>
      */
-    public function rules()
+    public function rules(): array
     {
         return [
             'display_name' => ['required','string','max:255', new Uniqueish('users')],

app.old/Http/Requests/UserRequest.php

@@ -15,14 +15,18 @@ class UserRequest extends BaseRequest
      *
      * @return array<string, mixed>
      */
-    public function postRules()
+    public function postRules(): array
     {
         $user = auth()->user();
         $isAdminUser = $user->hasPermission('admin/users');
 
         return [
-            'first_name' => ($isAdminUser === true ? 'required_with:last_name,display_name,phone' : 'required') . '|string|max:255|min:2',
-            'last_name' => ($isAdminUser === true ? 'required_with:first_name,display_name,phone' : 'required') . '|string|max:255|min:2',
+            'first_name' => (
+                $isAdminUser === true ? 'required_with:last_name,display_name,phone' : 'required'
+            ) . '|string|max:255|min:2',
+            'last_name' => (
+                $isAdminUser === true ? 'required_with:first_name,display_name,phone' : 'required'
+            ) . '|string|max:255|min:2',
             'display_name' => [
                 $isAdminUser === true ? 'required_with:first_name,last_name,phone' : 'required',
                 'string',
@@ -40,7 +44,7 @@ class UserRequest extends BaseRequest
      *
      * @return array<string, mixed>
      */
-    public function putRules()
+    public function putRules(): array
     {
         $user = auth()->user();
         $ruleUser = $this->route('user');

app.old/Http/Requests/UserResendVerifyEmailRequest.php

@@ -12,7 +12,7 @@ class UserResendVerifyEmailRequest extends FormRequest
      *
      * @return array<string, mixed>
      */
-    public function rules()
+    public function rules(): array
     {
         return [
             'email' => 'required|exists:users,email',

app.old/Http/Requests/UserResetPasswordRequest.php

@@ -12,7 +12,7 @@ class UserResetPasswordRequest extends FormRequest
      *
      * @return array<string, mixed>
      */
-    public function rules()
+    public function rules(): array
     {
         return [
             'code' => 'required|digits:6',

app.old/Http/Requests/UserVerifyEmailRequest.php

@@ -12,7 +12,7 @@ class UserVerifyEmailRequest extends FormRequest
      *
      * @return array<string, mixed>
      */
-    public function rules()
+    public function rules(): array
     {
         return [
             'code' => 'required|digits:6',

app.old/Jobs/MediaWorkerJob.php

@@ -0,0 +1,393 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Models\Media;
+use App\Models\MediaJob;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\File;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Storage;
+use FFMpeg;
+use FFMpeg\Coordinate\Dimension;
+use FFMpeg\FFProbe;
+use FFMpeg\Format\VideoInterface;
+use Intervention\Image\Facades\Image;
+
+/** @property on $format */
+class MediaWorkerJob implements ShouldQueue
+{
+    use Dispatchable;
+    use InteractsWithQueue;
+    use Queueable;
+    use SerializesModels;
+
+    /**
+     * MediaJob item
+     *
+     * @var MediaJob
+     */
+    protected $mediaJob;
+
+
+    /**
+     * Create a new job instance.
+     *
+     * @param MediaJob $mediaJob The mediaJob model.
+     * @return void
+     */
+    public function __construct(MediaJob $mediaJob)
+    {
+        $this->mediaJob = $mediaJob;
+    }
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle(): void
+    {
+        $media = $this->mediaJob->media()->first();
+        $newMedia = false;
+        $data = json_decode($this->mediaJob->data, true);
+
+        try {
+            // FILE
+            if (array_key_exists('file', $data) === true) {
+                if (file_exists($data['file']) === false) {
+                    $this->throwMediaJobFailure('temporary upload file no longer exists');
+                }
+
+                // convert HEIC files to JPG
+                $fileExtension = File::extension($data['file']);
+                if ($fileExtension === 'heic') {
+                    $this->mediaJob->setStatusProcessing(0, 0, 'converting image');
+
+                    // Get the path without the file name
+                    $uploadedFileDirectory = dirname($data['file']);
+
+                    // Convert the HEIC file to JPG
+                    $jpgFileName = pathinfo($data['file'], PATHINFO_FILENAME) . '.jpg';
+                    $jpgFilePath = $uploadedFileDirectory . '/' . $jpgFileName;
+                    if (file_exists($jpgFilePath) === true) {
+                        $this->throwMediaJobFailure('file already exists on server');
+                    }
+
+                    Image::make($data['file'])->save($jpgFilePath);
+
+                    // Update the uploaded file path and file name
+                    unlink($data['file']);
+                    $data['file'] = $jpgFileName;
+                }//end if
+
+                // get security
+                $security = [];
+                if ($media === null) {
+                    if (array_key_exists('security', $data) === true) {
+                        $security = $data['security'];
+                    }
+                } else {
+                    $security['type'] = $media->security_type;
+                    $security['data'] = $media->security_data;
+                }
+
+                // get storage
+                $storage = '';
+                if ($media === null) {
+                    if (array_key_exists('storage', $data) === true) {
+                        $storage = $data['storage'];
+                    }
+                } else {
+                    $storage = $media->storage;
+                }
+
+                if ($storage === '') {
+                    if (count($security) === 0 || $security['type'] === '') {
+                        if (strpos($data['mime_type'], 'image/') === 0) {
+                            $storage = 'local';
+                        } else {
+                            $storage = 'cdn';
+                        }
+                    } else {
+                        $storage = 'private';
+                    }
+                }
+
+                // Check if file already exists
+                $exists = Storage::disk($storage)->exists($data['name']);
+                if ($exists === true) {
+                    if (array_key_exists('noreplace', $data) === true && isTrue($data['noreplace']) === true) {
+                        $this->throwMediaJobFailure('file already exists on server');
+                    }
+                }
+
+                if ($exists === true) {
+                    $pathInfo = pathinfo($data['name']);
+                    $basename = $pathInfo['filename'];
+                    $extension = $pathInfo['extension'];
+                    $index = 0;
+
+                    do {
+                        $index++;
+                        $data['name'] = $basename . '-' . $index . '.' . $extension;
+                    } while (Storage::disk($storage)->exists($data['name']) === true);
+                }
+
+                if ($media === null) {
+                    $newMedia = true;
+                    $media = new Media([
+                        'user_id' => $this->mediaJob->user_id,
+                        'title' => $data['title'],
+                        'name' => $data['name'],
+                        'mime_type' => $data['mime_type'],
+                        'size' => $data['size'],
+                        'security_type' => $data['security']['type'],
+                        'security_data' => $data['security']['data'],
+                        'storage' => $storage,
+                    ]);
+                }//end if
+
+                $media->setStagingFile($data['file']);
+            } else {
+                if ($media === null) {
+                    $this->throwMediaJobFailure('The media item no longer exists');
+                }
+            }//end if
+
+            if (array_key_exists('transform', $data) === true) {
+                $media->createStagingFile();
+
+                // Modifications
+                if (strpos($media->mime_type, 'image/') === 0) {
+                    $modified = false;
+                    $image = Image::make($media->getStagingFilePath());
+
+                    // ROTATE
+                    if (array_key_exists("rotate", $data['transform']) === true) {
+                        $rotate = intval($data['transform']['rotate']);
+                        if ($rotate !== 0) {
+                            $this->mediaJob->setStatusProcessing(0, 0, 'rotating image');
+                            $image = $image->rotate($rotate);
+                            $modified = true;
+                        }
+                    }
+
+                    // FLIP-H/V
+                    if (array_key_exists('flip', $data['transform']) === true) {
+                        if (stripos($data['transform']['flip'], 'h') !== false) {
+                            $this->mediaJob->setStatusProcessing(0, 0, 'flipping image');
+                            $image = $image->flip('h');
+                            $modified = true;
+                        }
+
+                        if (stripos($data['transform']['flip'], 'v') !== false) {
+                            $this->mediaJob->setStatusProcessing(0, 0, 'flipping image');
+                            $image = $image->flip('v');
+                            $modified = true;
+                        }
+                    }
+
+                    // CROP
+                    if (array_key_exists("crop", $data['transform']) === true) {
+                        $cropData = $data['transform']['crop'];
+                        $width = intval(arrayDefaultValue("width", $cropData, $image->getWidth()));
+                        $height = intval(arrayDefaultValue("height", $cropData, $image->getHeight()));
+                        $x = intval(arrayDefaultValue("x", $cropData, 0));
+                        $y = intval(arrayDefaultValue("y", $cropData, 0));
+
+                        $this->mediaJob->setStatusProcessing(0, 0, 'cropping image');
+                        $image = $image->crop($width, $height, $x, $y);
+                        $modified = true;
+                    }//end if
+
+                    if ($modified === true) {
+                        $image->save();
+                    }
+                } elseif (strpos($data['mime_type'], 'video/') === 0) {
+                    $stagingFilePath = $media->getStagingFilePath();
+                    $ffmpeg = FFMpeg\FFMpeg::create();
+                    $video = $ffmpeg->open($stagingFilePath);
+                    $format = $this->detectVideoFormat($stagingFilePath);
+                    $modified = false;
+
+                    if ($format === null) {
+                        $this->mediaJob->setStatusFailed('Unsupported video format');
+                        return;
+                    }
+
+                    /** @var FFMpeg\Media\Video::filters */
+                    $filters = $video->filters();
+
+                    // ROTATE
+                    if (array_key_exists("rotate", $data['transform']) === true) {
+                        $rotate = intval($data['transform']['rotate']);
+                        $rotate = (($rotate % 360 + 360) % 360); // remove excess rotations
+                        $rotate = intval(round($rotate / 90) * 90); // round to nearest 90%
+
+                        if ($rotate > 0) {
+                            $this->mediaJob->setStatusProcessing(0, 0, 'rotating video');
+
+                            if ($rotate === 90) {
+                                $filters->rotate(FFMpeg\Filters\Video\RotateFilter::ROTATE_270);
+                                $modified = true;
+                            } elseif ($rotate === 180) {
+                                $filters->rotate(FFMpeg\Filters\Video\RotateFilter::ROTATE_180);
+                                $modified = true;
+                            } elseif ($rotate === 270) {
+                                $filters->rotate(FFMpeg\Filters\Video\RotateFilter::ROTATE_90);
+                                $modified = true;
+                            }
+                        }
+                    }
+
+                    // FLIP-H/V
+                    if (array_key_exists('flip', $data['transform']) === true) {
+                        if (stripos($data['transform']['flip'], 'h') !== false) {
+                            $this->mediaJob->setStatusProcessing(0, 0, 'flipping video');
+                            $filters->hflip()->synchronize();
+                            $modified = true;
+                        }
+
+                        if (stripos($data['transform']['flip'], 'v') !== false) {
+                            $this->mediaJob->setStatusProcessing(0, 0, 'flipping video');
+                            $filters->vflip()->synchronize();
+                            $modified = true;
+                        }
+                    }
+
+                    // CROP
+                    if (array_key_exists("crop", $data['transform']) === true) {
+                        $cropData = $data['transform']['crop'];
+                        $videoStream = $video->getStreams()->videos()->first();
+
+                        $width = intval(arrayDefaultValue("width", $cropData, $videoStream->get('width')));
+                        $height = intval(arrayDefaultValue("height", $cropData, $videoStream->get('height')));
+                        $x = intval(arrayDefaultValue("x", $cropData, 0));
+                        $y = intval(arrayDefaultValue("y", $cropData, 0));
+
+                        $cropDimension = new Dimension($width, $height);
+
+                        $this->mediaJob->setStatusProcessing(0, 0, 'cropping video');
+                        $filters->crop($cropDimension, $x, $y)->synchronize();
+                        $modified = true;
+                    }//end if
+
+                    $tempFilePath = generateTempFilePath(pathinfo($stagingFilePath, PATHINFO_EXTENSION));
+                    if (method_exists($format, 'on') === true) {
+                        $mediaJob = $this->mediaJob;
+                        $format->on('progress', function ($video, $format, $percentage) use ($mediaJob) {
+                            $mediaJob->setStatusProcessing($percentage, 100, 'transcoded');
+                        });
+                    }
+
+                    if ($modified === true) {
+                        $video->save($format, $tempFilePath);
+                        $media->changeStagingFile($tempFilePath);
+                    }
+                }//end if
+            }//end if
+
+            // Update attributes
+            if (array_key_exists('title', $data) === true) {
+                $media->title = $data['title'];
+            }
+
+            // Relocate file (if requested)
+            if (array_key_exists('security', $data) === true && array_key_exists('type', $data['security']) === true) {
+                $media->security_type = $data['security']['type'];
+                $media->security_data = $data['security']['data'];
+            }
+
+            if (array_key_exists('storage', $data) === true) {
+                if ($media->storage !== $data['storage']) {
+                    $media->createStagingFile();
+                    Storage::disk($media->storage)->delete($media->name);
+                    $media->storage = $data['storage'];
+                }
+            }
+
+            // Finish media object
+            if ($media->hasStagingFile() === true) {
+                $this->mediaJob->setStatusProcessing(0, 0, 'transferring to cdn');
+                $media->deleteFile();
+                $media->saveStagingFile(true);
+            }
+
+            $media->save();
+            $this->mediaJob->media_id = $media->id;
+            $this->mediaJob->setStatusComplete();
+        } catch (\Exception $e) {
+            if ($this->mediaJob->status !== 'failed') {
+                $this->mediaJob->setStatusFailed('Unexpected server error occurred');
+            }
+
+            if ($media !== null) {
+                $media->deleteStagingFile();
+                if ($newMedia === true) {
+                    $media->delete();
+                }
+            }
+
+            Log::error($e->getMessage() . "\n" . $e->getFile() . " - " . $e->getLine() . "\n" . $e->getTraceAsString());
+            $this->fail($e);
+        }//end try
+    }
+
+    /**
+     * Detects the format of a video using FFProbe
+     *
+     * @param string $videoPath The video file path.
+     * @return VideoInterface | null
+     */
+    public function detectVideoFormat(string $videoPath): VideoInterface | null
+    {
+        $ffprobe = FFProbe::create();
+
+        $videoStream = $ffprobe
+            ->streams($videoPath)  // Provide the path to the video file
+            ->videos()             // Filter video streams
+            ->first();
+
+        $codecName = $videoStream->get('codec_name');
+
+        $codecToFormatClass = [
+            'h264' => 'FFMpeg\Format\Video\X264',
+            'wmv2' => 'FFMpeg\Format\Video\WMV',
+            'vp9'  => 'FFMpeg\Format\Video\WebM',
+            'theora' => 'FFMpeg\Format\Video\Ogg',
+            'mpeg4' => 'FFMpeg\Format\Video\Mpeg4',
+            // Add more mappings as needed
+        ];
+
+        if (isset($codecToFormatClass[$codecName]) === false) {
+            Log::info("Unsupported codec: $codecName");
+            return null;
+        }
+
+        $formatClassName = $codecToFormatClass[$codecName];
+
+        if (class_exists($formatClassName) === false) {
+            Log::info("Format class does not exist: $formatClassName");
+            return null;
+        }
+
+        return new $formatClassName();
+    }
+
+    /**
+     * Set failure status of MediaJob and throw exception.
+     *
+     * @param string $error The failure message.
+     * @return void
+     */
+    private function throwMediaJobFailure(string $error): void
+    {
+        $this->mediaJob->setStatusFailed($error);
+        throw new \Exception($error);
+    }
+}

app.old/Jobs/SendEmailJob.php

@@ -0,0 +1,57 @@
+<?php
+
+namespace App\Jobs;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Mail\Mailable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Mail;
+
+class SendEmailJob implements ShouldQueue
+{
+    use Dispatchable;
+    use InteractsWithQueue;
+    use Queueable;
+    use SerializesModels;
+
+    /**
+     * Mail to receipt
+     *
+     * @var string
+     */
+    public $to;
+
+    /**
+     * Mailable item
+     *
+     * @var Mailable
+     */
+    public $mailable;
+
+
+    /**
+     * Create a new job instance.
+     *
+     * @param string   $to       The email receipient.
+     * @param Mailable $mailable The mailable.
+     * @return void
+     */
+    public function __construct(string $to, Mailable $mailable)
+    {
+        $this->to       = $to;
+        $this->mailable = $mailable;
+    }
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle(): void
+    {
+        Mail::to($this->to)->send($this->mailable);
+    }
+}

app.old/Mail/ChangeEmailVerify.php

@@ -55,9 +55,9 @@ class ChangeEmailVerify extends Mailable
     /**
      * Get the message envelope.
      *
-     * @return \Illuminate\Mail\Mailables\Envelope
+     * @return Illuminate\Mail\Mailables\Envelope
      */
-    public function envelope()
+    public function envelope(): Envelope
     {
         return new Envelope(
             subject: '👋🏻 Lets change your email!',
@@ -67,9 +67,9 @@ class ChangeEmailVerify extends Mailable
     /**
      * Get the message content definition.
      *
-     * @return \Illuminate\Mail\Mailables\Content
+     * @return Illuminate\Mail\Mailables\Content
      */
-    public function content()
+    public function content(): Content
     {
         return new Content(
             view: 'emails.user.change_email_verify',

app.old/Mail/ChangedEmail.php

@@ -55,9 +55,9 @@ class ChangedEmail extends Mailable
     /**
      * Get the message envelope.
      *
-     * @return \Illuminate\Mail\Mailables\Envelope
+     * @return Illuminate\Mail\Mailables\Envelope
      */
-    public function envelope()
+    public function envelope(): Envelope
     {
         return new Envelope(
             subject: '👍 Your email has been changed!',
@@ -67,9 +67,9 @@ class ChangedEmail extends Mailable
     /**
      * Get the message content definition.
      *
-     * @return \Illuminate\Mail\Mailables\Content
+     * @return Illuminate\Mail\Mailables\Content
      */
-    public function content()
+    public function content(): Content
     {
         return new Content(
             view: 'emails.user.changed_email',

app.old/Mail/ChangedPassword.php

@@ -37,9 +37,9 @@ class ChangedPassword extends Mailable
     /**
      * Get the message envelope.
      *
-     * @return \Illuminate\Mail\Mailables\Envelope
+     * @return Illuminate\Mail\Mailables\Envelope
      */
-    public function envelope()
+    public function envelope(): Envelope
     {
         return new Envelope(
             subject: '👍 Your password has been changed!',
@@ -49,9 +49,9 @@ class ChangedPassword extends Mailable
     /**
      * Get the message content definition.
      *
-     * @return \Illuminate\Mail\Mailables\Content
+     * @return Illuminate\Mail\Mailables\Content
      */
-    public function content()
+    public function content(): Content
     {
         return new Content(
             view: 'emails.user.changed_password',

app.old/Mail/Contact.php

@@ -54,9 +54,9 @@ class Contact extends Mailable
     /**
      * Get the message envelope.
      *
-     * @return \Illuminate\Mail\Mailables\Envelope
+     * @return Illuminate\Mail\Mailables\Envelope
      */
-    public function envelope()
+    public function envelope(): Envelope
     {
         return new Envelope(
             subject: config('contact.contact_subject'),
@@ -66,9 +66,9 @@ class Contact extends Mailable
     /**
      * Get the message content definition.
      *
-     * @return \Illuminate\Mail\Mailables\Content
+     * @return Illuminate\Mail\Mailables\Content
      */
-    public function content()
+    public function content(): Content
     {
         return new Content(
             view: 'emails.user.contact',

app.old/Mail/EmailVerify.php

@@ -46,9 +46,9 @@ class EmailVerify extends Mailable
     /**
      * Get the message envelope.
      *
-     * @return \Illuminate\Mail\Mailables\Envelope
+     * @return Illuminate\Mail\Mailables\Envelope
      */
-    public function envelope()
+    public function envelope(): Envelope
     {
         return new Envelope(
             subject: '👋🏻 Welcome to STEMMechanics!',
@@ -58,9 +58,9 @@ class EmailVerify extends Mailable
     /**
      * Get the message content definition.
      *
-     * @return \Illuminate\Mail\Mailables\Content
+     * @return Illuminate\Mail\Mailables\Content
      */
-    public function content()
+    public function content(): Content
     {
         return new Content(
             view: 'emails.user.email_verify',

app.old/Mail/ExceptionMail.php

@@ -0,0 +1,59 @@
+<?php
+
+namespace App\Mail;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Mail\Mailable;
+use Illuminate\Mail\Mailables\Content;
+use Illuminate\Mail\Mailables\Envelope;
+use Illuminate\Queue\SerializesModels;
+
+class ExceptionMail extends Mailable
+{
+    use Queueable;
+    use SerializesModels;
+
+
+    /**
+     * Create a new message instance.
+     */
+    public function __construct()
+    {
+        //
+    }
+
+    /**
+     * Get the message envelope.
+     *
+     * @return Illuminate\Mail\Mailables\Envelope
+     */
+    public function envelope(): Envelope
+    {
+        return new Envelope(
+            subject: 'Exception Mail',
+        );
+    }
+
+    /**
+     * Get the message content definition.
+     *
+     * @return Illuminate\Mail\Mailables\Content
+     */
+    public function content(): Content
+    {
+        return new Content(
+            view: 'view.name',
+        );
+    }
+
+    /**
+     * Get the attachments for the message.
+     *
+     * @return array<int, \Illuminate\Mail\Mailables\Attachment>
+     */
+    public function attachments(): array
+    {
+        return [];
+    }
+}

app.old/Mail/ForgotPassword.php

@@ -46,9 +46,9 @@ class ForgotPassword extends Mailable
     /**
      * Get the message envelope.
      *
-     * @return \Illuminate\Mail\Mailables\Envelope
+     * @return Illuminate\Mail\Mailables\Envelope
      */
-    public function envelope()
+    public function envelope(): Envelope
     {
         return new Envelope(
             subject: '🤦 Forgot your password?',
@@ -58,9 +58,9 @@ class ForgotPassword extends Mailable
     /**
      * Get the message content definition.
      *
-     * @return \Illuminate\Mail\Mailables\Content
+     * @return Illuminate\Mail\Mailables\Content
      */
-    public function content()
+    public function content(): Content
     {
         return new Content(
             view: 'emails.user.forgot_password',

app.old/Mail/SubscriptionConfirm.php

@@ -37,9 +37,9 @@ class SubscriptionConfirm extends Mailable
     /**
      * Get the message envelope.
      *
-     * @return \Illuminate\Mail\Mailables\Envelope
+     * @return Illuminate\Mail\Mailables\Envelope
      */
-    public function envelope()
+    public function envelope(): Envelope
     {
         return new Envelope(
             subject: '🗞️ You\'re on the mailing list!',
@@ -49,9 +49,9 @@ class SubscriptionConfirm extends Mailable
     /**
      * Get the message content definition.
      *
-     * @return \Illuminate\Mail\Mailables\Content
+     * @return Illuminate\Mail\Mailables\Content
      */
-    public function content()
+    public function content(): Content
     {
         return new Content(
             view: 'emails.user.subscription_confirm',

app.old/Mail/SubscriptionUnsubscribed.php

@@ -37,9 +37,9 @@ class SubscriptionUnsubscribed extends Mailable
     /**
      * Get the message envelope.
      *
-     * @return \Illuminate\Mail\Mailables\Envelope
+     * @return Illuminate\Mail\Mailables\Envelope
      */
-    public function envelope()
+    public function envelope(): Envelope
     {
         return new Envelope(
             subject: 'You have been unsubscribed',
@@ -49,9 +49,9 @@ class SubscriptionUnsubscribed extends Mailable
     /**
      * Get the message content definition.
      *
-     * @return \Illuminate\Mail\Mailables\Content
+     * @return Illuminate\Mail\Mailables\Content
      */
-    public function content()
+    public function content(): Content
     {
         return new Content(
             view: 'emails.user.subscription_unsubscribed',

app.old/Models/AnalyticsItemRequest.php

@@ -0,0 +1,73 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+class AnalyticsItemRequest extends Model
+{
+    use HasFactory;
+
+    /**
+     * The table name
+     *
+     * @var string
+     */
+    protected $table = 'analytics_requests';
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array<int, string>
+     */
+    protected $fillable = [
+        'type',
+        'path'
+    ];
+
+
+    /**
+     * Model Boot.
+     *
+     * @return void
+     */
+    protected static function boot()
+    {
+        parent::boot();
+
+        static::creating(function (AnalyticsItemRequest $analytics) {
+            if (isset($analytics->session_id) !== true) {
+                $request = request();
+                if ($request !== null) {
+                    $session = AnalyticsSession::where('ip', $request->ip())
+                        ->where('useragent', $request->userAgent())
+                        ->where('ended_at', '>=', now()->subMinutes(30))
+                        ->first();
+                    if ($session === null) {
+                        $session = AnalyticsSession::create([
+                            'ip'    => $request->ip(),
+                            'useragent' => $request->userAgent(),
+                            'ended_at'  => now()
+                        ]);
+                    } else {
+                        $session->update(['ended_at' => now()]);
+                    }
+
+                    $analytics->session_id = $session->id;
+                }
+            }//end if
+        });
+    }
+
+    /**
+     * Return the Analytics Session model.
+     *
+     * @return BelongsTo
+     */
+    public function session(): BelongsTo
+    {
+        return $this->belongsTo(AnalyticsSession::class, 'id', 'session_id');
+    }
+}

app.old/Models/AnalyticsSession.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+
+class AnalyticsSession extends Model
+{
+    use HasFactory;
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array<int, string>
+     */
+    protected $fillable = [
+        'ip',
+        'useragent',
+        'ended_at'
+    ];
+
+    /**
+     * Set the "useragent" attribute.
+     *
+     * @param  mixed  $value
+     * @return void
+     */
+    public function setUseragentAttribute($value)
+    {
+        $this->attributes['useragent'] = $value !== null ? $value : '';
+    }
+    
+    /**
+     * Returns the related requests for this session.
+     * 
+     * @return Illuminate\Database\Eloquent\Relations\HasMany
+     */
+    public function requests(): HasMany {
+        return $this->hasMany(AnalyticsItemRequest::class, 'session_id', 'id');
+    }
+    
+}

app.old/Models/Article.php

@@ -2,15 +2,19 @@
 
 namespace App\Models;
 
+use App\Traits\HasAttachments;
+use App\Traits\HasGallery;
 use App\Traits\Uuids;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\MorphMany;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 class Article extends Model
 {
     use HasFactory;
     use Uuids;
+    use HasGallery;
+    use HasAttachments;
 
     /**
      * The attributes that are mass assignable.
@@ -30,20 +34,10 @@ class Article extends Model
     /**
      * Get the article user
      *
-     * @return BelongsTo
+     * @return Illuminate\Database\Eloquent\Relations\BelongsTo
      */
-    public function user()
+    public function user(): BelongsTo
     {
         return $this->belongsTo(User::class);
     }
-
-    /**
-     * Get all of the article's attachments.
-     *
-     * @return MorphMany
-     */
-    public function attachments()
-    {
-        return $this->morphMany('App\Models\Attachment', 'attachable');
-    }
 }

app.old/Models/Attachment.php

@@ -0,0 +1,86 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Support\Facades\Cache;
+
+class Attachment extends Model
+{
+    use HasFactory;
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array<int, string>
+     */
+    protected $fillable = [
+        'media_id',
+        'private',
+    ];
+
+    /**
+     * The default attributes.
+     *
+     * @var string[]
+     */
+    protected $attributes = [
+        'private' => false,
+    ];
+
+
+    /**
+     * Get the media for this attachment.
+     *
+     * @return BelongsTo
+     */
+    public function media(): BelongsTo
+    {
+        return $this->belongsTo(Media::class);
+    }
+
+    /**
+     * Get associated Media object.
+     *
+     * @return null|Media
+     */
+    public function getMediaAttribute(): ?Media
+    {
+        $mediaId = '0';
+        $media = null;
+
+        if (Cache::has("attachment:{$this->id}:media") === true) {
+            $mediaId = Cache::get("attachment:{$this->id}:media");
+        } else {
+            $media = $this->media()->first();
+            if ($media === null) {
+                return null;
+            }
+
+            $mediaId = $media->id;
+            Cache::put("attachment:{$this->id}:media", $mediaId, now()->addDays(28));
+        }
+
+        return Cache::remember("media:{$mediaId}", now()->addDays(28), function () use ($media) {
+            if ($media !== null) {
+                return $media;
+            }
+
+            return $this->media()->first();
+        });
+    }
+
+    /**
+     * Set the media for this item.
+     *
+     * @param Media $media The media model.
+     * @return void
+     */
+    public function setMediaAttribute(Media $media): void
+    {
+        $this->media()->associate($media)->save();
+        Cache::put("attachment:{$this->id}:media", $media->id, now()->addDays(28));
+    }
+}

app.old/Models/Event.php

@@ -2,6 +2,7 @@
 
 namespace App\Models;
 
+use App\Traits\HasAttachments;
 use App\Traits\Uuids;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
@@ -10,6 +11,7 @@ use Illuminate\Database\Eloquent\Relations\MorphMany;
 
 class Event extends Model
 {
+    use HasAttachments;
     use HasFactory;
     use Uuids;
 
@@ -33,25 +35,16 @@ class Event extends Model
         'content',
         'price',
         'ages',
+        'open_at',
     ];
 
 
-    /**
-     * Get all of the article's attachments.
-     *
-     * @return MorphMany
-     */
-    public function attachments()
-    {
-        return $this->morphMany('App\Models\Attachment', 'attachable');
-    }
-
     /**
      * Get all the associated users.
      *
      * @return BelongsToMany
      */
-    public function users()
+    public function users(): BelongsToMany
     {
         return $this->belongsToMany(User::class, 'event_user', 'event_id', 'user_id');
     }

app.old/Models/EventUsers.php

@@ -5,6 +5,7 @@ namespace App\Models;
 use App\Traits\Uuids;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 class EventUser extends Model
 {
@@ -25,9 +26,9 @@ class EventUser extends Model
     /**
      * Get the event for this attachment.
      *
-     * @return BelongsTo
+     * @return Illuminate\Database\Eloquent\Relations\BelongsTo
      */
-    public function event()
+    public function event(): BelongsTo
     {
         return $this->belongsTo(Event::class);
     }
@@ -35,9 +36,9 @@ class EventUser extends Model
     /**
      * Get the user for this attachment.
      *
-     * @return BelongsTo
+     * @return Illuminate\Database\Eloquent\Relations\BelongsTo
      */
-    public function user()
+    public function user(): BelongsTo
     {
         return $this->belongsTo(User::class);
     }

app.old/Models/Gallery.php

@@ -0,0 +1,107 @@
+<?php
+
+namespace App\Models;
+
+use App\Traits\Uuids;
+use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\MorphTo;
+use Illuminate\Support\Facades\Cache;
+
+class Gallery extends Model
+{
+    use HasFactory;
+    use Uuids;
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array<int, string>
+     */
+    protected $fillable = [
+        'media_id',
+    ];
+
+
+    /**
+     * Boot the model.
+     *
+     * @return void
+     */
+    protected static function boot(): void
+    {
+        parent::boot();
+
+        $clearCache = function ($gallery) {
+            Cache::forget("gallery:{$gallery->id}:media");
+        };
+
+        static::saving($clearCache);
+        static::deleting($clearCache);
+    }
+
+    /**
+     * Get gallery addendum model.
+     *
+     * @return Illuminate\Database\Eloquent\Relations\MorphTo Addenum model.
+     */
+    public function addendum(): MorphTo
+    {
+        return $this->morphTo();
+    }
+
+    /**
+     * Get the media for this item.
+     *
+     * @return Illuminate\Database\Eloquent\Relations\BelongsTo The media model.
+     */
+    public function media(): BelongsTo
+    {
+        return $this->belongsTo(Media::class);
+    }
+
+    /**
+     * Get the media for this item.
+     *
+     * @return null|Media The media model.
+     */
+    public function getMediaAttribute(): ?Media
+    {
+        $mediaId = '0';
+        $media = null;
+
+        if (Cache::has("gallery:{$this->id}:media") === true) {
+            $mediaId = Cache::get("gallery:{$this->id}:media");
+        } else {
+            $media = $this->media()->first();
+            if ($media === null) {
+                return null;
+            }
+
+            $mediaId = $media->id;
+            Cache::put("gallery:{$this->id}:media", $mediaId, now()->addDays(28));
+        }
+
+        return Cache::remember("media:{$mediaId}", now()->addDays(28), function () use ($media) {
+            if ($media !== null) {
+                return $media;
+            }
+
+            return $this->media()->first();
+        });
+    }
+
+    /**
+     * Set the media for this item.
+     *
+     * @param Media $media The media model.
+     * @return void
+     */
+    public function setMediaAttribute(Media $media): void
+    {
+        $this->media()->associate($media)->save();
+        Cache::put("gallery:{$this->id}:media", $media->id, now()->addDays(28));
+    }
+}

app.old/Models/MediaJob.php

@@ -0,0 +1,239 @@
+<?php
+
+namespace App\Models;
+
+use App\Jobs\MediaWorkerJob;
+use App\Traits\Uuids;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+class MediaJob extends Model
+{
+    use HasFactory;
+    use Uuids;
+
+
+    /**
+     * The default attributes.
+     *
+     * @var string[]
+     */
+    protected $attributes = [
+        'user_id' => null,
+        'media_id' => null,
+        'status' => '',
+        'status_text' => '',
+        'progress' => 0,
+        'progress_max' => 0,
+        'data' => '',
+    ];
+
+
+    /**
+     * Set MediaJob status to failed.
+     *
+     * @param string $statusText The failed reason.
+     * @return void
+     */
+    public function setStatusFailed(string $statusText = ''): void
+    {
+        $this->setStatus('failed', $statusText, 0);
+    }
+
+    /**
+     * Set MediaJob status to queued.
+     *
+     * @return void
+     */
+    public function setStatusQueued(): void
+    {
+        $this->setStatus('queued', '', 0);
+    }
+
+    /**
+     * Set MediaJob status to waiting.
+     *
+     * @return void
+     */
+    public function setStatusWaiting(): void
+    {
+        $this->setStatus('waiting', '', 0);
+    }
+
+    /**
+     * Set MediaJob status to processing.
+     *
+     * @param integer $progress    The processing progress value.
+     * @param integer $progressMax The processing progress maximum value.
+     * @param string  $statusText  The processing status text.
+     * @return void
+     */
+    public function setStatusProcessing(int $progress = 0, int $progressMax = 0, string $statusText = ''): void
+    {
+        if ($statusText === '') {
+            $statusText = $this->status_text;
+        }
+
+        $this->setStatus('processing', $statusText, $progress, $progressMax);
+    }
+
+    /**
+     * Set MediaJob status to complete.
+     *
+     * @return void
+     */
+    public function setStatusComplete(): void
+    {
+        $this->setStatus('complete');
+    }
+
+    /**
+     * Set MediaJon status to invalid.
+     *
+     * @param string $text The status text.
+     * @return void
+     */
+    public function setStatusInvalid(string $text = ''): void
+    {
+        $this->setStatus('invalid', $text);
+    }
+
+    /**
+     * Set MediaJob status details.
+     *
+     * @param string  $status       The status string.
+     * @param string  $text         The status text.
+     * @param integer $progress     The status progress value.
+     * @param integer $progress_max The status progress maximum value.
+     * @return void
+     */
+    protected function setStatus(string $status, string $text = '', int $progress = 0, int $progress_max = 0): void
+    {
+        $this->status = $status;
+        $this->status_text = $text;
+        $this->progress = $progress;
+        $this->progress_max = $progress_max;
+        $this->save();
+    }
+
+    /**
+     * Process the MediaJob.
+     *
+     * @return void
+     */
+    public function process(): void
+    {
+        $data = json_decode($this->data, true);
+        if ($data !== null) {
+            if (array_key_exists('chunks', $data) === true) {
+                if (array_key_exists('chunk_count', $data) === false) {
+                    $this->setStatusInvalid('chunk_count is missing');
+                    return;
+                }
+
+                if (array_key_exists('name', $data) === false) {
+                    $this->setStatusInvalid('name is missing');
+                    return;
+                }
+
+                $numChunks = count($data['chunks']);
+                $maxChunks = intval($data['chunk_count']);
+                if ($numChunks >= $maxChunks) {
+                    // merge file and dispatch
+                    $this->setStatusProcessing(0, $maxChunks, 'combining chunks');
+
+                    $newFile = generateTempFilePath(pathinfo($data['name'], PATHINFO_EXTENSION));
+                    $failed = false;
+
+                    for ($index = 1; $index <= $maxChunks; $index++) {
+                        if (array_key_exists($index, $data['chunks']) === false) {
+                            $failed = `{$index} chunk is missing`;
+                        } else {
+                            $tempFileName = $data['chunks'][$index];
+
+                            if ($failed === false) {
+                                $chunkContents = file_get_contents($tempFileName);
+                                if ($chunkContents === false) {
+                                    $failed = `{$index} chunk is empty`;
+                                } else {
+                                    file_put_contents($newFile, $chunkContents, FILE_APPEND);
+                                }
+                            }
+
+                            unlink($tempFileName);
+                            $this->setStatusProcessing($index, $maxChunks);
+                        }
+                    }
+
+                    unset($data['chunks']);
+                    $this->data = json_encode($data);
+
+                    if ($failed !== false) {
+                        $this->setStatusInvalid($failed);
+                    } else {
+                        $finfo = finfo_open(FILEINFO_MIME_TYPE);
+                        $mime = finfo_file($finfo, $newFile);
+                        finfo_close($finfo);
+
+                        $data['file'] = $newFile;
+                        $data['size'] = filesize($newFile);
+                        $data['mime_type'] = $mime;
+
+                        if (
+                            array_key_exists('storage', $data) === true &&
+                            array_key_exists('security_type', $data) === true &&
+                            array_key_exists('mime_type', $data) === true &&
+                            $data['mime_type'] !== ""
+                        ) {
+                            $error = Media::verifyStorage($data['mime_type'], $data['security_type'], $data['storage']);
+                            switch ($error) {
+                                case Media::STORAGE_VALID:
+                                    break;
+                                case Media::STORAGE_MIME_MISSING:
+                                    $this->setStatusInvalid('The file type cannot be determined.');
+                                    return;
+                                case Media::STORAGE_NOT_FOUND:
+                                    $this->setStatusInvalid('Storage was not found.');
+                                    return;
+                                case Media::STORAGE_INVALID_SECURITY:
+                                    $this->setStatusInvalid('Storage invalid for security value.');
+                                    return;
+                                default:
+                                    $this->setStatusInvalid('Storage verification error occurred.');
+                                    return;
+                            }
+                        }
+
+                        $this->data = json_encode($data);
+                        $this->setStatusQueued();
+                        MediaWorkerJob::dispatch($this)->onQueue('media');
+                    }//end if
+                }//end if
+            } else {
+                $this->setStatusQueued();
+                MediaWorkerJob::dispatch($this)->onQueue('media');
+            }//end if
+        }//end if
+    }
+
+    /**
+     * Return the job owner
+     *
+     * @return BelongsTo
+     */
+    public function user(): BelongsTo
+    {
+        return $this->belongsTo(User::class);
+    }
+
+    /**
+     * Return the media item
+     *
+     * @return BelongsTo
+     */
+    public function media(): BelongsTo
+    {
+        return $this->belongsTo(Media::class);
+    }
+}

app.old/Models/Permission.php

@@ -5,6 +5,7 @@ namespace App\Models;
 use App\Traits\Uuids;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 class Permission extends Model
 {
@@ -25,9 +26,9 @@ class Permission extends Model
     /**
      * Get the User associated with this model
      *
-     * @return BelongsTo
+     * @return Illuminate\Database\Eloquent\Relations\BelongsTo
      */
-    public function user()
+    public function user(): BelongsTo
     {
         return $this->belongsTo(User::class);
     }

app.old/Models/Shortlink.php

@@ -3,9 +3,7 @@
 namespace App\Models;
 
 use App\Enum\HttpResponseCodes;
-use App\Jobs\MoveMediaJob;
 use App\Jobs\OptimizeMediaJob;
-use App\Jobs\StoreUploadedFileJob;
 use App\Traits\Uuids;
 use Illuminate\Contracts\Container\BindingResolutionException;
 use Illuminate\Database\Eloquent\Factories\HasFactory;

app.old/Models/User.php

@@ -0,0 +1,246 @@
+<?php
+
+namespace App\Models;
+
+// use Illuminate\Contracts\Auth\MustVerifyEmail;
+
+use App\Traits\Uuids;
+use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Foundation\Auth\User as Authenticatable;
+use Illuminate\Notifications\Notifiable;
+use Illuminate\Support\Facades\Cache;
+use Laravel\Sanctum\HasApiTokens;
+use OwenIt\Auditing\Contracts\Auditable;
+
+class User extends Authenticatable implements Auditable
+{
+    use HasApiTokens;
+    use HasFactory;
+    use Notifiable;
+    use Uuids;
+    use \OwenIt\Auditing\Auditable;
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array<int, string>
+     */
+    protected $fillable = [
+        'first_name',
+        'last_name',
+        'email',
+        'phone',
+        'password',
+        'display_name',
+    ];
+
+    /**
+     * The attributes that should be hidden for serialization.
+     *
+     * @var array<int, string>
+     */
+    protected $hidden = [
+        'password',
+        'remember_token',
+        'permissions'
+    ];
+
+    /**
+     * The attributes that should be cast.
+     *
+     * @var array<string, string>
+     */
+    protected $casts = [
+        'email_verified_at' => 'datetime',
+    ];
+
+    // protected $hidden = [
+    //     'permissions'
+    // ];
+
+    /**
+     * The attributes to append.
+     *
+     * @var string[]
+     */
+    protected $appends = [
+        'permissions'
+    ];
+
+    /**
+     * The default attributes.
+     *
+     * @var string[]
+     */
+    protected $attributes = [
+        'phone' => '',
+    ];
+
+
+    /**
+     * Boot the model.
+     *
+     * @return void
+     */
+    protected static function boot(): void
+    {
+        parent::boot();
+
+        $clearCache = function ($user) {
+            Cache::forget(
+                "user:{$user->id}",
+                "user:{$user->id}:permissions"
+            );
+        };
+
+        static::saving($clearCache);
+        static::deleting($clearCache);
+    }
+
+    /**
+     * Get the list of permissions of the user
+     *
+     * @return Illuminate\Database\Eloquent\Relations\HasMany
+     */
+    public function permissions(): HasMany
+    {
+        return $this->hasMany(Permission::class);
+    }
+
+    /**
+     * Get the permission attribute
+     *
+     * @return array
+     */
+    public function getPermissionsAttribute(): array
+    {
+        $cacheKey = "user:{$this->id}:permissions";
+        return Cache::remember($cacheKey, now()->addDays(28), function () {
+            return $this->permissions()->pluck('permission')->toArray();
+        });
+    }
+
+    /**
+     * Set the permission attribute
+     *
+     * @param array $newPermissions The new permissions to set to the user.
+     * @return void
+     */
+    public function setPermissionsAttribute(array $newPermissions): void
+    {
+        $existingPermissions = $this->permissions->pluck('permission')->toArray();
+
+        $this->revokePermission(array_diff($this->permissions, $newPermissions));
+        $this->givePermission(array_diff($newPermissions, $this->permissions));
+
+        $cacheKey = "user:{$this->id}:permissions";
+        Cache::delete($cacheKey);
+    }
+
+    /**
+     * Test if user has permission
+     *
+     * @param string $permission Permission to test.
+     * @return boolean
+     */
+    public function hasPermission(string $permission): bool
+    {
+        return in_array($permission, $this->permissions);
+    }
+
+    /**
+     * Give permissions to the user
+     *
+     * @param string|array $permissions The permission(s) to give.
+     * @return Illuminate\Database\Eloquent\Collection
+     */
+    public function givePermission($permissions): Collection
+    {
+        if (is_array($permissions) === false) {
+            $permissions = [$permissions];
+        }
+
+        $newPermissions = array_map(function ($permission) {
+            return ['permission' => $permission];
+        }, array_diff($permissions, $this->permissions));
+
+        $cacheKey = "user:{$this->id}:permissions";
+        Cache::forget($cacheKey);
+
+        return $this->permissions()->createMany($newPermissions);
+    }
+
+
+    /**
+     * Revoke permissions from the user
+     *
+     * @param string|array $permissions The permission(s) to revoke.
+     * @return integer
+     */
+    public function revokePermission($permissions): int
+    {
+        if (is_array($permissions) === false) {
+            $permissions = [$permissions];
+        }
+
+        $cacheKey = "user:{$this->id}:permissions";
+        Cache::forget($cacheKey);
+
+        return $this->permissions()
+            ->whereIn('permission', $permissions)
+            ->delete();
+    }
+
+    /**
+     * Get the list of files of the user
+     *
+     * @return HasMany
+     */
+    public function media(): HasMany
+    {
+        return $this->hasMany(Media::class);
+    }
+
+    /**
+     * Get the list of files of the user
+     *
+     * @return HasMany
+     */
+    public function articles(): HasMany
+    {
+        return $this->hasMany(Article::class);
+    }
+
+    /**
+     * Get associated user codes
+     *
+     * @return HasMany
+     */
+    public function codes(): HasMany
+    {
+        return $this->hasMany(UserCode::class);
+    }
+
+    /**
+     * Get the list of logins of the user
+     *
+     * @return HasMany
+     */
+    public function logins(): HasMany
+    {
+        return $this->hasMany(UserLogins::class);
+    }
+
+    /**
+     * Get the events associated with the user.
+     *
+     * @return BelongsToMany
+     */
+    public function events(): BelongsToMany
+    {
+        return $this->belongsToMany(Event::class, 'event_user', 'user_id', 'event_id');
+    }
+}

app.old/Models/UserCode.php

@@ -4,6 +4,7 @@ namespace App\Models;
 
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 class UserCode extends Model
 {
@@ -26,7 +27,7 @@ class UserCode extends Model
      *
      * @return void
      */
-    protected static function boot()
+    protected static function boot(): void
     {
         parent::boot();
         static::creating(function ($model) {
@@ -49,7 +50,7 @@ class UserCode extends Model
      *
      * @return void
      */
-    public function regenerate()
+    public function regenerate(): void
     {
         while (true) {
             $code = random_int(100000, 999999);
@@ -65,7 +66,7 @@ class UserCode extends Model
      *
      * @return void
      */
-    public static function clearExpired()
+    public static function clearExpired(): void
     {
         UserCode::where('updated_at', '<=', now()->subDays(5))->delete();
     }
@@ -73,9 +74,9 @@ class UserCode extends Model
     /**
      * Get associated user
      *
-     * @return BelongsTo
+     * @return Illuminate\Database\Eloquent\Relations\BelongsTo
      */
-    public function user()
+    public function user(): BelongsTo
     {
         return $this->belongsTo(User::class);
     }

app.old/Models/UserLogins.php

@@ -5,6 +5,7 @@ namespace App\Models;
 use App\Traits\Uuids;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 class UserLogins extends Model
 {
@@ -29,9 +30,9 @@ class UserLogins extends Model
     /**
      * Get the file user
      *
-     * @return BelongsTo
+     * @return Illuminate\Database\Eloquent\Relations\BelongsTo
      */
-    public function user()
+    public function user(): BelongsTo
     {
         return $this->belongsTo(User::class);
     }

app.old/Providers/AppServiceProvider.php

@@ -0,0 +1,53 @@
+<?php
+
+namespace App\Providers;
+
+use Illuminate\Http\Request;
+use Illuminate\Support\ServiceProvider;
+use Illuminate\Support\Facades\Storage;
+
+class AppServiceProvider extends ServiceProvider
+{
+    /**
+     * Register any application services.
+     *
+     * @return void
+     */
+    public function register(): void
+    {
+        //
+    }
+
+    /**
+     * Bootstrap any application services.
+     *
+     * @return void
+     */
+    public function boot(): void
+    {
+        Request::macro('rename', function ($param, $newParam = null) {
+            if (is_array($param) === false) {
+                if ($newParam === null) {
+                    return;
+                }
+
+                $param = [$param => $newParam];
+            }
+
+            $paramArray = $this->all();
+            foreach ($param as $oldParam => $newParam) {
+                if (isset($paramArray[$oldParam]) === true) {
+                    $paramArray[$newParam] = $paramArray[$oldParam];
+                    unset($paramArray[$oldParam]);
+                }
+            }
+
+            $this->replace($paramArray);
+        });
+
+        Storage::macro('public', function ($diskName) {
+            $public = config("filesystems.disks.{$diskName}.public", false);
+            return $public;
+        });
+    }
+}

app.old/Providers/AuthServiceProvider.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Providers;
+
+// use Illuminate\Support\Facades\Gate;
+use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
+
+class AuthServiceProvider extends ServiceProvider
+{
+    /**
+     * The model to policy mappings for the application.
+     *
+     * @var array<class-string, class-string>
+     */
+    protected $policies = [
+        // 'App\Models\Model' => 'App\Policies\ModelPolicy',
+    ];
+
+
+    /**
+     * Register any authentication / authorization services.
+     *
+     * @return void
+     */
+    public function boot(): void
+    {
+        //
+    }
+}

app.old/Providers/BroadcastServiceProvider.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Providers;
+
+use Illuminate\Support\Facades\Broadcast;
+use Illuminate\Support\ServiceProvider;
+
+class BroadcastServiceProvider extends ServiceProvider
+{
+    /**
+     * Bootstrap any application services.
+     *
+     * @return void
+     */
+    public function boot(): void
+    {
+        Broadcast::routes();
+
+        require base_path('routes/channels.php');
+    }
+}

app.old/Providers/EventServiceProvider.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace App\Providers;
+
+use Illuminate\Auth\Events\Registered;
+use Illuminate\Auth\Listeners\SendEmailVerificationNotification;
+use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
+use Illuminate\Queue\Events\JobProcessed;
+use Illuminate\Support\Facades\Queue;
+use Illuminate\Support\Facades\Event;
+use Illuminate\Support\Facades\Log;
+
+class EventServiceProvider extends ServiceProvider
+{
+    /**
+     * The event to listener mappings for the application.
+     *
+     * @var array<class-string, array<int, class-string>>
+     */
+    protected $listen = [
+        Registered::class => [
+            SendEmailVerificationNotification::class,
+        ],
+    ];
+
+
+    /**
+     * Register any events for your application.
+     *
+     * @return void
+     */
+    public function boot(): void
+    {
+        //
+    }
+
+    /**
+     * Determine if events and listeners should be automatically discovered.
+     *
+     * @return boolean
+     */
+    public function shouldDiscoverEvents(): bool
+    {
+        return false;
+    }
+}

app.old/Providers/RouteServiceProvider.php

@@ -0,0 +1,90 @@
+<?php
+
+namespace App\Providers;
+
+use Illuminate\Cache\RateLimiting\Limit;
+use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\RateLimiter;
+use Illuminate\Support\Facades\Route;
+use Illuminate\Support\Str;
+
+class RouteServiceProvider extends ServiceProvider
+{
+    /**
+     * The path to the "home" route for your application.
+     *
+     * Typically, users are redirected here after authentication.
+     *
+     * @var string
+     */
+    public const HOME = '/home';
+
+
+    /**
+     * Define your route model bindings, pattern filters, and other route configuration.
+     *
+     * @return void
+     */
+    public function boot(): void
+    {
+        // RateLimiter::for('api', function (Request $request) {
+        //     return Limit::perMinute(60)->by($request->user()?->id !== null ?: $request->ip());
+        // });
+
+        $rateLimitEnabled = true;
+        /** @var \App\Models\User */
+        $user = auth()->user();
+
+        if (app()->environment('testing') === true) {
+            $rateLimitEnabled = false;
+        } elseif ($user !== null && $user->hasPermission('admin/ratelimit') === true) {
+            // Admin users with the "admin/ratelimit" permission are not rate limited
+            $rateLimitEnabled = false;
+        }
+
+        if ($rateLimitEnabled === true) {
+            RateLimiter::for('api', function (Request $request) {
+                return Limit::perMinute(800)->by(isset($request->user()->id) === true ?: $request->ip());
+            });
+        } else {
+            RateLimiter::for('api', function () {
+                return Limit::none();
+            });
+        }
+
+        $this->routes(function () {
+            Route::middleware('api')
+                ->prefix('api')
+                ->group(base_path('routes/api.php'));
+
+            Route::middleware('web')
+                ->group(base_path('routes/web.php'));
+        });
+
+        Route::macro('apiAddendumResource', function ($addendum, $uri, $controller) {
+            $singularUri = Str::singular($uri);
+            $signularAddendum = Str::singular((strtolower($addendum)));
+            $pluralAddendum = Str::plural($signularAddendum);
+
+            Route::get("{$uri}/{{$singularUri}}/{$pluralAddendum}", [$controller, "{$signularAddendum}Index"])
+                ->name("{$singularUri}.{$signularAddendum}.index");
+
+            Route::post("{$uri}/{{$singularUri}}/{$pluralAddendum}", [$controller, "{$signularAddendum}Store"])
+                ->name("{$singularUri}.{$signularAddendum}.store");
+
+            Route::match(
+                ['put', 'patch'],
+                "{$uri}/{{$singularUri}}/{$pluralAddendum}",
+                [$controller, "{$signularAddendum}Update"]
+            )
+                ->name("{$singularUri}.{$signularAddendum}.update");
+
+            Route::delete(
+                "{$uri}/{{$singularUri}}/{$pluralAddendum}/{medium}",
+                [$controller,"{$signularAddendum}Delete"]
+            )
+                ->name("{$singularUri}.{$signularAddendum}.destroy");
+        });
+    }
+}