Update simbrief_briefing.blade.php (#1497)

Change in blade forms to SimBrief provided direct links.

.github/scripts/build.sh

@@ -1,52 +1,12 @@
 #!/usr/bin/env bash
 
-if [ "$TRAVIS" != "true" ]; then
-  exit 0
-fi
-
-cd $TRAVIS_BUILD_DIR
-
-if test "$TRAVIS_TAG"; then
-  VERSION=$TRAVIS_TAG
-
-  # Pass in the tag as the version to write out
-  php artisan phpvms:version --write --write-full-version "${VERSION}"
-  FULL_VERSION=$(php artisan phpvms:version)
-else
-  echo "On branch $TRAVIS_BRANCH"
-
-  if [ "$TRAVIS_BRANCH" != "master" ] && [ "$TRAVIS_BRANCH" != "dev" ]; then
-    echo "Not on valid branch, exiting"
-    exit 0
-  fi
-
-  # Write the version out but place the branch ID in there
-  # This is only for the dev branch
-  BASE_VERSION=$(php artisan phpvms:version --base-only)
-
-  # This now includes the pre-release version, so "-dev" by default
-  VERSION=${BASE_VERSION}
-
-  # Don't pass in a version here, just write out the latest hash
-  php artisan phpvms:version --write "${VERSION}"
-  FULL_VERSION=$(php artisan phpvms:version)
-fi
-
-FILE_NAME="phpvms-${VERSION}"
-TAR_NAME="$FILE_NAME.tar.gz"
-ZIP_NAME="$FILE_NAME.zip"
-
 echo "Version: ${VERSION}"
 echo "Full Version: ${FULL_VERSION}"
 echo "Package name: ${TAR_NAME}"
-
-echo "==========================="
+echo "Current directory: ${BASE_DIR}"
 
 echo "Cleaning files"
 
-rm -rf vendor
-composer install --no-dev --prefer-dist --no-interaction --verbose
-
 # Leftover individual files to delete
 declare -a remove_files=(
   .git
@@ -55,7 +15,10 @@ declare -a remove_files=(
   .idea
   .travis
   docker
+  node_modules
+  vendor/willdurand/geocoder/tests
   _ide_helper.php
+  .env
   .dockerignore
   .dpl
   .editorconfig
@@ -63,6 +26,7 @@ declare -a remove_files=(
   .eslintrc
   .php_cs
   .php_cs.cache
+  .php-cs-fixer.php
   .phpstorm.meta.php
   .styleci.yml
   .phpunit.result.cache
@@ -70,15 +34,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
-  node_modules
+  symfony.lock
   composer.phar
-  vendor/willdurand/geocoder/tests
 )
 
 for file in "${remove_files[@]}"; do
@@ -107,44 +71,32 @@ mkdir -p storage/framework/cache
 mkdir -p storage/framework/sessions
 mkdir -p storage/framework/views
 
-# Regenerate the autoloader and classes
-composer dump-autoload
-make clean
-
 cd /tmp
-ls -al $TRAVIS_BUILD_DIR/../
 
-tar -czf $TAR_NAME -C $TRAVIS_BUILD_DIR .
+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]
 sha256sum $TAR_NAME >"$TAR_NAME.sha256"
-tar2zip $TAR_NAME
+
+cd $BASE_DIR;
+zip -r $ZIP_NAME ./
 sha256sum $ZIP_NAME >"$ZIP_NAME.sha256"
 
+mv $ZIP_NAME /tmp
+mv "$ZIP_NAME.sha256" /tmp
+
 ls -al /tmp
 
-echo "Uploading to S3"
-mkdir -p $TRAVIS_BUILD_DIR/build
-cd $TRAVIS_BUILD_DIR/build
+echo "Moving to dist"
+mkdir -p $BASE_DIR/dist
+cd $BASE_DIR/dist
 
 mv "/tmp/$TAR_NAME" "/tmp/$ZIP_NAME" "/tmp/$TAR_NAME.sha256" "/tmp/$ZIP_NAME.sha256" .
-artifacts upload --target-paths "/" $ZIP_NAME $TAR_NAME $TRAVIS_BUILD_DIR/VERSION $TAR_NAME.sha256 $ZIP_NAME.sha256
 
-# Upload the version for a tagged release. Move to a version file in different
-# tags. Within phpVMS, we have an option of which version to track in the admin
-if test "$TRAVIS_TAG"; then
-  echo "Uploading release version file"
-  cp "$TRAVIS_BUILD_DIR/VERSION" release_version
-  artifacts upload --target-paths "/" release_version
-else
-  echo "Uploading ${TRAVIS_BRANCH}_version file"
-  cp $TRAVIS_BUILD_DIR/VERSION ${TRAVIS_BRANCH}_version
-  artifacts upload --target-paths "/" ${TRAVIS_BRANCH}_version
-fi
-
-#if [ "$TRAVIS_BRANCH" != "master" ] && [ "$TRAVIS_BRANCH" != "dev" ]; then
-#  echo "Skipping Discord branch update broadcast"
-#else
-  curl -X POST \
-       --data "{\"content\": \"A new build is available at http://downloads.phpvms.net/$TAR_NAME (${FULL_VERSION})\"}" \
-       -H "Content-Type: application/json" \
-       $DISCORD_WEBHOOK_URL
-#fi

.github/scripts/env.php

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

.github/scripts/version.sh

@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+
+if test "$GIT_TAG_NAME"; then
+  export VERSION=$GIT_TAG_NAME
+
+  # Pass in the tag as the version to write out
+  php artisan phpvms:version --write --write-full-version "${VERSION}"
+  export FULL_VERSION=$(php artisan phpvms:version)
+else
+  export BRANCH=${GITHUB_REF##*/}
+  echo "On branch $BRANCH"
+
+  # Write the version out but place the branch ID in there
+  # This is only for the dev branch
+  export BASE_VERSION=$(php artisan phpvms:version --base-only)
+
+  # This now includes the pre-release version, so "-dev" by default
+  export VERSION=${BASE_VERSION}
+
+  # Don't pass in a version here, just write out the latest hash
+  php artisan phpvms:version --write "${VERSION}"
+  export FULL_VERSION=$(php artisan phpvms:version)
+fi
+
+export FILE_NAME="phpvms-${VERSION}"
+export TAR_NAME="$FILE_NAME.tar.gz"
+export ZIP_NAME="$FILE_NAME.zip"
+export BASE_DIR=`pwd`
+
+# https://docs.github.com/en/actions/reference/workflow-commands-for-github-actions#environment-files
+echo "BRANCH=${BRANCH}" >> $GITHUB_ENV
+echo "FILE_NAME=${FILE_NAME}" >> $GITHUB_ENV
+echo "TAR_NAME=${TAR_NAME}" >> $GITHUB_ENV
+echo "ZIP_NAME=${ZIP_NAME}" >> $GITHUB_ENV
+echo "BASE_DIR=${BASE_DIR}" >> $GITHUB_ENV
+echo "DISCORD_MSG=Version ${FULL_VERSION} is available, download: [zip](http://downloads.phpvms.net/$ZIP_NAME) | [tar](http://downloads.phpvms.net/$TAR_NAME)" >> $GITHUB_ENV

.github/workflows/build.yml

@@ -0,0 +1,248 @@
+name: 'Build'
+on: ['push', 'pull_request', 'workflow_dispatch', 'release']
+jobs:
+  build:
+    runs-on: ubuntu-20.04
+    if: github.repository == 'nabeelio/phpvms'
+    strategy:
+      fail-fast: true
+      matrix:
+        php-versions: ['8.0', '8.1']
+    name: PHP ${{ matrix.php-versions }}
+    env:
+      extensions: intl, pcov, mbstring
+      key: cache-v1
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    # Configure Caching
+    - name: Setup cache environment
+      id: cache-env
+      uses: shivammathur/cache-extensions@v1
+      with:
+        php-version: ${{ matrix.php-versions }}
+        extensions: ${{ env.extensions }}
+        key: ${{ env.key }}
+
+    - name: Cache extensions
+      uses: actions/cache@v1
+      with:
+        path: ${{ steps.cache-env.outputs.dir }}
+        key: ${{ steps.cache-env.outputs.key }}
+        restore-keys: ${{ steps.cache-env.outputs.key }}
+
+    - name: Get composer cache directory
+      id: composer-cache
+      run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+    - name: Cache dependencies
+      uses: actions/cache@v2
+      with:
+        path: ${{ steps.composer-cache.outputs.dir }}
+        key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+
+    # Configure PHP
+    - name: Setup PHP
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: ${{ matrix.php-versions }}
+        extensions: ${{ env.extensions }}
+        ini-values: post_max_size=256M, short_open_tag=On
+        coverage: xdebug
+        tools: php-cs-fixer, phpunit
+
+    - name: Shutdown Ubuntu MySQL
+      run: sudo service mysql stop
+
+    - name: Install MariaDB
+      uses: getong/mariadb-action@v1.1
+      with:
+        character set server: 'utf8'
+        collation server: 'utf8_general_ci'
+        mysql database: 'phpvms'
+        mysql root password: ''
+        mysql user: ''
+        mysql password: ''
+
+    - name: Configure Environment
+      run: |
+        php --version
+        mysql --version
+        sleep 15
+        # Downgrade composer version to 1.x
+        composer install --dev --no-interaction --verbose
+        cp .github/scripts/env.php env.php
+        cp .github/scripts/phpunit.xml phpunit.xml
+        php artisan database:create --reset
+        php artisan migrate:refresh --seed
+
+    - 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/phpunit --debug --verbose
+
+  # This runs after all of the tests, run have run. Creates a cleaned up version of the
+  # distro, and then creates the artifact to push up to S3 or wherever
+  artifacts:
+    name: 'Create dev build'
+    needs: build
+    runs-on: ubuntu-20.04
+    if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev'
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.0'
+
+      - uses: olegtarasov/get-tag@v2.1
+        id: tagName
+
+      # Configure Caching
+      - name: Get composer cache directory
+        id: composer-cache
+        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+      - name: Cache dependencies
+        uses: actions/cache@v2
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: ${{ runner.os }}-composer-
+
+        # Dependencies
+      - name: 'Install Release Dependencies'
+        run: |
+          rm -rf vendor
+          composer install --no-dev --prefer-dist --no-interaction --verbose
+          sudo chmod +x ./.github/scripts/*
+
+      - name: Get version
+        run: .github/scripts/version.sh
+
+      - name: Build Distro
+        run: .github/scripts/build.sh
+
+      - name: Upload S3
+        uses: shallwefootball/s3-upload-action@v1.1.3
+        with:
+          aws_key_id: ${{ secrets.S3_BUILD_ARTIFACTS_ACCESS_KEY_ID }}
+          aws_secret_access_key: ${{ secrets.S3_BUILD_ARTIFACTS_SECRET_ACCESS_KEY}}
+          aws_bucket: ${{ secrets.S3_BUCKET_NAME }}
+          source_dir: 'dist'
+          destination_dir: ''
+
+      - name: Discord notification
+        env:
+          DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
+        uses: Ilshidur/action-discord@0.3.0
+        with:
+          # DISCORD_MSG is defined in versions.sh
+          args: '{{ DISCORD_MSG }}'
+
+  # This runs after all of the tests, run have run. Creates a cleaned up version of the
+  # distro, and then creates the artifact to push up to S3 or wherever
+   # https://github.com/actions/create-release
+  release:
+    name: 'Create Release'
+    needs: build
+    runs-on: ubuntu-20.04
+    if: startsWith(github.ref, 'refs/tags/')
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 8.0
+
+      - uses: olegtarasov/get-tag@v2.1
+        id: tagName
+
+      # Configure Caching
+      - name: Get composer cache directory
+        id: composer-cache
+        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+      - name: Cache dependencies
+        uses: actions/cache@v2
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: ${{ runner.os }}-composer-
+
+        # Dependencies
+      - name: 'Install Release Dependencies'
+        run: |
+          rm -rf vendor
+          composer install --no-dev --prefer-dist --no-interaction --verbose
+          sudo chmod +x ./.github/scripts/*
+
+      - name: Get version
+        run: .github/scripts/version.sh
+
+      - name: Build Distro
+        run: .github/scripts/build.sh
+
+      - name: Upload S3
+        uses: shallwefootball/s3-upload-action@v1.1.3
+        with:
+          aws_key_id: ${{ secrets.S3_BUILD_ARTIFACTS_ACCESS_KEY_ID }}
+          aws_secret_access_key: ${{ secrets.S3_BUILD_ARTIFACTS_SECRET_ACCESS_KEY}}
+          aws_bucket: ${{ secrets.S3_BUCKET_NAME }}
+          source_dir: 'dist'
+          destination_dir: ''
+
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Get version
+        run: .github/scripts/version.sh
+
+      - name: Create Release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: Release ${{ github.ref }}
+          draft: true
+          prerelease: false
+
+      # Upload the tar file to the release
+      - name: Upload Tar Asset
+        id: upload-tar-asset
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: dist/{{TAR_NAME}}
+          asset_name: '{{ TAR_NAME }}'
+          asset_content_type: application/gzip
+
+      # upload the zip file to the release
+      - name: Upload Zip Asset
+        id: upload-zip-asset
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: dist/{{ZIP_NAME}}
+          asset_name: '{{ ZIP_NAME }}'
+          asset_content_type: application/zip
+
+      - name: Discord notification
+        env:
+          DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
+        uses: Ilshidur/action-discord@0.3.0
+        with:
+          # DISCORD_MSG is defined in versions.sh
+          args: '{{ DISCORD_MSG }}'

.gitignore

@@ -22,6 +22,7 @@ storage/*.sqlite
 .env.*.php
 .env.php
 .env
+.env.*
 .env.bak
 env.php
 .env.generated
@@ -74,4 +75,16 @@ 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,6 +28,8 @@ 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

@@ -0,0 +1,69 @@
+<?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

@@ -1,37 +0,0 @@
-<?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);

.travis.yml

@@ -1,162 +0,0 @@
-#
-# Travis CI config file
-#
-
-language: php
-php:
-  - '7.4'
-  - '7.3'
-
-#env:
-#  - DB=mysql
-#  - DB=mariadb
-
-cache:
-  # Cache lives for 10 min
-  # Default of 3m might not be long enough for all the runs
-  timeout: 600
-  directories:
-  - "$HOME/.composer/cache"
-  - "$HOME/.npm"
-
-services:
-- mysql
-
-#addons:
-#  mariadb: '10.2'
-
-install:
-  - php --version
-  - mysql --version
-  # Downgrade composer version to 1.x
-  - composer self-update --1
-  - composer install --dev --no-interaction --verbose
-  - npm i tar-to-zip -g
-  - cp .travis/env.travis.php env.php
-  - cp .travis/phpunit.travis.xml phpunit.xml
-
-before_script:
-  - php artisan database:create --reset
-  - php artisan migrate:refresh --seed
-
-script:
-  - vendor/bin/php-cs-fixer fix --config=.php_cs -v --dry-run --diff --using-cache=no
-  - vendor/bin/phpunit --debug --verbose
-
-after_failure:
-  - cat storage/logs/*.log
-
-# Refer to: https://github.com/doctrine/dbal/blob/master/.travis.yml#L39
-jobs:
-  include:
-    # Different test stages
-#    - stage: Test
-#      name: PHP 7.2 + MySQL 5.7
-#      php: 7.2
-#      env: DB=mysql
-#      services:
-#        - mysql
-#    - stage: Test
-#      name: PHP 7.3 + MySQL 5.7
-#      php: 7.3
-#      env: DB=mysql
-#      services:
-#        - mysql
-#    - stage: Test
-#      name: PHP 7.4 + MySQL 5.7
-#      php: 7.4
-#      env: DB=mysql
-#      services:
-#        - mysql
-#    - stage: Test
-#      name: PHP 7.2 + MariaDB 10.1
-#      php: 7.2
-#      env: DB=mariadb
-#      addons:
-#        mariadb: '10.1'
-#    - stage: Test
-#      name: PHP 7.3 + MariaDB 10.1
-#      php: 7.3
-#      env: DB=mariadb
-#      addons:
-#        mariadb: '10.1'
-#    - stage: Test
-#      name: PHP 7.4 + MariaDB 10.1
-#      php: 7.4
-#      env: DB=mariadb MARIADB_VERSION=10.1
-#      addons:
-#        mariadb: '10.1'
-#    - stage: Test
-#      name: PHP 7.2 + MariaDB 10.2
-#      php: 7.2
-#      env: DB=mariadb
-#      addons:
-#        mariadb: '10.2'
-#    - stage: Test
-#      name: PHP 7.3 + MariaDB 10.3
-#      php: 7.3
-#      env: DB=mariadb
-#      addons:
-#        mariadb: '10.2'
-#    - stage: Test
-#      name: PHP 7.4 + MariaDB 10.2
-#      php: 7.4
-#      env: DB=mariadb
-#      addons:
-#        mariadb: '10.2'
-#    - stage: Test
-#      name: PHP 7.2 + MariaDB 10.3
-#      php: 7.2
-#      env: DB=mariadb
-#      addons:
-#        mariadb: '10.3'
-#    - stage: Test
-#      name: PHP 7.3 + MariaDB 10.3
-#      php: 7.3
-#      env: DB=mariadb
-#      addons:
-#        mariadb: '10.3'
-#    - stage: Test
-#      name: PHP 7.4 + MariaDB 10.3
-#      php: 7.4
-#      env: DB=mariadb
-#      addons:
-#        mariadb: '10.3'
-
-    # Just packages up a release
-    - stage: package
-      script: skip
-      before_deploy:
-        - curl -sL https://raw.githubusercontent.com/travis-ci/artifacts/6b10798/install | bash
-
-      # Configure the conditional deployment
-      # https://docs.travis-ci.com/user/deployment/#examples-of-conditional-deployment
-      deploy:
-        - provider: script
-          skip_cleanup: true
-          script: ./.travis/deploy_script.sh
-          on:
-            all_branches: true
-            repo: nabeelio/phpvms
-            php: '7.4'
-            tags: false
-
-    # RELEASE STAGE
-    # Only runs when there's a tag applied to this release (tag should be the version)
-    # This uses Github Releases and posts it there (provider: releases)
-    # https://docs.travis-ci.com/user/deployment/releases
-    - stage: release
-      script: skip
-      before_deploy:
-        - curl -sL https://raw.githubusercontent.com/travis-ci/artifacts/6b10798/install | bash
-        - ./.travis/deploy_script.sh
-      deploy:
-        provider: releases
-        skip_cleanup: true
-        api_key: $GITHUB_TOKEN
-        file_glob: true
-        file: build/*
-        on:
-          tags: true
-          repo: nabeelio/phpvms
-          php: '7.4'

Dockerfile

@@ -1,28 +1,35 @@
-FROM php:7.4-fpm-alpine
+FROM php:8.1-fpm-alpine3.15
 
 WORKDIR /var/www/
 
-RUN apk add gmp-dev
-RUN curl --silent --show-error https://getcomposer.org/installer | php
+# 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
 
 # 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 \
-  opcache && \
-  docker-php-ext-enable pdo_mysql opcache
+  bcmath \
+  opcache \
+  zip && \
+  docker-php-ext-enable pdo_mysql opcache bcmath zip intl
 
 COPY . /var/www/
-RUN php composer.phar install \
+RUN composer 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,5 +1,3 @@
-BSD 3-Clause License
-
 Copyright (c) 2017, phpvms - http://www.phpvms.net
 All rights reserved.
 
@@ -17,6 +15,9 @@ 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,11 +80,7 @@ test:
 
 .PHONY: phpcs
 phpcs:
-	@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
+	@PHP_CS_FIXER_IGNORE_ENV=1 vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.php -v --dry-run --diff --using-cache=no
 
 .PHONY: replay-acars
 replay-acars:
@@ -95,11 +91,6 @@ 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
@@ -109,17 +100,9 @@ reset-installer:
 	@php artisan database:create --reset
 	@php artisan migrate:refresh --seed
 
-.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-test
+docker-test:
+	@docker compose -f docker-compose.dev.yml up
 
 .PHONY: docker-clean
 docker-clean:

README.md

@@ -1,6 +1,6 @@
 # phpVMS <sup>7</sup>
 
-[![Build Status](https://travis-ci.org/nabeelio/phpvms.svg)](https://travis-ci.org/nabeelio/phpvms) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/d668bebb0a3c46bda381af16ce3d9450)](https://www.codacy.com/app/nabeelio/phpvms?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=nabeelio/phpvms&amp;utm_campaign=Badge_Grade) [![Latest Stable Version](https://poser.pugx.org/nabeel/phpvms/v/stable)](https://packagist.org/packages/nabeel/phpvms) ![StyleCI](https://github.styleci.io/repos/93688482/shield?branch=dev) [![License](https://poser.pugx.org/nabeel/phpvms/license)](https://packagist.org/packages/nabeel/phpvms)
+[![Build](https://github.com/nabeelio/phpvms/workflows/Build/badge.svg?branch=dev)](https://github.com/nabeelio/phpvms/actions) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/d668bebb0a3c46bda381af16ce3d9450)](https://www.codacy.com/app/nabeelio/phpvms?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=nabeelio/phpvms&amp;utm_campaign=Badge_Grade) [![Latest Stable Version](https://poser.pugx.org/nabeel/phpvms/v/stable)](https://packagist.org/packages/nabeel/phpvms) ![StyleCI](https://github.styleci.io/repos/93688482/shield?branch=dev) [![License](https://poser.pugx.org/nabeel/phpvms/license)](https://packagist.org/packages/nabeel/phpvms)
 
 The next phpvms version built on the laravel framework. work in progress. The latest documentation, with installation instructions is available [on the phpVMS documentation](https://docs.phpvms.net/) page.
 
@@ -11,7 +11,7 @@ A full distribution, with all of the composer dependencies, is available at this
 
 ### Requirements
 
-- PHP 7.3+, extensions:
+- PHP 8.0+, extensions:
   - cURL
   - JSON
   - mbstring
@@ -30,15 +30,16 @@ A full distribution, with all of the composer dependencies, is available at this
 
 [View installation details](https://docs.phpvms.net/installation/installation)
 
-## Development Environment
+## Development Environment with Docker
 
-A full development environment can be brought up using Docker:
+A full development environment can be brought up using Docker, without having to install composer/npm locally
 
 ```bash
-composer install
-yarn install
-docker-compose build
-docker-compose up
+make docker-test
+
+# **OR** with docker-compose directly
+
+docker-compose -f docker-compose.yml -f docker-compose.dev.yml 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:
@@ -47,6 +48,8 @@ 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 $apiKey = 'testadminapikey';
+    protected string $apiKey = 'testadminapikey';
 
     /**
      * For automatic updates, how many seconds to sleep between updates
      *
      * @var int
      */
-    protected $sleepTime = 10;
+    protected int $sleepTime = 10;
 
     /**
      * @var array key == update[callsign]
      *            value == PIREP ID
      */
-    protected $pirepList = [];
+    protected array $pirepList = [];
 
     /**
      * @var Client
      */
-    protected $httpClient;
+    protected Client $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 Modules\Installer\Services\ConfigService;
+use Illuminate\Support\Facades\App;
 
 /**
  * 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;
-    private $seederSvc;
+    private DatabaseSeeder $databaseSeeder;
+    private SeederService $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_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'),
+            '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'),
         ]);
 
         $this->info('Config files generated!');

app/Console/Commands/CreateDatabase.php

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

app/Console/Commands/DevCommands.php

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

app/Console/Commands/DevInstall.php

@@ -3,7 +3,7 @@
 namespace App\Console\Commands;
 
 use App\Contracts\Command;
-use Modules\Installer\Services\ConfigService;
+use App\Services\Installer\ConfigService;
 
 /**
  * Create a fresh development install
@@ -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;
+    private \DatabaseSeeder $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_CONN'   => 'sqlite',
+            'APP_ENV'       => 'dev',
+            'SITE_NAME'     => 'phpvms test',
+            'DB_CONNECTION' => 'sqlite',
         ]);
 
         $this->info('Config files generated!');

app/Console/Commands/EmailTest.php

@@ -0,0 +1,32 @@
+<?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 $importer;
+    private ImportService $importer;
 
     /**
      * Import constructor.

app/Console/Commands/ProcessQueue.php

@@ -0,0 +1,42 @@
+<?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

@@ -0,0 +1,25 @@
+<?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,7 +8,11 @@ use GuzzleHttp\Client;
 class TestApi extends Command
 {
     protected $signature = 'phpvms:test-api {apikey} {url}';
-    protected $httpClient;
+
+    /**
+     * @var Client
+     */
+    protected Client $httpClient;
 
     /**
      * Run dev related commands

app/Console/Commands/Version.php

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

app/Console/Commands/YamlImport.php

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

app/Console/Cron.php

@@ -0,0 +1,90 @@
+<?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

@@ -0,0 +1,26 @@
+<?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

@@ -0,0 +1,29 @@
+<?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\Command;
+use App\Contracts\CronCommand;
 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 Command
+class Hourly extends CronCommand
 {
     protected $signature = 'cron:hourly';
     protected $description = 'Run the hourly cron tasks';
@@ -17,7 +17,11 @@ class Hourly extends Command
 
     public function handle(): void
     {
-        $this->redirectLoggingToFile('cron');
+        $this->callEvent();
+    }
+
+    public function callEvent()
+    {
         event(new CronHourly());
     }
 }

app/Console/Cron/JobQueue.php

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

app/Console/Cron/Nightly.php

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

app/Console/Cron/ThirtyMinute.php

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

app/Console/Kernel.php

@@ -2,9 +2,13 @@
 
 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;
@@ -13,7 +17,11 @@ use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
 class Kernel extends ConsoleKernel
 {
     /**
-     * Define the application's command schedule.
+     * 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.
      *
      * @param \Illuminate\Console\Scheduling\Schedule $schedule
      *
@@ -21,16 +29,32 @@ 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
-        $schedule->command('backup:clean')->daily()->at('01:00');
-        $schedule->command('backup:run')->daily()->at('02:00');
+        /*if (config('backup.backup.enabled', false) === true) {
+            $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 $award;
+    protected ?AwardModel $award;
 
     /** @var \App\Models\User|null */
-    protected $user;
+    protected ?User $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
+     * @return bool|UserAward|null
      */
-    protected function addAward()
+    protected function addAward(): bool|UserAward|null
     {
         $w = [
             'user_id'  => $this->user->id,

app/Contracts/Command.php

@@ -24,9 +24,19 @@ 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,19 +84,21 @@ 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)
+    public function message($message, $count = null, $attrs = [])
     {
-        $attrs = [
+        $ret = [
             'message' => $message,
+            'attrs'   => $attrs,
         ];
 
         if ($count !== null) {
-            $attrs['count'] = $count;
+            $ret['count'] = $count;
         }
 
-        return response()->json($attrs);
+        return response()->json($ret);
     }
 }

app/Contracts/CronCommand.php

@@ -0,0 +1,20 @@
+<?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 $cache = [];
-    protected static $codes = [];
-    protected static $labels = [];
+    protected static array $cache = [];
+    protected static array $codes = [];
+    protected static array $labels = [];
 
     /**
      * @var int
      */
-    protected $value;
+    protected int $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 mixed
+     * @return int|null
      */
-    final public function getValue()
+    final public function getValue(): ?int
     {
         return $this->value;
     }
@@ -41,9 +41,9 @@ abstract class Enum
      *
      * @param $value
      *
-     * @return mixed
+     * @return string
      */
-    final public static function label($value)
+    final public static function label($value): string
     {
         if (isset(static::$labels[$value])) {
             $val = static::$labels[$value];
@@ -53,6 +53,8 @@ abstract class Enum
 
             return $val;
         }
+
+        return $value;
     }
 
     /**
@@ -87,11 +89,11 @@ abstract class Enum
      *
      * @return false|int|string
      */
-    public static function convertToCode($value)
+    public static function convertToCode($value): bool|int|string|null
     {
         $value = (int) $value;
         if (!array_key_exists($value, static::$codes)) {
-            return;
+            return null;
         }
 
         return static::$codes[$value];

app/Contracts/Factory.php

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

app/Contracts/ImportExport.php

@@ -166,10 +166,36 @@ 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/Metar.php

@@ -12,13 +12,24 @@ abstract class Metar
 {
     /**
      * Implement retrieving the METAR - return the METAR string. Needs to be protected,
-     * since this shouldn't be directly called. Call `get_metar($icao)` instead
+     * since this shouldn't be directly called. Call `metar($icao)`. If not implemented,
+     * return a blank string
      *
      * @param $icao
      *
      * @return mixed
      */
-    abstract protected function metar($icao): string;
+    abstract protected function get_metar($icao): string;
+
+    /**
+     * Implement retrieving the TAF - return the string. Call `taf($icao)`. If not implemented,
+     * return a blank string
+     *
+     * @param $icao
+     *
+     * @return mixed
+     */
+    abstract protected function get_taf($icao): string;
 
     /**
      * Download the METAR, wrap in caching
@@ -27,9 +38,9 @@ abstract class Metar
      *
      * @return string
      */
-    public function get_metar($icao): string
+    public function metar($icao): string
     {
-        $cache = config('cache.keys.WEATHER_LOOKUP');
+        $cache = config('cache.keys.METAR_WEATHER_LOOKUP');
         $key = $cache['key'].$icao;
 
         if (Cache::has($key)) {
@@ -40,7 +51,7 @@ abstract class Metar
         }
 
         try {
-            $raw_metar = $this->metar($icao);
+            $raw_metar = $this->get_metar($icao);
         } catch (\Exception $e) {
             Log::error('Error getting METAR: '.$e->getMessage(), $e->getTrace());
             return '';
@@ -52,4 +63,37 @@ abstract class Metar
 
         return $raw_metar;
     }
+
+    /**
+     * Download the TAF, wrap in caching
+     *
+     * @param $icao
+     *
+     * @return string
+     */
+    public function taf($icao): string
+    {
+        $cache = config('cache.keys.TAF_WEATHER_LOOKUP');
+        $key = $cache['key'].$icao;
+
+        if (Cache::has($key)) {
+            $taf = Cache::get($key);
+            if ($taf !== '') {
+                return $taf;
+            }
+        }
+
+        try {
+            $taf = $this->get_taf($icao);
+        } catch (\Exception $e) {
+            Log::error('Error getting TAF: '.$e->getMessage(), $e->getTrace());
+            return '';
+        }
+
+        if ($taf !== '') {
+            Cache::put($key, $taf, $cache['time']);
+        }
+
+        return $taf;
+    }
 }

app/Contracts/Notification.php

@@ -4,7 +4,6 @@ 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
 {
@@ -17,25 +16,13 @@ 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];
-    }
-
-    /**
-     * Get the notification's delivery channels.
-     *
-     * @param mixed $notifiable
-     *
-     * @return array
-     */
-    public function via($notifiable)
-    {
-        return $this->channels;
+        $this->channels = $notif_config[$klass];*/
     }
 }

app/Contracts/Repository.php

@@ -2,11 +2,14 @@
 
 namespace App\Contracts;
 
+use Exception;
 use Illuminate\Validation\Validator;
+use function is_array;
 use Prettus\Repository\Eloquent\BaseRepository;
+use Prettus\Repository\Exceptions\RepositoryException;
 
 /**
- * @mixin \Prettus\Repository\Eloquent\BaseRepository
+ * @mixin BaseRepository
  */
 abstract class Repository extends BaseRepository
 {
@@ -20,8 +23,8 @@ abstract class Repository extends BaseRepository
     {
         try {
             return $this->find($id, $columns);
-        } catch (\Exception $e) {
-            return;
+        } catch (Exception $e) {
+            return null;
         }
     }
 
@@ -32,11 +35,7 @@ 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();
         }
@@ -50,6 +49,8 @@ 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')
@@ -71,7 +72,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);
                 }
@@ -98,7 +99,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);
                 }
@@ -118,7 +119,7 @@ abstract class Repository extends BaseRepository
      * @param array  $columns
      * @param string $method
      *
-     * @throws \Prettus\Repository\Exceptions\RepositoryException
+     * @throws RepositoryException
      *
      * @return mixed
      */
@@ -132,7 +133,10 @@ abstract class Repository extends BaseRepository
         $page = (int) request()->query('page', 1);
 
         $results = $this->model->{$method}($limit, $columns, 'page', $page);
-        $results->appends(app('request')->query());
+
+        $qs = request()->except(['page', 'user']);
+        $results->appends($qs);
+
         $this->resetModel();
 
         return $this->parserResult($results);

app/Contracts/Resource.php

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

app/Cron/Hourly/ClearExpiredSimbrief.php

@@ -1,17 +1,18 @@
 <?php
 
-namespace App\Cron\Nightly;
+namespace App\Cron\Hourly;
 
 use App\Contracts\Listener;
-use App\Events\CronNightly;
+use App\Events\CronHourly;
 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 $simbriefSvc;
+    private SimBriefService $simbriefSvc;
 
     public function __construct(SimBriefService $simbriefSvc)
     {
@@ -19,10 +20,11 @@ class ClearExpiredSimbrief extends Listener
     }
 
     /**
-     * @param \App\Events\CronNightly $event
+     * @param CronHourly $event
      */
-    public function handle(CronNightly $event): void
+    public function handle(CronHourly $event): void
     {
+        Log::info('Hourly: Removing expired Simbrief entries');
         $this->simbriefSvc->removeExpiredEntries();
     }
 }

app/Cron/Hourly/DeletePireps.php

@@ -0,0 +1,56 @@
+<?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()->subHours(setting('bids.expire_time'));
-        Bid::whereDate('created_at', '<', $date)->delete();
+        $date = Carbon::now('UTC')->subHours(setting('bids.expire_time'));
+        Bid::where('created_at', '<', $date)->delete();
     }
 }

app/Cron/Hourly/RemoveExpiredLiveFlights.php

@@ -4,9 +4,12 @@ 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
@@ -26,9 +29,16 @@ class RemoveExpiredLiveFlights extends Listener
             return;
         }
 
-        $date = Carbon::now()->subHours(setting('acars.live_time'));
-        Pirep::whereDate('updated_at', '<', $date)
+        $date = Carbon::now('UTC')->subHours(setting('acars.live_time'));
+        $pireps = Pirep::where('updated_at', '<', $date)
             ->where('state', PirepState::IN_PROGRESS)
-            ->delete();
+            ->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();
+        }
     }
 }

app/Cron/Monthly/ApplyExpenses.php

@@ -6,13 +6,14 @@ 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 $financeSvc;
+    private RecurringFinanceService $financeSvc;
 
     /**
      * ApplyExpenses constructor.
@@ -35,6 +36,7 @@ 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,13 +6,14 @@ 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 $financeSvc;
+    private RecurringFinanceService $financeSvc;
 
     /**
      * ApplyExpenses constructor.
@@ -35,6 +36,7 @@ class ApplyExpenses extends Listener
      */
     public function handle(CronNightly $event): void
     {
+        Log::info('Nightly: Applying daily expenses');
         $this->financeSvc->processExpenses(ExpenseType::DAILY);
     }
 }

app/Cron/Nightly/NewVersionCheck.php

@@ -5,13 +5,11 @@ 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 $versionSvc;
+    private VersionService $versionSvc;
 
     /**
      * @param VersionService $versionSvc
@@ -28,6 +26,7 @@ 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

@@ -4,20 +4,20 @@ namespace App\Cron\Nightly;
 
 use App\Contracts\Listener;
 use App\Events\CronNightly;
-use App\Models\Enums\UserState;
-use App\Models\User;
 use App\Services\UserService;
-use Carbon\Carbon;
+use Illuminate\Support\Facades\Log;
 
 /**
  * Determine if any pilots should be set to ON LEAVE status
  */
 class PilotLeave extends Listener
 {
-    private $userSvc;
+    private UserService $userSvc;
 
     /**
      * PilotLeave constructor.
+     *
+     * @param UserService $userSvc
      */
     public function __construct(UserService $userSvc)
     {
@@ -34,13 +34,9 @@ class PilotLeave extends Listener
      */
     public function handle(CronNightly $event): void
     {
-        if (setting('pilots.auto_leave_days') === 0) {
-            return;
-        }
-
-        $date = Carbon::now()->subDay(setting('pilots.auto_leave_days'));
-        $users = User::where('status', UserState::ACTIVE)
-           ->whereDate('updated_at', '<', $date);
+        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');

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 Log;
+use Illuminate\Support\Facades\Log;
 
 /**
  * This recalculates the balances on all of the journals
  */
 class RecalculateBalances extends Listener
 {
-    private $journalRepo;
+    private JournalRepository $journalRepo;
 
     /**
      * Nightly constructor.
@@ -35,7 +35,7 @@ class RecalculateBalances extends Listener
      */
     public function handle(CronNightly $event): void
     {
-        Log::info('Recalculating balances');
+        Log::info('Nightly: 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 $aircraftSvc;
-    private $userSvc;
+    private AircraftService $aircraftSvc;
+    private UserService $userSvc;
 
     public function __construct(AircraftService $aircraftSvc, UserService $userSvc)
     {
@@ -32,10 +32,10 @@ class RecalculateStats extends Listener
      */
     public function handle(CronNightly $event): void
     {
-        Log::info('Recalculating user stats');
+        Log::info('Nightly: Recalculating user stats');
         $this->userSvc->recalculateAllUserStats();
 
-        Log::info('Recalcuating aircraft status');
+        Log::info('Nightly: Recalcuating aircraft status');
         $this->aircraftSvc->recalculateStats();
     }
 }

app/Cron/Nightly/SetActiveFlights.php

@@ -19,6 +19,8 @@ class SetActiveFlights extends Listener
      */
     public function handle(CronNightly $event): void
     {
+        Log::info('Nightly: Setting active flights');
+
         $this->checkFlights();
     }
 
@@ -42,23 +44,18 @@ class SetActiveFlights extends Listener
                 continue;
             }
 
+            // Set to visible by default
+            $flight->visible = true;
+
             // dates aren't set, so just save if there were any changes above
             // and move onto the next one
             if ($flight->start_date === null || $flight->end_date === null) {
                 if ($flight->days !== null && $flight->days > 0) {
-                    $visible = Days::isToday($flight->days);
-                    if ($flight->visible !== $visible) {
-                        Log::info('Flight '.$flight->ident.' to '.($visible ? 'shown' : 'hidden'));
-
-                        $flight->visible = $visible;
-                        if ($visible === false) {
-                            Log::info('Today='.date('N').', start=no, mask='.$flight->days.', in='
-                                .Days::in($flight->days, Days::$isoDayMap[(int) date('N')]));
-                        }
+                    $flight->visible = Days::isToday($flight->days);
+                    if (!$flight->visible) {
+                        Log::info('Today='.date('N').', start=no, mask='.$flight->days.', in='
+                            .Days::in($flight->days, Days::$isoDayMap[(int) date('N')]));
                     }
-                } else {
-                    Log::info('Toggling flight '.$flight->ident.' to visible');
-                    $flight->visible = true;
                 }
 
                 $flight->save();
@@ -71,20 +68,11 @@ class SetActiveFlights extends Listener
             // and then make sure if days of the week are specified, check that too
             if ($today->gte($flight->start_date) && $today->lte($flight->end_date)) {
                 if ($flight->days !== null && $flight->days > 0) {
-                    $visible = Days::isToday($flight->days);
-                    if ($flight->visible !== $visible) {
-                        Log::info('Toggling flight '.$flight->ident.' to '.($visible ? 'shown' : 'hidden').'');
-
-                        $flight->visible = $visible;
-                        if ($visible === false) {
-                            Log::info('Today='.date('N').', start='.$flight->start_date
-                                .', end='.$flight->end_date.', mask='.$flight->days.', in='
+                    $flight->visible = Days::isToday($flight->days);
+                    if (!$flight->visible) {
+                        Log::info('Today='.date('N').', start=no, mask='.$flight->days.', in='
                                 .Days::in($flight->days, Days::$isoDayMap[(int) date('N')]));
-                        }
                     }
-                } else {
-                    Log::info('Toggling flight '.$flight->ident.' to visible');
-                    $flight->visible = true;
                 }
             } else {
                 $flight->visible = false;

app/Database/factories/AcarsFactory.php

@@ -1,23 +1,43 @@
 <?php
 
-use Faker\Generator as Faker;
+/** @noinspection PhpIllegalPsrClassPathInspection */
 
-$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'),
-    ];
-});
+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),
+        ];
+    }
+}

app/Database/factories/AircraftFactory.php

@@ -1,33 +1,51 @@
 <?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 Faker\Generator as Faker;
+use DateTime;
 
-$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'];
-        },
-    ];
-});
+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'],
+        ];
+    }
+}

app/Database/factories/AirlineFactory.php

@@ -1,25 +1,41 @@
 <?php
 
-use Faker\Generator as Faker;
+/** @noinspection PhpIllegalPsrClassPathInspection */
+
+namespace App\Database\Factories;
+
+use App\Contracts\Factory;
+use App\Models\Airline;
 use Hashids\Hashids;
 
-/*
- * 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));
+class AirlineFactory extends Factory
+{
+    /**
+     * The name of the factory's corresponding model.
+     *
+     * @var string
+     */
+    protected $model = Airline::class;
 
-            return $hashids->encode($mt);
-        },
-        'iata' => function (array $apt) {
-            return $apt['icao'];
-        },
-        'name'    => $faker->sentence(3),
-        'country' => $faker->country,
-        'active'  => 1,
-    ];
-});
+    /**
+     * 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,
+        ];
+    }
+}

app/Database/factories/AirportFactory.php

@@ -1,17 +1,36 @@
 <?php
 
-use Faker\Generator as Faker;
+/** @noinspection PhpIllegalPsrClassPathInspection */
 
-/*
- * Create an ICAO for use in the factory.
- */
-if (!function_exists('createFactoryICAO')) {
-    function createFactoryICAO(): string
+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
     {
         $characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
         $max = strlen($characters) - 1;
         $string = '';
-        for ($i = 0; $i < 4; $i++) {
+        for ($i = 0; $i < 5; $i++) {
             try {
                 $string .= $characters[random_int(0, $max)];
             } catch (Exception $e) {
@@ -20,37 +39,35 @@ if (!function_exists('createFactoryICAO')) {
 
         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

@@ -0,0 +1,34 @@
+<?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

@@ -1,13 +0,0 @@
-<?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,18 +1,39 @@
 <?php
 
-use App\Models\Enums\ExpenseType;
-use Faker\Generator as Faker;
+/** @noinspection PhpIllegalPsrClassPathInspection */
 
-$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,
-    ];
-});
+namespace App\Database\Factories;
+
+use App\Contracts\Factory;
+use App\Models\Enums\ExpenseType;
+use App\Models\Expense;
+
+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,
+        ];
+    }
+}

app/Database/factories/FareFactory.php

@@ -1,16 +1,35 @@
 <?php
 
-use Faker\Generator as Faker;
+/** @noinspection PhpIllegalPsrClassPathInspection */
 
-$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),
-    ];
-});
+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),
+        ];
+    }
+}

app/Database/factories/FlightFactory.php

@@ -1,44 +1,58 @@
 <?php
-/**
- * Create flights
- */
-use Faker\Generator as Faker;
 
-$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'];
-        },
-    ];
-});
+/** @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'],
+        ];
+    }
+}

app/Database/factories/JournalFactory.php

@@ -1,9 +1,30 @@
 <?php
 
-use Faker\Generator as Faker;
+/** @noinspection PhpIllegalPsrClassPathInspection */
 
-$factory->define(App\Models\Journal::class, function (Faker $faker) {
-    return [
-        'currency' => 'USD',
-    ];
-});
+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',
+        ];
+    }
+}

app/Database/factories/JournalTransactionsFactory.php

@@ -1,17 +1,39 @@
 <?php
 
-use Faker\Generator as Faker;
+/** @noinspection PhpIllegalPsrClassPathInspection */
 
-$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(),
-    ];
-});
+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(),
+        ];
+    }
+}

app/Database/factories/NavdataFactory.php

@@ -1,15 +1,36 @@
 <?php
 
-use App\Models\Enums\NavaidType;
-use Faker\Generator as Faker;
+/** @noinspection PhpIllegalPsrClassPathInspection */
 
-$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),
-    ];
-});
+namespace App\Database\Factories;
+
+use App\Contracts\Factory;
+use App\Models\Enums\NavaidType;
+use App\Models\Navdata;
+
+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),
+        ];
+    }
+}

app/Database/factories/NewsFactory.php

@@ -1,14 +1,33 @@
 <?php
 
-use Faker\Generator as Faker;
+/** @noinspection PhpIllegalPsrClassPathInspection */
 
-$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,
-    ];
-});
+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,
+        ];
+    }
+}

app/Database/factories/PirepFactory.php

@@ -1,69 +1,74 @@
 <?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;
 
-/*
- * 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,
-    ]);
+class PirepFactory extends Factory
+{
+    /**
+     * The name of the factory's corresponding model.
+     *
+     * @var string
+     */
+    protected $model = Pirep::class;
 
-    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'];
-        },
-    ];
-});
+    /**
+     * 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'],
+        ];
+    }
+}

app/Database/factories/RankFactory.php

@@ -1,23 +1,37 @@
 <?php
 
-use Faker\Generator as Faker;
+/** @noinspection PhpIllegalPsrClassPathInspection */
 
-/*
- * 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,
-    ];
-});
+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,
+        ];
+    }
+}

app/Database/factories/RoleFactory.php

@@ -0,0 +1,34 @@
+<?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

@@ -0,0 +1,38 @@
+<?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

@@ -1,21 +0,0 @@
-<?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,15 +1,34 @@
 <?php
 
-use Faker\Generator as Faker;
+/** @noinspection PhpIllegalPsrClassPathInspection */
 
-$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),
-    ];
-});
+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),
+        ];
+    }
+}

app/Database/factories/UserFactory.php

@@ -1,28 +1,54 @@
 <?php
 
+/** @noinspection PhpIllegalPsrClassPathInspection */
+
+namespace App\Database\Factories;
+
+use App\Contracts\Factory;
 use App\Models\Airline;
 use App\Models\Enums\UserState;
-use Faker\Generator as Faker;
+use App\Models\User;
 use Illuminate\Support\Facades\Hash;
 
-$factory->define(App\Models\User::class, function (Faker $faker) {
-    static $password;
+class UserFactory extends Factory
+{
+    /**
+     * The name of the factory's corresponding model.
+     *
+     * @var string
+     */
+    protected $model = User::class;
 
-    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),
-    ];
-});
+    /**
+     * @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),
+        ];
+    }
+}

app/Database/migrations/2017_06_07_014930_create_settings_table.php

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

app/Database/migrations/2017_06_08_0000_create_users_table.php

@@ -5,8 +5,7 @@ use App\Models\Pirep;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreateUsersTable extends Migration
-{
+return new class() extends Migration {
     /**
      * Run the migrations.
      *
@@ -55,4 +54,4 @@ class CreateUsersTable 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;
 
-class RolesPermissionsTables extends Migration
-{
+return new class() extends Migration {
     public function up()
     {
         // Create table for storing roles
@@ -82,4 +82,4 @@ class RolesPermissionsTables extends Migration
         Schema::dropIfExists('role_user');
         Schema::dropIfExists('roles');
     }
-}
+};

app/Database/migrations/2017_06_08_0005_create_password_resets_table.php

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

app/Database/migrations/2017_06_08_0006_create_sessions_table.php

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

app/Database/migrations/2017_06_08_191703_create_airlines_table.php

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

app/Database/migrations/2017_06_09_010621_create_aircrafts_table.php

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

app/Database/migrations/2017_06_10_040335_create_fares_table.php

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

app/Database/migrations/2017_06_11_135707_create_airports_table.php

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

app/Database/migrations/2017_06_17_214650_create_flight_tables.php

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

app/Database/migrations/2017_06_21_165410_create_ranks_table.php

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

app/Database/migrations/2017_06_23_011011_create_subfleet_tables.php

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

app/Database/migrations/2017_06_28_195426_create_pirep_tables.php

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

app/Database/migrations/2017_12_12_174519_create_bids_table.php

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

app/Database/migrations/2017_12_14_225241_create_jobs_table.php

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

app/Database/migrations/2017_12_14_225337_create_failed_jobs_table.php

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

app/Database/migrations/2017_12_20_004147_create_navdata_tables.php

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

app/Database/migrations/2017_12_20_005147_create_acars_tables.php

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

app/Database/migrations/2018_01_03_014930_create_stats_table.php

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