fix: package.json & package-lock.json to reduce vulnerabilities

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-LODASH-1018905
- https://snyk.io/vuln/SNYK-JS-LODASH-1040724

.github/scripts/build.sh

@@ -15,10 +15,7 @@ declare -a remove_files=(
   .idea
   .travis
   docker
-  node_modules
-  vendor/willdurand/geocoder/tests
   _ide_helper.php
-  .env
   .dockerignore
   .dpl
   .editorconfig
@@ -26,7 +23,6 @@ declare -a remove_files=(
   .eslintrc
   .php_cs
   .php_cs.cache
-  .php-cs-fixer.php
   .phpstorm.meta.php
   .styleci.yml
   .phpunit.result.cache
@@ -34,15 +30,15 @@ declare -a remove_files=(
   intellij_style.xml
   config.php
   docker-compose.yml
-  docker-compose.local.yml
   Makefile
   phpcs.xml
   phpunit.xml
   phpvms.iml
   Procfile
   phpstan.neon
-  symfony.lock
+  node_modules
   composer.phar
+  vendor/willdurand/geocoder/tests
 )
 
 for file in "${remove_files[@]}"; do
@@ -73,25 +69,13 @@ mkdir -p storage/framework/views
 
 cd /tmp
 
-echo "Current directory contents"
-ls -al $BASE_DIR
-
-echo "Parent directory contents"
 ls -al $BASE_DIR/../
 
-echo "Calling find"
-find $BASE_DIR/../ -type d -maxdepth 2
-
-tar -czf $TAR_NAME -C $BASE_DIR --xform 's:^\./::' . [--show-transformed-names|--show-stored-names]
+tar -czf $TAR_NAME -C $BASE_DIR .
 sha256sum $TAR_NAME >"$TAR_NAME.sha256"
-
-cd $BASE_DIR;
-zip -r $ZIP_NAME ./
+tar2zip $TAR_NAME
 sha256sum $ZIP_NAME >"$ZIP_NAME.sha256"
 
-mv $ZIP_NAME /tmp
-mv "$ZIP_NAME.sha256" /tmp
-
 ls -al /tmp
 
 echo "Moving to dist"

.github/scripts/env.php

@@ -1,3 +1,7 @@
+<?php
+exit();
+?>
+
 APP_ENV="dev"
 APP_KEY="base64:zdgcDqu9PM8uGWCtMxd74ZqdGJIrnw812oRMmwDF6KY="
 APP_URL="http://localhost"
@@ -8,7 +12,7 @@ APP_LOCALE="en"
 PHPVMS_INSTALLED="true"
 
 APP_LOG="daily"
-LOG_LEVEL="debug"
+APP_LOG_LEVEL="debug"
 APP_LOG_MAX_FILES="3"
 
 DB_CONNECTION="mysql"

.github/workflows/build.yml

@@ -2,12 +2,12 @@ name: 'Build'
 on: ['push', 'pull_request', 'workflow_dispatch', 'release']
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-18.04
     if: github.repository == 'nabeelio/phpvms'
     strategy:
       fail-fast: true
       matrix:
-        php-versions: ['8.0', '8.1']
+        php-versions: ['7.3', '7.4']
     name: PHP ${{ matrix.php-versions }}
     env:
       extensions: intl, pcov, mbstring
@@ -41,6 +41,7 @@ jobs:
       with:
         path: ${{ steps.composer-cache.outputs.dir }}
         key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+        restore-keys: ${{ runner.os }}-composer-
 
     # Configure PHP
     - name: Setup PHP
@@ -69,8 +70,8 @@ jobs:
       run: |
         php --version
         mysql --version
-        sleep 15
         # Downgrade composer version to 1.x
+        composer self-update --1
         composer install --dev --no-interaction --verbose
         cp .github/scripts/env.php env.php
         cp .github/scripts/phpunit.xml phpunit.xml
@@ -79,8 +80,7 @@ jobs:
 
     - name: Run Tests
       run: |
-        export PHP_CS_FIXER_IGNORE_ENV=1
-        #vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.php -v --dry-run --diff --using-cache=no
+        vendor/bin/php-cs-fixer fix --config=.php_cs -v --dry-run --diff --using-cache=no
         vendor/bin/phpunit --debug --verbose
 
   # This runs after all of the tests, run have run. Creates a cleaned up version of the
@@ -88,7 +88,7 @@ jobs:
   artifacts:
     name: 'Create dev build'
     needs: build
-    runs-on: ubuntu-20.04
+    runs-on: 'ubuntu-18.04'
     if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev'
     steps:
       - name: Checkout
@@ -97,7 +97,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.0'
+          php-version: '7.4'
 
       - uses: olegtarasov/get-tag@v2.1
         id: tagName
@@ -118,6 +118,8 @@ jobs:
       - name: 'Install Release Dependencies'
         run: |
           rm -rf vendor
+          sudo npm i tar-to-zip -g
+          composer self-update --1
           composer install --no-dev --prefer-dist --no-interaction --verbose
           sudo chmod +x ./.github/scripts/*
 
@@ -150,7 +152,7 @@ jobs:
   release:
     name: 'Create Release'
     needs: build
-    runs-on: ubuntu-20.04
+    runs-on: 'ubuntu-18.04'
     if: startsWith(github.ref, 'refs/tags/')
     steps:
       - name: Checkout
@@ -159,7 +161,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.0
+          php-version: '7.4'
 
       - uses: olegtarasov/get-tag@v2.1
         id: tagName
@@ -180,6 +182,8 @@ jobs:
       - name: 'Install Release Dependencies'
         run: |
           rm -rf vendor
+          sudo npm i tar-to-zip -g
+          composer self-update --1
           composer install --no-dev --prefer-dist --no-interaction --verbose
           sudo chmod +x ./.github/scripts/*
 

.gitignore

@@ -22,7 +22,6 @@ storage/*.sqlite
 .env.*.php
 .env.php
 .env
-.env.*
 .env.bak
 env.php
 .env.generated
@@ -75,16 +74,4 @@ error_log
 .sass-cache
 .DS_Store
 /config.php
-/config.bak.php
 /VERSION
-sync.sh
-
-###> friendsofphp/php-cs-fixer ###
-/.php-cs-fixer.php
-/.php-cs-fixer.cache
-###< friendsofphp/php-cs-fixer ###
-
-###> phpunit/phpunit ###
-/phpunit.xml
-.phpunit.result.cache
-###< phpunit/phpunit ###

.htaccess

@@ -28,8 +28,6 @@ RedirectMatch 403 ^/composer.phar
 RedirectMatch 403 ^/env.php.*?$
 RedirectMatch 403 ^/env.php
 RedirectMatch 403 ^/env.php$
-RedirectMatch 403 ^/config.php$
-RedirectMatch 403 ^/config.bak.php$
 RedirectMatch 403 ^/Makefile
 RedirectMatch 403 ^/package.json
 RedirectMatch 403 ^/package-lock.json

.php-cs-fixer.php

@@ -1,69 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * This file is part of PHP CS Fixer.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *     Dariusz Rumiński <dariusz.ruminski@gmail.com>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-$header = <<<'EOF'
-This file is part of PHP CS Fixer.
-(c) Fabien Potencier <fabien@symfony.com>
-    Dariusz Rumiński <dariusz.ruminski@gmail.com>
-This source file is subject to the MIT license that is bundled
-with this source code in the file LICENSE.
-EOF;
-
-$finder = PhpCsFixer\Finder::create()
-    ->ignoreVCSIgnored(true)
-    ->exclude('tests/data')
-    ->exclude('storage')
-    ->exclude('resources')
-    ->in(__DIR__)
-    ->append([
-        __DIR__.'/dev-tools/doc.php',
-        // __DIR__.'/php-cs-fixer', disabled, as we want to be able to run bootstrap file even on lower PHP version, to show nice message
-        __FILE__,
-    ])
-;
-
-$config = new PhpCsFixer\Config();
-$config
-    ->setRiskyAllowed(true)
-    ->setRules([
-        '@PSR2'                             => true,
-        'strict_param'                      => true,
-        'no_php4_constructor'               => true,
-        'no_extra_blank_lines'              => true,
-        'no_superfluous_elseif'             => true,
-        'single_line_comment_style'         => false,
-        'simple_to_complex_string_variable' => true,
-        'array_syntax'                      => [
-            'syntax' => 'short',
-        ],
-        'binary_operator_spaces' => [
-            'operators' => [
-                '=>' => 'align_single_space_minimal'
-            ]
-        ],
-        /*
-        'blank_line_before_statement'       => [
-            'statements' => [
-                'declare',
-                'for',
-                'return',
-                'throw',
-                'try',
-            ],
-        ],
-        */
-    ])
-    ->setFinder($finder);
-
-return $config;

.php_cs

@@ -0,0 +1,37 @@
+<?php
+
+$finder = PhpCsFixer\Finder::create()
+    ->in('app')
+    ->in('config');
+
+return PhpCsFixer\Config::create()
+    ->setHideProgress(true)
+    ->setUsingCache(false)
+    ->setRiskyAllowed(true)
+    ->setRules([
+        '@PSR2'                             => true,
+        'strict_param'                      => true,
+        'no_php4_constructor'               => true,
+        'no_extra_blank_lines'              => true,
+        'no_superfluous_elseif'             => true,
+        'single_line_comment_style'         => false,
+        'simple_to_complex_string_variable' => true,
+        'array_syntax'                      => [
+            'syntax' => 'short',
+        ],
+        'binary_operator_spaces'            => [
+            'align_double_arrow' => true,
+        ],
+        /*
+        'blank_line_before_statement'       => [
+            'statements' => [
+                'declare',
+                'for',
+                'return',
+                'throw',
+                'try',
+            ],
+        ],
+        */
+    ])
+    ->setFinder($finder);

Dockerfile

@@ -1,35 +1,28 @@
-FROM php:8.1-fpm-alpine3.15
+FROM php:7.4-fpm-alpine
 
 WORKDIR /var/www/
 
-# Setup composer
-COPY --from=composer:2.2.7 /usr/bin/composer /usr/local/bin/composer
-
-RUN apk add gmp-dev icu-dev zlib-dev libpng-dev libzip-dev zip
+RUN apk add gmp-dev
+RUN curl --silent --show-error https://getcomposer.org/installer | php
 
 # Copy any config files in
 COPY resources/docker/php/ext-opcache.ini $PHP_INI_DIR/conf.d/
 COPY resources/docker/php/www.conf /usr/local/etc/php-fpm.d/www.conf
+RUN ln -sf /dev/stderr /var/log/fpm-error.log
 
 RUN docker-php-ext-install \
   calendar \
-  intl \
   pdo_mysql \
-  gd \
   gmp \
-  bcmath \
-  opcache \
-  zip && \
-  docker-php-ext-enable pdo_mysql opcache bcmath zip intl
+  opcache && \
+  docker-php-ext-enable pdo_mysql opcache
 
 COPY . /var/www/
-RUN composer install \
+RUN php composer.phar install \
     --ignore-platform-reqs \
     --no-interaction \
     --no-plugins \
     --no-scripts \
     --prefer-dist
 
-#RUN chown -R www-data:www-data /var/www
-
 EXPOSE 9000

LICENSE

@@ -1,3 +1,5 @@
+BSD 3-Clause License
+
 Copyright (c) 2017, phpvms - http://www.phpvms.net
 All rights reserved.
 
@@ -15,9 +17,6 @@ modification, are permitted provided that the following conditions are met:
   contributors may be used to endorse or promote products derived from
   this software without specific prior written permission.
 
-* A "powered by phpvms" is required in page footers, unless the license has 
-  purchased to omit it.
-
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

Makefile

@@ -80,7 +80,11 @@ test:
 
 .PHONY: phpcs
 phpcs:
-	@PHP_CS_FIXER_IGNORE_ENV=1 vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.php -v --dry-run --diff --using-cache=no
+	@vendor/bin/php-cs-fixer fix --config=.php_cs -v --diff --diff-format=udiff --dry-run
+
+#.PHONY: phpstan
+#phpstan:
+#	vendor/bin/phpstan analyse -c phpstan.neon -v --level 2 app
 
 .PHONY: replay-acars
 replay-acars:
@@ -91,6 +95,11 @@ replay-acars:
 sass-watch:
 	sass --watch public/assets/admin/sass/paper-dashboard.scss:public/assets/admin/css/paper-dashboard.css
 
+.PHONY: schema
+schema:
+	#php artisan infyom:scaffold Aircraft --fieldsFile=database/schema/aircraft.json
+	echo ""
+
 .PHONY: deploy-package
 deploy-package:
 	./.travis/deploy_script.sh
@@ -100,9 +109,17 @@ reset-installer:
 	@php artisan database:create --reset
 	@php artisan migrate:refresh --seed
 
-.PHONY: docker-test
-docker-test:
-	@docker compose -f docker-compose.dev.yml up
+.PHONY: docker
+docker:
+	@mkdir -p $(CURR_PATH)/tmp/mysql
+
+	-docker rm -f phpvms
+	docker build -t phpvms .
+	docker run --name=phpvms \
+       -v $(CURR_PATH):/var/www/ \
+       -v $(CURR_PATH)/tmp/mysql:/var/lib/mysql \
+       -p 8080:80 \
+       phpvms
 
 .PHONY: docker-clean
 docker-clean:

README.md

@@ -11,7 +11,7 @@ A full distribution, with all of the composer dependencies, is available at this
 
 ### Requirements
 
-- PHP 8.0+, extensions:
+- PHP 7.3+, extensions:
   - cURL
   - JSON
   - mbstring
@@ -30,16 +30,15 @@ A full distribution, with all of the composer dependencies, is available at this
 
 [View installation details](https://docs.phpvms.net/installation/installation)
 
-## Development Environment with Docker
+## Development Environment
 
-A full development environment can be brought up using Docker, without having to install composer/npm locally
+A full development environment can be brought up using Docker:
 
 ```bash
-make docker-test
-
-# **OR** with docker-compose directly
-
-docker-compose -f docker-compose.yml -f docker-compose.dev.yml up
+composer install
+yarn install
+docker-compose build
+docker-compose up
 ```
 
 Then go to `http://localhost`. If you're using dnsmasq, the `app` container is listening on `phpvms.test`, or you can add to your `/etc/hosts` file:
@@ -48,8 +47,6 @@ Then go to `http://localhost`. If you're using dnsmasq, the `app` container is l
 127.0.0.1   phpvms.test
 ```
 
-The `docker-compose.local.yml` overrides the `app` section in `docker-compose.yml`. The standard `docker-compose.yml` can be used if you want to deploy from the image, or as a template for your own Dockerized deployments.
-
 ### Building JS/CSS assets
 
 Yarn is required, run:

app/Console/Commands/AcarsReplay.php

@@ -17,25 +17,25 @@ class AcarsReplay extends Command
      *
      * @var string
      */
-    protected string $apiKey = 'testadminapikey';
+    protected $apiKey = 'testadminapikey';
 
     /**
      * For automatic updates, how many seconds to sleep between updates
      *
      * @var int
      */
-    protected int $sleepTime = 10;
+    protected $sleepTime = 10;
 
     /**
      * @var array key == update[callsign]
      *            value == PIREP ID
      */
-    protected array $pirepList = [];
+    protected $pirepList = [];
 
     /**
      * @var Client
      */
-    protected Client $httpClient;
+    protected $httpClient;
 
     /**
      * Return an instance of an HTTP client all ready to post

app/Console/Commands/CreateConfigs.php

@@ -2,11 +2,11 @@
 
 namespace App\Console\Commands;
 
+use App;
 use App\Contracts\Command;
-use App\Services\Installer\ConfigService;
 use App\Services\Installer\SeederService;
 use DatabaseSeeder;
-use Illuminate\Support\Facades\App;
+use Modules\Installer\Services\ConfigService;
 
 /**
  * Create the config files
@@ -16,8 +16,8 @@ class CreateConfigs extends Command
     protected $signature = 'phpvms:config {db_host} {db_name} {db_user} {db_pass}';
     protected $description = 'Create the config files';
 
-    private DatabaseSeeder $databaseSeeder;
-    private SeederService $seederSvc;
+    private $databaseSeeder;
+    private $seederSvc;
 
     public function __construct(DatabaseSeeder $databaseSeeder, SeederService $seederSvc)
     {
@@ -81,13 +81,13 @@ class CreateConfigs extends Command
 
         $this->info('Regenerating the config files');
         $cfgSvc->createConfigFiles([
-            'APP_ENV'       => 'dev',
-            'SITE_NAME'     => $this->argument('name'),
-            'DB_CONNECTION' => 'mysql',
-            'DB_HOST'       => $this->argument('db_host'),
-            'DB_DATABASE'   => $this->argument('db_name'),
-            'DB_USERNAME'   => $this->argument('db_user'),
-            'DB_PASSWORD'   => $this->argument('db_pass'),
+            'APP_ENV'   => 'dev',
+            'SITE_NAME' => $this->argument('name'),
+            'DB_CONN'   => 'mysql',
+            'DB_HOST'   => $this->argument('db_host'),
+            'DB_NAME'   => $this->argument('db_name'),
+            'DB_USER'   => $this->argument('db_user'),
+            'DB_PASS'   => $this->argument('db_pass'),
         ]);
 
         $this->info('Config files generated!');

app/Console/Commands/CreateDatabase.php

@@ -11,11 +11,7 @@ class CreateDatabase extends Command
 {
     protected $signature = 'database:create {--reset} {--migrate} {--conn=?}';
     protected $description = 'Create a database';
-
-    /**
-     * @var Detector
-     */
-    protected Detector $os;
+    protected $os;
 
     /**
      * CreateDatabase constructor.

app/Console/Commands/DevCommands.php

@@ -24,8 +24,7 @@ class DevCommands extends Command
 {
     protected $signature = 'phpvms {cmd} {param?}';
     protected $description = 'Developer commands';
-
-    protected DatabaseService $dbSvc;
+    protected $dbSvc;
 
     /**
      * DevCommands constructor.

app/Console/Commands/DevInstall.php

@@ -13,7 +13,7 @@ class DevInstall extends Command
     protected $signature = 'phpvms:dev-install {--reset-db} {--reset-configs}';
     protected $description = 'Run a developer install and run the sample migration';
 
-    private \DatabaseSeeder $databaseSeeder;
+    private $databaseSeeder;
 
     public function __construct(\DatabaseSeeder $databaseSeeder)
     {
@@ -79,9 +79,9 @@ class DevInstall extends Command
 
         $this->info('Regenerating the config files');
         $cfgSvc->createConfigFiles([
-            'APP_ENV'       => 'dev',
-            'SITE_NAME'     => 'phpvms test',
-            'DB_CONNECTION' => 'sqlite',
+            'APP_ENV'   => 'dev',
+            'SITE_NAME' => 'phpvms test',
+            'DB_CONN'   => 'sqlite',
         ]);
 
         $this->info('Config files generated!');

app/Console/Commands/EmailTest.php

@@ -1,32 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use App;
-use App\Contracts\Command;
-
-class EmailTest extends Command
-{
-    protected $signature = 'phpvms:email-test';
-    protected $description = 'Send a test notification to admins';
-
-    /**
-     * Run dev related commands
-     *
-     * @throws \Symfony\Component\HttpFoundation\File\Exception\FileException
-     */
-    public function handle()
-    {
-        /** @var App\Notifications\NotificationEventsHandler $eventHandler */
-        $eventHandler = app(App\Notifications\NotificationEventsHandler::class);
-
-        $news = new App\Models\News();
-        $news->user_id = 1;
-        $news->subject = 'Test News';
-        $news->body = 'Test Body';
-        $news->save();
-
-        $newsEvent = new App\Events\NewsAdded($news);
-        $eventHandler->onNewsAdded($newsEvent);
-    }
-}

app/Console/Commands/ImportCsv.php

@@ -10,7 +10,7 @@ class ImportCsv extends Command
     protected $signature = 'phpvms:csv-import {type} {file}';
     protected $description = 'Import from a CSV file';
 
-    private ImportService $importer;
+    private $importer;
 
     /**
      * Import constructor.

app/Console/Commands/ProcessQueue.php

@@ -1,42 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use App;
-use App\Contracts\Command;
-use Illuminate\Support\Facades\Artisan;
-use Illuminate\Support\Facades\Log;
-
-class ProcessQueue extends Command
-{
-    protected $signature = 'queue:cron';
-    protected $description = 'Process the queue from a cron job';
-
-    /**
-     * Run the queue tasks
-     */
-    public function handle()
-    {
-        Artisan::call('queue:work', [
-            //'--sansdaemon'      => null,
-            '--stop-when-empty' => null,
-        ]);
-
-        $jobOutput = trim(Artisan::output());
-        if (!empty($jobOutput)) {
-            Log::info($jobOutput);
-        }
-
-        ///** @var App\Support\WorkCommand $queueWorker */
-        //$queueWorker = new App\Support\WorkCommand(app('queue.worker'), app('cache.store'));
-
-        //$queueWorker->setInput($queueWorker->createInputFromArguments([]));
-        //$queueWorker->handle();
-
-        /*$output = $this->call('queue:work', [
-            '--stop-when-empty' => null,
-        ]);
-
-        Log::info($output);*/
-    }
-}

app/Console/Commands/RewriteConfigs.php

@@ -1,25 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use App\Contracts\Command;
-use App\Services\Installer\ConfigService;
-
-/**
- * Command to rewrite the config files
- */
-class RewriteConfigs extends Command
-{
-    protected $signature = 'phpvms:rewrite-configs';
-    protected $description = 'Rewrite the config files';
-
-    /**
-     * Run dev related commands
-     */
-    public function handle()
-    {
-        /** @var ConfigService $configSvc */
-        $configSvc = app(ConfigService::class);
-        $configSvc->rewriteConfigFiles();
-    }
-}

app/Console/Commands/TestApi.php

@@ -8,11 +8,7 @@ use GuzzleHttp\Client;
 class TestApi extends Command
 {
     protected $signature = 'phpvms:test-api {apikey} {url}';
-
-    /**
-     * @var Client
-     */
-    protected Client $httpClient;
+    protected $httpClient;
 
     /**
      * Run dev related commands

app/Console/Commands/Version.php

@@ -10,14 +10,8 @@ class Version extends Command
 {
     protected $signature = 'phpvms:version {--write} {--base-only} {--write-full-version} {version?}';
 
-    /**
-     * @var VersionService
-     */
-    private VersionService $versionSvc;
+    private $versionSvc;
 
-    /**
-     * @param VersionService $versionSvc
-     */
     public function __construct(VersionService $versionSvc)
     {
         parent::__construct();

app/Console/Commands/YamlImport.php

@@ -12,11 +12,7 @@ class YamlImport extends Command
 {
     protected $signature = 'phpvms:yaml-import {files*}';
     protected $description = 'Developer commands';
-
-    /**
-     * @var DatabaseService
-     */
-    protected DatabaseService $dbSvc;
+    protected $dbSvc;
 
     /**
      * YamlImport constructor.

app/Console/Cron.php

@@ -1,90 +0,0 @@
-<?php
-/**
- * This runs any of the cron tasks that are set to run according to the Laravel schedule
- */
-
-namespace App\Console;
-
-use App\Console\Cron\FifteenMinute;
-use App\Console\Cron\FiveMinute;
-use App\Console\Cron\Hourly;
-use App\Console\Cron\JobQueue;
-use App\Console\Cron\Monthly;
-use App\Console\Cron\Nightly;
-use App\Console\Cron\ThirtyMinute;
-use App\Console\Cron\Weekly;
-use App\Contracts\Command;
-use Illuminate\Console\Scheduling\Schedule;
-
-class Cron
-{
-    /** @var Schedule */
-    private $scheduler;
-
-    /**
-     * @var string[] The cron tasks which get called/run
-     */
-    private $cronTasks = [
-        JobQueue::class,
-        FiveMinute::class,
-        FifteenMinute::class,
-        ThirtyMinute::class,
-        Hourly::class,
-        Nightly::class,
-        Weekly::class,
-        Monthly::class,
-    ];
-
-    /**
-     * @var array Stores the instantiated cron tasks
-     */
-    private $cronRunners = [];
-
-    /**
-     * @param Schedule $scheduler
-     */
-    public function __construct(Schedule $scheduler)
-    {
-        $this->scheduler = $scheduler;
-        foreach ($this->cronTasks as $task) {
-            /** @var Command $cronTask */
-            $cronTask = app($task);
-            $signature = $cronTask->getSignature();
-
-            if (empty($signature)) {
-                continue;
-            }
-
-            $this->cronRunners[$signature] = $cronTask;
-        }
-    }
-
-    /**
-     * Try to figure out which commands are supposed to run right now
-     *
-     * @return array string of tasks that were run
-     */
-    public function run(): array
-    {
-        $events = $this->scheduler->dueEvents(app());
-        if (empty($events)) {
-            return [];
-        }
-
-        $run = [];
-
-        /** @var \Illuminate\Console\Scheduling\Event $event */
-        foreach ($events as $event) {
-            foreach ($this->cronRunners as $signature => $task) {
-                if (!str_contains($event->command, $signature)) {
-                    continue;
-                }
-
-                $task->callEvent();
-                $run[] = $signature;
-            }
-        }
-
-        return $run;
-    }
-}

app/Console/Cron/FifteenMinute.php

@@ -1,26 +0,0 @@
-<?php
-
-namespace App\Console\Cron;
-
-use App\Contracts\CronCommand;
-use App\Events\CronFifteenMinute;
-
-/**
- * The actual cron tasks are in app/Cron
- */
-class FifteenMinute extends CronCommand
-{
-    protected $signature = 'cron:fifteen';
-    protected $description = 'Run the 15 minute cron tasks';
-    protected $schedule;
-
-    public function handle(): void
-    {
-        $this->callEvent();
-    }
-
-    public function callEvent()
-    {
-        event(new CronFifteenMinute());
-    }
-}

app/Console/Cron/FiveMinute.php

@@ -1,29 +0,0 @@
-<?php
-
-namespace App\Console\Cron;
-
-use App\Contracts\CronCommand;
-use App\Events\CronFiveMinute;
-
-/**
- * This just calls the CronNightly event, so all of the
- * listeners, etc can just be called to run those tasks
- *
- * The actual cron tasks are in app/Cron
- */
-class FiveMinute extends CronCommand
-{
-    protected $signature = 'cron:five';
-    protected $description = 'Run the 5 minute cron tasks';
-    protected $schedule;
-
-    public function handle(): void
-    {
-        $this->callEvent();
-    }
-
-    public function callEvent()
-    {
-        event(new CronFiveMinute());
-    }
-}

app/Console/Cron/Hourly.php

@@ -2,14 +2,14 @@
 
 namespace App\Console\Cron;
 
-use App\Contracts\CronCommand;
+use App\Contracts\Command;
 use App\Events\CronHourly;
 
 /**
  * This just calls the CronHourly event, so all of the
  * listeners, etc can just be called to run those tasks
  */
-class Hourly extends CronCommand
+class Hourly extends Command
 {
     protected $signature = 'cron:hourly';
     protected $description = 'Run the hourly cron tasks';
@@ -17,11 +17,7 @@ class Hourly extends CronCommand
 
     public function handle(): void
     {
-        $this->callEvent();
-    }
-
-    public function callEvent()
-    {
+        $this->redirectLoggingToFile('cron');
         event(new CronHourly());
     }
 }

app/Console/Cron/JobQueue.php

@@ -1,32 +0,0 @@
-<?php
-
-namespace App\Console\Cron;
-
-use App\Contracts\CronCommand;
-use Illuminate\Support\Facades\Artisan;
-
-/**
- * This just calls the CronHourly event, so all of the
- * listeners, etc can just be called to run those tasks
- */
-class JobQueue extends CronCommand
-{
-    protected $signature = 'cron:queue';
-    protected $description = 'Run the cron queue tasks';
-    protected $schedule;
-
-    public function handle(): void
-    {
-        $this->callEvent();
-
-        $queueOutput = trim(Artisan::output());
-        if (!empty($queueOutput)) {
-            $this->info($queueOutput);
-        }
-    }
-
-    public function callEvent()
-    {
-        Artisan::call('queue:cron');
-    }
-}

app/Console/Cron/Monthly.php

@@ -2,7 +2,7 @@
 
 namespace App\Console\Cron;
 
-use App\Contracts\CronCommand;
+use App\Contracts\Command;
 use App\Events\CronMonthly;
 
 /**
@@ -11,7 +11,7 @@ use App\Events\CronMonthly;
  *
  * The actual cron tasks are in app/Cron
  */
-class Monthly extends CronCommand
+class Monthly extends Command
 {
     protected $signature = 'cron:monthly';
     protected $description = 'Run the monthly cron tasks';
@@ -19,11 +19,7 @@ class Monthly extends CronCommand
 
     public function handle(): void
     {
-        $this->callEvent();
-    }
-
-    public function callEvent()
-    {
+        $this->redirectLoggingToFile('cron');
         event(new CronMonthly());
     }
 }

app/Console/Cron/Nightly.php

@@ -2,7 +2,7 @@
 
 namespace App\Console\Cron;
 
-use App\Contracts\CronCommand;
+use App\Contracts\Command;
 use App\Events\CronNightly;
 
 /**
@@ -11,7 +11,7 @@ use App\Events\CronNightly;
  *
  * The actual cron tasks are in app/Cron
  */
-class Nightly extends CronCommand
+class Nightly extends Command
 {
     protected $signature = 'cron:nightly';
     protected $description = 'Run the nightly cron tasks';
@@ -19,11 +19,7 @@ class Nightly extends CronCommand
 
     public function handle(): void
     {
-        $this->callEvent();
-    }
-
-    public function callEvent()
-    {
+        $this->redirectLoggingToFile('cron');
         event(new CronNightly());
     }
 }

app/Console/Cron/ThirtyMinute.php

@@ -1,26 +0,0 @@
-<?php
-
-namespace App\Console\Cron;
-
-use App\Contracts\CronCommand;
-use App\Events\CronThirtyMinute;
-
-/**
- * The actual cron tasks are in app/Cron
- */
-class ThirtyMinute extends CronCommand
-{
-    protected $signature = 'cron:thirty';
-    protected $description = 'Run the 30 minute cron tasks';
-    protected $schedule;
-
-    public function handle(): void
-    {
-        $this->callEvent();
-    }
-
-    public function callEvent()
-    {
-        event(new CronThirtyMinute());
-    }
-}

app/Console/Cron/Weekly.php

@@ -2,7 +2,7 @@
 
 namespace App\Console\Cron;
 
-use App\Contracts\CronCommand;
+use App\Contracts\Command;
 use App\Events\CronWeekly;
 
 /**
@@ -11,7 +11,7 @@ use App\Events\CronWeekly;
  *
  * The actual cron tasks are in app/Cron
  */
-class Weekly extends CronCommand
+class Weekly extends Command
 {
     protected $signature = 'cron:weekly';
     protected $description = 'Run the weekly cron tasks';
@@ -19,11 +19,7 @@ class Weekly extends CronCommand
 
     public function handle(): void
     {
-        $this->callEvent();
-    }
-
-    public function callEvent()
-    {
+        $this->redirectLoggingToFile('cron');
         event(new CronWeekly());
     }
 }

app/Console/Kernel.php

@@ -2,13 +2,9 @@
 
 namespace App\Console;
 
-use App\Console\Cron\FifteenMinute;
-use App\Console\Cron\FiveMinute;
 use App\Console\Cron\Hourly;
-use App\Console\Cron\JobQueue;
 use App\Console\Cron\Monthly;
 use App\Console\Cron\Nightly;
-use App\Console\Cron\ThirtyMinute;
 use App\Console\Cron\Weekly;
 use App\Services\CronService;
 use Illuminate\Console\Scheduling\Schedule;
@@ -17,11 +13,7 @@ use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
 class Kernel extends ConsoleKernel
 {
     /**
-     * Define the application's command schedule. How this works... according to the command
-     * time, an event gets send out with the appropriate time (e.g, hourly sends an hourly event)
-     *
-     * Then the CronServiceProvider has the list of cronjobs which then run according to the events
-     * and then calls those at the proper times.
+     * Define the application's command schedule.
      *
      * @param \Illuminate\Console\Scheduling\Schedule $schedule
      *
@@ -29,32 +21,16 @@ class Kernel extends ConsoleKernel
      */
     protected function schedule(Schedule $schedule): void
     {
-        // If not using the queue worker then run those via cron
-        if (!config('queue.worker', false)) {
-            $schedule->command(JobQueue::class)
-                ->everyMinute()
-                ->withoutOverlapping();
-        }
-
-        /*
-         * NOTE: IF MORE TASKS ARE ADDED, THEY ALSO MUST BE ADDED TO THE CRON.PHP
-         */
-        $schedule->command(FiveMinute::class)->everyFiveMinutes();
-        $schedule->command(FifteenMinute::class)->everyFifteenMinutes();
-        $schedule->command(ThirtyMinute::class)->everyThirtyMinutes();
         $schedule->command(Nightly::class)->dailyAt('01:00');
-        $schedule->command(Hourly::class)->hourly();
         $schedule->command(Weekly::class)->weeklyOn(0);
         $schedule->command(Monthly::class)->monthlyOn(1);
+        $schedule->command(Hourly::class)->hourly();
 
         // When spatie-backups runs
-        /*if (config('backup.backup.enabled', false) === true) {
-            $schedule->command('backup:clean')->daily()->at('01:00');
-            $schedule->command('backup:run')->daily()->at('02:00');
-        }*/
+        $schedule->command('backup:clean')->daily()->at('01:00');
+        $schedule->command('backup:run')->daily()->at('02:00');
 
         // Update the last time the cron was run
-        /** @var CronService $cronSvc */
         $cronSvc = app(CronService::class);
         $cronSvc->updateLastRunTime();
     }

app/Contracts/Award.php

@@ -37,10 +37,10 @@ abstract class Award
      */
 
     /** @var \App\Models\Award|null */
-    protected ?AwardModel $award;
+    protected $award;
 
     /** @var \App\Models\User|null */
-    protected ?User $user;
+    protected $user;
 
     public function __construct(AwardModel $award = null, User $user = null)
     {
@@ -69,9 +69,9 @@ abstract class Award
     /**
      * Add the award to this user, if they don't already have it
      *
-     * @return bool|UserAward|null
+     * @return bool|UserAward
      */
-    protected function addAward(): bool|UserAward|null
+    protected function addAward()
     {
         $w = [
             'user_id'  => $this->user->id,

app/Contracts/Command.php

@@ -24,19 +24,9 @@ abstract class Command extends \Illuminate\Console\Command
         parent::__construct();
 
         // Running in the console but not in the tests
-        /*if (app()->runningInConsole() && env('APP_ENV') !== 'testing') {
+        if (app()->runningInConsole() && env('APP_ENV') !== 'testing') {
             $this->redirectLoggingToFile('stdout');
-        }*/
-    }
-
-    /**
-     * Return the signature of the command
-     *
-     * @return string
-     */
-    public function getSignature(): string
-    {
-        return $this->signature;
+        }
     }
 
     /**

app/Contracts/Controller.php

@@ -84,21 +84,19 @@ abstract class Controller extends \Illuminate\Routing\Controller
      *
      * @param $message
      * @param null|mixed $count
-     * @param mixed      $attrs
      *
      * @return \Illuminate\Http\JsonResponse
      */
-    public function message($message, $count = null, $attrs = [])
+    public function message($message, $count = null)
     {
-        $ret = [
+        $attrs = [
             'message' => $message,
-            'attrs'   => $attrs,
         ];
 
         if ($count !== null) {
-            $ret['count'] = $count;
+            $attrs['count'] = $count;
         }
 
-        return response()->json($ret);
+        return response()->json($attrs);
     }
 }

app/Contracts/CronCommand.php

@@ -1,20 +0,0 @@
-<?php
-
-namespace App\Contracts;
-
-abstract class CronCommand extends Command
-{
-    /**
-     * @return mixed
-     */
-    abstract public function callEvent();
-
-    /**
-     * Adjust the logging depending on where we're running from
-     */
-    public function __construct()
-    {
-        parent::__construct();
-        $this->redirectLoggingToFile('cron');
-    }
-}

app/Contracts/Enum.php

@@ -7,14 +7,14 @@ namespace App\Contracts;
  */
 abstract class Enum
 {
-    protected static array $cache = [];
-    protected static array $codes = [];
-    protected static array $labels = [];
+    protected static $cache = [];
+    protected static $codes = [];
+    protected static $labels = [];
 
     /**
      * @var int
      */
-    protected int $value;
+    protected $value;
 
     /**
      * Create an instance of this Enum
@@ -29,9 +29,9 @@ abstract class Enum
     /**
      * Return the value that's been set if this is an instance
      *
-     * @return int|null
+     * @return mixed
      */
-    final public function getValue(): ?int
+    final public function getValue()
     {
         return $this->value;
     }
@@ -41,9 +41,9 @@ abstract class Enum
      *
      * @param $value
      *
-     * @return string
+     * @return mixed
      */
-    final public static function label($value): string
+    final public static function label($value)
     {
         if (isset(static::$labels[$value])) {
             $val = static::$labels[$value];
@@ -53,8 +53,6 @@ abstract class Enum
 
             return $val;
         }
-
-        return $value;
     }
 
     /**
@@ -89,11 +87,11 @@ abstract class Enum
      *
      * @return false|int|string
      */
-    public static function convertToCode($value): bool|int|string|null
+    public static function convertToCode($value)
     {
         $value = (int) $value;
         if (!array_key_exists($value, static::$codes)) {
-            return null;
+            return;
         }
 
         return static::$codes[$value];

app/Contracts/Factory.php

@@ -1,9 +0,0 @@
-<?php
-
-namespace App\Contracts;
-
-use Illuminate\Database\Eloquent\Factories\Factory as EloquentFactory;
-
-abstract class Factory extends EloquentFactory
-{
-}

app/Contracts/ImportExport.php

@@ -166,36 +166,10 @@ class ImportExport
                 return [];
             }
 
-            if (strpos($split_values[0], '?') !== false) {
-                // This contains the query string, which turns it into a multi-level array
-                $query_str = explode('?', $split_values[0]);
-                $parent = trim($query_str[0]);
-
-                $children = [];
-                $kvp = explode('&', trim($query_str[1]));
-                foreach ($kvp as $items) {
-                    if (!$items) {
-                        continue;
-                    }
-
-                    $this->kvpToArray($items, $children);
-                }
-
-                $ret[$parent] = $children;
-
-                return $ret;
-            }
-
-            // This is not a query string, return it back untouched
             return [$split_values[0]];
         }
 
         foreach ($split_values as $value) {
-            $value = trim($value);
-            if ($value === '') {
-                continue;
-            }
-
             // This isn't in the query string format, so it's
             // just a straight key-value pair set
             if (strpos($value, '?') === false) {

app/Contracts/Notification.php

@@ -4,6 +4,7 @@ namespace App\Contracts;
 
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Support\Facades\Log;
 
 class Notification extends \Illuminate\Notifications\Notification implements ShouldQueue
 {
@@ -16,13 +17,25 @@ class Notification extends \Illuminate\Notifications\Notification implements Sho
     {
         // Look in the notifications.channels config and see where this particular
         // notification can go. Map it to $channels
-        /*$klass = static::class;
+        $klass = static::class;
         $notif_config = config('notifications.channels', []);
         if (!array_key_exists($klass, $notif_config)) {
             Log::error('Notification type '.$klass.' missing from notifications config, defaulting to mail');
             return;
         }
 
-        $this->channels = $notif_config[$klass];*/
+        $this->channels = $notif_config[$klass];
+    }
+
+    /**
+     * Get the notification's delivery channels.
+     *
+     * @param mixed $notifiable
+     *
+     * @return array
+     */
+    public function via($notifiable)
+    {
+        return $this->channels;
     }
 }

app/Contracts/Repository.php

@@ -2,14 +2,11 @@
 
 namespace App\Contracts;
 
-use Exception;
 use Illuminate\Validation\Validator;
-use function is_array;
 use Prettus\Repository\Eloquent\BaseRepository;
-use Prettus\Repository\Exceptions\RepositoryException;
 
 /**
- * @mixin BaseRepository
+ * @mixin \Prettus\Repository\Eloquent\BaseRepository
  */
 abstract class Repository extends BaseRepository
 {
@@ -23,8 +20,8 @@ abstract class Repository extends BaseRepository
     {
         try {
             return $this->find($id, $columns);
-        } catch (Exception $e) {
-            return null;
+        } catch (\Exception $e) {
+            return;
         }
     }
 
@@ -35,7 +32,11 @@ abstract class Repository extends BaseRepository
      */
     public function validate($values)
     {
-        $validator = Validator::make($values, $this->model()->rules);
+        $validator = Validator::make(
+            $values,
+            $this->model()->rules
+        );
+
         if ($validator->fails()) {
             return $validator->messages();
         }
@@ -49,8 +50,6 @@ abstract class Repository extends BaseRepository
      * @param int    $count
      * @param string $sort_by created_at (default) or updated_at
      *
-     * @throws RepositoryException
-     *
      * @return mixed
      */
     public function recent($count = null, $sort_by = 'created_at')
@@ -72,7 +71,7 @@ abstract class Repository extends BaseRepository
         return $this->scopeQuery(function ($query) use ($where, $sort_by, $order_by) {
             $q = $query->where($where);
             // See if there are multi-column sorts
-            if (is_array($sort_by)) {
+            if (\is_array($sort_by)) {
                 foreach ($sort_by as $key => $sort) {
                     $q = $q->orderBy($key, $sort);
                 }
@@ -99,7 +98,7 @@ abstract class Repository extends BaseRepository
         return $this->scopeQuery(function ($query) use ($col, $values, $sort_by, $order_by) {
             $q = $query->whereNotIn($col, $values);
             // See if there are multi-column sorts
-            if (is_array($sort_by)) {
+            if (\is_array($sort_by)) {
                 foreach ($sort_by as $key => $sort) {
                     $q = $q->orderBy($key, $sort);
                 }
@@ -119,7 +118,7 @@ abstract class Repository extends BaseRepository
      * @param array  $columns
      * @param string $method
      *
-     * @throws RepositoryException
+     * @throws \Prettus\Repository\Exceptions\RepositoryException
      *
      * @return mixed
      */
@@ -133,10 +132,7 @@ abstract class Repository extends BaseRepository
         $page = (int) request()->query('page', 1);
 
         $results = $this->model->{$method}($limit, $columns, 'page', $page);
-
-        $qs = request()->except(['page', 'user']);
-        $results->appends($qs);
-
+        $results->appends(app('request')->query());
         $this->resetModel();
 
         return $this->parserResult($results);

app/Contracts/Resource.php

@@ -2,10 +2,7 @@
 
 namespace App\Contracts;
 
-use App\Support\Resources\CustomAnonymousResourceCollection;
-use App\Support\Resources\CustomPaginatedResourceResponse;
 use Illuminate\Http\Resources\Json\JsonResource;
-use Illuminate\Pagination\AbstractPaginator;
 
 /**
  * Base class for a resource/response
@@ -29,28 +26,4 @@ class Resource extends JsonResource
             }
         }
     }
-
-    /**
-     * Customize the response to exclude all the extra data that isn't used. Based on:
-     * https://gist.github.com/derekphilipau/4be52164a69ce487dcd0673656d280da
-     *
-     * @param \Illuminate\Http\Request $request
-     *
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function toResponse($request)
-    {
-        return $this->resource instanceof AbstractPaginator
-                    ? (new CustomPaginatedResourceResponse($this))->toResponse($request)
-                    : parent::toResponse($request);
-    }
-
-    public static function collection($resource)
-    {
-        return tap(new CustomAnonymousResourceCollection($resource, static::class), function ($collection) {
-            if (property_exists(static::class, 'preserveKeys')) {
-                $collection->preserveKeys = (new static([]))->preserveKeys === true;
-            }
-        });
-    }
 }

app/Contracts/Unit.php

@@ -3,6 +3,7 @@
 namespace App\Contracts;
 
 use ArrayAccess;
+use PhpUnitsOfMeasure\Exception\UnknownUnitOfMeasure;
 
 /**
  * Abstract unit wrapper
@@ -10,89 +11,45 @@ use ArrayAccess;
 class Unit implements ArrayAccess
 {
     /**
-     * The localized unit the user wants it displayed in
+     * The unit this is kept as
      */
-    public string $localUnit;
+    public $unit;
 
     /**
-     * The unit that this value is stored in locally
+     * All of the units of this class
      */
-    public string $internalUnit;
-
-    /**
-     * All of the units of this class which are reported in an API response
-     */
-    public array $units;
+    public $units;
 
     /**
      * Holds an instance of the PhpUnit type
+     *
+     * @var \PhpUnitsOfMeasure\AbstractPhysicalQuantity
      */
-    protected mixed $instance;
+    protected $instance;
 
     /**
      * Units that are included as part of the REST response
      */
-    public array $responseUnits = [];
+    public $responseUnits = [];
 
     /**
-     * Factory method for creating a new unit type
-     *
-     * @param mixed  $value
-     * @param string $unit
-     *
-     * @throws \Exception
-     *
-     * @return Unit
+     * @return mixed
      */
-    public static function make(mixed $value, string $unit): self
+    public function value()
     {
-        if ($value instanceof self) {
-            return $value;
-        }
-
-        return new static($value, $unit);
-    }
-
-    /**
-     * Return the value in an internal format
-     *
-     * @param int|null $round Optional value to round to
-     *
-     * @return float|null
-     */
-    public function internal(?int $round = null): ?float
-    {
-        return $this->toUnit($this->internalUnit, $round);
-    }
-
-    /**
-     * Return the value in the localized format
-     *
-     * @param int|null $round Optional value to round to
-     *
-     * @return float|null
-     */
-    public function local(?int $round = null): ?float
-    {
-        return $this->toUnit($this->localUnit, $round);
+        return $this->__toString();
     }
 
     /**
      * Just call toUnit() on the PhpUnitOfMeasure instance
      *
-     * @param string   $unit
-     * @param int|null $round Optional value to round to
+     * @param string $unit
      *
-     * @return float|null
+     * @return mixed
      */
-    public function toUnit(string $unit, ?int $round = null): ?float
+    public function toUnit($unit)
     {
-        $val = $this->instance->toUnit($unit);
-        if ($round === null) {
-            return $val;
-        }
-
-        return round($val, $round);
+        return $this->instance->toUnit($unit);
     }
 
     /**
@@ -102,7 +59,7 @@ class Unit implements ArrayAccess
     {
         $response = [];
         foreach ($this->responseUnits as $unit) {
-            $response[$unit] = round($this->instance->toUnit($unit), 2);
+            $response[$unit] = $this[$unit] ?? 0;
         }
 
         return $response;
@@ -115,7 +72,7 @@ class Unit implements ArrayAccess
      *
      * @return bool
      */
-    public function offsetExists($offset): bool
+    public function offsetExists($offset)
     {
         return $this->offsetGet($offset) !== null;
     }
@@ -123,15 +80,19 @@ class Unit implements ArrayAccess
     /**
      * Implements ArrayAccess
      *
-     * @param $unit
+     * @param $offset
      *
-     * @return float|null
+     * @return mixed
      */
-    public function offsetGet($unit): ?float
+    public function offsetGet($offset)
     {
-        $value = $this->instance->toUnit($unit);
-        if (!$value) {
-            return null;
+        try {
+            $value = $this->instance->toUnit($offset);
+            if (!$value) {
+                return;
+            }
+        } catch (UnknownUnitOfMeasure $e) {
+            return;
         }
 
         return round($value, 2);
@@ -163,6 +124,6 @@ class Unit implements ArrayAccess
      */
     public function __toString()
     {
-        return (string) $this->offsetGet($this->localUnit);
+        return (string) $this->offsetGet($this->unit);
     }
 }

app/Cron/Hourly/DeletePireps.php

@@ -1,56 +0,0 @@
-<?php
-
-namespace App\Cron\Hourly;
-
-use App\Contracts\Listener;
-use App\Events\CronHourly;
-use App\Models\Enums\PirepState;
-use App\Models\Enums\PirepStatus;
-use App\Models\Pirep;
-use App\Services\PirepService;
-use Carbon\Carbon;
-use Illuminate\Support\Facades\Log;
-
-/**
- * Remove cancelled/deleted PIREPs. Look for PIREPs that were created before the setting time
- * (e.g, 12 hours ago) and are marked with the
- */
-class DeletePireps extends Listener
-{
-    /**
-     * Delete old rejected PIREPs
-     *
-     * @param CronHourly $event
-     *
-     * @throws \Exception
-     */
-    public function handle(CronHourly $event): void
-    {
-        $this->deletePireps(setting('pireps.delete_rejected_hours'), PirepState::REJECTED);
-        $this->deletePireps(setting('pireps.delete_cancelled_hours'), PirepState::CANCELLED);
-    }
-
-    /**
-     * Look for and delete PIREPs which match the criteria
-     *
-     * @param int $expire_time_hours The time in hours to look for PIREPs
-     * @param int $state             The PirepState enum value
-     */
-    protected function deletePireps(int $expire_time_hours, int $state)
-    {
-        $dt = Carbon::now('UTC')->subHours($expire_time_hours);
-        $pireps = Pirep::where('created_at', '<', $dt)
-            ->where(['state' => $state])
-            ->where('status', '<>', PirepStatus::PAUSED)
-            ->get();
-
-        /** @var PirepService $pirepSvc */
-        $pirepSvc = app(PirepService::class);
-
-        /** @var Pirep $pirep */
-        foreach ($pireps as $pirep) {
-            Log::info('Cron: Deleting PIREP id='.$pirep->id.', state='.PirepState::label($state));
-            $pirepSvc->delete($pirep);
-        }
-    }
-}

app/Cron/Hourly/RemoveExpiredBids.php

@@ -25,7 +25,7 @@ class RemoveExpiredBids extends Listener
             return;
         }
 
-        $date = Carbon::now('UTC')->subHours(setting('bids.expire_time'));
-        Bid::where('created_at', '<', $date)->delete();
+        $date = Carbon::now()->subHours(setting('bids.expire_time'));
+        Bid::whereDate('created_at', '<', $date)->delete();
     }
 }

app/Cron/Hourly/RemoveExpiredLiveFlights.php

@@ -4,12 +4,9 @@ namespace App\Cron\Hourly;
 
 use App\Contracts\Listener;
 use App\Events\CronHourly;
-use App\Events\PirepCancelled;
 use App\Models\Enums\PirepState;
-use App\Models\Enums\PirepStatus;
 use App\Models\Pirep;
 use Carbon\Carbon;
-use Illuminate\Support\Facades\Log;
 
 /**
  * Remove expired live flights
@@ -29,16 +26,9 @@ class RemoveExpiredLiveFlights extends Listener
             return;
         }
 
-        $date = Carbon::now('UTC')->subHours(setting('acars.live_time'));
-        $pireps = Pirep::where('updated_at', '<', $date)
+        $date = Carbon::now()->subHours(setting('acars.live_time'));
+        Pirep::whereDate('updated_at', '<', $date)
             ->where('state', PirepState::IN_PROGRESS)
-            ->where('status', '<>', PirepStatus::PAUSED)
-            ->get();
-
-        foreach ($pireps as $pirep) {
-            event(new PirepCancelled($pirep));
-            Log::info('Cron: Deleting Expired Live PIREP id='.$pirep->id.', state='.PirepState::label($pirep->state));
-            $pirep->delete();
-        }
+            ->delete();
     }
 }

app/Cron/Monthly/ApplyExpenses.php

@@ -6,14 +6,13 @@ use App\Contracts\Listener;
 use App\Events\CronMonthly;
 use App\Models\Enums\ExpenseType;
 use App\Services\Finance\RecurringFinanceService;
-use Illuminate\Support\Facades\Log;
 
 /**
  * Go through and apply any finances that are daily
  */
 class ApplyExpenses extends Listener
 {
-    private RecurringFinanceService $financeSvc;
+    private $financeSvc;
 
     /**
      * ApplyExpenses constructor.
@@ -36,7 +35,6 @@ class ApplyExpenses extends Listener
      */
     public function handle(CronMonthly $event): void
     {
-        Log::info('Monthly: Applying monthly expenses');
         $this->financeSvc->processExpenses(ExpenseType::MONTHLY);
     }
 }

app/Cron/Nightly/ApplyExpenses.php

@@ -6,14 +6,13 @@ use App\Contracts\Listener;
 use App\Events\CronNightly;
 use App\Models\Enums\ExpenseType;
 use App\Services\Finance\RecurringFinanceService;
-use Illuminate\Support\Facades\Log;
 
 /**
  * Go through and apply any finances that are daily
  */
 class ApplyExpenses extends Listener
 {
-    private RecurringFinanceService $financeSvc;
+    private $financeSvc;
 
     /**
      * ApplyExpenses constructor.
@@ -36,7 +35,6 @@ class ApplyExpenses extends Listener
      */
     public function handle(CronNightly $event): void
     {
-        Log::info('Nightly: Applying daily expenses');
         $this->financeSvc->processExpenses(ExpenseType::DAILY);
     }
 }

app/Cron/Nightly/ClearExpiredSimbrief.php

@@ -1,18 +1,17 @@
 <?php
 
-namespace App\Cron\Hourly;
+namespace App\Cron\Nightly;
 
 use App\Contracts\Listener;
-use App\Events\CronHourly;
+use App\Events\CronNightly;
 use App\Services\SimBriefService;
-use Illuminate\Support\Facades\Log;
 
 /**
  * Clear any expired SimBrief flight briefs that aren't attached to a PIREP
  */
 class ClearExpiredSimbrief extends Listener
 {
-    private SimBriefService $simbriefSvc;
+    private $simbriefSvc;
 
     public function __construct(SimBriefService $simbriefSvc)
     {
@@ -20,11 +19,10 @@ class ClearExpiredSimbrief extends Listener
     }
 
     /**
-     * @param CronHourly $event
+     * @param \App\Events\CronNightly $event
      */
-    public function handle(CronHourly $event): void
+    public function handle(CronNightly $event): void
     {
-        Log::info('Hourly: Removing expired Simbrief entries');
         $this->simbriefSvc->removeExpiredEntries();
     }
 }

app/Cron/Nightly/NewVersionCheck.php

@@ -5,11 +5,13 @@ namespace App\Cron\Nightly;
 use App\Contracts\Listener;
 use App\Events\CronNightly;
 use App\Services\VersionService;
-use Illuminate\Support\Facades\Log;
 
+/**
+ * Determine if any pilots should be set to ON LEAVE status
+ */
 class NewVersionCheck extends Listener
 {
-    private VersionService $versionSvc;
+    private $versionSvc;
 
     /**
      * @param VersionService $versionSvc
@@ -26,7 +28,6 @@ class NewVersionCheck extends Listener
      */
     public function handle(CronNightly $event): void
     {
-        Log::info('Nightly: Checking for new version');
         $this->versionSvc->isNewVersionAvailable();
     }
 }

app/Cron/Nightly/PilotLeave.php

@@ -12,7 +12,7 @@ use Illuminate\Support\Facades\Log;
  */
 class PilotLeave extends Listener
 {
-    private UserService $userSvc;
+    private $userSvc;
 
     /**
      * PilotLeave constructor.
@@ -34,10 +34,7 @@ class PilotLeave extends Listener
      */
     public function handle(CronNightly $event): void
     {
-        Log::info('Cron: Running pilot leave check');
         $users = $this->userSvc->findUsersOnLeave();
-        Log::info('Found '.count($users).' users on leave');
-
         foreach ($users as $user) {
             Log::info('Setting user '.$user->ident.' to ON LEAVE status');
             $this->userSvc->setStatusOnLeave($user);

app/Cron/Nightly/RecalculateBalances.php

@@ -6,14 +6,14 @@ use App\Contracts\Listener;
 use App\Events\CronNightly;
 use App\Models\Journal;
 use App\Repositories\JournalRepository;
-use Illuminate\Support\Facades\Log;
+use Log;
 
 /**
  * This recalculates the balances on all of the journals
  */
 class RecalculateBalances extends Listener
 {
-    private JournalRepository $journalRepo;
+    private $journalRepo;
 
     /**
      * Nightly constructor.
@@ -35,7 +35,7 @@ class RecalculateBalances extends Listener
      */
     public function handle(CronNightly $event): void
     {
-        Log::info('Nightly: Recalculating balances');
+        Log::info('Recalculating balances');
 
         $journals = Journal::all();
         foreach ($journals as $journal) {

app/Cron/Nightly/RecalculateStats.php

@@ -13,8 +13,8 @@ use Illuminate\Support\Facades\Log;
  */
 class RecalculateStats extends Listener
 {
-    private AircraftService $aircraftSvc;
-    private UserService $userSvc;
+    private $aircraftSvc;
+    private $userSvc;
 
     public function __construct(AircraftService $aircraftSvc, UserService $userSvc)
     {
@@ -32,10 +32,10 @@ class RecalculateStats extends Listener
      */
     public function handle(CronNightly $event): void
     {
-        Log::info('Nightly: Recalculating user stats');
+        Log::info('Recalculating user stats');
         $this->userSvc->recalculateAllUserStats();
 
-        Log::info('Nightly: Recalcuating aircraft status');
+        Log::info('Recalcuating aircraft status');
         $this->aircraftSvc->recalculateStats();
     }
 }

app/Cron/Nightly/SetActiveFlights.php

@@ -19,8 +19,6 @@ class SetActiveFlights extends Listener
      */
     public function handle(CronNightly $event): void
     {
-        Log::info('Nightly: Setting active flights');
-
         $this->checkFlights();
     }
 

app/Database/factories/AcarsFactory.php

@@ -1,43 +1,23 @@
 <?php
 
-/** @noinspection PhpIllegalPsrClassPathInspection */
+use Faker\Generator as Faker;
 
-namespace App\Database\Factories;
-
-use App\Contracts\Factory;
-use App\Models\Acars;
-use DateTime;
-
-class AcarsFactory extends Factory
-{
-    /**
-     * The name of the factory's corresponding model.
-     *
-     * @var string
-     */
-    protected $model = Acars::class;
-
-    /**
-     * @return array <string, mixed>
-     */
-    public function definition(): array
-    {
-        return [
-            'id'          => null,
-            'pirep_id'    => null,
-            'log'         => $this->faker->text(100),
-            'lat'         => $this->faker->latitude,
-            'lon'         => $this->faker->longitude,
-            'distance'    => $this->faker->randomFloat(2, 0, 6000),
-            'heading'     => $this->faker->numberBetween(0, 359),
-            'altitude'    => $this->faker->numberBetween(20, 400),
-            'vs'          => $this->faker->numberBetween(-5000, 5000),
-            'gs'          => $this->faker->numberBetween(300, 500),
-            'transponder' => $this->faker->numberBetween(200, 9999),
-            'autopilot'   => $this->faker->text(10),
-            'fuel'        => $this->faker->randomFloat(2, 100, 1000),
-            'fuel_flow'   => $this->faker->randomFloat(2, 100, 1000),
-            'sim_time'    => $this->faker->dateTime('now', 'UTC')->format(DateTime::ATOM),
-        ];
-    }
-}
+$factory->define(App\Models\Acars::class, function (Faker $faker) {
+    return [
+        'id'          => null,
+        'pirep_id'    => null,
+        'log'         => $faker->text(100),
+        'lat'         => $faker->latitude,
+        'lon'         => $faker->longitude,
+        'distance'    => $faker->randomFloat(2, 0, 6000),
+        'heading'     => $faker->numberBetween(0, 359),
+        'altitude'    => $faker->numberBetween(20, 400),
+        'vs'          => $faker->numberBetween(-5000, 5000),
+        'gs'          => $faker->numberBetween(300, 500),
+        'transponder' => $faker->numberBetween(200, 9999),
+        'autopilot'   => $faker->text(10),
+        'fuel'        => $faker->randomFloat(2, 100, 1000),
+        'fuel_flow'   => $faker->randomFloat(2, 100, 1000),
+        'sim_time'    => $faker->dateTime('now', 'UTC'),
+    ];
+});

app/Database/factories/AircraftFactory.php

@@ -1,51 +1,33 @@
 <?php
 
-/** @noinspection PhpIllegalPsrClassPathInspection */
-
-namespace App\Database\Factories;
-
-use App\Contracts\Factory;
-use App\Models\Aircraft;
 use App\Models\Airport;
 use App\Models\Enums\AircraftState;
 use App\Models\Enums\AircraftStatus;
 use App\Models\Subfleet;
 use App\Support\ICAO;
-use DateTime;
+use Faker\Generator as Faker;
 
-class AircraftFactory extends Factory
-{
-    /**
-     * The name of the factory's corresponding model.
-     *
-     * @var string
-     */
-    protected $model = Aircraft::class;
-
-    /**
-     * Define the model's default state.
-     *
-     * @throws \Exception
-     *
-     * @return array<string, mixed>
-     */
-    public function definition(): array
-    {
-        return [
-            'id'           => null,
-            'subfleet_id'  => fn () => Subfleet::factory()->create()->id,
-            'airport_id'   => fn () => Airport::factory()->create()->id,
-            'iata'         => $this->faker->unique()->text(5),
-            'icao'         => $this->faker->unique()->text(5),
-            'name'         => $this->faker->text(50),
-            'registration' => $this->faker->unique()->text(10),
-            'hex_code'     => ICAO::createHexCode(),
-            'mtow'         => $this->faker->randomFloat(2, 0, 50000),
-            'zfw'          => $this->faker->randomFloat(2, 0, 50000),
-            'status'       => AircraftStatus::ACTIVE,
-            'state'        => AircraftState::PARKED,
-            'created_at'   => $this->faker->dateTimeBetween('-1 week')->format(DateTime::ATOM),
-            'updated_at'   => fn (array $pirep) => $pirep['created_at'],
-        ];
-    }
-}
+$factory->define(App\Models\Aircraft::class, function (Faker $faker) {
+    return [
+        'id'          => null,
+        'subfleet_id' => function () {
+            return factory(Subfleet::class)->create()->id;
+        },
+        'airport_id' => function () {
+            return factory(Airport::class)->create()->id;
+        },
+        'iata'         => $faker->unique()->text(5),
+        'icao'         => $faker->unique()->text(5),
+        'name'         => $faker->text(50),
+        'registration' => $faker->unique()->text(10),
+        'hex_code'     => ICAO::createHexCode(),
+        'mtow'         => $faker->randomFloat(2, 0, 50000),
+        'zfw'          => $faker->randomFloat(2, 0, 50000),
+        'status'       => AircraftStatus::ACTIVE,
+        'state'        => AircraftState::PARKED,
+        'created_at'   => $faker->dateTimeBetween('-1 week', 'now'),
+        'updated_at'   => function (array $pirep) {
+            return $pirep['created_at'];
+        },
+    ];
+});

app/Database/factories/AirlineFactory.php

@@ -1,41 +1,25 @@
 <?php
 
-/** @noinspection PhpIllegalPsrClassPathInspection */
-
-namespace App\Database\Factories;
-
-use App\Contracts\Factory;
-use App\Models\Airline;
+use Faker\Generator as Faker;
 use Hashids\Hashids;
 
-class AirlineFactory extends Factory
-{
-    /**
-     * The name of the factory's corresponding model.
-     *
-     * @var string
-     */
-    protected $model = Airline::class;
+/*
+ * Add any number of airports. Don't really care if they're real or not
+ */
+$factory->define(App\Models\Airline::class, function (Faker $faker) {
+    return [
+        'id'   => null,
+        'icao' => function (array $apt) {
+            $hashids = new Hashids(microtime(), 5);
+            $mt = str_replace('.', '', microtime(true));
 
-    /**
-     * Define the model's default state.
-     *
-     * @return array<string, mixed>
-     */
-    public function definition(): array
-    {
-        return [
-            'id'   => null,
-            'icao' => function (array $apt): string {
-                $hashids = new Hashids(microtime(), 5);
-                $mt = str_replace('.', '', microtime(true));
-
-                return $hashids->encode($mt);
-            },
-            'iata'    => fn (array $apt) => $apt['icao'],
-            'name'    => $this->faker->sentence(3),
-            'country' => $this->faker->country,
-            'active'  => 1,
-        ];
-    }
-}
+            return $hashids->encode($mt);
+        },
+        'iata' => function (array $apt) {
+            return $apt['icao'];
+        },
+        'name'    => $faker->sentence(3),
+        'country' => $faker->country,
+        'active'  => 1,
+    ];
+});

app/Database/factories/AirportFactory.php

@@ -1,36 +1,17 @@
 <?php
 
-/** @noinspection PhpIllegalPsrClassPathInspection */
+use Faker\Generator as Faker;
 
-namespace App\Database\Factories;
-
-use App\Contracts\Factory;
-use App\Models\Airport;
-
-class AirportFactory extends Factory
-{
-    /**
-     * The name of the factory's corresponding model.
-     *
-     * @var string
-     */
-    protected $model = Airport::class;
-
-    protected array $usedIcaos = [];
-
-    /**
-     * Generate a fake ICAO
-     *
-     * @throws \Exception
-     *
-     * @return string
-     */
-    protected function createFactoryICAO(): string
+/*
+ * Create an ICAO for use in the factory.
+ */
+if (!function_exists('createFactoryICAO')) {
+    function createFactoryICAO(): string
     {
         $characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
         $max = strlen($characters) - 1;
         $string = '';
-        for ($i = 0; $i < 5; $i++) {
+        for ($i = 0; $i < 4; $i++) {
             try {
                 $string .= $characters[random_int(0, $max)];
             } catch (Exception $e) {
@@ -39,35 +20,37 @@ class AirportFactory extends Factory
 
         return $string;
     }
-
-    /**
-     * Define the model's default state.
-     *
-     * @return array<string, mixed>
-     */
-    public function definition(): array
-    {
-        return [
-            'id' => function () {
-                do {
-                    $airport = $this->createFactoryICAO();
-                } while (in_array($airport, $this->usedIcaos, true));
-
-                return $airport;
-            },
-            'icao'                 => fn (array $apt) => $apt['id'],
-            'iata'                 => fn (array $apt) => $apt['id'],
-            'name'                 => $this->faker->sentence(3),
-            'country'              => $this->faker->country,
-            'timezone'             => $this->faker->timezone,
-            'lat'                  => $this->faker->latitude,
-            'lon'                  => $this->faker->longitude,
-            'hub'                  => false,
-            'notes'                => null,
-            'ground_handling_cost' => $this->faker->randomFloat(2, 0, 500),
-            'fuel_100ll_cost'      => $this->faker->randomFloat(2, 1, 10),
-            'fuel_jeta_cost'       => $this->faker->randomFloat(2, 1, 10),
-            'fuel_mogas_cost'      => $this->faker->randomFloat(2, 1, 10),
-        ];
-    }
 }
+
+/*
+ * Add any number of airports. Don't really care if they're real or not
+ */
+$factory->define(App\Models\Airport::class, function (Faker $faker) {
+    $usedIcaos = [];
+
+    return [
+        'id' => function () use ($usedIcaos) {
+            do {
+                $airport = createFactoryICAO();
+            } while (in_array($airport, $usedIcaos, true));
+
+            return $airport;
+        },
+        'icao' => function (array $apt) {
+            return $apt['id'];
+        },
+        'iata' => function (array $apt) {
+            return $apt['id'];
+        },
+        'name'                 => $faker->sentence(3),
+        'country'              => $faker->country,
+        'timezone'             => $faker->timezone,
+        'lat'                  => $faker->latitude,
+        'lon'                  => $faker->longitude,
+        'hub'                  => false,
+        'ground_handling_cost' => $faker->randomFloat(2, 0, 500),
+        'fuel_100ll_cost'      => $faker->randomFloat(2, 1, 10),
+        'fuel_jeta_cost'       => $faker->randomFloat(2, 1, 10),
+        'fuel_mogas_cost'      => $faker->randomFloat(2, 1, 10),
+    ];
+});

app/Database/factories/AwardFactory.php

@@ -1,34 +0,0 @@
-<?php
-
-/** @noinspection PhpIllegalPsrClassPathInspection */
-
-namespace App\Database\Factories;
-
-use App\Contracts\Factory;
-use App\Models\Award;
-
-class AwardFactory extends Factory
-{
-    /**
-     * The name of the factory's corresponding model.
-     *
-     * @var string
-     */
-    protected $model = Award::class;
-
-    /**
-     * Define the model's default state.
-     *
-     * @return array<string, mixed>
-     */
-    public function definition(): array
-    {
-        return [
-            'id'               => null,
-            'name'             => $this->faker->name,
-            'description'      => $this->faker->text(10),
-            'ref_model'        => null,
-            'ref_model_params' => null,
-        ];
-    }
-}

app/Database/factories/AwardsFactory.php

@@ -0,0 +1,13 @@
+<?php
+
+use Faker\Generator as Faker;
+
+$factory->define(App\Models\Award::class, function (Faker $faker) {
+    return [
+        'id'               => null,
+        'name'             => $faker->name,
+        'description'      => $faker->text(10),
+        'ref_model'        => null,
+        'ref_model_params' => null,
+    ];
+});

app/Database/factories/ExpenseFactory.php

@@ -1,39 +1,18 @@
 <?php
 
-/** @noinspection PhpIllegalPsrClassPathInspection */
-
-namespace App\Database\Factories;
-
-use App\Contracts\Factory;
 use App\Models\Enums\ExpenseType;
-use App\Models\Expense;
+use Faker\Generator as Faker;
 
-class ExpenseFactory extends Factory
-{
-    /**
-     * The name of the factory's corresponding model.
-     *
-     * @var string
-     */
-    protected $model = Expense::class;
-
-    /**
-     * Define the model's default state.
-     *
-     * @return array<string, mixed>
-     */
-    public function definition(): array
-    {
-        return [
-            'id'           => null,
-            'airline_id'   => null,
-            'name'         => $this->faker->text(20),
-            'amount'       => $this->faker->randomFloat(2, 100, 1000),
-            'type'         => ExpenseType::FLIGHT,
-            'multiplier'   => false,
-            'ref_model'    => \App\Models\Expense::class,
-            'ref_model_id' => null,
-            'active'       => true,
-        ];
-    }
-}
+$factory->define(App\Models\Expense::class, function (Faker $faker) {
+    return [
+        'id'           => null,
+        'airline_id'   => null,
+        'name'         => $faker->text(20),
+        'amount'       => $faker->randomFloat(2, 100, 1000),
+        'type'         => ExpenseType::FLIGHT,
+        'multiplier'   => false,
+        'ref_model'    => \App\Models\Expense::class,
+        'ref_model_id' => null,
+        'active'       => true,
+    ];
+});

app/Database/factories/FareFactory.php

@@ -1,35 +1,16 @@
 <?php
 
-/** @noinspection PhpIllegalPsrClassPathInspection */
+use Faker\Generator as Faker;
 
-namespace App\Database\Factories;
-
-use App\Contracts\Factory;
-use App\Models\Fare;
-
-class FareFactory extends Factory
-{
-    /**
-     * The name of the factory's corresponding model.
-     *
-     * @var string
-     */
-    protected $model = Fare::class;
-
-    /**
-     * Define the model's default state.
-     *
-     * @return array<string, mixed>
-     */
-    public function definition(): array
-    {
-        return [
-            'id'       => null,
-            'code'     => $this->faker->unique()->text(50),
-            'name'     => $this->faker->text(50),
-            'price'    => $this->faker->randomFloat(2, 100, 1000),
-            'cost'     => fn (array $fare) => round($fare['price'] / 2),
-            'capacity' => $this->faker->randomFloat(0, 20, 500),
-        ];
-    }
-}
+$factory->define(App\Models\Fare::class, function (Faker $faker) {
+    return [
+        'id'    => null,
+        'code'  => $faker->unique()->text(50),
+        'name'  => $faker->text(50),
+        'price' => $faker->randomFloat(2, 100, 1000),
+        'cost'  => function (array $fare) {
+            return round($fare['price'] / 2);
+        },
+        'capacity' => $faker->randomFloat(0, 20, 500),
+    ];
+});

app/Database/factories/FlightFactory.php

@@ -1,58 +1,44 @@
 <?php
+/**
+ * Create flights
+ */
+use Faker\Generator as Faker;
 
-/** @noinspection PhpIllegalPsrClassPathInspection */
-
-namespace App\Database\Factories;
-
-use App\Contracts\Factory;
-use App\Models\Flight;
-use DateTime;
-
-class FlightFactory extends Factory
-{
-    /**
-     * The name of the factory's corresponding model.
-     *
-     * @var string
-     */
-    protected $model = Flight::class;
-
-    /**
-     * Define the model's default state.
-     *
-     * @return array<string, mixed>
-     */
-    public function definition(): array
-    {
-        return [
-            'id'            => $this->faker->unique()->numberBetween(10, 10000000),
-            'airline_id'    => fn () => \App\Models\Airline::factory()->create()->id,
-            'flight_number' => $this->faker->unique()->numberBetween(10, 1000000),
-            'route_code'    => $this->faker->randomElement(['', $this->faker->text(5)]),
-            'route_leg'     => $this->faker->randomElement(
-                ['', $this->faker->numberBetween(0, 1000)]
-            ),
-            'dpt_airport_id'       => static fn () => \App\Models\Airport::factory()->create()->id,
-            'arr_airport_id'       => static fn () => \App\Models\Airport::factory()->create()->id,
-            'alt_airport_id'       => static fn () => \App\Models\Airport::factory()->create()->id,
-            'distance'             => $this->faker->numberBetween(1, 1000),
-            'route'                => null,
-            'level'                => 0,
-            'dpt_time'             => $this->faker->time(),
-            'arr_time'             => $this->faker->time(),
-            'flight_time'          => $this->faker->numberBetween(60, 360),
-            'load_factor'          => $this->faker->randomElement([15, 20, 50, 90, 100]),
-            'load_factor_variance' => $this->faker->randomElement([15, 20, 50, 90, 100]),
-            'has_bid'              => false,
-            'active'               => true,
-            'visible'              => true,
-            'days'                 => 0,
-            'start_date'           => null,
-            'end_date'             => null,
-            'created_at'           => $this->faker->dateTimeBetween('-1 week')->format(
-                DateTime::ATOM
-            ),
-            'updated_at' => static fn (array $flight) => $flight['created_at'],
-        ];
-    }
-}
+$factory->define(App\Models\Flight::class, function (Faker $faker) {
+    return [
+        'id'         => $faker->unique()->numberBetween(10, 10000000),
+        'airline_id' => function () {
+            return factory(\App\Models\Airline::class)->create()->id;
+        },
+        'flight_number'  => $faker->unique()->numberBetween(10, 1000000),
+        'route_code'     => $faker->randomElement(['', $faker->text(5)]),
+        'route_leg'      => $faker->randomElement(['', $faker->numberBetween(0, 1000)]),
+        'dpt_airport_id' => function () {
+            return factory(\App\Models\Airport::class)->create()->id;
+        },
+        'arr_airport_id' => function () {
+            return factory(\App\Models\Airport::class)->create()->id;
+        },
+        'alt_airport_id' => function () {
+            return factory(\App\Models\Airport::class)->create()->id;
+        },
+        'distance'             => $faker->numberBetween(1, 1000),
+        'route'                => null,
+        'level'                => 0,
+        'dpt_time'             => $faker->time(),
+        'arr_time'             => $faker->time(),
+        'flight_time'          => $faker->numberBetween(60, 360),
+        'load_factor'          => $faker->randomElement([15, 20, 50, 90, 100]),
+        'load_factor_variance' => $faker->randomElement([15, 20, 50, 90, 100]),
+        'has_bid'              => false,
+        'active'               => true,
+        'visible'              => true,
+        'days'                 => 0,
+        'start_date'           => null,
+        'end_date'             => null,
+        'created_at'           => $faker->dateTimeBetween('-1 week', 'now'),
+        'updated_at'           => static function (array $flight) {
+            return $flight['created_at'];
+        },
+    ];
+});

app/Database/factories/JournalFactory.php

@@ -1,30 +1,9 @@
 <?php
 
-/** @noinspection PhpIllegalPsrClassPathInspection */
+use Faker\Generator as Faker;
 
-namespace App\Database\Factories;
-
-use App\Contracts\Factory;
-use App\Models\Journal;
-
-class JournalFactory extends Factory
-{
-    /**
-     * The name of the factory's corresponding model.
-     *
-     * @var string
-     */
-    protected $model = Journal::class;
-
-    /**
-     * Define the model's default state.
-     *
-     * @return array<string, mixed>
-     */
-    public function definition(): array
-    {
-        return [
-            'currency' => 'USD',
-        ];
-    }
-}
+$factory->define(App\Models\Journal::class, function (Faker $faker) {
+    return [
+        'currency' => 'USD',
+    ];
+});

app/Database/factories/JournalTransactionsFactory.php

@@ -1,39 +1,17 @@
 <?php
 
-/** @noinspection PhpIllegalPsrClassPathInspection */
+use Faker\Generator as Faker;
 
-namespace App\Database\Factories;
-
-use App\Contracts\Factory;
-use App\Models\Journal;
-use App\Models\JournalTransaction;
-use Carbon\Carbon;
-use Ramsey\Uuid\Uuid;
-
-class JournalTransactionsFactory extends Factory
-{
-    /**
-     * The name of the factory's corresponding model.
-     *
-     * @var string
-     */
-    protected $model = JournalTransaction::class;
-
-    /**
-     * Define the model's default state.
-     *
-     * @return array<string, mixed>
-     */
-    public function definition(): array
-    {
-        return [
-            'transaction_group' => Uuid::uuid4()->toString(),
-            'journal_id'        => fn () => Journal::factory()->create()->id,
-            'credit'            => $this->faker->numberBetween(100, 10000),
-            'debit'             => $this->faker->numberBetween(100, 10000),
-            'currency'          => 'USD',
-            'memo'              => $this->faker->sentence(6),
-            'post_date'         => Carbon::now('UTC')->toDateTimeString(),
-        ];
-    }
-}
+$factory->define(App\Models\JournalTransactions::class, function (Faker $faker) {
+    return [
+        'transaction_group' => \Ramsey\Uuid\Uuid::uuid4()->toString(),
+        'journal_id'        => function () {
+            return factory(\App\Models\Journal::class)->create()->id;
+        },
+        'credit'    => $faker->numberBetween(100, 10000),
+        'debit'     => $faker->numberBetween(100, 10000),
+        'currency'  => 'USD',
+        'memo'      => $faker->sentence(6),
+        'post_date' => \Carbon\Carbon::now(),
+    ];
+});

app/Database/factories/NavdataFactory.php

@@ -1,36 +1,15 @@
 <?php
 
-/** @noinspection PhpIllegalPsrClassPathInspection */
-
-namespace App\Database\Factories;
-
-use App\Contracts\Factory;
 use App\Models\Enums\NavaidType;
-use App\Models\Navdata;
+use Faker\Generator as Faker;
 
-class NavdataFactory extends Factory
-{
-    /**
-     * The name of the factory's corresponding model.
-     *
-     * @var string
-     */
-    protected $model = Navdata::class;
-
-    /**
-     * Define the model's default state.
-     *
-     * @return array<string, mixed>
-     */
-    public function definition(): array
-    {
-        return [
-            'id'   => str_replace(' ', '', str_replace('.', '', $this->faker->unique()->text(5))),
-            'name' => str_replace('.', '', $this->faker->unique()->word),
-            'type' => $this->faker->randomElement([NavaidType::VOR, NavaidType::NDB]),
-            'lat'  => $this->faker->latitude,
-            'lon'  => $this->faker->longitude,
-            'freq' => $this->faker->randomFloat(2, 100, 1000),
-        ];
-    }
-}
+$factory->define(App\Models\Navdata::class, function (Faker $faker) {
+    return [
+        'id'   => str_replace(' ', '', str_replace('.', '', $faker->unique()->text(5))),
+        'name' => str_replace('.', '', $faker->unique()->word),
+        'type' => $faker->randomElement([NavaidType::VOR, NavaidType::NDB]),
+        'lat'  => $faker->latitude,
+        'lon'  => $faker->longitude,
+        'freq' => $faker->randomFloat(2, 100, 1000),
+    ];
+});

app/Database/factories/NewsFactory.php

@@ -1,33 +1,14 @@
 <?php
 
-/** @noinspection PhpIllegalPsrClassPathInspection */
+use Faker\Generator as Faker;
 
-namespace App\Database\Factories;
-
-use App\Contracts\Factory;
-use App\Models\News;
-
-class NewsFactory extends Factory
-{
-    /**
-     * The name of the factory's corresponding model.
-     *
-     * @var string
-     */
-    protected $model = News::class;
-
-    /**
-     * Define the model's default state.
-     *
-     * @return array<string, mixed>
-     */
-    public function definition(): array
-    {
-        return [
-            'id'      => null,
-            'user_id' => fn () => \App\Models\User::factory()->create()->id,
-            'subject' => $this->faker->text(),
-            'body'    => $this->faker->sentence,
-        ];
-    }
-}
+$factory->define(App\Models\News::class, function (Faker $faker) {
+    return [
+        'id'      => null,
+        'user_id' => function () {
+            return factory(\App\Models\User::class)->create()->id;
+        },
+        'subject' => $faker->text(),
+        'body'    => $faker->sentence,
+    ];
+});

app/Database/factories/PirepFactory.php

@@ -1,74 +1,69 @@
 <?php
 
-/** @noinspection PhpIllegalPsrClassPathInspection */
-
-namespace App\Database\Factories;
-
-use App\Contracts\Factory;
-use App\Models\Airline;
 use App\Models\Enums\PirepSource;
 use App\Models\Enums\PirepState;
 use App\Models\Enums\PirepStatus;
-use App\Models\Flight;
-use App\Models\Pirep;
 use Carbon\Carbon;
+use Faker\Generator as Faker;
 
-class PirepFactory extends Factory
-{
-    /**
-     * The name of the factory's corresponding model.
-     *
-     * @var string
-     */
-    protected $model = Pirep::class;
+/*
+ * Create a new PIREP
+ */
+$factory->define(App\Models\Pirep::class, function (Faker $faker) {
+    $airline = factory(\App\Models\Airline::class)->create();
+    $flight = factory(\App\Models\Flight::class)->create([
+        'airline_id' => $airline->id,
+    ]);
 
-    /**
-     * Define the model's default state.
-     *
-     * @return array<string, mixed>
-     */
-    public function definition(): array
-    {
-        /** @var Airline $airline */
-        $airline = Airline::factory()->create();
-
-        /** @var Flight $flight */
-        $flight = Flight::factory()->create(['airline_id' => $airline->id]);
-
-        return [
-            'id'                  => $this->faker->unique()->numberBetween(10, 10000000),
-            'airline_id'          => fn () => $airline->id,
-            'user_id'             => fn () => \App\Models\User::factory()->create()->id,
-            'aircraft_id'         => fn () => \App\Models\Aircraft::factory()->create()->id,
-            'flight_id'           => fn () => $flight->id,
-            'flight_number'       => fn () => $flight->flight_number,
-            'route_code'          => null,
-            'route_leg'           => null,
-            'dpt_airport_id'      => fn () => $flight->dpt_airport_id,
-            'arr_airport_id'      => fn () => $flight->arr_airport_id,
-            'level'               => $this->faker->numberBetween(20, 400),
-            'distance'            => $this->faker->randomFloat(2, 0, 6000),
-            'planned_distance'    => $this->faker->randomFloat(2, 0, 6000),
-            'flight_time'         => $this->faker->numberBetween(60, 360),
-            'planned_flight_time' => $this->faker->numberBetween(60, 360),
-            'zfw'                 => $this->faker->randomFloat(2),
-            'block_fuel'          => $this->faker->randomFloat(2, 0, 1000),
-            'fuel_used'           => fn (array $pirep) => round($pirep['block_fuel'] * .9, 2),
-            'block_on_time'       => Carbon::now('UTC'),
-            'block_off_time'      => fn (array $pirep) => $pirep['block_on_time']->subMinutes(
-                $pirep['flight_time']
-            ),
-            'route'  => $this->faker->text(200),
-            'notes'  => $this->faker->text(200),
-            'source' => $this->faker->randomElement(
-                [PirepSource::MANUAL, PirepSource::ACARS]
-            ),
-            'source_name'  => 'TestFactory',
-            'state'        => PirepState::PENDING,
-            'status'       => PirepStatus::SCHEDULED,
-            'submitted_at' => Carbon::now('UTC')->toDateTimeString(),
-            'created_at'   => Carbon::now('UTC')->toDateTimeString(),
-            'updated_at'   => fn (array $pirep) => $pirep['created_at'],
-        ];
-    }
-}
+    return [
+        'id'         => $faker->unique()->numberBetween(10, 10000000),
+        'airline_id' => function () use ($airline) {
+            return $airline->id;
+        },
+        'user_id' => function () {
+            return factory(\App\Models\User::class)->create()->id;
+        },
+        'aircraft_id' => function () {
+            return factory(\App\Models\Aircraft::class)->create()->id;
+        },
+        'flight_id' => function () use ($flight) {
+            return $flight->id;
+        },
+        'flight_number' => function () use ($flight) {
+            return $flight->flight_number;
+        },
+        'route_code'     => null,
+        'route_leg'      => null,
+        'dpt_airport_id' => function () use ($flight) {
+            return $flight->dpt_airport_id;
+        },
+        'arr_airport_id' => function () use ($flight) {
+            return $flight->arr_airport_id;
+        },
+        'level'               => $faker->numberBetween(20, 400),
+        'distance'            => $faker->randomFloat(2, 0, 6000),
+        'planned_distance'    => $faker->randomFloat(2, 0, 6000),
+        'flight_time'         => $faker->numberBetween(60, 360),
+        'planned_flight_time' => $faker->numberBetween(60, 360),
+        'zfw'                 => $faker->randomFloat(2),
+        'block_fuel'          => $faker->randomFloat(2, 0, 1000),
+        'fuel_used'           => function (array $pirep) {
+            return round($pirep['block_fuel'] * .9, 2); // 90% of the fuel loaded was used
+        },
+        'block_on_time'  => Carbon::now('UTC'),
+        'block_off_time' => function (array $pirep) {
+            return $pirep['block_on_time']->subMinutes($pirep['flight_time']);
+        },
+        'route'        => $faker->text(200),
+        'notes'        => $faker->text(200),
+        'source'       => $faker->randomElement([PirepSource::MANUAL, PirepSource::ACARS]),
+        'source_name'  => 'TestFactory',
+        'state'        => PirepState::PENDING,
+        'status'       => PirepStatus::SCHEDULED,
+        'submitted_at' => Carbon::now('UTC')->toDateTimeString(),
+        'created_at'   => Carbon::now('UTC')->toDateTimeString(),
+        'updated_at'   => function (array $pirep) {
+            return $pirep['created_at'];
+        },
+    ];
+});

app/Database/factories/RankFactory.php

@@ -1,37 +1,23 @@
 <?php
 
-/** @noinspection PhpIllegalPsrClassPathInspection */
+use Faker\Generator as Faker;
 
-namespace App\Database\Factories;
-
-use App\Contracts\Factory;
-use App\Models\Rank;
-
-class RankFactory extends Factory
-{
-    /**
-     * The name of the factory's corresponding model.
-     *
-     * @var string
-     */
-    protected $model = Rank::class;
-
-    /**
-     * Define the model's default state.
-     *
-     * @return array<string, mixed>
-     */
-    public function definition(): array
-    {
-        return [
-            'id'                   => null,
-            'name'                 => $this->faker->unique()->text(50),
-            'hours'                => $this->faker->numberBetween(10, 50),
-            'acars_base_pay_rate'  => $this->faker->numberBetween(10, 100),
-            'manual_base_pay_rate' => $this->faker->numberBetween(10, 100),
-            'auto_approve_acars'   => 0,
-            'auto_approve_manual'  => 0,
-            'auto_promote'         => 0,
-        ];
-    }
-}
+/*
+ * id: 2
+    name: Junior First Officer
+    hours: 10
+    auto_approve_acars: 1
+    auto_approve_manual: 1
+ */
+$factory->define(App\Models\Rank::class, function (Faker $faker) {
+    return [
+        'id'                   => null,
+        'name'                 => $faker->unique()->text(50),
+        'hours'                => $faker->numberBetween(10, 50),
+        'acars_base_pay_rate'  => $faker->numberBetween(10, 100),
+        'manual_base_pay_rate' => $faker->numberBetween(10, 100),
+        'auto_approve_acars'   => 0,
+        'auto_approve_manual'  => 0,
+        'auto_promote'         => 0,
+    ];
+});

app/Database/factories/RoleFactory.php

@@ -1,34 +0,0 @@
-<?php
-
-/** @noinspection PhpIllegalPsrClassPathInspection */
-
-namespace App\Database\Factories;
-
-use App\Contracts\Factory;
-use App\Models\Role;
-
-class RoleFactory extends Factory
-{
-    /**
-     * The name of the factory's corresponding model.
-     *
-     * @var string
-     */
-    protected $model = Role::class;
-
-    /**
-     * Define the model's default state.
-     *
-     * @return array<string, mixed>
-     */
-    public function definition(): array
-    {
-        return [
-            'id'                      => null,
-            'name'                    => $this->faker->name,
-            'display_name'            => $this->faker->name,
-            'read_only'               => false,
-            'disable_activity_checks' => $this->faker->boolean(),
-        ];
-    }
-}

app/Database/factories/SimBriefFactory.php

@@ -1,38 +0,0 @@
-<?php
-
-/** @noinspection PhpIllegalPsrClassPathInspection */
-
-namespace App\Database\Factories;
-
-use App\Contracts\Factory;
-use App\Models\SimBrief;
-use Carbon\Carbon;
-
-class SimBriefFactory extends Factory
-{
-    /**
-     * The name of the factory's corresponding model.
-     *
-     * @var string
-     */
-    protected $model = SimBrief::class;
-
-    /**
-     * Define the model's default state.
-     *
-     * @return array<string, mixed>
-     */
-    public function definition()
-    {
-        return [
-            'id'         => $this->faker->unique()->numberBetween(10, 10000000),
-            'user_id'    => null,
-            'flight_id'  => null,
-            'pirep_id'   => null,
-            'acars_xml'  => '',
-            'ofp_xml'    => '',
-            'created_at' => Carbon::now('UTC')->toDateTimeString(),
-            'updated_at' => fn (array $sb) => $sb['created_at'],
-        ];
-    }
-}

app/Database/factories/SimbriefFactory.php

@@ -0,0 +1,21 @@
+<?php
+
+/** @var \Illuminate\Database\Eloquent\Factory $factory */
+
+use Carbon\Carbon;
+use Faker\Generator as Faker;
+
+$factory->define(App\Models\SimBrief::class, function (Faker $faker) {
+    return [
+        'id'         => $faker->unique()->numberBetween(10, 10000000),
+        'user_id'    => null,
+        'flight_id'  => null,
+        'pirep_id'   => null,
+        'acars_xml'  => '',
+        'ofp_xml'    => '',
+        'created_at' => Carbon::now('UTC')->toDateTimeString(),
+        'updated_at' => function (array $sb) {
+            return $sb['created_at'];
+        },
+    ];
+});

app/Database/factories/SubfleetFactory.php

@@ -1,34 +1,15 @@
 <?php
 
-/** @noinspection PhpIllegalPsrClassPathInspection */
+use Faker\Generator as Faker;
 
-namespace App\Database\Factories;
-
-use App\Contracts\Factory;
-use App\Models\Subfleet;
-
-class SubfleetFactory extends Factory
-{
-    /**
-     * The name of the factory's corresponding model.
-     *
-     * @var string
-     */
-    protected $model = Subfleet::class;
-
-    /**
-     * Define the model's default state.
-     *
-     * @return array<string, mixed>
-     */
-    public function definition(): array
-    {
-        return [
-            'id'                         => null,
-            'airline_id'                 => fn () => \App\Models\Airline::factory()->create()->id,
-            'name'                       => $this->faker->unique()->text(50),
-            'type'                       => $this->faker->unique()->text(7),
-            'ground_handling_multiplier' => $this->faker->numberBetween(50, 200),
-        ];
-    }
-}
+$factory->define(App\Models\Subfleet::class, function (Faker $faker) {
+    return [
+        'id'         => null,
+        'airline_id' => function () {
+            return factory(\App\Models\Airline::class)->create()->id;
+        },
+        'name'                       => $faker->unique()->text(50),
+        'type'                       => $faker->unique()->text(7),
+        'ground_handling_multiplier' => $faker->numberBetween(50, 200),
+    ];
+});

app/Database/factories/UserFactory.php

@@ -1,54 +1,28 @@
 <?php
 
-/** @noinspection PhpIllegalPsrClassPathInspection */
-
-namespace App\Database\Factories;
-
-use App\Contracts\Factory;
 use App\Models\Airline;
 use App\Models\Enums\UserState;
-use App\Models\User;
+use Faker\Generator as Faker;
 use Illuminate\Support\Facades\Hash;
 
-class UserFactory extends Factory
-{
-    /**
-     * The name of the factory's corresponding model.
-     *
-     * @var string
-     */
-    protected $model = User::class;
+$factory->define(App\Models\User::class, function (Faker $faker) {
+    static $password;
 
-    /**
-     * @var string
-     */
-    private static string $password;
-
-    /**
-     * Define the model's default state.
-     *
-     * @return array<string, mixed>
-     */
-    public function definition(): array
-    {
-        if (empty(self::$password)) {
-            self::$password = Hash::make('secret');
-        }
-
-        return [
-            'id'             => null,
-            'pilot_id'       => null,
-            'name'           => $this->faker->name,
-            'email'          => $this->faker->safeEmail,
-            'password'       => self::$password,
-            'api_key'        => $this->faker->sha1,
-            'airline_id'     => fn () => Airline::factory()->create()->id,
-            'rank_id'        => 1,
-            'flights'        => $this->faker->numberBetween(0, 1000),
-            'flight_time'    => $this->faker->numberBetween(0, 10000),
-            'transfer_time'  => $this->faker->numberBetween(0, 10000),
-            'state'          => UserState::ACTIVE,
-            'remember_token' => $this->faker->unique()->text(5),
-        ];
-    }
-}
+    return [
+        'id'         => null,
+        'pilot_id'   => null,
+        'name'       => $faker->name,
+        'email'      => $faker->safeEmail,
+        'password'   => $password ?: $password = Hash::make('secret'),
+        'api_key'    => $faker->sha1,
+        'airline_id' => function () {
+            return factory(Airline::class)->create()->id;
+        },
+        'rank_id'        => 1,
+        'flights'        => $faker->numberBetween(0, 1000),
+        'flight_time'    => $faker->numberBetween(0, 10000),
+        'transfer_time'  => $faker->numberBetween(0, 10000),
+        'state'          => UserState::ACTIVE,
+        'remember_token' => $faker->unique()->text(5),
+    ];
+});

app/Database/migrations/2017_06_07_014930_create_settings_table.php

@@ -4,7 +4,8 @@ use App\Contracts\Migration;
 use App\Services\Installer\SeederService;
 use Illuminate\Database\Schema\Blueprint;
 
-return new class() extends Migration {
+class CreateSettingsTable extends Migration
+{
     private $seederSvc;
 
     public function __construct()
@@ -49,4 +50,4 @@ return new class() extends Migration {
     {
         Schema::dropIfExists('settings');
     }
-};
+}

app/Database/migrations/2017_06_08_0000_create_users_table.php

@@ -5,7 +5,8 @@ use App\Models\Pirep;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class() extends Migration {
+class CreateUsersTable extends Migration
+{
     /**
      * Run the migrations.
      *
@@ -54,4 +55,4 @@ return new class() extends Migration {
     {
         Schema::dropIfExists('users');
     }
-};
+}

app/Database/migrations/2017_06_08_0001_roles_permissions_tables.php

@@ -2,9 +2,9 @@
 
 use App\Contracts\Migration;
 use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
 
-return new class() extends Migration {
+class RolesPermissionsTables extends Migration
+{
     public function up()
     {
         // Create table for storing roles
@@ -82,4 +82,4 @@ return new class() extends Migration {
         Schema::dropIfExists('role_user');
         Schema::dropIfExists('roles');
     }
-};
+}

app/Database/migrations/2017_06_08_0005_create_password_resets_table.php

@@ -4,7 +4,8 @@ use App\Contracts\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class() extends Migration {
+class CreatePasswordResetsTable extends Migration
+{
     public function up()
     {
         Schema::create('password_resets', function (Blueprint $table) {
@@ -18,4 +19,4 @@ return new class() extends Migration {
     {
         Schema::dropIfExists('password_resets');
     }
-};
+}

app/Database/migrations/2017_06_08_0006_create_sessions_table.php

@@ -4,7 +4,8 @@ use App\Contracts\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class() extends Migration {
+class CreateSessionsTable extends Migration
+{
     public function up()
     {
         Schema::create('sessions', function (Blueprint $table) {
@@ -21,4 +22,4 @@ return new class() extends Migration {
     {
         Schema::dropIfExists('sessions');
     }
-};
+}

app/Database/migrations/2017_06_08_191703_create_airlines_table.php

@@ -3,7 +3,8 @@
 use App\Contracts\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-return new class() extends Migration {
+class CreateAirlinesTable extends Migration
+{
     public function up()
     {
         Schema::create('airlines', function (Blueprint $table) {
@@ -30,4 +31,4 @@ return new class() extends Migration {
     {
         Schema::dropIfExists('airlines');
     }
-};
+}

app/Database/migrations/2017_06_09_010621_create_aircrafts_table.php

@@ -5,7 +5,8 @@ use App\Models\Enums\AircraftState;
 use App\Models\Enums\AircraftStatus;
 use Illuminate\Database\Schema\Blueprint;
 
-return new class() extends Migration {
+class CreateAircraftsTable extends Migration
+{
     public function up()
     {
         Schema::create('aircraft', function (Blueprint $table) {
@@ -33,4 +34,4 @@ return new class() extends Migration {
     {
         Schema::dropIfExists('aircraft');
     }
-};
+}

app/Database/migrations/2017_06_10_040335_create_fares_table.php

@@ -3,7 +3,8 @@
 use App\Contracts\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-return new class() extends Migration {
+class CreateFaresTable extends Migration
+{
     public function up()
     {
         Schema::create('fares', function (Blueprint $table) {
@@ -23,4 +24,4 @@ return new class() extends Migration {
     {
         Schema::dropIfExists('fares');
     }
-};
+}

app/Database/migrations/2017_06_11_135707_create_airports_table.php

@@ -3,7 +3,8 @@
 use App\Contracts\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-return new class() extends Migration {
+class CreateAirportsTable extends Migration
+{
     public function up()
     {
         Schema::create('airports', function (Blueprint $table) {
@@ -32,4 +33,4 @@ return new class() extends Migration {
     {
         Schema::dropIfExists('airports');
     }
-};
+}

app/Database/migrations/2017_06_17_214650_create_flight_tables.php

@@ -5,7 +5,8 @@ use App\Contracts\Model;
 use App\Models\Enums\FlightType;
 use Illuminate\Database\Schema\Blueprint;
 
-return new class() extends Migration {
+class CreateFlightTables extends Migration
+{
     public function up()
     {
         Schema::create('flights', function (Blueprint $table) {
@@ -97,4 +98,4 @@ return new class() extends Migration {
         Schema::drop('flight_subfleet');
         Schema::drop('flights');
     }
-};
+}

app/Database/migrations/2017_06_21_165410_create_ranks_table.php

@@ -3,7 +3,8 @@
 use App\Contracts\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-return new class() extends Migration {
+class CreateRanksTable extends Migration
+{
     public function up()
     {
         Schema::create('ranks', function (Blueprint $table) {
@@ -28,4 +29,4 @@ return new class() extends Migration {
     {
         Schema::dropIfExists('ranks');
     }
-};
+}

app/Database/migrations/2017_06_23_011011_create_subfleet_tables.php

@@ -3,7 +3,8 @@
 use App\Contracts\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-return new class() extends Migration {
+class CreateSubfleetTables extends Migration
+{
     public function up()
     {
         Schema::create('subfleets', function (Blueprint $table) {
@@ -50,4 +51,4 @@ return new class() extends Migration {
         Schema::dropIfExists('subfleet_fare');
         Schema::dropIfExists('subfleet_rank');
     }
-};
+}

app/Database/migrations/2017_06_28_195426_create_pirep_tables.php

@@ -7,7 +7,8 @@ use App\Models\Enums\PirepState;
 use App\Models\Enums\PirepStatus;
 use Illuminate\Database\Schema\Blueprint;
 
-return new class() extends Migration {
+class CreatePirepTables extends Migration
+{
     /**
      * Run the migrations.
      *
@@ -105,4 +106,4 @@ return new class() extends Migration {
         Schema::dropIfExists('pirep_fields');
         Schema::dropIfExists('pirep_field_values');
     }
-};
+}

app/Database/migrations/2017_12_12_174519_create_bids_table.php

@@ -5,7 +5,8 @@ use App\Contracts\Model;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class() extends Migration {
+class CreateBidsTable extends Migration
+{
     public function up()
     {
         Schema::create('bids', function (Blueprint $table) {
@@ -23,4 +24,4 @@ return new class() extends Migration {
     {
         Schema::dropIfExists('bids');
     }
-};
+}

app/Database/migrations/2017_12_14_225241_create_jobs_table.php

@@ -4,7 +4,8 @@ use App\Contracts\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class() extends Migration {
+class CreateJobsTable extends Migration
+{
     public function up()
     {
         Schema::create('jobs', function (Blueprint $table) {
@@ -22,4 +23,4 @@ return new class() extends Migration {
     {
         Schema::dropIfExists('jobs');
     }
-};
+}

app/Database/migrations/2017_12_14_225337_create_failed_jobs_table.php

@@ -4,7 +4,8 @@ use App\Contracts\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class() extends Migration {
+class CreateFailedJobsTable extends Migration
+{
     public function up()
     {
         Schema::create('failed_jobs', function (Blueprint $table) {
@@ -21,4 +22,4 @@ return new class() extends Migration {
     {
         Schema::dropIfExists('failed_jobs');
     }
-};
+}

app/Database/migrations/2017_12_20_004147_create_navdata_tables.php

@@ -4,7 +4,8 @@ use App\Contracts\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class() extends Migration {
+class CreateNavdataTables extends Migration
+{
     public function up()
     {
         /*
@@ -29,4 +30,4 @@ return new class() extends Migration {
     {
         Schema::dropIfExists('navdata');
     }
-};
+}

app/Database/migrations/2017_12_20_005147_create_acars_tables.php

@@ -5,7 +5,8 @@ use App\Contracts\Model;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class() extends Migration {
+class CreateAcarsTables extends Migration
+{
     public function up()
     {
         Schema::create('acars', function (Blueprint $table) {
@@ -42,4 +43,4 @@ return new class() extends Migration {
     {
         Schema::dropIfExists('acars');
     }
-};
+}

app/Database/migrations/2018_01_03_014930_create_stats_table.php

@@ -4,7 +4,8 @@ use App\Contracts\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class() extends Migration {
+class CreateStatsTable extends Migration
+{
     public function up()
     {
         Schema::create('stats', function (Blueprint $table) {
@@ -23,4 +24,4 @@ return new class() extends Migration {
     {
         Schema::dropIfExists('stats');
     }
-};
+}

app/Database/migrations/2018_01_08_142204_create_news_table.php

@@ -4,7 +4,8 @@ use App\Contracts\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class() extends Migration {
+class CreateNewsTable extends Migration
+{
     public function up()
     {
         Schema::create('news', function (Blueprint $table) {
@@ -20,4 +21,4 @@ return new class() extends Migration {
     {
         Schema::drop('news');
     }
-};
+}

app/Database/migrations/2018_01_28_180522_create_awards_table.php

@@ -5,7 +5,8 @@ use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 use Modules\Awards\Awards\PilotFlightAwards;
 
-return new class() extends Migration {
+class CreateAwardsTable extends Migration
+{
     public function up()
     {
         Schema::create('awards', function (Blueprint $table) {
@@ -51,4 +52,4 @@ return new class() extends Migration {
         Schema::dropIfExists('awards');
         Schema::dropIfExists('user_awards');
     }
-};
+}

app/Database/migrations/2018_02_26_185121_create_expenses_table.php

@@ -4,7 +4,8 @@ use App\Contracts\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class() extends Migration {
+class CreateExpensesTable extends Migration
+{
     public function up()
     {
         Schema::create('expenses', function (Blueprint $table) {
@@ -33,4 +34,4 @@ return new class() extends Migration {
     {
         Schema::dropIfExists('expenses');
     }
-};
+}

app/Database/migrations/2018_02_28_231807_create_journal_transactions_table.php

@@ -4,7 +4,8 @@ use App\Contracts\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class() extends Migration {
+class CreateJournalTransactionsTable extends Migration
+{
     public function up()
     {
         Schema::create('journal_transactions', function (Blueprint $table) {
@@ -32,4 +33,4 @@ return new class() extends Migration {
     {
         Schema::dropIfExists('journal_transactions');
     }
-};
+}

app/Database/migrations/2018_02_28_231813_create_journals_table.php

@@ -4,7 +4,8 @@ use App\Contracts\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class() extends Migration {
+class CreateJournalsTable extends Migration
+{
     public function up()
     {
         Schema::create('journals', function (Blueprint $table) {
@@ -22,4 +23,4 @@ return new class() extends Migration {
     {
         Schema::dropIfExists('journals');
     }
-};
+}

app/Database/migrations/2018_02_28_232438_create_ledgers_table.php

@@ -4,7 +4,8 @@ use App\Contracts\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class() extends Migration {
+class CreateLedgersTable extends Migration
+{
     /**
      * Run the migrations.
      *
@@ -29,4 +30,4 @@ return new class() extends Migration {
     {
         Schema::dropIfExists('ledgers');
     }
-};
+}