Add test for METAR string

* Add unit conversion handling for block_fuel like for fuel_used, add further checks in PIREPTest->testUnitFields

* Remove accidentially added "use"

Co-authored-by: Andreas Palm <ap@ewsp.de>

.dockerignore

@@ -0,0 +1 @@
+vendor

.editorconfig

@@ -0,0 +1,30 @@
+#
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+
+[*.js]
+indent_style = space
+indent_size = 2
+
+[*.php]
+indent_style = space
+indent_size = 4
+
+[*.blade.php]
+indent_style = space
+indent_size = 2
+
+[*.stub]
+indent_style = space
+indent_size = 4
+
+[Makefile]
+indent_style = tab
+
+# Matches the exact files either package.json or .travis.yml
+[{package.json, .travis.yml}]
+indent_style = space
+indent_size = 2

.eslintignore

@@ -0,0 +1,7 @@
+.travis/*
+.idea/*
+.vscode/*
+node_modules/*
+public/*
+gulpfile.js
+webpack.mix.js

.eslintrc

@@ -0,0 +1,28 @@
+{
+  "extends": "airbnb",
+  "env": {
+    "es6": true,
+    "browser": true
+  },
+  "parserOptions": {
+    "ecmaVersion": 8
+  },
+  "rules": {
+    "camelcase": 0,
+    "no-console": 0,
+    "func-names": 0,
+    "prefer-object-spread": 0,
+    "no-param-reassign": [
+      2,
+      {
+        "props": false
+      }
+    ],
+    "import/no-extraneous-dependencies": [
+      "error",
+      {
+        "devDependencies": true
+      }
+    ]
+  }
+}

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,30 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is. Please upload the Laravel logs as well from `storage/logs/laravel.log` (or the file with the correct date)
+
+**Version**
+Please enter the version
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Additional context**
+Add any other context and attach logs (from `storage/logs/laravel-<date>.log`)

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/scripts/Formatting.xml

@@ -0,0 +1,27 @@
+<code_scheme name="PHPVMS" version="173">
+  <option name="RIGHT_MARGIN" value="100" />
+  <PHPCodeStyleSettings>
+    <option name="ALIGN_KEY_VALUE_PAIRS" value="true" />
+    <option name="LOWER_CASE_BOOLEAN_CONST" value="true" />
+    <option name="LOWER_CASE_NULL_CONST" value="true" />
+    <option name="ALIGN_CLASS_CONSTANTS" value="true" />
+    <option name="FORCE_SHORT_DECLARATION_ARRAY_STYLE" value="true" />
+  </PHPCodeStyleSettings>
+  <XML>
+    <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
+  </XML>
+  <codeStyleSettings language="JAVA">
+    <indentOptions>
+      <option name="CONTINUATION_INDENT_SIZE" value="4" />
+    </indentOptions>
+  </codeStyleSettings>
+  <codeStyleSettings language="JSON">
+    <indentOptions>
+      <option name="INDENT_SIZE" value="4" />
+    </indentOptions>
+  </codeStyleSettings>
+  <codeStyleSettings language="PHP">
+    <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
+    <option name="ALIGN_MULTILINE_ARRAY_INITIALIZER_EXPRESSION" value="true" />
+  </codeStyleSettings>
+</code_scheme>

.github/scripts/build.sh

@@ -0,0 +1,86 @@
+#!/usr/bin/env bash
+
+echo "Version: ${VERSION}"
+echo "Full Version: ${FULL_VERSION}"
+echo "Package name: ${TAR_NAME}"
+echo "Current directory: ${BASE_DIR}"
+
+echo "Cleaning files"
+
+# Leftover individual files to delete
+declare -a remove_files=(
+  .git
+  .github
+  .sass-cache
+  .idea
+  .travis
+  docker
+  _ide_helper.php
+  .dockerignore
+  .dpl
+  .editorconfig
+  .eslintignore
+  .eslintrc
+  .php_cs
+  .php_cs.cache
+  .phpstorm.meta.php
+  .styleci.yml
+  .phpunit.result.cache
+  env.php
+  intellij_style.xml
+  config.php
+  docker-compose.yml
+  Makefile
+  phpcs.xml
+  phpunit.xml
+  phpvms.iml
+  Procfile
+  phpstan.neon
+  node_modules
+  composer.phar
+  vendor/willdurand/geocoder/tests
+)
+
+for file in "${remove_files[@]}"; do
+  rm -rf $file
+done
+
+find ./vendor -type d -name ".git" -print0 | xargs rm -rf
+find . -type d -name "sass-cache" -print0 | xargs rm -rf
+
+# clear any app specific stuff that might have been loaded in
+find bootstrap/cache -mindepth 1 -maxdepth 1 -not -name '.gitignore' -print0 -exec rm -rf {} +
+find storage/app -mindepth 1 -maxdepth 1 -not -name '.gitignore' -not -name public -not -name import -print0 -exec rm -rf {} +
+find storage/app/public -mindepth 1 -maxdepth 1 -not -name '.gitignore' -not -name avatars -not -name uploads -print0 -exec rm -rf {} +
+find storage/app/public/avatars -mindepth 1 -not -name '.gitignore' -print0 -exec rm -rf {} +
+find storage/app/public/uploads -mindepth 1 -not -name '.gitignore' -print0 -exec rm -rf {} +
+find storage/debugbar -mindepth 1 -not -name '.gitignore' -print0 -exec rm -rf {} +
+find storage/docker -mindepth 1 -not -name '.gitignore' -print0 -exec rm -rf {} +
+find storage/framework/cache -mindepth 1 -not -name '.gitignore' -print0 -exec rm -rf {} +
+find storage/framework/sessions -mindepth 1 -not -name '.gitignore' -print0 -exec rm -rf {} +
+find storage/framework/views -mindepth 1 -not -name '.gitignore' -print0 -exec rm -rf {} +
+find storage/logs -mindepth 1 -not -name '.gitignore' -print0 -exec rm -rf {} +
+
+mkdir -p storage/app/public/avatars
+mkdir -p storage/app/public/uploads
+mkdir -p storage/framework/cache
+mkdir -p storage/framework/sessions
+mkdir -p storage/framework/views
+
+cd /tmp
+
+ls -al $BASE_DIR/../
+
+tar -czf $TAR_NAME -C $BASE_DIR .
+sha256sum $TAR_NAME >"$TAR_NAME.sha256"
+tar2zip $TAR_NAME
+sha256sum $ZIP_NAME >"$ZIP_NAME.sha256"
+
+ls -al /tmp
+
+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" .
+

.github/scripts/env.php

@@ -0,0 +1,25 @@
+APP_ENV="dev"
+APP_KEY="base64:zdgcDqu9PM8uGWCtMxd74ZqdGJIrnw812oRMmwDF6KY="
+APP_URL="http://localhost"
+APP_SKIN="default"
+APP_DEBUG="true"
+APP_LOCALE="en"
+
+PHPVMS_INSTALLED="true"
+
+APP_LOG="daily"
+APP_LOG_LEVEL="debug"
+APP_LOG_MAX_FILES="3"
+
+DB_CONNECTION="mysql"
+DB_HOST="127.0.0.1"
+DB_PORT="3306"
+DB_DATABASE="phpvms"
+DB_USERNAME="root"
+DB_PASSWORD=
+
+CACHE_DRIVER="file"
+CACHE_PREFIX=
+
+SESSION_DRIVER="file"
+QUEUE_DRIVER="database"

.github/scripts/phpunit.xml

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit bootstrap="bootstrap/autoload.php"
+         colors="true"
+         processIsolation="false"
+         stopOnFailure="true"
+         convertErrorsToExceptions="false"
+         convertNoticesToExceptions="false"
+         convertWarningsToExceptions="false"
+         beStrictAboutOutputDuringTests="false"
+         beStrictAboutTestsThatDoNotTestAnything="false">
+    <testsuites>
+        <testsuite name="Application Test Suite">
+            <directory suffix="Test.php">./tests</directory>
+        </testsuite>
+    </testsuites>
+    <extensions>
+        <extension class="Tests\Bootstrap"/>
+    </extensions>
+    <filter>
+        <whitelist processUncoveredFilesFromWhitelist="true">
+            <directory suffix=".php">./app</directory>
+        </whitelist>
+    </filter>
+    <!--<listeners>
+        <listener class="NunoMaduro\Collision\Adapters\Phpunit\Listener"/>
+    </listeners>-->
+    <php>
+        <ini name="error_reporting" value="E_ALL"/>
+        <ini name="display_errors" value="On"/>
+        <ini name="display_startup_errors" value="On"/>
+        <server name="APP_ENV" value="testing"/>
+        <server name="APP_KEY" value="base64:ve66Z5Kt/zTN3p++0zOPu854PHfZkwJE5VuoFAlzHtI="/>
+        <server name="APP_DEBUG" value="true"/>
+        <server name="APP_LOG_LEVEL" value="debug"/>
+        <server name="DB_CONNECTION" value="memory"/>
+        <server name="CACHE_DRIVER" value="array"/>
+        <server name="SESSION_DRIVER" value="array"/>
+        <server name="QUEUE_DRIVER" value="sync"/>
+        <server name="APP_CONFIG_CACHE" value="bootstrap/cache/config.phpunit.php"/>
+        <server name="APP_SERVICES_CACHE" value="bootstrap/cache/services.phpunit.php"/>
+        <server name="APP_PACKAGES_CACHE" value="bootstrap/cache/packages.phpunit.php"/>
+        <server name="APP_ROUTES_CACHE" value="bootstrap/cache/routes.phpunit.php"/>
+        <server name="APP_EVENTS_CACHE" value="bootstrap/cache/events.phpunit.php"/>
+    </php>
+</phpunit>

.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/stale.yml

@@ -0,0 +1,10 @@
+---
+daysUntilStale: 60
+daysUntilClose: false
+exemptLabels:
+  - pinned
+  - security
+exemptMilestones: true
+staleLabel: wontfix
+markComment: false
+closeComment: false

.github/workflows/build.yml

@@ -0,0 +1,249 @@
+name: 'Build'
+on: ['push', 'pull_request', 'workflow_dispatch', 'release']
+jobs:
+  build:
+    runs-on: ubuntu-18.04
+    if: github.repository == 'nabeelio/phpvms'
+    strategy:
+      fail-fast: true
+      matrix:
+        php-versions: ['7.3', '7.4']
+    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') }}
+        restore-keys: ${{ runner.os }}-composer-
+
+    # 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
+        # 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: |
+        vendor/bin/php-cs-fixer fix --config=.php_cs -v --dry-run --diff --using-cache=no
+        vendor/bin/phpunit --debug --verbose
+
+  # This runs after all of the tests, run have run. Creates a cleaned up version of the
+  # distro, and then creates the artifact to push up to S3 or wherever
+  artifacts:
+    name: 'Create dev build'
+    needs: build
+    runs-on: 'ubuntu-18.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: '7.4'
+
+      - 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
+          sudo npm i tar-to-zip -g
+          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-18.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: '7.4'
+
+      - 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
+          sudo npm i tar-to-zip -g
+          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

@@ -1,9 +1,12 @@
 _ide_helper.php
+.php_cs.cache
 .phpstorm.meta.php
+.phpunit.result.cache
 /vendor
 node_modules/
 npm-debug.log
-
+composer.phar
+yarn-error.log
 *.bak
 
 # Laravel 4 specific
@@ -26,6 +29,7 @@ env.php
 #Homestead.yaml
 Homestead.json
 LocalValetDriver.php
+docker-compose-profiler.yml
 
 # Rocketeer PHP task runner and deployment package. https://github.com/rocketeers/rocketeer
 .rocketeer/

.htaccess

@@ -4,8 +4,8 @@ Options -Indexes
 RewriteEngine On
 
 # Handle Authorization Header
-RewriteCond %{HTTP:Authorization} ^(.*)
-RewriteRule .* - [e=HTTP_AUTHORIZATION:%1]
+RewriteCond %{HTTP:Authorization} .
+RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
 
 # Deny all these files/folders
 RedirectMatch 403 ^/.git/.*?$
@@ -20,6 +20,7 @@ RedirectMatch 403 ^/storage/.*?$
 RedirectMatch 403 ^/tests/.*?$
 RedirectMatch 403 ^/vendor/.*?$
 RedirectMatch 403 ^/.bowerrc$
+RedirectMatch 403 ^/.env
 RedirectMatch 403 ^/artisan$
 RedirectMatch 403 ^/composer.json
 RedirectMatch 403 ^/composer.lock
@@ -32,12 +33,6 @@ RedirectMatch 403 ^/package.json
 RedirectMatch 403 ^/package-lock.json
 RedirectMatch 403 ^/phpunit.xml
 RedirectMatch 403 ^/webpack.mix.js
+RedirectMatch 403 ^/yarn.lock
 
-# Redirect Trailing Slashes If Not A Folder...
-RewriteCond %{REQUEST_FILENAME} !-d
-RewriteRule ^(.*)/$ /$1 [L,R=301]
-
-# Handle Front Controller...
-RewriteCond %{REQUEST_FILENAME} !-d
-RewriteCond %{REQUEST_FILENAME} !-f
-RewriteRule ^ index.php [L]
+RewriteRule ^(.*)$ public/$1 [L]

.php_cs

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

.styleci.yml

@@ -0,0 +1,30 @@
+preset: recommended
+risky: true
+enabled:
+  - align_double_arrow_minimal
+  # - align_equals_minimal
+  # - date_time_immutable
+  - ereg_to_preg
+  - function_to_constant
+  # - mb_str_functions
+  - modernize_types_casting
+  # - native_function_invocation
+  - no_blank_lines_after_return
+  - no_homoglyph_names
+  - no_php4_constructor
+  - no_useless_else
+  - phpdoc_add_missing_param_annotation
+disabled:
+  - align_double_arrow
+  - blank_line_before_return
+  # - hash_to_slash_comment
+  - phpdoc_summary
+  - phpdoc_var_without_name
+  # - unalign_equals
+finder:
+  exclude:
+    - node_modules
+    - storage
+    - vendor
+  name: "*.php"
+  not-name: "*.blade.php"

.travis.yml

@@ -1,58 +0,0 @@
-language: php
-php:
-- '7.0'
-- '7.1'
-#- '7.2'
-#- nightly
-
-cache:
-  directories:
-  - "$HOME/.composer/cache"
-  - "$HOME/.npm"
-
-services:
-- mysql
-#- redis-server
-
-before_script:
-  - cp .travis/env.travis.php env.php
-  - composer install --no-interaction --verbose
-
-script:
-- php artisan database:create --reset
-- php artisan migrate:refresh --seed
-- cp .travis/phpunit.travis.xml phpunit.xml
-- vendor/bin/phpunit --debug --verbose
-
-after_failure:
-- cat storage/logs/*.log
-
-jobs:
-  include:
-    - stage: package
-      script: skip
-      before_deploy:
-        - curl -sL https://raw.githubusercontent.com/travis-ci/artifacts/master/install | bash
-      deploy:
-        - provider: script
-          skip_cleanup: true
-          script: ./.travis/deploy_script.sh
-          on:
-            all_branches: true
-            php: '7.0'
-    - stage: release
-      script: skip
-      before_deploy:
-        - curl -sL https://raw.githubusercontent.com/travis-ci/artifacts/master/install | bash
-        - ./.travis/deploy_script.sh
-      deploy:
-        provider: releases
-        skip_cleanup: true
-        api_key:
-          secure: kAOYEThsSF8wM7vx+e+xWKhlvsNzhgKn1bk0zLBb7RLUM5pHIGKV/j0KrCNspwIUEPF0O594H6hCyswlpIZfxW2mTnmPqfbKxG/H2rLEAoOV0/MqzeC/gffxm7Eop6Sn4T/UC9kLSgqRynllbYtJDK6aWESdnvK3Fka0Cnpn7l/2phEf2J/nOF6QT/utpws1E0MUGqrKvX1/UYIu8np5e5aYLPOXnqahK8qzJFL4CyNBv+fhXuXfmOF4UbNbSPnrg/kY0QpUtFpz9ebvg5BjfMXJT0P4Q1BjgKBN76A7vz+ZfPmW6SqKv3o1yisXAgBWzylXh8B6pK+cUk4uXbagcGcIdkGOI6pQ5sLq+JOkBhVjSfogERePkt44KPif4EMsLRw/Jp4pTMy/vmgrON/jkbA+jXsOARTG5vAwIq4lyZzZXWUfirYwXeCfasgf+xTdo9C0cOE0jlqojO7SdF2CinDk9BduYpBTectea8Xx+YP5R1JCZNORDYynlLHKMW/8PJyAG+AsbcfKNTobQAfxw1nHa7GoKP1j4MSx1UtbulZdhmeRX/nUTFIvfgEDrl4cdBlt0/o5SuyN92DiCnvJZaYHcgXwYMvoqdXxBCnBKsM/1BZcykWi7Zt/q8krWYCOfCzBN4TDdmrKsEOUkCSOL9mI6gERHGmcGZN05PxU950=
-        file_glob: true
-        file: build/*
-        on:
-          tags: true
-          repo: nabeelio/phpvms
-          php: '7.0'

.travis/deploy_script.sh

@@ -1,67 +0,0 @@
-#!/usr/bin/env bash
-
-if [ "$TRAVIS" = "true" ]; then
-
-    cd $TRAVIS_BUILD_DIR
-
-    if test "$TRAVIS_TAG"; then
-        PKG_NAME=$TRAVIS_TAG
-    else
-        echo "On branch $TRAVIS_BRANCH"
-
-        if [ "$TRAVIS_BRANCH" != "master" ] && [ "$TRAVIS_BRANCH" != "dev" ]; then
-            echo "Not on valid branch, exiting"
-            exit 0;
-        fi;
-
-        BASE_VERSION=`php artisan phpvms:version --base-only`
-        PKG_NAME=${BASE_VERSION}-${TRAVIS_BRANCH}
-    fi
-
-    FILE_NAME="phpvms-$PKG_NAME"
-    TAR_NAME="$FILE_NAME.tar.gz"
-    echo "Writing $TAR_NAME"
-
-    php artisan phpvms:version --write > VERSION
-    VERSION=`cat VERSION`
-    echo "Version: $VERSION"
-
-    echo "Cleaning files"
-
-    make clean
-
-    rm -rf env.php config.php
-    find ./vendor -type d -name ".git" -print0 | xargs rm -rf
-    find . -type d -name "sass-cache" -print0 | xargs rm -rf
-
-    # clear any app specific stuff that might have been loaded in
-    find storage/app/public -mindepth 1 -not -name '.gitignore' -print0 -exec rm -rf {} +
-    find storage/app -mindepth 1 -not -name '.gitignore' -not -name public -print0 -exec rm -rf {} +
-
-    # Remove any development files
-    rm -rf .sass-cache
-    rm -rf .idea phpvms.iml .travis .dpl
-    rm -rf .phpstorm.meta.php _ide_helper.php phpunit.xml Procfile
-
-    # remove large sized files
-    rm -rf .git
-    rm -rf node_modules
-    rm -rf composer.phar
-
-    # delete files in vendor that are rather large
-    rm -rf vendor/willdurand/geocoder/tests
-
-    echo "creating tarball"
-    cd /tmp
-    tar -czf $TAR_NAME -C $TRAVIS_BUILD_DIR/../ phpvms
-    sha256sum $TAR_NAME > "$TAR_NAME.sha256"
-
-    echo "uploading to s3"
-    mkdir -p $TRAVIS_BUILD_DIR/build
-    cd $TRAVIS_BUILD_DIR/build
-
-    mv "/tmp/$TAR_NAME" "/tmp/$TAR_NAME.sha256" .
-    artifacts upload --target-paths "/" $TAR_NAME $TRAVIS_BUILD_DIR/VERSION $TAR_NAME.sha256
-
-    curl -X POST --data "{\"content\": \"A new build is available at http://downloads.phpvms.net/$TAR_NAME ($VERSION)\"}" -H "Content-Type: application/json"  $DISCORD_WEBHOOK_URL
-fi

.travis/env.travis

@@ -1,14 +0,0 @@
-APP_ENV=prod
-APP_KEY=base64:ve66Z5Kt/zTN3p++0zOPu854PHfZkwJE5VuoFAlzHtI=
-APP_DEBUG=true
-APP_LOG_LEVEL=debug
-APP_URL=http://localhost
-
-DB_CONNECTION=mysql
-DB_HOST=127.0.0.1
-DB_PORT=3306
-DB_DATABASE=phpvms
-DB_USERNAME=root
-DB_PASSWORD=
-
-CACHE_DRIVER=array

.travis/env.travis.php

@@ -1,30 +0,0 @@
-<?php
-exit();
-?>
-
-APP_ENV=dev
-APP_KEY=base64:zdgcDqu9PM8uGWCtMxd74ZqdGJIrnw812oRMmwDF6KY=
-APP_URL=http://localhost
-APP_SKIN=default
-APP_DEBUG=true
-APP_LOCALE=en
-
-PHPVMS_INSTALLED=true
-VACENTRAL_API_KEY=
-
-APP_LOG=daily
-APP_LOG_LEVEL=debug
-APP_LOG_MAX_FILES=3
-
-DB_CONNECTION=mysql
-DB_HOST=127.0.0.1
-DB_PORT=3306
-DB_DATABASE=phpvms
-DB_USERNAME=root
-DB_PASSWORD=
-
-CACHE_DRIVER=file
-CACHE_PREFIX=
-
-SESSION_DRIVER=file
-QUEUE_DRIVER=database

.travis/phpunit.travis.xml

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="bootstrap/autoload.php"
-         colors="true"
-         processIsolation="false"
-         stopOnFailure="true"
-         convertErrorsToExceptions="false"
-         convertNoticesToExceptions="false"
-         convertWarningsToExceptions="false"
-         beStrictAboutOutputDuringTests="false"
-         beStrictAboutTestsThatDoNotTestAnything="false">
-    <testsuites>
-        <testsuite name="Application Test Suite">
-            <directory suffix="Test.php">./tests</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">./app</directory>
-        </whitelist>
-    </filter>
-    <php>
-        <ini name="error_reporting" value="E_ALL"/>
-        <ini name="display_errors" value="On"/>
-        <ini name="display_startup_errors" value="On"/>
-    </php>
-</phpunit>

CHANGELOG.md

@@ -1,8 +1,706 @@
 # Changelog
 
-## [Unreleased]
+## [7.0.0-beta.4](https://github.com/nabeelio/phpvms/tree/7.0.0-beta.4) (2020-05-09)
 
-## 7.0.0-alpha1
+[Full Changelog](https://github.com/nabeelio/phpvms/compare/7.0.0-beta.3...7.0.0-beta.4)
 
-### Added
-- Initial release
+**Implemented enhancements:**
+
+- Move currency selection to admin settings [\#671](https://github.com/nabeelio/phpvms/issues/671)
+- Center live map to custom location [\#661](https://github.com/nabeelio/phpvms/issues/661)
+- Pilot Names -  Pilots ID [\#656](https://github.com/nabeelio/phpvms/issues/656)
+- Simbrief sample data [\#651](https://github.com/nabeelio/phpvms/issues/651)
+- Simbrief only available for bids [\#642](https://github.com/nabeelio/phpvms/issues/642)
+- PIREP prefile download [\#634](https://github.com/nabeelio/phpvms/issues/634)
+- Importer - group imported aircraft by type [\#628](https://github.com/nabeelio/phpvms/issues/628)
+- API: When looking up flight, return the load factor [\#611](https://github.com/nabeelio/phpvms/issues/611)
+- API: On prefile, return required fields [\#610](https://github.com/nabeelio/phpvms/issues/610)
+- Center on active flights [\#605](https://github.com/nabeelio/phpvms/issues/605)
+- Profiling/performance improvments [\#602](https://github.com/nabeelio/phpvms/issues/602)
+- Aircraft stats resync [\#585](https://github.com/nabeelio/phpvms/issues/585)
+- Cron Job [\#553](https://github.com/nabeelio/phpvms/issues/553)
+- Importing a CSV with additional airports clears all previous airports [\#490](https://github.com/nabeelio/phpvms/issues/490)
+- Use continuation token instead of page/offset [\#469](https://github.com/nabeelio/phpvms/issues/469)
+- Combine the Util classes in Facade and Support [\#467](https://github.com/nabeelio/phpvms/issues/467)
+- ACARS/Live flight events [\#436](https://github.com/nabeelio/phpvms/issues/436)
+- Allow logo upload for airline [\#417](https://github.com/nabeelio/phpvms/issues/417)
+- Google Analytics Settings [\#382](https://github.com/nabeelio/phpvms/issues/382)
+- Let update only be run if logged in/admin [\#372](https://github.com/nabeelio/phpvms/issues/372)
+- Airport Lookup - possible additions [\#364](https://github.com/nabeelio/phpvms/issues/364)
+- Set flight type for expenses for flight [\#348](https://github.com/nabeelio/phpvms/issues/348)
+- Extend search schedule options [\#297](https://github.com/nabeelio/phpvms/issues/297)
+- Change currency from settings \#671 [\#672](https://github.com/nabeelio/phpvms/pull/672)
+- Add privatized version of name \#656 [\#658](https://github.com/nabeelio/phpvms/pull/658)
+- Add Simbrief entries as sample data for load \#651 [\#652](https://github.com/nabeelio/phpvms/pull/652)
+- Option for SB only on bids; add the new file type \#642 [\#643](https://github.com/nabeelio/phpvms/pull/643)
+- Account ICAO for subfleet, airline/location if columns exist \#628 [\#632](https://github.com/nabeelio/phpvms/pull/632)
+- Performance improvements \#602 [\#607](https://github.com/nabeelio/phpvms/pull/607)
+- Center on active flights \#605 [\#606](https://github.com/nabeelio/phpvms/pull/606)
+- Installer fixes, remove bcmath, fix design [\#596](https://github.com/nabeelio/phpvms/pull/596)
+- Remove airport length restrictions \#590 [\#592](https://github.com/nabeelio/phpvms/pull/592)
+- Remove 4 char restriction from ICAO; use decimal type for lat/lon \#590 [\#591](https://github.com/nabeelio/phpvms/pull/591)
+- Recalcuate aircraft stats in nightly cron and importer \#585 \#443 [\#587](https://github.com/nabeelio/phpvms/pull/587)
+- \(Importer\) Set the pay rate for the ranks \#443 [\#586](https://github.com/nabeelio/phpvms/pull/586)
+- Fix rowmapper generator, check for fields, map users \#443 [\#583](https://github.com/nabeelio/phpvms/pull/583)
+- Add bcmath to the required extensions list \#558 [\#564](https://github.com/nabeelio/phpvms/pull/564)
+- Add the argc\_argv flag for the cgi exec \#553 [\#556](https://github.com/nabeelio/phpvms/pull/556)
+- Add logo to the flights page if its set \#417 [\#550](https://github.com/nabeelio/phpvms/pull/550)
+- Add additional events for PIREP states \#436 [\#548](https://github.com/nabeelio/phpvms/pull/548)
+- Cleanup Utils \#467 [\#547](https://github.com/nabeelio/phpvms/pull/547)
+- Add checkbox to clear previous data when importing \#490 [\#546](https://github.com/nabeelio/phpvms/pull/546)
+- Distro zip file from tar file \#449 [\#543](https://github.com/nabeelio/phpvms/pull/543)
+- Spanish files translation [\#542](https://github.com/nabeelio/phpvms/pull/542)
+- Add link to download ACARS config from profile [\#539](https://github.com/nabeelio/phpvms/pull/539)
+- Format all blade templates to 2 spaces \#530 [\#531](https://github.com/nabeelio/phpvms/pull/531)
+- Add menu bar for mobile [\#529](https://github.com/nabeelio/phpvms/pull/529)
+- Fix live and route map errors \#527 [\#528](https://github.com/nabeelio/phpvms/pull/528)
+- Set PIREPs page to public [\#526](https://github.com/nabeelio/phpvms/pull/526)
+- Try to clear caches before updating [\#522](https://github.com/nabeelio/phpvms/pull/522)
+- Reduce number of queries for update check [\#520](https://github.com/nabeelio/phpvms/pull/520)
+- Add getRootDomain\(\) to Utils [\#514](https://github.com/nabeelio/phpvms/pull/514)
+- Search flights by subfleet \#484 [\#506](https://github.com/nabeelio/phpvms/pull/506)
+- Add base Dockerfile for Dockerhub upload [\#504](https://github.com/nabeelio/phpvms/pull/504)
+- Add reference to docs on doc site [\#502](https://github.com/nabeelio/phpvms/pull/502)
+- Add new command to export a specific PIREP for debugging [\#501](https://github.com/nabeelio/phpvms/pull/501)
+- Flight search for departure/arrival airports not using column names [\#496](https://github.com/nabeelio/phpvms/pull/496)
+- Split the importer module out from the installer module [\#468](https://github.com/nabeelio/phpvms/pull/468)
+
+**Fixed bugs:**
+
+- Aircraft hours not counting [\#683](https://github.com/nabeelio/phpvms/issues/683)
+- Error creating first user/airline [\#677](https://github.com/nabeelio/phpvms/issues/677)
+- submitting PIREP: Page Not Found [\#676](https://github.com/nabeelio/phpvms/issues/676)
+- Filing manual report causes SimBrief Error [\#668](https://github.com/nabeelio/phpvms/issues/668)
+- Error on finance page in admin [\#667](https://github.com/nabeelio/phpvms/issues/667)
+- API: User bids aren't loading SimBrief data for flight [\#664](https://github.com/nabeelio/phpvms/issues/664)
+- .: Links to pilot profiles :. [\#655](https://github.com/nabeelio/phpvms/issues/655)
+- Some domains \(ex, .co.uk\) not properly parsed [\#647](https://github.com/nabeelio/phpvms/issues/647)
+- API: Load bids through the bids.flight fields, not the flights field on the user [\#639](https://github.com/nabeelio/phpvms/issues/639)
+- Login page not using theme [\#638](https://github.com/nabeelio/phpvms/issues/638)
+- CSV import error says "csv not found" [\#636](https://github.com/nabeelio/phpvms/issues/636)
+- Importer - schedules not importing properly [\#630](https://github.com/nabeelio/phpvms/issues/630)
+- Disable using of php opcache [\#625](https://github.com/nabeelio/phpvms/issues/625)
+- API: Flight fields are an array when empty [\#618](https://github.com/nabeelio/phpvms/issues/618)
+- "Pending Pireps" in admin is blank [\#616](https://github.com/nabeelio/phpvms/issues/616)
+- Flight fields show all fields, not custom added ones [\#614](https://github.com/nabeelio/phpvms/issues/614)
+- Mixed content causes error [\#612](https://github.com/nabeelio/phpvms/issues/612)
+- Fares not appearing in API response for user/subfleets [\#608](https://github.com/nabeelio/phpvms/issues/608)
+- Not selecting active for aircraft shows nullable error [\#603](https://github.com/nabeelio/phpvms/issues/603)
+- Airports page repeats airport name \(infinite loop\) [\#599](https://github.com/nabeelio/phpvms/issues/599)
+- Calculate Distance button not working  [\#595](https://github.com/nabeelio/phpvms/issues/595)
+- Support Seaports with 3 letter IATA/ID codes [\#590](https://github.com/nabeelio/phpvms/issues/590)
+- Hubs only show for registration [\#580](https://github.com/nabeelio/phpvms/issues/580)
+- Error when updating user in admin [\#576](https://github.com/nabeelio/phpvms/issues/576)
+- Updater not working because Source repository \[github\] is not defined [\#575](https://github.com/nabeelio/phpvms/issues/575)
+- Flights Page Search Subfleet Column [\#574](https://github.com/nabeelio/phpvms/issues/574)
+- Duplicate key entry for ACARS data [\#572](https://github.com/nabeelio/phpvms/issues/572)
+- No hint path defined for updater [\#570](https://github.com/nabeelio/phpvms/issues/570)
+- My Bids Page Error [\#561](https://github.com/nabeelio/phpvms/issues/561)
+- I can't change Current Theme [\#554](https://github.com/nabeelio/phpvms/issues/554)
+- Pilots cannot use the dashboard or flights without admin rights [\#480](https://github.com/nabeelio/phpvms/issues/480)
+- Database prefix not being applied [\#442](https://github.com/nabeelio/phpvms/issues/442)
+- Install not working [\#411](https://github.com/nabeelio/phpvms/issues/411)
+- typo in dependency on 'leaflet.geodesic' [\#687](https://github.com/nabeelio/phpvms/pull/687)
+- Emails/notifications not sending \#675 [\#686](https://github.com/nabeelio/phpvms/pull/686)
+- Aircraft hours not showing/incrementing \#683 [\#684](https://github.com/nabeelio/phpvms/pull/684)
+- METAR: KM as unit in visibility \#680 [\#682](https://github.com/nabeelio/phpvms/pull/682)
+- Blank/null IATA code isn't unique when added \#679 [\#681](https://github.com/nabeelio/phpvms/pull/681)
+- Fix airline creation in installer \#677 [\#678](https://github.com/nabeelio/phpvms/pull/678)
+- Journal not created when airline is created \#667 [\#670](https://github.com/nabeelio/phpvms/pull/670)
+- Check for SB being avail before filing \#668 [\#669](https://github.com/nabeelio/phpvms/pull/669)
+- Load Simbrief and flight data when getting bids \#664 [\#665](https://github.com/nabeelio/phpvms/pull/665)
+- Fix pilots page not showing up \#655 [\#660](https://github.com/nabeelio/phpvms/pull/660)
+- Fix PirepComment response; 201 to 200 [\#654](https://github.com/nabeelio/phpvms/pull/654)
+- Domain detection failing for .co.uk, etc \#647 [\#648](https://github.com/nabeelio/phpvms/pull/648)
+- Auth routes not using themes \#638 [\#645](https://github.com/nabeelio/phpvms/pull/645)
+- Don't return bids by default, fix user flight column \#639 [\#640](https://github.com/nabeelio/phpvms/pull/640)
+- Account for admin role, don't error out on null rows \#632 [\#637](https://github.com/nabeelio/phpvms/pull/637)
+- Fix airline mapping for aircraft \#628 [\#633](https://github.com/nabeelio/phpvms/pull/633)
+- Increase ID column size; seed ID generator with uniqid\(\) \#630 [\#631](https://github.com/nabeelio/phpvms/pull/631)
+- Disable using apc/opcache by default if found \#625 [\#629](https://github.com/nabeelio/phpvms/pull/629)
+- Fix saving of fare \#621 [\#624](https://github.com/nabeelio/phpvms/pull/624)
+- API: Flight fields are an array when empty \#618 [\#619](https://github.com/nabeelio/phpvms/pull/619)
+- Remove the flight fields link from admin \#614 [\#615](https://github.com/nabeelio/phpvms/pull/615)
+- HTTP/HTTPS mixed content errors \#612 [\#613](https://github.com/nabeelio/phpvms/pull/613)
+- Fare information not included in subfleet response \#608 [\#609](https://github.com/nabeelio/phpvms/pull/609)
+- Aircraft status field blank causes error \#603 [\#604](https://github.com/nabeelio/phpvms/pull/604)
+- METAR parsing infinite loop bugfix \#599 [\#600](https://github.com/nabeelio/phpvms/pull/600)
+- Table prefixes not being added to indexes [\#597](https://github.com/nabeelio/phpvms/pull/597)
+- Import expense and ledger entries \#443 [\#588](https://github.com/nabeelio/phpvms/pull/588)
+- User country mapping; ignore unused groups \#443  [\#584](https://github.com/nabeelio/phpvms/pull/584)
+- Change fuel used to optional \#512 [\#582](https://github.com/nabeelio/phpvms/pull/582)
+- Respect home hubs setting for registration \#580 [\#581](https://github.com/nabeelio/phpvms/pull/581)
+- Upstream null version; build version tags not being saved properly \#575 [\#578](https://github.com/nabeelio/phpvms/pull/578)
+- Fix edit pilot error \(Facade\Utils missing\) \#576 [\#577](https://github.com/nabeelio/phpvms/pull/577)
+- Upsert on ACARS positions \#572 [\#573](https://github.com/nabeelio/phpvms/pull/573)
+- Fix the namespace path on updater templates \#570 [\#571](https://github.com/nabeelio/phpvms/pull/571)
+- Route not found error for Pirep::resource\(\) call \#559 [\#565](https://github.com/nabeelio/phpvms/pull/565)
+- Add extra check for $acars being set \#560 [\#563](https://github.com/nabeelio/phpvms/pull/563)
+- Missing $subfleet error on bids page \#561 [\#562](https://github.com/nabeelio/phpvms/pull/562)
+- Refresh theme cache on settings page load \#554 [\#557](https://github.com/nabeelio/phpvms/pull/557)
+- Fix migrations when table prefix is involved \#442 [\#555](https://github.com/nabeelio/phpvms/pull/555)
+- Use optional\(\) around the airport fields [\#537](https://github.com/nabeelio/phpvms/pull/537)
+- PIREPS resource except for show [\#536](https://github.com/nabeelio/phpvms/pull/536)
+- Fix import during flight cron \#532 [\#535](https://github.com/nabeelio/phpvms/pull/535)
+- Fix PIREP edit endpoint [\#534](https://github.com/nabeelio/phpvms/pull/534)
+- Add a public\_url\(\) helper \#513 [\#519](https://github.com/nabeelio/phpvms/pull/519)
+- Correct text for no subfleets \#507 [\#518](https://github.com/nabeelio/phpvms/pull/518)
+- Error page not showing when database isn't configured [\#517](https://github.com/nabeelio/phpvms/pull/517)
+- Check user permissions on the routes \#508 [\#516](https://github.com/nabeelio/phpvms/pull/516)
+- Show admin dropdown for admin-access ability [\#515](https://github.com/nabeelio/phpvms/pull/515)
+- New subfleet not being attached to an airline on import \#479 [\#505](https://github.com/nabeelio/phpvms/pull/505)
+- Importing not updating existing items \#486 [\#503](https://github.com/nabeelio/phpvms/pull/503)
+- Set a default model value for airports on PIREP [\#500](https://github.com/nabeelio/phpvms/pull/500)
+- Fix GeoService errors when viewing PIREP \#498 [\#499](https://github.com/nabeelio/phpvms/pull/499)
+- Properly set the distance/planned\_distance [\#497](https://github.com/nabeelio/phpvms/pull/497)
+- 491 Installation Error [\#495](https://github.com/nabeelio/phpvms/pull/495)
+- Return the flight fares if there are no subfleet fares \#488 [\#489](https://github.com/nabeelio/phpvms/pull/489)
+- Error if there are no roles when editing a user \#480 [\#483](https://github.com/nabeelio/phpvms/pull/483)
+- Allow nullable field and calculate distance if nulled [\#482](https://github.com/nabeelio/phpvms/pull/482)
+- Pilots cannot use the dashboard or flights without admin rights [\#481](https://github.com/nabeelio/phpvms/pull/481)
+- Fix BindingResolutionError when debug toolbar isn't present [\#465](https://github.com/nabeelio/phpvms/pull/465)
+- Fix CSV imports giving Storage class not found \#454 [\#462](https://github.com/nabeelio/phpvms/pull/462)
+- Use PhpExecutableFinder\(\) closes \#457 \#458 [\#460](https://github.com/nabeelio/phpvms/pull/460)
+- Avoid proc\_open use \#455 [\#456](https://github.com/nabeelio/phpvms/pull/456)
+- Stricter checks on ACARS API data [\#451](https://github.com/nabeelio/phpvms/pull/451)
+- Remove bootstrap cache [\#448](https://github.com/nabeelio/phpvms/pull/448)
+
+**Closed issues:**
+
+- Dashboard error when METAR visibility in KM [\#680](https://github.com/nabeelio/phpvms/issues/680)
+- Error adding multiple airlines without IATA codes [\#679](https://github.com/nabeelio/phpvms/issues/679)
+- Pages [\#641](https://github.com/nabeelio/phpvms/issues/641)
+- Create a "fare type" for cargo [\#621](https://github.com/nabeelio/phpvms/issues/621)
+- Split Sample module out into separate repo [\#593](https://github.com/nabeelio/phpvms/issues/593)
+- No way to add files to fleet [\#567](https://github.com/nabeelio/phpvms/issues/567)
+- Map Center Coords [\#566](https://github.com/nabeelio/phpvms/issues/566)
+- Pilot Profile Page Error [\#560](https://github.com/nabeelio/phpvms/issues/560)
+- File New Pirep [\#559](https://github.com/nabeelio/phpvms/issues/559)
+- I can't add new flight [\#558](https://github.com/nabeelio/phpvms/issues/558)
+- Pilot Pay route modifier [\#487](https://github.com/nabeelio/phpvms/issues/487)
+- Auto-update [\#449](https://github.com/nabeelio/phpvms/issues/449)
+- Setting to not automatically calculate distances [\#446](https://github.com/nabeelio/phpvms/issues/446)
+- Classic importer [\#443](https://github.com/nabeelio/phpvms/issues/443)
+- SimBrief integration - pirep prefile [\#405](https://github.com/nabeelio/phpvms/issues/405)
+- PIREP rejection doesn't move pilot back to previous airport [\#392](https://github.com/nabeelio/phpvms/issues/392)
+- Load Factor for flights [\#352](https://github.com/nabeelio/phpvms/issues/352)
+
+**Merged pull requests:**
+
+- Upgrade packages with security alerts [\#653](https://github.com/nabeelio/phpvms/pull/653)
+- Add public/private pages \#641 [\#644](https://github.com/nabeelio/phpvms/pull/644)
+- SimBrief integration \#405 [\#635](https://github.com/nabeelio/phpvms/pull/635)
+- Add fare type for pax/cargo/mixed flights \#621 [\#623](https://github.com/nabeelio/phpvms/pull/623)
+- Add fixed pilot pay for a flight \#487 [\#622](https://github.com/nabeelio/phpvms/pull/622)
+- Add load factor and variance to flights \#352 [\#620](https://github.com/nabeelio/phpvms/pull/620)
+- Module/plugin installation working \#593 [\#594](https://github.com/nabeelio/phpvms/pull/594)
+- Add Google Analytics tracking ID to settings and to main template \#382 [\#551](https://github.com/nabeelio/phpvms/pull/551)
+- Set expenses on specific flight types \#348 [\#549](https://github.com/nabeelio/phpvms/pull/549)
+- Auto update \#449 [\#545](https://github.com/nabeelio/phpvms/pull/545)
+- Auto-update functionality \#449 [\#544](https://github.com/nabeelio/phpvms/pull/544)
+- ACARS XML config file download [\#540](https://github.com/nabeelio/phpvms/pull/540)
+- Make the fuel used optional [\#512](https://github.com/nabeelio/phpvms/pull/512)
+- Add PHP 7.4 support [\#464](https://github.com/nabeelio/phpvms/pull/464)
+- Replace importer with AJAX powered; better error handling \#443 [\#447](https://github.com/nabeelio/phpvms/pull/447)
+- Fix missing newsRepo variable [\#445](https://github.com/nabeelio/phpvms/pull/445)
+- Refactor and add importer to Installer module \#443 [\#444](https://github.com/nabeelio/phpvms/pull/444)
+- 391 Notification refactorings [\#441](https://github.com/nabeelio/phpvms/pull/441)
+
+## [7.0.0-beta.3](https://github.com/nabeelio/phpvms/tree/7.0.0-beta.3) (2020-02-08)
+
+[Full Changelog](https://github.com/nabeelio/phpvms/compare/7.0.0-beta.2...7.0.0-beta.3)
+
+**Implemented enhancements:**
+
+- Fix formatting in blade files [\#530](https://github.com/nabeelio/phpvms/issues/530)
+- Make PIREP view page public [\#525](https://github.com/nabeelio/phpvms/issues/525)
+- Fix map line colors [\#523](https://github.com/nabeelio/phpvms/issues/523)
+- Null-able fuel values on PIREP [\#510](https://github.com/nabeelio/phpvms/issues/510)
+- include subfleet in search options [\#484](https://github.com/nabeelio/phpvms/issues/484)
+- PHP 7.4 in Travis [\#463](https://github.com/nabeelio/phpvms/issues/463)
+- Move cron problem report to main page [\#458](https://github.com/nabeelio/phpvms/issues/458)
+
+**Fixed bugs:**
+
+- Method GET for /pireps/\<id\>/edit not supported [\#533](https://github.com/nabeelio/phpvms/issues/533)
+- Cron error for removing expired flights [\#532](https://github.com/nabeelio/phpvms/issues/532)
+- Live map marker click not working [\#527](https://github.com/nabeelio/phpvms/issues/527)
+- Redirect to installer properly [\#513](https://github.com/nabeelio/phpvms/issues/513)
+- Admin panel link not shown for users in role group [\#509](https://github.com/nabeelio/phpvms/issues/509)
+- Users without "admin" role can modify roles [\#508](https://github.com/nabeelio/phpvms/issues/508)
+- Edit flights page - text error [\#507](https://github.com/nabeelio/phpvms/issues/507)
+- Installation error with external databases [\#494](https://github.com/nabeelio/phpvms/issues/494)
+- Pirep not in KG [\#493](https://github.com/nabeelio/phpvms/issues/493)
+- Installation Error step2 [\#491](https://github.com/nabeelio/phpvms/issues/491)
+- Fares assigned to flights not working/overwritten by Subfleet [\#488](https://github.com/nabeelio/phpvms/issues/488)
+- Status not changing when importing CSV for aircraft [\#486](https://github.com/nabeelio/phpvms/issues/486)
+- Default Theme unusable on Mobile [\#485](https://github.com/nabeelio/phpvms/issues/485)
+- Fatal Error in subfleet page when importing routes with new aircraft [\#479](https://github.com/nabeelio/phpvms/issues/479)
+- Flights CSV import fails if no distance stipulated [\#478](https://github.com/nabeelio/phpvms/issues/478)
+- Subfleet CSV import [\#476](https://github.com/nabeelio/phpvms/issues/476)
+- Cron - DateTime::construct\(\) expects parameter 2 to be DateTimeZone, int given [\#461](https://github.com/nabeelio/phpvms/issues/461)
+- if PHP\_CLI not found in cron maintenance, put generic `php` exec there [\#457](https://github.com/nabeelio/phpvms/issues/457)
+- Importing schedule bug [\#454](https://github.com/nabeelio/phpvms/issues/454)
+- The updater/installer should clear all caches [\#408](https://github.com/nabeelio/phpvms/issues/408)
+
+**Closed issues:**
+
+- Error 500 when trying to access Dashboard. [\#498](https://github.com/nabeelio/phpvms/issues/498)
+- Import multiple aircraft of different subtypes in one sheet [\#477](https://github.com/nabeelio/phpvms/issues/477)
+- Split out installer/importer from updater [\#453](https://github.com/nabeelio/phpvms/issues/453)
+- ACARS update fields can be nulled [\#450](https://github.com/nabeelio/phpvms/issues/450)
+- Retryable HTTP client [\#430](https://github.com/nabeelio/phpvms/issues/430)
+- Pireps page: 'Pending' doesn't show pending PIREPs [\#427](https://github.com/nabeelio/phpvms/issues/427)
+- Email when news sent out [\#391](https://github.com/nabeelio/phpvms/issues/391)
+- Save cron last run time [\#386](https://github.com/nabeelio/phpvms/issues/386)
+
+**Merged pull requests:**
+
+- 7.0.0-beta3 Release [\#541](https://github.com/nabeelio/phpvms/pull/541)
+
+## [7.0.0-beta.2](https://github.com/nabeelio/phpvms/tree/7.0.0-beta.2) (2019-11-19)
+
+[Full Changelog](https://github.com/nabeelio/phpvms/compare/v7.0.0-beta...7.0.0-beta.2)
+
+**Implemented enhancements:**
+
+- CSS Love needed for the Flights Page  [\#418](https://github.com/nabeelio/phpvms/issues/418)
+- Add Subfleet, Custom Fields and Fares during initial schedule entry [\#410](https://github.com/nabeelio/phpvms/issues/410)
+- PIREP from flight/bid; orig: Bid not removed after flight accepted [\#406](https://github.com/nabeelio/phpvms/issues/406)
+- Auto airport lookup [\#404](https://github.com/nabeelio/phpvms/issues/404)
+- API Changes [\#389](https://github.com/nabeelio/phpvms/issues/389)
+- "Maintenance" section in admin [\#376](https://github.com/nabeelio/phpvms/issues/376)
+- Auto-calculate Distance on Add Flight page [\#355](https://github.com/nabeelio/phpvms/issues/355)
+- Change PIREP fuel field type [\#340](https://github.com/nabeelio/phpvms/issues/340)
+- Fuel in pireps [\#295](https://github.com/nabeelio/phpvms/issues/295)
+- Add field to set aircraft location [\#277](https://github.com/nabeelio/phpvms/issues/277)
+- Suggestion: edit pilot ID [\#265](https://github.com/nabeelio/phpvms/issues/265)
+- Combine subfleet and aircraft export [\#233](https://github.com/nabeelio/phpvms/issues/233)
+- Allow URL for downloads [\#229](https://github.com/nabeelio/phpvms/issues/229)
+- Move settings into database seeder [\#224](https://github.com/nabeelio/phpvms/issues/224)
+- Allow specifying transfer hours on registration [\#129](https://github.com/nabeelio/phpvms/issues/129)
+- Backend changes separating id from pilot\_id [\#324](https://github.com/nabeelio/phpvms/pull/324)
+
+**Fixed bugs:**
+
+- Flight ID's and Airport ICAO's not clickable on airport page [\#419](https://github.com/nabeelio/phpvms/issues/419)
+- Distance lookup needs bcmath extension [\#407](https://github.com/nabeelio/phpvms/issues/407)
+- Missing flight level field on frontend [\#401](https://github.com/nabeelio/phpvms/issues/401)
+- Set distance to 0 if no value [\#400](https://github.com/nabeelio/phpvms/issues/400)
+- Upload livery via admin [\#398](https://github.com/nabeelio/phpvms/issues/398)
+- Block deleting airline if there are assets associated with it [\#367](https://github.com/nabeelio/phpvms/issues/367)
+- Cron not calculating number of flights [\#357](https://github.com/nabeelio/phpvms/issues/357)
+- Error Seeing data of pilot profile [\#351](https://github.com/nabeelio/phpvms/issues/351)
+- Fresh install doesn't create rank [\#346](https://github.com/nabeelio/phpvms/issues/346)
+- Fuel cost only allows whole numbers for price [\#342](https://github.com/nabeelio/phpvms/issues/342)
+- API calls in subfolder going to root domain [\#339](https://github.com/nabeelio/phpvms/issues/339)
+- Errors versión 7.0.0 \(compilación 181025-6f7735\) [\#332](https://github.com/nabeelio/phpvms/issues/332)
+- Error on Install [\#303](https://github.com/nabeelio/phpvms/issues/303)
+- Having a "Error 505" when trying to install PHPVMS [\#302](https://github.com/nabeelio/phpvms/issues/302)
+- Error when viewing profile or trying to add flights [\#291](https://github.com/nabeelio/phpvms/issues/291)
+- "Hubs as home airport" doesn't work [\#288](https://github.com/nabeelio/phpvms/issues/288)
+- Undocumented Extension Required - PHP 7.2 GMP [\#285](https://github.com/nabeelio/phpvms/issues/285)
+- ErrorException  Trying to get property 'name' of non-object [\#281](https://github.com/nabeelio/phpvms/issues/281)
+
+**Closed issues:**
+
+- Add settings.yaml changes to update available check [\#437](https://github.com/nabeelio/phpvms/issues/437)
+- Write current version to DB [\#428](https://github.com/nabeelio/phpvms/issues/428)
+- Message for configuring cron [\#424](https://github.com/nabeelio/phpvms/issues/424)
+- Opt in for telemetry on install [\#415](https://github.com/nabeelio/phpvms/issues/415)
+- Error when saving a PIREP without filling some fields and attempting to edit it [\#414](https://github.com/nabeelio/phpvms/issues/414)
+- Update htaccess file [\#412](https://github.com/nabeelio/phpvms/issues/412)
+- Allow typing in drop down menus [\#409](https://github.com/nabeelio/phpvms/issues/409)
+- Malformed email error on file [\#402](https://github.com/nabeelio/phpvms/issues/402)
+- Residual design issues from Bootstrap update [\#397](https://github.com/nabeelio/phpvms/issues/397)
+- Don't allow PIREP cancel if not in PENDING phase [\#395](https://github.com/nabeelio/phpvms/issues/395)
+- Pageable Criteria [\#390](https://github.com/nabeelio/phpvms/issues/390)
+- Update CSS Libraries [\#387](https://github.com/nabeelio/phpvms/issues/387)
+- Laravel 6 [\#384](https://github.com/nabeelio/phpvms/issues/384)
+- Profile menu dropdown [\#383](https://github.com/nabeelio/phpvms/issues/383)
+- Update vaCentral Library [\#380](https://github.com/nabeelio/phpvms/issues/380)
+- Implement Laravel 5.7 Notifications [\#378](https://github.com/nabeelio/phpvms/issues/378)
+- Generate random cache prefix on install [\#374](https://github.com/nabeelio/phpvms/issues/374)
+- Move transaction/journal code out of controller [\#370](https://github.com/nabeelio/phpvms/issues/370)
+- Add Contract for Airport information lookup [\#363](https://github.com/nabeelio/phpvms/issues/363)
+- RFC7807 - Standardize API error messages [\#361](https://github.com/nabeelio/phpvms/issues/361)
+- Imposible delete bid [\#360](https://github.com/nabeelio/phpvms/issues/360)
+- Change theme from settings [\#359](https://github.com/nabeelio/phpvms/issues/359)
+- Integration with PACX \[Feature\] [\#338](https://github.com/nabeelio/phpvms/issues/338)
+- Why don't you create a free ACARS for PHPVMS7 testing? [\#336](https://github.com/nabeelio/phpvms/issues/336)
+- Error add Roles [\#334](https://github.com/nabeelio/phpvms/issues/334)
+- Error during installation [\#333](https://github.com/nabeelio/phpvms/issues/333)
+- spatie - laravel-backup [\#330](https://github.com/nabeelio/phpvms/issues/330)
+- Refactor data seeding [\#329](https://github.com/nabeelio/phpvms/issues/329)
+- Notify/download latest version file as part of cron [\#327](https://github.com/nabeelio/phpvms/issues/327)
+- Notify if migration/updates are pending [\#326](https://github.com/nabeelio/phpvms/issues/326)
+- PIREP ID change [\#318](https://github.com/nabeelio/phpvms/issues/318)
+- Missing folders on install [\#316](https://github.com/nabeelio/phpvms/issues/316)
+- Pull in VMACars plugin [\#315](https://github.com/nabeelio/phpvms/issues/315)
+- Account for fuel in the finances [\#313](https://github.com/nabeelio/phpvms/issues/313)
+- Show module in the external website [\#310](https://github.com/nabeelio/phpvms/issues/310)
+- Profile picture distorted [\#309](https://github.com/nabeelio/phpvms/issues/309)
+- Implement cachable in models [\#307](https://github.com/nabeelio/phpvms/issues/307)
+- update [\#305](https://github.com/nabeelio/phpvms/issues/305)
+- Error with installer - Permission  denied [\#298](https://github.com/nabeelio/phpvms/issues/298)
+- No Staff Groups/ Authorised Permissions [\#296](https://github.com/nabeelio/phpvms/issues/296)
+- .css and .js 404 [\#294](https://github.com/nabeelio/phpvms/issues/294)
+- Error on Install [\#292](https://github.com/nabeelio/phpvms/issues/292)
+- Ability to change interval of cron jobs [\#289](https://github.com/nabeelio/phpvms/issues/289)
+- ACARS  api add response [\#287](https://github.com/nabeelio/phpvms/issues/287)
+- No bids returned in json [\#286](https://github.com/nabeelio/phpvms/issues/286)
+- Importing \*.csv with special characters [\#282](https://github.com/nabeelio/phpvms/issues/282)
+- laravel-theme doesn't seem to be respecting the theme.json extends [\#279](https://github.com/nabeelio/phpvms/issues/279)
+- Flight for current location not being restricted [\#263](https://github.com/nabeelio/phpvms/issues/263)
+- Self diagnosis [\#253](https://github.com/nabeelio/phpvms/issues/253)
+- Add /api/pireps/validate endpoint [\#247](https://github.com/nabeelio/phpvms/issues/247)
+- Cosmetic issues [\#245](https://github.com/nabeelio/phpvms/issues/245)
+- GDPR Compliance [\#244](https://github.com/nabeelio/phpvms/issues/244)
+- Read all settings into the page session [\#243](https://github.com/nabeelio/phpvms/issues/243)
+- Open Airspace [\#241](https://github.com/nabeelio/phpvms/issues/241)
+- Option to cancel PIREP [\#238](https://github.com/nabeelio/phpvms/issues/238)
+- Navdata sources [\#231](https://github.com/nabeelio/phpvms/issues/231)
+- Refactor export, use streamed response [\#227](https://github.com/nabeelio/phpvms/issues/227)
+- Add expense multiplier to subfleet [\#206](https://github.com/nabeelio/phpvms/issues/206)
+- Expenses [\#136](https://github.com/nabeelio/phpvms/issues/136)
+- Finances [\#130](https://github.com/nabeelio/phpvms/issues/130)
+- phpVMS Classic Importer [\#114](https://github.com/nabeelio/phpvms/issues/114)
+- Setup cron tasks [\#95](https://github.com/nabeelio/phpvms/issues/95)
+- Warning in admin if Installer module is still present [\#77](https://github.com/nabeelio/phpvms/issues/77)
+- flight planning [\#60](https://github.com/nabeelio/phpvms/issues/60)
+
+**Merged pull requests:**
+
+- Merge 7.0.0-beta.2 to master [\#440](https://github.com/nabeelio/phpvms/pull/440)
+- Refactor the upgrade pending check to see if there are settings/permi… [\#438](https://github.com/nabeelio/phpvms/pull/438)
+- Fixes [\#435](https://github.com/nabeelio/phpvms/pull/435)
+- \#406 Refactor bids [\#432](https://github.com/nabeelio/phpvms/pull/432)
+- fixes for issue \#419 [\#429](https://github.com/nabeelio/phpvms/pull/429)
+- Wrap values in travis env [\#426](https://github.com/nabeelio/phpvms/pull/426)
+- Show a message about setting up the cron and if there was an error ru… [\#425](https://github.com/nabeelio/phpvms/pull/425)
+- 359 Select theme in settings [\#423](https://github.com/nabeelio/phpvms/pull/423)
+- Fix blank aircraft field causing error closes \#414 [\#422](https://github.com/nabeelio/phpvms/pull/422)
+- Bundle CSS changes [\#421](https://github.com/nabeelio/phpvms/pull/421)
+- Some minor CSS fixes as discussed on Discord [\#420](https://github.com/nabeelio/phpvms/pull/420)
+- Move telemetry option into settings; checkbox in install refs \#415 [\#416](https://github.com/nabeelio/phpvms/pull/416)
+- Issue fixes [\#413](https://github.com/nabeelio/phpvms/pull/413)
+- Catch error messages in notifying [\#403](https://github.com/nabeelio/phpvms/pull/403)
+- Design and file upload issues [\#399](https://github.com/nabeelio/phpvms/pull/399)
+- Don't allow cancels from certain states [\#396](https://github.com/nabeelio/phpvms/pull/396)
+- Fix map checkout call [\#394](https://github.com/nabeelio/phpvms/pull/394)
+- 389 API Changes [\#393](https://github.com/nabeelio/phpvms/pull/393)
+- CSS Libraries and style updates [\#388](https://github.com/nabeelio/phpvms/pull/388)
+- 384 Laravel 6 changes [\#385](https://github.com/nabeelio/phpvms/pull/385)
+- 380 vacentral library [\#381](https://github.com/nabeelio/phpvms/pull/381)
+- Use Notification/Notifiable [\#379](https://github.com/nabeelio/phpvms/pull/379)
+- Add maintenance section to admin, clear caches \#376 [\#377](https://github.com/nabeelio/phpvms/pull/377)
+- Refactor all JS API calls \#360 [\#375](https://github.com/nabeelio/phpvms/pull/375)
+- Set the baseURL for ajax requests [\#373](https://github.com/nabeelio/phpvms/pull/373)
+- Move airline transaction code into service layer [\#371](https://github.com/nabeelio/phpvms/pull/371)
+- 229 url for downloads [\#369](https://github.com/nabeelio/phpvms/pull/369)
+- \#355 Calculate distance button [\#366](https://github.com/nabeelio/phpvms/pull/366)
+- Add Contract interface for airport lookup functionality [\#365](https://github.com/nabeelio/phpvms/pull/365)
+- Refactor error handling internally to follow RFC7807 [\#362](https://github.com/nabeelio/phpvms/pull/362)
+- Additional logging for the stats recalculation [\#358](https://github.com/nabeelio/phpvms/pull/358)
+- Add missing expiry time for PIREP API [\#356](https://github.com/nabeelio/phpvms/pull/356)
+- Fix/metar reading [\#354](https://github.com/nabeelio/phpvms/pull/354)
+- Fix/metar reading [\#353](https://github.com/nabeelio/phpvms/pull/353)
+- Add setting to include transfer hours in calculations [\#350](https://github.com/nabeelio/phpvms/pull/350)
+- Remove ext-cal from requirements list [\#349](https://github.com/nabeelio/phpvms/pull/349)
+- Multiple ticket crash fixes [\#347](https://github.com/nabeelio/phpvms/pull/347)
+- Issue/327 versioning [\#345](https://github.com/nabeelio/phpvms/pull/345)
+- Update issue templates [\#344](https://github.com/nabeelio/phpvms/pull/344)
+- Add step fields to enable decimal points on fields \#342 [\#343](https://github.com/nabeelio/phpvms/pull/343)
+- Issue fixes [\#341](https://github.com/nabeelio/phpvms/pull/341)
+- Issue/329 refactor seeding [\#337](https://github.com/nabeelio/phpvms/pull/337)
+- Fix issue where user stats aren't incremented on PIREP auto accept [\#335](https://github.com/nabeelio/phpvms/pull/335)
+- Account for fuel in the finance calculations \#313 [\#331](https://github.com/nabeelio/phpvms/pull/331)
+- Middleware to detect is update is pending; move Routes into HTTP [\#328](https://github.com/nabeelio/phpvms/pull/328)
+- Change exporter to use utf-8 close \#282 [\#325](https://github.com/nabeelio/phpvms/pull/325)
+- Rename Interfaces to Contracts to better match Laravel conventions [\#323](https://github.com/nabeelio/phpvms/pull/323)
+- Cleanup SI Unit classes; METAR fixes [\#322](https://github.com/nabeelio/phpvms/pull/322)
+- Bump lodash from 4.17.11 to 4.17.13 [\#321](https://github.com/nabeelio/phpvms/pull/321)
+- Update composer library versions [\#320](https://github.com/nabeelio/phpvms/pull/320)
+- Add missing folders under storage/public \#316 [\#319](https://github.com/nabeelio/phpvms/pull/319)
+- Add interface to additional roles/permissions \#296 [\#314](https://github.com/nabeelio/phpvms/pull/314)
+- Fix pax count fields; add fuel used field \#295 [\#312](https://github.com/nabeelio/phpvms/pull/312)
+- Apply fixes from StyleCI [\#311](https://github.com/nabeelio/phpvms/pull/311)
+- Laravel 5.8 Update [\#308](https://github.com/nabeelio/phpvms/pull/308)
+- Add more search criteria/dev environment via docker-compose \#297 [\#306](https://github.com/nabeelio/phpvms/pull/306)
+- Add gmp to requirements in install \#285 [\#301](https://github.com/nabeelio/phpvms/pull/301)
+- Revert "Update issue templates" [\#300](https://github.com/nabeelio/phpvms/pull/300)
+- Update issue templates [\#299](https://github.com/nabeelio/phpvms/pull/299)
+
+## [v7.0.0-beta](https://github.com/nabeelio/phpvms/tree/v7.0.0-beta) (2018-10-25)
+
+[Full Changelog](https://github.com/nabeelio/phpvms/compare/v7.0.0-alpha2...v7.0.0-beta)
+
+**Implemented enhancements:**
+
+- Follow flight checkbox on live map [\#246](https://github.com/nabeelio/phpvms/issues/246)
+- PIREP restrictions based on settings [\#221](https://github.com/nabeelio/phpvms/issues/221)
+- Save PIREP as draft [\#220](https://github.com/nabeelio/phpvms/issues/220)
+- Shorten fields on flights table [\#205](https://github.com/nabeelio/phpvms/issues/205)
+- Show bids in profile [\#203](https://github.com/nabeelio/phpvms/issues/203)
+- Don't change rank if current rank is higher than the one found [\#196](https://github.com/nabeelio/phpvms/issues/196)
+- pagination sizes [\#162](https://github.com/nabeelio/phpvms/issues/162)
+- Allow overriding templates [\#161](https://github.com/nabeelio/phpvms/issues/161)
+- Replace old pjax library with newer one [\#133](https://github.com/nabeelio/phpvms/issues/133)
+- Awards [\#113](https://github.com/nabeelio/phpvms/issues/113)
+- Setting to restrict airport selection to hubs [\#104](https://github.com/nabeelio/phpvms/issues/104)
+- Pilot leave status [\#96](https://github.com/nabeelio/phpvms/issues/96)
+- schedule import [\#15](https://github.com/nabeelio/phpvms/issues/15)
+
+**Fixed bugs:**
+
+- Error saving PIREP [\#252](https://github.com/nabeelio/phpvms/issues/252)
+- Updater with modules not working [\#249](https://github.com/nabeelio/phpvms/issues/249)
+- User registration country and timezone not saving [\#223](https://github.com/nabeelio/phpvms/issues/223)
+- Importer inserts invalid data on empty columns/rows [\#222](https://github.com/nabeelio/phpvms/issues/222)
+- Import/export - missing fields [\#219](https://github.com/nabeelio/phpvms/issues/219)
+- Country flag not showing on user list [\#218](https://github.com/nabeelio/phpvms/issues/218)
+- fares/subfleet unique field blocks saving [\#214](https://github.com/nabeelio/phpvms/issues/214)
+- module navigation not working \(admin\) [\#201](https://github.com/nabeelio/phpvms/issues/201)
+- Bid not removed when pirep if filled [\#200](https://github.com/nabeelio/phpvms/issues/200)
+- Not saving Flight Time [\#199](https://github.com/nabeelio/phpvms/issues/199)
+
+**Closed issues:**
+
+- SettingsController/Repo are saving as "on" instead of 1/true [\#272](https://github.com/nabeelio/phpvms/issues/272)
+- Auto Accept New Pilot isn't working [\#269](https://github.com/nabeelio/phpvms/issues/269)
+- Suggestion: button to copy aircraft [\#267](https://github.com/nabeelio/phpvms/issues/267)
+- Combine aircraft and subfleet import/export into one [\#256](https://github.com/nabeelio/phpvms/issues/256)
+- cron - recalculate hours [\#254](https://github.com/nabeelio/phpvms/issues/254)
+- Install Directory is missing from git repo  [\#251](https://github.com/nabeelio/phpvms/issues/251)
+- Warning: require\(C:\xampp\Virtual Airline Website\bootstrap/../vendor/autoload.php\): failed to open stream: No such file or directory in C:\xampp\Virtual Airline Website\bootstrap\autoload.php on line 17 [\#248](https://github.com/nabeelio/phpvms/issues/248)
+- Settings [\#239](https://github.com/nabeelio/phpvms/issues/239)
+- HTTP caching [\#237](https://github.com/nabeelio/phpvms/issues/237)
+- Module artisan command bug [\#234](https://github.com/nabeelio/phpvms/issues/234)
+- Add /api/news [\#232](https://github.com/nabeelio/phpvms/issues/232)
+- Start date/end date, along with day of week options [\#230](https://github.com/nabeelio/phpvms/issues/230)
+- Replace weather lookup [\#228](https://github.com/nabeelio/phpvms/issues/228)
+- File/avatar uploads [\#226](https://github.com/nabeelio/phpvms/issues/226)
+- Change fleet page to load subfleets first [\#217](https://github.com/nabeelio/phpvms/issues/217)
+- Add sort options [\#216](https://github.com/nabeelio/phpvms/issues/216)
+- Auto loader on Line 17 [\#215](https://github.com/nabeelio/phpvms/issues/215)
+- Add flight fields [\#213](https://github.com/nabeelio/phpvms/issues/213)
+- Recaptcha in registration [\#212](https://github.com/nabeelio/phpvms/issues/212)
+- Browser tests [\#211](https://github.com/nabeelio/phpvms/issues/211)
+- Axios HTTP library [\#210](https://github.com/nabeelio/phpvms/issues/210)
+- Replace skinning with laravel-theme [\#209](https://github.com/nabeelio/phpvms/issues/209)
+- Refactor getting expenses in FinanceData [\#208](https://github.com/nabeelio/phpvms/issues/208)
+- Change all money to hold in cents, not dollars [\#204](https://github.com/nabeelio/phpvms/issues/204)
+- Pilot pay - rank base and subfleet multiplier [\#197](https://github.com/nabeelio/phpvms/issues/197)
+- Flight schedule importer/exporter [\#194](https://github.com/nabeelio/phpvms/issues/194)
+- use find/replace in bootstrapWith\(\) call [\#163](https://github.com/nabeelio/phpvms/issues/163)
+- Awards [\#155](https://github.com/nabeelio/phpvms/issues/155)
+- System Changes/Additions [\#135](https://github.com/nabeelio/phpvms/issues/135)
+- Airport & Aircraft Changes [\#134](https://github.com/nabeelio/phpvms/issues/134)
+- Handle flight specific fares & multipliers [\#125](https://github.com/nabeelio/phpvms/issues/125)
+- Flight set day of week [\#122](https://github.com/nabeelio/phpvms/issues/122)
+- Airport page [\#85](https://github.com/nabeelio/phpvms/issues/85)
+- Bulk upload charts to airport [\#84](https://github.com/nabeelio/phpvms/issues/84)
+- Pull some values from existing .env file [\#79](https://github.com/nabeelio/phpvms/issues/79)
+- METAR Information [\#61](https://github.com/nabeelio/phpvms/issues/61)
+- flights page [\#57](https://github.com/nabeelio/phpvms/issues/57)
+- fuel costs to airports and fuel type on subfleet [\#41](https://github.com/nabeelio/phpvms/issues/41)
+- generate aircraft hex code on create [\#33](https://github.com/nabeelio/phpvms/issues/33)
+
+**Merged pull requests:**
+
+- More acceptable translation to opt-in \(es\) [\#284](https://github.com/nabeelio/phpvms/pull/284)
+- Fix 404s to requirements/setup in README.md [\#283](https://github.com/nabeelio/phpvms/pull/283)
+- Hide expired live flight from live map and remove from DB [\#280](https://github.com/nabeelio/phpvms/pull/280)
+- \[WIP\] Laravel 5.7 Update [\#278](https://github.com/nabeelio/phpvms/pull/278)
+- Make admin input outline darker [\#276](https://github.com/nabeelio/phpvms/pull/276)
+- capture & display pilot transfer hours [\#275](https://github.com/nabeelio/phpvms/pull/275)
+- Optimize query with eager loading [\#274](https://github.com/nabeelio/phpvms/pull/274)
+- Fix SettingsController saving boolean value as 'on' [\#273](https://github.com/nabeelio/phpvms/pull/273)
+- Hide inactive pilot from pilot list page [\#271](https://github.com/nabeelio/phpvms/pull/271)
+- Fix flight search restriction [\#270](https://github.com/nabeelio/phpvms/pull/270)
+- Apply fixes from StyleCI [\#268](https://github.com/nabeelio/phpvms/pull/268)
+- Fix METAR issue [\#264](https://github.com/nabeelio/phpvms/pull/264)
+- Apply fixes from StyleCI [\#262](https://github.com/nabeelio/phpvms/pull/262)
+- Apply fixes from StyleCI [\#261](https://github.com/nabeelio/phpvms/pull/261)
+- Enable eager loading [\#259](https://github.com/nabeelio/phpvms/pull/259)
+- Implement cron to remove expired bids [\#258](https://github.com/nabeelio/phpvms/pull/258)
+- Fix timezone list HTML Escaped [\#257](https://github.com/nabeelio/phpvms/pull/257)
+- Update 07/13/2018 es-translations [\#255](https://github.com/nabeelio/phpvms/pull/255)
+- ES translation [\#250](https://github.com/nabeelio/phpvms/pull/250)
+- flights filtered per va [\#242](https://github.com/nabeelio/phpvms/pull/242)
+- Avatar Issue [\#236](https://github.com/nabeelio/phpvms/pull/236)
+- Install bug [\#235](https://github.com/nabeelio/phpvms/pull/235)
+
+## [v7.0.0-alpha2](https://github.com/nabeelio/phpvms/tree/v7.0.0-alpha2) (2018-02-23)
+
+[Full Changelog](https://github.com/nabeelio/phpvms/compare/v7.0.0-alpha1...v7.0.0-alpha2)
+
+**Implemented enhancements:**
+
+- Get user PIREPs [\#192](https://github.com/nabeelio/phpvms/issues/192)
+- Use time conversion class [\#190](https://github.com/nabeelio/phpvms/issues/190)
+- Require inputs in Imperial units [\#189](https://github.com/nabeelio/phpvms/issues/189)
+- Make planned\_distance in prefile optional [\#185](https://github.com/nabeelio/phpvms/issues/185)
+- If there's no /pirep/route calls, when it's filed, write the route [\#184](https://github.com/nabeelio/phpvms/issues/184)
+- Create a /api/flight/{id}/route call [\#183](https://github.com/nabeelio/phpvms/issues/183)
+- Make all APIs behind auth [\#173](https://github.com/nabeelio/phpvms/issues/173)
+- Add bid [\#172](https://github.com/nabeelio/phpvms/issues/172)
+- Setting for only showing aircraft that are at the departure airport [\#171](https://github.com/nabeelio/phpvms/issues/171)
+- Font for input [\#169](https://github.com/nabeelio/phpvms/issues/169)
+- Read default value from settings table [\#106](https://github.com/nabeelio/phpvms/issues/106)
+
+**Fixed bugs:**
+
+- Volume units to lbs/kg, not gal/liter [\#193](https://github.com/nabeelio/phpvms/issues/193)
+- Add country to airline missing [\#191](https://github.com/nabeelio/phpvms/issues/191)
+- SKIN\_NAME missing on error pages [\#187](https://github.com/nabeelio/phpvms/issues/187)
+- Airport timezone not being saved [\#182](https://github.com/nabeelio/phpvms/issues/182)
+- Rank checkboxes not being saved [\#181](https://github.com/nabeelio/phpvms/issues/181)
+- Make sure cancelled PIREPs don't show [\#180](https://github.com/nabeelio/phpvms/issues/180)
+- Ignore cancelled PIREPs in duplicate check [\#179](https://github.com/nabeelio/phpvms/issues/179)
+- Make sure all fields are returned in PIREP object [\#178](https://github.com/nabeelio/phpvms/issues/178)
+- autopopulate SOURCE field in ACARS [\#177](https://github.com/nabeelio/phpvms/issues/177)
+- Make sure pireps.restrict\_aircraft\_to\_rank is respected [\#170](https://github.com/nabeelio/phpvms/issues/170)
+- Don't change rank if current rank is non-auto promoting [\#168](https://github.com/nabeelio/phpvms/issues/168)
+- PIREP hours can't be changed [\#167](https://github.com/nabeelio/phpvms/issues/167)
+- Changing a flight status does not save [\#150](https://github.com/nabeelio/phpvms/issues/150)
+- Additional PIREP fields don't save correctly [\#146](https://github.com/nabeelio/phpvms/issues/146)
+
+**Closed issues:**
+
+- Cleanup icons [\#195](https://github.com/nabeelio/phpvms/issues/195)
+- remove raw\_data field from pirep table [\#188](https://github.com/nabeelio/phpvms/issues/188)
+- Remove Resource::withoutWrapping\(\) to follow jsonapi spec [\#186](https://github.com/nabeelio/phpvms/issues/186)
+- Add an `artisan phpvms:dev-install` command [\#176](https://github.com/nabeelio/phpvms/issues/176)
+- Pagination settings [\#175](https://github.com/nabeelio/phpvms/issues/175)
+- Implement setting for flights at pilot's current airport [\#174](https://github.com/nabeelio/phpvms/issues/174)
+- Minimum PHP supported version to 7.1 [\#166](https://github.com/nabeelio/phpvms/issues/166)
+- Update to Laravel 5.6 [\#165](https://github.com/nabeelio/phpvms/issues/165)
+- Updater [\#164](https://github.com/nabeelio/phpvms/issues/164)
+- Allow adding rank in subfleet page [\#160](https://github.com/nabeelio/phpvms/issues/160)
+- Docs [\#153](https://github.com/nabeelio/phpvms/issues/153)
+
+## [v7.0.0-alpha1](https://github.com/nabeelio/phpvms/tree/v7.0.0-alpha1) (2018-02-04)
+
+[Full Changelog](https://github.com/nabeelio/phpvms/compare/f158c11dea7c0a4af27c93382333b67fdc531e3a...v7.0.0-alpha1)
+
+**Implemented enhancements:**
+
+- Widgetized components [\#127](https://github.com/nabeelio/phpvms/issues/127)
+- Set aircraft location on landing [\#112](https://github.com/nabeelio/phpvms/issues/112)
+- save user IP on login [\#110](https://github.com/nabeelio/phpvms/issues/110)
+- When rejecting PIREP, add a comment/reason [\#107](https://github.com/nabeelio/phpvms/issues/107)
+- Check for duplicate PIREPs and add setting [\#105](https://github.com/nabeelio/phpvms/issues/105)
+- create vendor.js with webpack [\#91](https://github.com/nabeelio/phpvms/issues/91)
+- move from bower to webpack [\#90](https://github.com/nabeelio/phpvms/issues/90)
+- Pilots list and profile [\#82](https://github.com/nabeelio/phpvms/issues/82)
+- pirep auto-accept for certain rankings [\#24](https://github.com/nabeelio/phpvms/issues/24)
+- Investigate removing the Repository pattern to simplify [\#6](https://github.com/nabeelio/phpvms/issues/6)
+
+**Fixed bugs:**
+
+- Error when sending /api/pireps/prefile [\#149](https://github.com/nabeelio/phpvms/issues/149)
+- Extra numbers on flights page [\#148](https://github.com/nabeelio/phpvms/issues/148)
+- Unable to select any aircraft from fleet on file PIREP page [\#147](https://github.com/nabeelio/phpvms/issues/147)
+- Error thrown when editing a saved flight [\#145](https://github.com/nabeelio/phpvms/issues/145)
+- When you delete flight from admin, filed pirep will throw error [\#144](https://github.com/nabeelio/phpvms/issues/144)
+- Avoid calling MySQL executable for creating database [\#132](https://github.com/nabeelio/phpvms/issues/132)
+- Aircraft can be added without specifying a subfleet [\#128](https://github.com/nabeelio/phpvms/issues/128)
+- Non error flash messages not showing [\#126](https://github.com/nabeelio/phpvms/issues/126)
+- Removing subfleet from flight [\#124](https://github.com/nabeelio/phpvms/issues/124)
+- User still has API access if they're not ACTIVE [\#119](https://github.com/nabeelio/phpvms/issues/119)
+- Delete bids when flight is deleted [\#103](https://github.com/nabeelio/phpvms/issues/103)
+- JSON error messages [\#92](https://github.com/nabeelio/phpvms/issues/92)
+- add subfleet to flight broken [\#88](https://github.com/nabeelio/phpvms/issues/88)
+- logout functionality not working from frontpage [\#26](https://github.com/nabeelio/phpvms/issues/26)
+
+**Closed issues:**
+
+- `fuel\_used` in pirep/file [\#159](https://github.com/nabeelio/phpvms/issues/159)
+- Add additional fields for PIREP and flights [\#158](https://github.com/nabeelio/phpvms/issues/158)
+- Stub file [\#157](https://github.com/nabeelio/phpvms/issues/157)
+- Add config.php in root on install [\#156](https://github.com/nabeelio/phpvms/issues/156)
+- New registrations are auto-accepted and put as active [\#151](https://github.com/nabeelio/phpvms/issues/151)
+- new version alert [\#143](https://github.com/nabeelio/phpvms/issues/143)
+- Footer copyright text [\#142](https://github.com/nabeelio/phpvms/issues/142)
+- Version build number to use string/assigned date [\#141](https://github.com/nabeelio/phpvms/issues/141)
+- Handle duplicate flight number [\#139](https://github.com/nabeelio/phpvms/issues/139)
+- Restrict shown aircraft to user's rank [\#138](https://github.com/nabeelio/phpvms/issues/138)
+- Docs [\#137](https://github.com/nabeelio/phpvms/issues/137)
+- Checksum for tarball [\#123](https://github.com/nabeelio/phpvms/issues/123)
+- API Items need [\#120](https://github.com/nabeelio/phpvms/issues/120)
+- ACARS API [\#118](https://github.com/nabeelio/phpvms/issues/118)
+- List of cron jobs required [\#117](https://github.com/nabeelio/phpvms/issues/117)
+- Add create/edit fields for columns [\#111](https://github.com/nabeelio/phpvms/issues/111)
+- Add PIREP cancel endpoint and cleanup job [\#109](https://github.com/nabeelio/phpvms/issues/109)
+- ACARS table should save the route [\#102](https://github.com/nabeelio/phpvms/issues/102)
+- /api/fleet and /api/user/fleet [\#101](https://github.com/nabeelio/phpvms/issues/101)
+- Assign subfleets to ranks [\#100](https://github.com/nabeelio/phpvms/issues/100)
+- show dates/times in proper timezone [\#97](https://github.com/nabeelio/phpvms/issues/97)
+- editable fields not working [\#94](https://github.com/nabeelio/phpvms/issues/94)
+- Settings page needs to be completed [\#93](https://github.com/nabeelio/phpvms/issues/93)
+- Airport page pagination & search [\#87](https://github.com/nabeelio/phpvms/issues/87)
+- Mark airport as hub [\#86](https://github.com/nabeelio/phpvms/issues/86)
+- Terms and Conditions & COPPA during registration [\#81](https://github.com/nabeelio/phpvms/issues/81)
+- Look at alternative to Entrust [\#78](https://github.com/nabeelio/phpvms/issues/78)
+- Check if .env file exists in installer [\#76](https://github.com/nabeelio/phpvms/issues/76)
+- upload travis artifact to phpvms ftp as "latest.zip" [\#75](https://github.com/nabeelio/phpvms/issues/75)
+- Track hours on airframes [\#73](https://github.com/nabeelio/phpvms/issues/73)
+- PIREP accept/reject in admin should call PIREP service [\#72](https://github.com/nabeelio/phpvms/issues/72)
+- Error with MySQL syntax when creating database. [\#71](https://github.com/nabeelio/phpvms/issues/71)
+- pirep comments [\#70](https://github.com/nabeelio/phpvms/issues/70)
+- findWithoutFail Method does not exist [\#69](https://github.com/nabeelio/phpvms/issues/69)
+- Commit error 403 [\#67](https://github.com/nabeelio/phpvms/issues/67)
+- Keep Showing 404.... [\#66](https://github.com/nabeelio/phpvms/issues/66)
+- wrap migrate command [\#65](https://github.com/nabeelio/phpvms/issues/65)
+- Create 404 page [\#63](https://github.com/nabeelio/phpvms/issues/63)
+- link to admin in nav if you have permissions [\#62](https://github.com/nabeelio/phpvms/issues/62)
+- Error while creating database [\#56](https://github.com/nabeelio/phpvms/issues/56)
+- shared hosting stuff [\#55](https://github.com/nabeelio/phpvms/issues/55)
+- gravatar url for profile [\#54](https://github.com/nabeelio/phpvms/issues/54)
+- news and notams module [\#52](https://github.com/nabeelio/phpvms/issues/52)
+- try atoum vs phpunit [\#51](https://github.com/nabeelio/phpvms/issues/51)
+- Cache Airports calls [\#49](https://github.com/nabeelio/phpvms/issues/49)
+- add custom fields table for flights [\#48](https://github.com/nabeelio/phpvms/issues/48)
+- Events system [\#43](https://github.com/nabeelio/phpvms/issues/43)
+- add fuel costs types to the airports table [\#40](https://github.com/nabeelio/phpvms/issues/40)
+- adjust "created" date for airline [\#39](https://github.com/nabeelio/phpvms/issues/39)
+- add gross\_weight to PIREPs [\#38](https://github.com/nabeelio/phpvms/issues/38)
+- subfleet to flight pivot values [\#37](https://github.com/nabeelio/phpvms/issues/37)
+- API authentication/middleware [\#36](https://github.com/nabeelio/phpvms/issues/36)
+- REST API [\#35](https://github.com/nabeelio/phpvms/issues/35)
+- use uuids on a few tables [\#34](https://github.com/nabeelio/phpvms/issues/34)
+- subfleet \(ranks, expenses\) [\#32](https://github.com/nabeelio/phpvms/issues/32)
+- How to install this? [\#31](https://github.com/nabeelio/phpvms/issues/31)
+- experiment with changing PDO mode [\#30](https://github.com/nabeelio/phpvms/issues/30)
+- forgot password [\#27](https://github.com/nabeelio/phpvms/issues/27)
+- rankings [\#23](https://github.com/nabeelio/phpvms/issues/23)
+- module system [\#22](https://github.com/nabeelio/phpvms/issues/22)
+- pireps  [\#21](https://github.com/nabeelio/phpvms/issues/21)
+- admin user management [\#20](https://github.com/nabeelio/phpvms/issues/20)
+- modify DatabaseSeeder to look at env [\#19](https://github.com/nabeelio/phpvms/issues/19)
+- look at flarum method of install [\#18](https://github.com/nabeelio/phpvms/issues/18)
+- navdata ingestion [\#17](https://github.com/nabeelio/phpvms/issues/17)
+- settings panel [\#16](https://github.com/nabeelio/phpvms/issues/16)
+- routing and scheduling [\#14](https://github.com/nabeelio/phpvms/issues/14)
+- airport details page [\#13](https://github.com/nabeelio/phpvms/issues/13)
+- currency format config [\#12](https://github.com/nabeelio/phpvms/issues/12)
+- aircraft details page [\#11](https://github.com/nabeelio/phpvms/issues/11)
+- user dashboard and profile pages [\#10](https://github.com/nabeelio/phpvms/issues/10)
+- admin panel work [\#9](https://github.com/nabeelio/phpvms/issues/9)
+- theme/skins engine [\#8](https://github.com/nabeelio/phpvms/issues/8)
+- Integrate roles and permissions [\#7](https://github.com/nabeelio/phpvms/issues/7)
+- rebuild tables [\#5](https://github.com/nabeelio/phpvms/issues/5)
+- front-end template [\#4](https://github.com/nabeelio/phpvms/issues/4)
+- Laravel 5.4 [\#3](https://github.com/nabeelio/phpvms/issues/3)
+- look up role-based permissions  [\#2](https://github.com/nabeelio/phpvms/issues/2)
+- installer [\#1](https://github.com/nabeelio/phpvms/issues/1)
+
+**Merged pull requests:**
+
+- Fixed a few field entries [\#116](https://github.com/nabeelio/phpvms/pull/116)
+- Remove unique email entry [\#115](https://github.com/nabeelio/phpvms/pull/115)
+
+
+
+\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*

CODE_OF_CONDUCT.md

@@ -1,46 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at gm@nabs.io. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
-
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/

Dockerfile

@@ -0,0 +1,28 @@
+FROM php:7.4-fpm-alpine
+
+WORKDIR /var/www/
+
+RUN apk add gmp-dev
+RUN curl --silent --show-error https://getcomposer.org/installer | php
+
+# Copy any config files in
+COPY resources/docker/php/ext-opcache.ini $PHP_INI_DIR/conf.d/
+COPY resources/docker/php/www.conf /usr/local/etc/php-fpm.d/www.conf
+RUN ln -sf /dev/stderr /var/log/fpm-error.log
+
+RUN docker-php-ext-install \
+  calendar \
+  pdo_mysql \
+  gmp \
+  opcache && \
+  docker-php-ext-enable pdo_mysql opcache
+
+COPY . /var/www/
+RUN php composer.phar install \
+    --ignore-platform-reqs \
+    --no-interaction \
+    --no-plugins \
+    --no-scripts \
+    --prefer-dist
+
+EXPOSE 9000

LICENSE

@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2017, phpvms
+Copyright (c) 2017, phpvms - http://www.phpvms.net
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

Makefile

@@ -19,7 +19,7 @@ clean:
 	@php artisan view:clear
 	@find bootstrap/cache -type f -not -name '.gitignore' -print0 | xargs -0 rm -rf
 
-	@find storage/framework/cache/ -mindepth 1 -not -name '.gitignore' -print0 | xargs -0 rm -rf
+	@find storage/framework/cache/ -mindepth 1 -type f -not -name '.gitignore' -print0 | xargs -0 rm -rf
 	@find storage/framework/sessions/ -mindepth 1 -type f -not -name '.gitignore' -print0 | xargs -0 rm -rf
 	@find storage/framework/views/ -mindepth 1 -not -name '.gitignore' -print0 | xargs -0 rm -rf
 
@@ -29,6 +29,13 @@ clean:
 clean-routes:
 	@php artisan route:clear
 
+.PHONY: clear
+clear:
+	@php artisan cache:clear
+	@php artisan config:clear
+	@php artisan route:clear
+	@php artisan view:clear
+
 .PHONY:  build
 build:
 	@php $(COMPOSER) install --no-interaction
@@ -36,8 +43,7 @@ build:
 # This is to build all the stylesheets, etc
 .PHONY: build-assets
 build-assets:
-	npm update
-	npm run dev
+	npm run production
 
 .PHONY: install
 install: build
@@ -60,17 +66,25 @@ reset: clean
 .PHONY: reload-db
 reload-db:
 	@php artisan database:create --reset
-	@php artisan migrate:refresh --seed
-	@php artisan phpvms:import app/Database/seeds/sample.yml
-	#php artisan phpvms:navdata
+	@php artisan migrate --seed
+	@echo "Done!"
+	@make clean
 
 .PHONY: tests
 tests: test
 
 .PHONY: test
 test:
-	#php artisan database:create --reset
-	vendor/bin/phpunit --debug --verbose
+	@#php artisan database:create --reset
+	@vendor/bin/phpunit --verbose
+
+.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
 
 .PHONY: replay-acars
 replay-acars:

Procfile

@@ -1,5 +1,5 @@
-dnsmasq: /usr/local/sbin/dnsmasq --keep-in-foreground
+#dnsmasq: /usr/local/sbin/dnsmasq --keep-in-foreground
 php-fpm: /usr/local/sbin/php-fpm --nodaemonize
 nginx: /usr/local/bin/nginx -g 'daemon off;'
-#mysql: /usr/local/bin/mysqld
+mysql: docker-compose --file ~/docker/mysql/docker-compose.yml up
 #mailhog: /usr/local/bin/mailhog

README.md

@@ -1,21 +1,17 @@
-# phpvms <sup>7</sup>
+# 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) [![Total Downloads](https://poser.pugx.org/nabeel/phpvms/downloads)](https://packagist.org/packages/nabeel/phpvms) [![Latest Stable Version](https://poser.pugx.org/nabeel/phpvms/v/stable)](https://packagist.org/packages/nabeel/phpvms) [![Latest Unstable Version](https://poser.pugx.org/nabeel/phpvms/v/unstable)](https://packagist.org/packages/nabeel/phpvms) [![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. If you're looking for 
-the old, phpVMS classic, it's [available here](https://github.com/nabeelio/phpvms_v2).
+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.
 
-# installation
+## Installation
 
 A full distribution, with all of the composer dependencies, is available at this 
 [GitHub Releases](https://github.com/nabeelio/phpvms/releases) link. 
 
-The latest documentation, with installation instructions is available 
-[on the phpVMS documentation](http://docs.phpvms.net/) page.
+### Requirements
 
-## Requirements
-
-- PHP 7.0+, extensions:
+- PHP 7.3+, extensions:
   - cURL
   - JSON
   - mbstring
@@ -25,11 +21,38 @@ The latest documentation, with installation instructions is available
 - Database:
   - MySQL 5.5+ (or MySQL variant, including MariaDB and Percona)
 
-[View more details on requirements](http://docs.phpvms.net/basics/requirements)
+[View more details on requirements](https://docs.phpvms.net/requirements)
 
-## Installer
+### Installer
 
 1. Upload to your server
-2. Visit the site, and follow the link to the installer
+1. Visit the site, and follow the link to the installer
 
-[View installation details](http://docs.phpvms.net/basics/installation)
+[View installation details](https://docs.phpvms.net/installation/installation)
+
+## Development Environment
+
+A full development environment can be brought up using Docker:
+
+```bash
+composer install
+npm install
+docker-compose build
+docker-compose up
+```
+
+Then go to `http://localhost`. If you're using dnsmasq, the `app` container is listening on `phpvms.test`, or you can add to your `/etc/hosts` file:
+
+```
+127.0.0.1   phpvms.test
+```
+
+### Building JS/CSS assets
+
+Yarn is required, run:
+
+```bash
+make build-assets
+```
+
+This will build all of the assets according to the webpack file.

app/Bootstrap/LoadConfiguration.php

@@ -2,36 +2,25 @@
 
 namespace App\Bootstrap;
 
-use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Contracts\Config\Repository as RepositoryContract;
+use Illuminate\Contracts\Foundation\Application;
 
-/**
- * Class LoadConfiguration
- * @package App\Bootstrap
- *
- * I'm overriding this to take advantage of the configuration caching
- * and not needing to read the files from disk every time.
- *
- * Hopefully it won't affect anything within core framework but this
- * should be ok. Will just have to be cognizant of any changes to the
- * LoadConfiguration parent class, or if the Kernel changes the boot
- * order -NS
- */
 class LoadConfiguration extends \Illuminate\Foundation\Bootstrap\LoadConfiguration
 {
     /**
-     * Load the configuration items from all of the files.
+     * Load the configuration items from all of the files. This reads the config.php from
+     * that's sitting in the root, and then recursively merges it with the current configs
+     *
+     * @param \Illuminate\Contracts\Foundation\Application $app
+     * @param \Illuminate\Contracts\Config\Repository      $repository
      *
-     * @param  \Illuminate\Contracts\Foundation\Application $app
-     * @param  \Illuminate\Contracts\Config\Repository $repository
-     * @return void
      * @throws \Exception
      */
     protected function loadConfigurationFiles(Application $app, RepositoryContract $repository)
     {
         parent::loadConfigurationFiles($app, $repository);
 
-        /**
+        /*
          * Read in the base config, only if it exists
          */
         if (file_exists($app->basePath().'/config.php')) {

app/Console/BaseCommand.php

@@ -1,65 +0,0 @@
-<?php
-
-namespace App\Console;
-
-use Illuminate\Console\Command;
-use Symfony\Component\Process\Process;
-
-class BaseCommand extends Command
-{
-
-    /**
-     * Streaming file read
-     * @param $filename
-     * @return \Generator
-     */
-    public function readFile($filename)
-    {
-        $fp = fopen($filename, 'rb');
-
-        while (($line = fgets($fp)) !== false) {
-            $line = rtrim($line, "\r\n");
-            if ($line[0] === ';') {
-                continue;
-            }
-
-            yield $line;
-        }
-
-        fclose($fp);
-    }
-
-    /**
-     * @param $cmd
-     * @param bool $return
-     * @return string
-     */
-    public function runCommand($cmd, $return=false, $verbose=true)
-    {
-        if (\is_array($cmd)) {
-            $cmd = join(' ', $cmd);
-        }
-
-        if($verbose) {
-            $this->info('Running "' . $cmd . '"');
-        }
-
-        $val = '';
-        $process = new Process($cmd);
-        $process->run(function ($type, $buffer) use ($return, $val) {
-            if ($return) {
-                $val .= $buffer;
-            } else {
-                echo $buffer;
-            }
-
-            /*if (Process::ERR === $type) {
-                echo $buffer;
-            } else {
-                echo $buffer;
-            }*/
-        });
-
-        return $val;
-    }
-}

app/Console/Commands/AcarsReplay.php

@@ -2,25 +2,26 @@
 
 namespace App\Console\Commands;
 
-use Illuminate\Database\Eloquent\Collection;
+use App\Contracts\Command;
+use App\Support\Units\Time;
 use GuzzleHttp\Client;
+use Illuminate\Database\Eloquent\Collection;
 
-use App\Console\BaseCommand;
-use App\Facades\Utils;
-
-class AcarsReplay extends BaseCommand
+class AcarsReplay extends Command
 {
     protected $signature = 'phpvms:replay {files} {--manual} {--write-all} {--no-submit}';
     protected $description = 'Replay an ACARS file';
 
     /**
      * API Key to post as
+     *
      * @var string
      */
     protected $apiKey = 'testadminapikey';
 
     /**
      * For automatic updates, how many seconds to sleep between updates
+     *
      * @var int
      */
     protected $sleepTime = 10;
@@ -36,7 +37,6 @@ class AcarsReplay extends BaseCommand
      */
     protected $httpClient;
 
-
     /**
      * Return an instance of an HTTP client all ready to post
      */
@@ -46,148 +46,159 @@ class AcarsReplay extends BaseCommand
 
         $this->httpClient = new Client([
             'base_uri' => config('app.url'),
-            'headers' => [
+            'headers'  => [
                 'Authorization' => $this->apiKey,
-            ]
+            ],
         ]);
     }
 
-    /*protected function getArguments()
-    {
-        return [
-            ['--files', InputOption::VALUE_OPTIONAL]
-        ];
-    }*/
-
     /**
      * Make a request to start a PIREP
+     *
      * @param \stdClass $flight
+     *
+     * @throws \RuntimeException
+     *
      * @return string
      */
     protected function startPirep($flight): string
     {
-        # convert the planned flight time to be completely in minutes
-        $pft = Utils::hoursToMinutes($flight->planned_hrsenroute,
-                                     $flight->planned_minenroute);
+        // convert the planned flight time to be completely in minutes
+        $pft = Time::hoursToMinutes(
+            $flight->planned_hrsenroute,
+            $flight->planned_minenroute
+        );
 
         $flight_number = substr($flight->callsign, 3);
 
         $response = $this->httpClient->post('/api/pireps/prefile', [
             'json' => [
-                'airline_id'            => 1,
-                'flight_number'         => $flight_number,
-                'aircraft_id'           => 1,
-                'dpt_airport_id'        => $flight->planned_depairport,
-                'arr_airport_id'        => $flight->planned_destairport,
-                'level'                 => $flight->planned_altitude,
-                'planned_flight_time'   => $pft,
-                'route'                 => $flight->planned_route,
-            ]
+                'airline_id'          => 1,
+                'flight_number'       => $flight_number,
+                'aircraft_id'         => 1,
+                'dpt_airport_id'      => $flight->planned_depairport,
+                'arr_airport_id'      => $flight->planned_destairport,
+                'level'               => $flight->planned_altitude,
+                'planned_flight_time' => $pft,
+                'route'               => $flight->planned_route,
+            ],
         ]);
 
         $body = \json_decode($response->getBody()->getContents());
+
         return $body->id;
     }
 
     /**
      * Mark the PIREP as filed
+     *
      * @param $pirep_id
+     *
+     * @throws \RuntimeException
+     *
      * @return mixed
      */
     protected function filePirep($pirep_id)
     {
         $response = $this->httpClient->post('/api/pireps/'.$pirep_id.'/file', [
-            'json'=> []
+            'json' => [],
         ]);
 
         $body = \json_decode($response->getBody()->getContents());
+
         return $body;
     }
 
     /**
      * @param $pirep_id
      * @param $data
+     *
+     * @throws \RuntimeException
+     *
      * @return array
      */
     protected function postUpdate($pirep_id, $data)
     {
-        $uri = '/api/pireps/' . $pirep_id . '/acars/position';
+        $uri = '/api/pireps/'.$pirep_id.'/acars/position';
 
         $position = [
-            'log' => '',
-            'lat' => $data->latitude,
-            'lon' => $data->longitude,
-            'heading' => $data->heading,
-            'altitude' => $data->altitude,
-            'gs' => $data->groundspeed,
+            'log'         => '',
+            'lat'         => $data->latitude,
+            'lon'         => $data->longitude,
+            'heading'     => $data->heading,
+            'altitude'    => $data->altitude,
+            'gs'          => $data->groundspeed,
             'transponder' => $data->transponder,
         ];
 
         $upd = [
             'positions' => [
-                $position
-            ]
+                $position,
+            ],
         ];
 
         $this->info("Update: $data->callsign, $position[lat] x $position[lon] \t\t"
-                    . "hdg: $position[heading]\t\talt: $position[altitude]\t\tgs: $position[gs]");
+            ."hdg: $position[heading]\t\talt: $position[altitude]\t\tgs: $position[gs]");
 
         $response = $this->httpClient->post($uri, [
-            'json' => $upd
+            'json' => $upd,
         ]);
 
         $body = \json_decode($response->getBody()->getContents());
+
         return [
             $data->callsign,
             $position['lat'],
             $position['lon'],
             $position['heading'],
             $position['altitude'],
-            $position['gs']
+            $position['gs'],
         ];
     }
 
     /**
      * Parse this file and run the updates
+     *
      * @param array $files
+     *
+     * @throws \RuntimeException
      */
     protected function updatesFromFile(array $files)
     {
         /**
          * @var $flights Collection
          */
-        $flights = collect($files)->transform(function ($f)
-        {
-            $file = storage_path('/replay/' . $f . '.json');
+        $flights = collect($files)->transform(function ($f) {
+            $file = $f;
             if (file_exists($file)) {
-                $this->info('Loading ' . $file);
+                $this->info('Loading '.$file);
                 $contents = file_get_contents($file);
                 $contents = \json_decode($contents);
+
                 return collect($contents->updates);
-            } else {
-                $this->error($file . ' not found, skipping');
-                return false;
             }
+            $this->error($file.' not found, skipping');
+
+            return false;
         })
-            # remove any of errored file entries
+            // remove any of errored file entries
             ->filter(function ($value, $key) {
                 return $value !== false;
             });
 
         $this->info('Starting playback');
 
-        /**
+        /*
          * File the initial pirep to get a "preflight" status
          */
-        $flights->each(function ($updates, $idx)
-        {
+        $flights->each(function ($updates, $idx) {
             $update = $updates->first();
             $pirep_id = $this->startPirep($update);
             $this->pirepList[$update->callsign] = $pirep_id;
-            $this->info('Prefiled ' . $update->callsign . ', ID: ' . $pirep_id);
+            $this->info('Prefiled '.$update->callsign.', ID: '.$pirep_id);
         });
 
-        /**
+        /*
          * Iterate through all of the flights, retrieving the updates
          * from each individual flight. Remove the update. Continue through
          * until there are no updates left, at which point we remove the flight
@@ -202,15 +213,15 @@ class AcarsReplay extends BaseCommand
 
                 $this->postUpdate($pirep_id, $update);
 
-                # we're done and don't put the "no-submit" option
-                if($updates->count() === 0 && !$this->option('no-submit')) {
+                // we're done and don't put the "no-submit" option
+                if ($updates->count() === 0 && !$this->option('no-submit')) {
                     $this->filePirep($pirep_id);
                 }
             })->filter(function ($updates, $idx) {
                 return $updates->count() > 0;
             });
 
-            if(!$this->option('write-all')) {
+            if (!$this->option('write-all')) {
                 if (!$this->option('manual')) {
                     sleep($this->sleepTime);
                 } else {
@@ -223,9 +234,11 @@ class AcarsReplay extends BaseCommand
     /**
      * Execute the console command.
      *
+     * @throws \RuntimeException
+     *
      * @return mixed
      */
-    public function handle()
+    public function handle(): void
     {
         $files = $this->argument('files');
         $manual_mode = $this->option('manual');
@@ -233,6 +246,7 @@ class AcarsReplay extends BaseCommand
         if ($this->option('write-all')) {
             $this->info('In "dump-all" mode, just writing it all in');
         } else {
+            /* @noinspection NestedPositiveIfStatementsInspection */
             if (!$manual_mode) {
                 $this->info('Going to send updates every 10s');
             } else {

app/Console/Commands/ClearCaches.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Contracts\Command;
+use Nwidart\Modules\Facades\Module;
+
+class ClearCaches extends Command
+{
+    protected $signature = 'phpvms:caches';
+    protected $description = 'Clear all caches';
+
+    /**
+     * {@inheritdoc}
+     */
+    public function handle()
+    {
+        self::clearCaches();
+    }
+
+    public static function clearCaches()
+    {
+        self::clearBootstrapCache();
+        self::clearModuleCache();
+    }
+
+    /**
+     * Clear the bootstrap/cache dir
+     */
+    private static function clearBootstrapCache()
+    {
+    }
+
+    /**
+     * Rescan for new modules
+     */
+    private static function clearModuleCache()
+    {
+        Module::scan();
+    }
+}

app/Console/Commands/ComposerCommand.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Contracts\Command;
+use Illuminate\Support\Facades\Artisan;
+
+class ComposerCommand extends Command
+{
+    protected $signature = 'phpvms:composer {cmd}';
+    protected $description = 'Composer related tasks';
+
+    /**
+     * Run composer update related commands
+     */
+    public function handle()
+    {
+        switch (trim($this->argument('cmd'))) {
+            case 'post-update':
+                $this->postUpdate();
+                break;
+            default:
+                $this->error('Command exists');
+        }
+    }
+
+    /**
+     * Any composer post update tasks
+     */
+    protected function postUpdate(): void
+    {
+        if (config('app.env') === 'dev') {
+            /* @noinspection NestedPositiveIfStatementsInspection */
+            if (class_exists(\Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider::class)) {
+                Artisan::call('ide-helper:generate');
+                Artisan::call('ide-helper:meta');
+            }
+        }
+    }
+}

app/Console/Commands/CreateConfigs.php

@@ -0,0 +1,95 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App;
+use App\Contracts\Command;
+use App\Services\Installer\SeederService;
+use DatabaseSeeder;
+use Modules\Installer\Services\ConfigService;
+
+/**
+ * Create the config files
+ */
+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;
+
+    public function __construct(DatabaseSeeder $databaseSeeder, SeederService $seederSvc)
+    {
+        parent::__construct();
+
+        $this->databaseSeeder = $databaseSeeder;
+        $this->seederSvc = $seederSvc;
+    }
+
+    /**
+     * Run dev related commands
+     *
+     * @throws \Symfony\Component\HttpFoundation\File\Exception\FileException
+     */
+    public function handle()
+    {
+        $this->writeConfigs();
+
+        // Reload the configuration
+        App::boot();
+
+        $this->info('Recreating database');
+        $this->call('database:create', [
+            '--reset' => true,
+        ]);
+
+        $this->info('Running migrations');
+        $this->call('migrate:fresh', [
+            '--seed' => true,
+        ]);
+
+        $this->seederSvc->syncAllSeeds();
+
+        $this->info('Done!');
+    }
+
+    /**
+     * Rewrite the configuration files
+     *
+     * @throws \Symfony\Component\HttpFoundation\File\Exception\FileException
+     */
+    protected function writeConfigs()
+    {
+        /** @var ConfigService $cfgSvc */
+        $cfgSvc = app(ConfigService::class);
+
+        $this->info('Removing the old config files');
+
+        // Remove the old files
+        $config_file = base_path('config.php');
+        if (file_exists($config_file)) {
+            unlink($config_file);
+        }
+
+        $env_file = base_path('env.php');
+        if (file_exists($env_file)) {
+            unlink($env_file);
+        }
+
+        //{name} {db_host} {db_name} {db_user} {db_pass}
+
+        $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'),
+        ]);
+
+        $this->info('Config files generated!');
+    }
+}

app/Console/Commands/CreateDatabase.php

@@ -2,49 +2,56 @@
 
 namespace App\Console\Commands;
 
-use Log;
+use App\Console\Services\Database;
+use App\Contracts\Command;
+use Illuminate\Support\Facades\Log;
+use Tivie\OS\Detector;
 
-use App\Console\BaseCommand;
-
-class CreateDatabase extends BaseCommand
+class CreateDatabase extends Command
 {
-    protected $signature = 'database:create {--reset} {--conn=?}';
+    protected $signature = 'database:create {--reset} {--migrate} {--conn=?}';
     protected $description = 'Create a database';
     protected $os;
 
+    /**
+     * CreateDatabase constructor.
+     */
     public function __construct()
     {
         parent::__construct();
-        $this->os = new \Tivie\OS\Detector();
+        $this->os = new Detector();
     }
 
     /**
      * Create the mysql database
+     *
      * @param $dbkey
+     *
      * @return bool
      */
     protected function create_mysql($dbkey)
     {
-        $host = config($dbkey . 'host');
-        $port = config($dbkey . 'port');
-        $name = config($dbkey . 'database');
-        $user = config($dbkey . 'username');
-        $pass = config($dbkey . 'password');
-
-        $dbSvc = new \App\Console\Services\Database();
+        $host = config($dbkey.'host');
+        $port = config($dbkey.'port');
+        $name = config($dbkey.'database');
+        $user = config($dbkey.'username');
+        $pass = config($dbkey.'password');
 
+        $dbSvc = new Database();
         $dsn = $dbSvc->createDsn($host, $port);
-        Log::info('Connection string: ' . $dsn);
+        Log::info('Connection string: '.$dsn);
 
         try {
             $conn = $dbSvc->createPDO($dsn, $user, $pass);
         } catch (\PDOException $e) {
             Log::error($e);
+
             return false;
         }
 
         if ($this->option('reset') === true) {
             $sql = "DROP DATABASE IF EXISTS `$name`";
+
             try {
                 Log::info('Dropping database: '.$sql);
                 $conn->exec($sql);
@@ -60,31 +67,41 @@ class CreateDatabase extends BaseCommand
             $conn->exec($sql);
         } catch (\PDOException $e) {
             Log::error($e);
+
             return false;
         }
     }
 
     /**
      * Create the sqlite database
+     *
      * @param $dbkey
      */
     protected function create_sqlite($dbkey)
     {
+        $dbPath = config($dbkey.'database');
+
+        // Skip if running in memory
+        if ($dbPath === ':memory:') {
+            return;
+        }
+
         $exec = 'sqlite3';
         if ($this->os->isWindowsLike()) {
             $exec = 'sqlite3.exe';
         }
 
         if ($this->option('reset') === true) {
-            $cmd = ['rm', '-rf', config($dbkey . 'database')];
-            $this->runCommand($cmd);
+            if (file_exists($dbPath)) {
+                unlink(config($dbkey.'database'));
+            }
         }
 
-        if (!file_exists(config($dbkey . 'database'))) {
+        if (!file_exists($dbPath)) {
             $cmd = [
                 $exec,
-                config($dbkey . 'database'),
-                '""',
+                $dbPath,
+                '".exit"',
             ];
 
             $this->runCommand($cmd);
@@ -109,21 +126,17 @@ class CreateDatabase extends BaseCommand
             }
         }*/
 
-        $this->info('Using connection "' . config('database.default') . '"');
+        $this->info('Using connection "'.config('database.default').'"');
 
         $conn = config('database.default');
-        $dbkey = 'database.connections.' . $conn . '.';
+        $dbkey = 'database.connections.'.$conn.'.';
 
-        if (config($dbkey . 'driver') === 'mysql') {
+        if (config($dbkey.'driver') === 'mysql') {
             $this->create_mysql($dbkey);
-        }
-
-        elseif (config($dbkey . 'driver') === 'sqlite') {
+        } elseif (config($dbkey.'driver') === 'sqlite') {
             $this->create_sqlite($dbkey);
-        }
-
-        // TODO: Eventually
-        elseif (config($dbkey . 'driver') === 'postgres') {
+        } // TODO: Eventually
+        elseif (config($dbkey.'driver') === 'postgres') {
             $this->create_postgres($dbkey);
         }
     }

app/Console/Commands/DevCommands.php

@@ -2,20 +2,41 @@
 
 namespace App\Console\Commands;
 
-use DB;
-use PDO;
-
-use App\Models\Airline;
-use App\Models\User;
-
-use App\Console\BaseCommand;
+use App\Contracts\Command;
 use App\Models\Acars;
+use App\Models\Airline;
 use App\Models\Pirep;
+use App\Models\User;
+use App\Notifications\Messages\UserRegistered;
+use App\Repositories\AcarsRepository;
+use App\Services\AirportService;
+use App\Services\AwardService;
+use App\Services\DatabaseService;
+use App\Services\UserService;
+use Illuminate\Database\QueryException;
+use Illuminate\Support\Facades\Artisan;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+use PDO;
+use Symfony\Component\Yaml\Yaml;
 
-class DevCommands extends BaseCommand
+class DevCommands extends Command
 {
-    protected $signature = 'phpvms {cmd}';
+    protected $signature = 'phpvms {cmd} {param?}';
     protected $description = 'Developer commands';
+    protected $dbSvc;
+
+    /**
+     * DevCommands constructor.
+     *
+     * @param DatabaseService $dbSvc
+     */
+    public function __construct(DatabaseService $dbSvc)
+    {
+        parent::__construct();
+
+        $this->dbSvc = $dbSvc;
+    }
 
     /**
      * Run dev related commands
@@ -30,13 +51,21 @@ class DevCommands extends BaseCommand
         }
 
         $commands = [
-            'clear-acars' => 'clearAcars',
-            'clear-users' => 'clearUsers',
-            'compile-assets' => 'compileAssets',
-            'db-attrs' => 'dbAttrs',
+            'clear-acars'       => 'clearAcars',
+            'clear-users'       => 'clearUsers',
+            'compile-assets'    => 'compileAssets',
+            'db-attrs'          => 'dbAttrs',
+            'list-awards'       => 'listAwardClasses',
+            'live-flights'      => 'liveFlights',
+            'manual-insert'     => 'manualInsert',
+            'metar'             => 'getMetar',
+            'recalculate-stats' => 'recalculateStats',
+            'reset-install'     => 'resetInstall',
+            'new-user-email'    => 'newUserEmail',
+            'xml-to-yaml'       => 'xmlToYaml',
         ];
 
-        if(!array_key_exists($command, $commands)) {
+        if (!array_key_exists($command, $commands)) {
             $this->error('Command not found!');
             exit();
         }
@@ -44,12 +73,29 @@ class DevCommands extends BaseCommand
         $this->{$commands[$command]}();
     }
 
+    /**
+     * List all award classes
+     */
+    protected function listAwardClasses()
+    {
+        $awardSvc = app(AwardService::class);
+        $awards = $awardSvc->findAllAwardClasses();
+
+        $headers = ['Award Name', 'Class'];
+        $formatted_awards = [];
+        foreach ($awards as $award) {
+            $formatted_awards[] = [$award->name, \get_class($award)];
+        }
+
+        $this->table($headers, $formatted_awards);
+    }
+
     /**
      * Delete all the data from the ACARS and PIREP tables
      */
     protected function clearAcars()
     {
-        if(config('database.default') === 'mysql') {
+        if (config('database.default') === 'mysql') {
             DB::statement('SET foreign_key_checks=0');
         }
 
@@ -103,9 +149,164 @@ class DevCommands extends BaseCommand
         $server_version = $pdo->getAttribute(PDO::ATTR_SERVER_VERSION);
         $emulate_prepares = version_compare($server_version, $emulate_prepares_below_version, '<');
 
-        $this->info('Server Version: '. $server_version);
+        $this->info('Server Version: '.$server_version);
         $this->info('Emulate Prepares: '.$emulate_prepares);
 
         $pdo->setAttribute(PDO::ATTR_EMULATE_PREPARES, $emulate_prepares);
     }
+
+    /**
+     * Convert the sequelpro xml export to yaml
+     */
+    protected function xmlToYaml()
+    {
+        $file = $this->argument('param');
+        $this->info('Reading '.$file);
+
+        $xml_str = file_get_contents($file);
+        $xml = new \SimpleXMLElement($xml_str);
+
+        $yaml = [];
+        $table_name = (string) $xml->database->table_data['name'];
+        $this->info('Writing table "'.$table_name.'"');
+
+        $count = 0;
+        $yaml[$table_name] = [];
+
+        foreach ($xml->database->table_data->row as $row) {
+            $yaml_row = [];
+            foreach ($row->field as $field) {
+                $fname = (string) $field['name'];
+                $fvalue = (string) $field;
+
+                $yaml_row[$fname] = $fvalue;
+            }
+
+            $yaml[$table_name][] = $yaml_row;
+            $count++;
+        }
+
+        $this->info('Exporting '.$count.' rows');
+
+        $file_name = $table_name.'.yml';
+        file_put_contents(storage_path($file_name), Yaml::dump($yaml, 4, 2));
+        $this->info('Writing yaml to storage: '.$file_name);
+    }
+
+    protected function getMetar(): void
+    {
+        $icao = $this->argument('param');
+        if (!$icao) {
+            $this->error('Enter an ICAO!');
+            exit();
+        }
+
+        $airportSvc = app(AirportService::class);
+        $metar = $airportSvc->getMetar($icao);
+        $this->info($metar->raw);
+    }
+
+    /**
+     * Insert the rows from the file, manually advancing each row
+     */
+    protected function manualInsert(): void
+    {
+        $file = $this->argument('param');
+        $this->info('Reading '.$file);
+
+        if (!file_exists($file)) {
+            $this->error('File '.$file.' doesn\'t exist');
+            exit;
+        }
+
+        $yml = Yaml::parse(file_get_contents($file));
+        foreach ($yml as $table => $rows) {
+            $this->info('Importing table '.$table);
+            $this->info('Number of rows: '.\count($rows));
+
+            foreach ($rows as $row) {
+                try {
+                    $this->dbSvc->insert_row($table, $row);
+                } catch (\Exception $e) {
+                    $this->error($e);
+                }
+
+                $this->confirm('Insert next row?', true);
+            }
+        }
+    }
+
+    /**
+     * Recalculate the stats for all users
+     */
+    protected function recalculateStats(): void
+    {
+        $userSvc = app(UserService::class);
+        $userSvc->recalculateAllUserStats();
+    }
+
+    /**
+     * Delete all of the tables, etc from the database, for a clean install
+     */
+    protected function resetInstall(): void
+    {
+        $confirm = $this->ask('This will erase your entire install and database, are you sure? y/n ');
+        if (strtolower($confirm) !== 'y') {
+            exit(0);
+        }
+
+        try {
+            if (config('database.default') === 'mysql') {
+                DB::statement('SET foreign_key_checks=0');
+            }
+
+            $this->info('Dropping all tables');
+            $tables = DB::connection()->getDoctrineSchemaManager()->listTableNames();
+            foreach ($tables as $table) {
+                Schema::dropIfExists($table);
+            }
+        } catch (QueryException $e) {
+            $this->error('DB error: '.$e->getMessage());
+        }
+
+        $this->info('Deleting config file');
+
+        try {
+            unlink('config.php');
+        } catch (\Exception $e) {
+        }
+
+        $this->info('Deleting env file');
+
+        try {
+            unlink('env.php');
+        } catch (\Exception $e) {
+        }
+
+        $this->info('Clearing caches');
+        Artisan::call('cache:clear');
+        Artisan::call('route:clear');
+        Artisan::call('config:clear');
+        Artisan::call('view:clear');
+
+        $this->info('Done!');
+    }
+
+    /**
+     * Test sending a user a registered email
+     */
+    protected function newUserEmail()
+    {
+        $user_id = $this->argument('param');
+        $user = User::find($user_id);
+        $user->notify(new UserRegistered($user));
+    }
+
+    public function liveFlights(): void
+    {
+        $acarsRepo = app(AcarsRepository::class);
+        $flights = $acarsRepo->getPositions(setting('acars.live_time'))->toArray();
+
+        dd($flights);
+    }
 }

app/Console/Commands/DevInstall.php

@@ -0,0 +1,89 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Contracts\Command;
+use App\Services\Installer\ConfigService;
+
+/**
+ * Create a fresh development install
+ */
+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;
+
+    public function __construct(\DatabaseSeeder $databaseSeeder)
+    {
+        parent::__construct();
+
+        $this->databaseSeeder = $databaseSeeder;
+    }
+
+    /**
+     * Run dev related commands
+     *
+     * @throws \Symfony\Component\HttpFoundation\File\Exception\FileException
+     */
+    public function handle()
+    {
+        if ($this->option('reset-configs')) {
+            $this->rewriteConfigs();
+        }
+
+        // Reload the configuration
+        \App::boot();
+
+        $this->info('Recreating database');
+        $this->call('database:create', [
+            '--reset' => true,
+        ]);
+
+        $this->info('Running migrations');
+        $this->call('migrate:fresh', [
+            '--seed' => true,
+        ]);
+
+        $this->info('Done!');
+    }
+
+    /**
+     * Rewrite the configuration files
+     *
+     * @throws \Symfony\Component\HttpFoundation\File\Exception\FileException
+     */
+    protected function rewriteConfigs()
+    {
+        $cfgSvc = app(ConfigService::class);
+
+        $this->info('Removing the old config files');
+
+        // Remove the old files
+        $config_file = base_path('config.php');
+        if (file_exists($config_file)) {
+            unlink($config_file);
+        }
+
+        $env_file = base_path('env.php');
+        if (file_exists($env_file)) {
+            unlink($env_file);
+        }
+
+        $this->info('Removing the sqlite db');
+        $db_file = storage_path('db.sqlite');
+        if (file_exists($db_file)) {
+            unlink($db_file);
+        }
+
+        $this->info('Regenerating the config files');
+        $cfgSvc->createConfigFiles([
+            'APP_ENV'   => 'dev',
+            'SITE_NAME' => 'phpvms test',
+            'DB_CONN'   => 'sqlite',
+        ]);
+
+        $this->info('Config files generated!');
+    }
+}

app/Console/Commands/ImportCsv.php

@@ -0,0 +1,55 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Contracts\Command;
+use App\Services\ImportService;
+
+class ImportCsv extends Command
+{
+    protected $signature = 'phpvms:csv-import {type} {file}';
+    protected $description = 'Import from a CSV file';
+
+    private $importer;
+
+    /**
+     * Import constructor.
+     *
+     * @param ImportService $importer
+     */
+    public function __construct(ImportService $importer)
+    {
+        parent::__construct();
+
+        $this->importer = $importer;
+    }
+
+    /**
+     * @throws \Illuminate\Validation\ValidationException
+     *
+     * @return mixed|void
+     */
+    public function handle()
+    {
+        $type = $this->argument('type');
+        $file = $this->argument('file');
+
+        if (\in_array($type, ['flight', 'flights'], true)) {
+            $status = $this->importer->importFlights($file);
+        } elseif ($type === 'aircraft') {
+            $status = $this->importer->importAircraft($file);
+        } elseif (\in_array($type, ['airport', 'airports'], true)) {
+            $status = $this->importer->importAirports($file);
+        } elseif ($type === 'subfleet') {
+            $status = $this->importer->importSubfleets($file);
+        }
+
+        foreach ($status['success'] as $line) {
+            $this->info($line);
+        }
+
+        foreach ($status['errors'] as $line) {
+            $this->error($line);
+        }
+    }
+}

app/Console/Commands/ImportFromClassicCommand.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Contracts\Command;
+use App\Services\ImporterService;
+use Illuminate\Support\Facades\Log;
+
+class ImportFromClassicCommand extends Command
+{
+    protected $signature = 'phpvms:importer {db_host} {db_name} {db_user} {db_pass?} {table_prefix=phpvms_}';
+    protected $description = 'Import from an older version of phpVMS';
+
+    /**
+     * Run dev related commands
+     */
+    public function handle()
+    {
+        $creds = [
+            'host'         => $this->argument('db_host'),
+            'name'         => $this->argument('db_name'),
+            'user'         => $this->argument('db_user'),
+            'pass'         => $this->argument('db_pass'),
+            'table_prefix' => $this->argument('table_prefix'),
+        ];
+
+        $importerSvc = new ImporterService();
+
+        $importerSvc->saveCredentials($creds);
+        $manifest = $importerSvc->generateImportManifest();
+
+        foreach ($manifest as $record) {
+            try {
+                $importerSvc->run($record['importer'], $record['start']);
+            } catch (\Exception $e) {
+                Log::error($e->getMessage());
+            }
+        }
+    }
+}

app/Console/Commands/Importer.php

@@ -1,29 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use DB;
-use App\Console\BaseCommand;
-
-class Importer extends BaseCommand
-{
-    protected $signature = 'phpvms:importer {db_host} {db_name} {db_user} {db_pass?} {table_prefix=phpvms_}';
-    protected $description = 'Import from an older version of phpVMS';
-
-    /**
-     * Run dev related commands
-     */
-    public function handle()
-    {
-        $db_creds = [
-            'host' => $this->argument('db_host'),
-            'name' => $this->argument('db_name'),
-            'user' => $this->argument('db_user'),
-            'pass' => $this->argument('db_pass'),
-            'table_prefix' => $this->argument('table_prefix')
-        ];
-
-        $importerSvc = new \App\Console\Services\Importer($db_creds);
-        $importerSvc->run();
-    }
-}

app/Console/Commands/Install.php

@@ -1,77 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use App\Console\BaseCommand;
-
-class Install extends BaseCommand
-{
-    protected $signature = 'phpvms:install 
-                                {--update}
-                                {--airline-name?} 
-                                {--airline-code?}';
-
-    protected $description = 'Install or update phpVMS';
-
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    public function handle()
-    {
-        $this->info('Installing phpVMS...');
-
-        $this->setupDatabase();
-
-        # Only run these if we're doing an initial install
-        if(!$this->option('update')) {
-            $this->writeLocalConfig();
-            $this->initialData();
-        }
-    }
-
-    /**
-     * Setup the database and run the migrations
-     * Only call the database creation if we're not
-     * explicitly trying to upgrade
-     */
-    protected function setupDatabase()
-    {
-        if(!$this->option('update')) {
-            $this->call('database:create');
-        }
-
-        $this->info('Running database migrations...');
-        $this->call('migrate');
-
-        # TODO: Call initial seed data, for the groups and other supporting data
-    }
-
-    /**
-     * Write a local config file
-     */
-    protected function writeLocalConfig()
-    {
-
-    }
-
-    /**
-     * Set an initial airline and admin user/password
-     */
-    protected function initialData()
-    {
-        # TODO: Prompt for initial airline info
-        $airline_name = $this->option('airline-name');
-        if(!$airline_name) {
-            $airline_name = $this->ask('Enter your airline name');
-        }
-
-        $airline_code = $this->option('airline-code');
-        if(!$airline_code) {
-            $airline_code = $this->ask('Enter your airline code');
-        }
-
-        # TODO: Prompt for admin user/password
-    }
-}

app/Console/Commands/NavdataImport.php

@@ -2,21 +2,38 @@
 
 namespace App\Console\Commands;
 
-use App\Console\BaseCommand;
-use App\Models\Navdata;
+use App\Contracts\Command;
 use App\Models\Enums\NavaidType;
+use App\Models\Navdata;
 
-
-class NavdataCommand extends BaseCommand
+class NavdataImport extends Command
 {
     protected $signature = 'phpvms:navdata';
     protected $description = '';
 
     /**
-     * Read and parse in the navaid file
      * @throws \League\Geotools\Exception\InvalidArgumentException
+     *
+     * @return void
      */
-    public function read_wp_nav_aid()
+    public function handle()
+    {
+        $this->info('Emptying the current navdata...');
+        Navdata::query()->truncate();
+
+        $this->info('Looking for nav files...');
+        $this->read_wp_nav_aid();
+        $this->read_wp_nav_fix();
+    }
+
+    /**
+     * Read and parse in the navaid file
+     *
+     * @throws \League\Geotools\Exception\InvalidArgumentException
+     *
+     * @return void
+     */
+    public function read_wp_nav_aid(): void
     {
         /*
          * ....,....1....,....2....,....3....,....4....,....5....,....6..
@@ -50,7 +67,7 @@ class NavdataCommand extends BaseCommand
         $file_path = storage_path('/navdata/WPNAVAID.txt');
         if (!file_exists($file_path)) {
             $this->error('WPNAVAID.txt not found in storage/navdata');
-            return false;
+            return;
         }
 
         $this->info('Importing navaids (WPNAVAID.txt) ...');
@@ -58,10 +75,9 @@ class NavdataCommand extends BaseCommand
 
         $imported = 0;
 
-        foreach($generator as $line) {
-
+        foreach ($generator as $line) {
             $navaid = [
-                'id' => trim(substr($line, 24, 4)), // ident column
+                'id'    => trim(substr($line, 24, 4)), // ident column
                 'name'  => trim(substr($line, 0, 24)),
                 'type'  => trim(substr($line, 29, 4)),
                 'lat'   => trim(substr($line, 33, 9)),
@@ -70,9 +86,8 @@ class NavdataCommand extends BaseCommand
                 'class' => trim($line[60]),
             ];
 
-            # Map to the Navaid enum
-            switch($navaid['type'])
-            {
+            // Map to the Navaid enum
+            switch ($navaid['type']) {
                 case 'ILS':
                     $navaid['type'] = NavaidType::LOC;
                     break;
@@ -101,22 +116,22 @@ class NavdataCommand extends BaseCommand
             }*/
 
             Navdata::updateOrCreate([
-                'id' => $navaid['id'], 'name' => $navaid['name']
+                'id' => $navaid['id'], 'name' => $navaid['name'],
             ], $navaid);
 
             $imported++;
-            if($imported % 100 === 0) {
-                $this->info('Imported ' . $imported . ' entries...');
+            if ($imported % 100 === 0) {
+                $this->info('Imported '.$imported.' entries...');
             }
         }
 
-        $this->info('Imported a total of ' . $imported . ' nav aids');
+        $this->info('Imported a total of '.$imported.' nav aids');
     }
 
     /**
-     *
+     * @return void
      */
-    public function read_wp_nav_fix()
+    public function read_wp_nav_fix(): void
     {
         /*
          * ....,....1....,....2....,...3....,....4....,....
@@ -138,9 +153,9 @@ class NavdataCommand extends BaseCommand
          */
 
         $file_path = storage_path('/navdata/WPNAVFIX.txt');
-        if(!file_exists($file_path)) {
+        if (!file_exists($file_path)) {
             $this->error('WPNAVFIX.txt not found in storage/navdata');
-            return false;
+            return;
         }
 
         $this->info('Importing navaids (WPNAVFIX.txt) ...');
@@ -149,37 +164,23 @@ class NavdataCommand extends BaseCommand
         $imported = 0;
         foreach ($generator as $line) {
             $navfix = [
-                'id' => trim(substr($line, 0, 4)), // ident column
+                'id'   => trim(substr($line, 0, 4)), // ident column
                 'name' => trim(substr($line, 24, 6)),
                 'type' => NavaidType::FIX,
-                'lat' => trim(substr($line, 30, 10)),
-                'lon' => trim(substr($line, 40, 11)),
+                'lat'  => trim(substr($line, 30, 10)),
+                'lon'  => trim(substr($line, 40, 11)),
             ];
 
-            switch ($navfix['type']) {
-                default:
-                    $navfix['type'] = NavaidType::UNKNOWN;
-                    break;
-            }
-
-            Navdata::updateOrCreate(['id' => $navfix['id']], $navfix);
+            Navdata::updateOrCreate([
+                'id' => $navfix['id'], 'name' => $navfix['name'],
+            ], $navfix);
 
             $imported++;
             if ($imported % 100 === 0) {
-                $this->info('Imported ' . $imported . ' entries...');
+                $this->info('Imported '.$imported.' entries...');
             }
         }
 
-        $this->info('Imported a total of ' . $imported . ' nav fixes');
-    }
-
-    public function handle()
-    {
-        $this->info('Emptying the current navdata...');
-        Navdata::query()->truncate();
-
-        $this->info('Looking for nav files...');
-        $this->read_wp_nav_aid();
-        $this->read_wp_nav_fix();
+        $this->info('Imported a total of '.$imported.' nav fixes');
     }
 }

app/Console/Commands/PirepExport.php

@@ -0,0 +1,52 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Contracts\Command;
+use Illuminate\Support\Facades\DB;
+use Symfony\Component\Yaml\Yaml;
+
+class PirepExport extends Command
+{
+    protected $signature = 'phpvms:pirep-export {id}';
+    protected $description = 'PIREP table export';
+
+    /**
+     * Run dev related commands
+     */
+    public function handle()
+    {
+        $pirep_id = $this->argument('id');
+        if (empty($pirep_id)) {
+            $this->error('No PIREP ID specified');
+            exit();
+        }
+
+        // List the tables to export and the column name for the pirep id
+        $tables = [
+            'pireps'               => 'id',
+            'acars'                => 'pirep_id',
+            'pirep_comments'       => 'pirep_id',
+            'pirep_fares'          => 'pirep_id',
+            'pirep_field_values'   => 'pirep_id',
+            'expenses'             => 'ref_model_id',
+            'journal_transactions' => 'ref_model_id',
+        ];
+
+        $export_tables = [];
+        foreach ($tables as $table => $key) {
+            $export_tables[$table] = [];
+
+            $rows = DB::table($table)
+                ->where($key, '=', $pirep_id)
+                ->get();
+
+            foreach ($rows as $row) {
+                $export_tables[$table][] = (array) $row;
+            }
+        }
+
+        $yaml = Yaml::dump($export_tables, 4, 2);
+        echo $yaml;
+    }
+}

app/Console/Commands/TestApi.php

@@ -2,13 +2,12 @@
 
 namespace App\Console\Commands;
 
+use App\Contracts\Command;
 use GuzzleHttp\Client;
-use App\Console\BaseCommand;
 
-class TestApi extends BaseCommand
+class TestApi extends Command
 {
     protected $signature = 'phpvms:test-api {apikey} {url}';
-
     protected $httpClient;
 
     /**
@@ -17,11 +16,11 @@ class TestApi extends BaseCommand
     public function handle()
     {
         $this->httpClient = new Client([
-           'headers' => [
-               'Authorization' => $this->argument('apikey'),
-               'Content-type' => 'application/json',
-               'X-API-Key' => $this->argument('apikey'),
-           ]
+            'headers' => [
+                'Authorization' => $this->argument('apikey'),
+                'Content-type'  => 'application/json',
+                'X-API-Key'     => $this->argument('apikey'),
+            ],
         ]);
 
         $result = $this->httpClient->get($this->argument('url'));

app/Console/Commands/Version.php

@@ -2,56 +2,64 @@
 
 namespace App\Console\Commands;
 
-use App\Console\BaseCommand;
+use App\Contracts\Command;
+use App\Services\VersionService;
 use Symfony\Component\Yaml\Yaml;
 
-class Version extends BaseCommand
+class Version extends Command
 {
-    protected $signature = 'phpvms:version {--write} {--base-only}';
+    protected $signature = 'phpvms:version {--write} {--base-only} {--write-full-version} {version?}';
 
-    /**
-     * Create the version number that gets written out
-     */
-    protected function createVersionNumber($cfg)
+    private $versionSvc;
+
+    public function __construct(VersionService $versionSvc)
     {
-        exec($cfg['git']['git-local'], $version);
-        $version = substr($version[0], 0, $cfg['build']['length']);
+        parent::__construct();
 
-        # prefix with the date in YYMMDD format
-        $date = date('ymd');
-
-        $version = $date.'-'.$version;
-
-        return $version;
+        $this->versionSvc = $versionSvc;
     }
 
     /**
      * Run dev related commands
+     *
      * @throws \Symfony\Component\Yaml\Exception\ParseException
      */
     public function handle()
     {
-        $version_file = config_path('version.yml');
-        $cfg = Yaml::parse(file_get_contents($version_file));
+        if ($this->option('write')) {
+            // Write the updated build number out to the file
+            $version_file = config_path('version.yml');
+            $cfg = Yaml::parse(file_get_contents($version_file));
+
+            // If a version is being passed in, the update the build, etc data against this
+            if ($this->argument('version')) {
+                $version = \SemVer\SemVer\Version::fromString($this->argument('version'));
+                if ($this->option('write-full-version')) {
+                    $cfg['current']['major'] = $version->getMajor();
+                    $cfg['current']['minor'] = $version->getMinor();
+                    $cfg['current']['patch'] = $version->getPatch();
+                }
+
+                $prerelease = $version->getPreRelease();
+                if (strpos($prerelease, '.') !== false) {
+                    $prerelease = explode('.', $prerelease);
+                    $cfg['current']['prerelease'] = $prerelease[0];
+                    $cfg['current']['buildmetadata'] = $prerelease[1];
+                } else {
+                    $cfg['current']['prerelease'] = $prerelease;
+                }
+            }
+
+            // Always write out the build ID/build number which is the commit hash
+            $build_number = $this->versionSvc->generateBuildId($cfg);
+            $cfg['current']['commit'] = $build_number;
+            $cfg['build']['number'] = $build_number;
 
-        if($this->option('write')) {
-            $version = $this->createVersionNumber($cfg);
-            $cfg['build']['number'] = $version;
             file_put_contents($version_file, Yaml::dump($cfg, 4, 2));
         }
 
-        # Only show the major.minor.patch version
-        if($this->option('base-only')) {
-            $version = 'v'.$cfg['current']['major'] . '.'
-                       .$cfg['current']['minor'] . '.'
-                       .$cfg['current']['patch'];
-
-            print $version;
-        } else {
-            $this->call('version:show', [
-                '--format' => 'compact',
-                '--suppress-app-name' => true
-            ]);
-        }
+        $incl_build = empty($this->option('base-only')) ? true : false;
+        $version = $this->versionSvc->getCurrentVersion($incl_build);
+        echo $version."\n";
     }
 }

app/Console/Commands/YamlExport.php

@@ -0,0 +1,55 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Contracts\Command;
+use Illuminate\Support\Facades\DB;
+use Symfony\Component\Yaml\Yaml;
+
+/**
+ * Class YamlExport
+ */
+class YamlExport extends Command
+{
+    protected $signature = 'phpvms:yaml-export {tables*}';
+    protected $description = 'YAML table export';
+
+    /**
+     * Run dev related commands
+     */
+    public function handle()
+    {
+        $tables = $this->argument('tables');
+        if (empty($tables)) {
+            $this->error('No tables specified');
+            exit();
+        }
+
+        // A "preset" for exporting the base set of data
+        if ($tables[0] === 'base') {
+            $tables = [
+                'airlines',
+                'aircraft',
+                'subfleets',
+                'subfleet_fare',
+                'subfleet_rank',
+                'bids',
+                'fares',
+                'flights',
+            ];
+        }
+
+        $export_tables = [];
+        foreach ($tables as $table) {
+            $export_tables[$table] = [];
+
+            $rows = DB::table($table)->get();
+            foreach ($rows as $row) {
+                $export_tables[$table][] = (array) $row;
+            }
+        }
+
+        $yaml = Yaml::dump($export_tables, 4, 2);
+        echo $yaml;
+    }
+}

app/Console/Commands/YamlImport.php

@@ -2,50 +2,55 @@
 
 namespace App\Console\Commands;
 
-use DB;
-use App\Console\BaseCommand;
+use App\Contracts\Command;
 use App\Services\DatabaseService;
 
-class ImportCommand extends BaseCommand
+/**
+ * Class YamlImport
+ */
+class YamlImport extends Command
 {
-    protected $signature = 'phpvms:import {files*}';
+    protected $signature = 'phpvms:yaml-import {files*}';
     protected $description = 'Developer commands';
-
     protected $dbSvc;
 
+    /**
+     * YamlImport constructor.
+     *
+     * @param DatabaseService $dbSvc
+     */
     public function __construct(DatabaseService $dbSvc)
     {
         parent::__construct();
+
         $this->dbSvc = $dbSvc;
     }
 
     /**
      * Run dev related commands
+     *
+     * @throws \Exception
      */
     public function handle()
     {
         $files = $this->argument('files');
-        if(empty($files)) {
+        if (empty($files)) {
             $this->error('No files to import specified!');
             exit();
         }
 
         $ignore_errors = true;
-        /*$ignore_errors = $this->option('ignore_errors');
-        if(!$ignore_errors) {
-            $ignore_errors = false;
-        }*/
 
-        foreach($files as $file) {
-            if(!file_exists($file)) {
-                $this->error('File ' . $file .' doesn\'t exist');
+        foreach ($files as $file) {
+            if (!file_exists($file)) {
+                $this->error('File '.$file.' doesn\'t exist');
                 exit;
             }
 
-            $this->info('Importing ' . $file);
+            $this->info('Importing '.$file);
 
             $imported = $this->dbSvc->seed_from_yaml_file($file, $ignore_errors);
-            foreach($imported as $table => $count) {
+            foreach ($imported as $table => $count) {
                 $this->info('Imported '.$count.' records from "'.$table.'"');
             }
         }

app/Console/Cron/Hourly.php

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

app/Console/Cron/Monthly.php

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

app/Console/Cron/Nightly.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Console\Cron;
+
+use App\Contracts\Command;
+use App\Events\CronNightly;
+
+/**
+ * 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 Nightly extends Command
+{
+    protected $signature = 'cron:nightly';
+    protected $description = 'Run the nightly cron tasks';
+    protected $schedule;
+
+    public function handle(): void
+    {
+        $this->redirectLoggingToFile('cron');
+        event(new CronNightly());
+    }
+}

app/Console/Cron/Weekly.php

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

app/Console/Kernel.php

@@ -2,37 +2,44 @@
 
 namespace App\Console;
 
+use App\Console\Cron\Hourly;
+use App\Console\Cron\Monthly;
+use App\Console\Cron\Nightly;
+use App\Console\Cron\Weekly;
+use App\Services\CronService;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
 
 class Kernel extends ConsoleKernel
 {
     /**
-     * The Artisan commands provided by your application.
+     * 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)
      *
-     * @var array
-     */
-    protected $commands = [
-        Commands\AcarsReplay::class,
-        Commands\CreateDatabase::class,
-        Commands\DevCommands::class,
-        Commands\ImportCommand::class,
-        Commands\Importer::class,
-        Commands\Install::class,
-        Commands\NavdataCommand::class,
-        Commands\TestApi::class,
-    ];
-
-    /**
-     * Define the application's command schedule.
+     * 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
      *
-     * @param  \Illuminate\Console\Scheduling\Schedule  $schedule
      * @return void
      */
-    protected function schedule(Schedule $schedule)
+    protected function schedule(Schedule $schedule): void
     {
-        // $schedule->command('inspire')
-        //          ->hourly();
+        $schedule->command(Nightly::class)->dailyAt('01:00');
+        $schedule->command(Weekly::class)->weeklyOn(0);
+        $schedule->command(Monthly::class)->monthlyOn(1);
+        $schedule->command(Hourly::class)->hourly();
+
+        // When spatie-backups runs
+        /*if (config('backup.backup.enabled', false) === true) {
+            $schedule->command('backup:clean')->daily()->at('01:00');
+            $schedule->command('backup:run')->daily()->at('02:00');
+        }*/
+
+        // Update the last time the cron was run
+        /** @var CronService $cronSvc */
+        $cronSvc = app(CronService::class);
+        $cronSvc->updateLastRunTime();
     }
 
     /**
@@ -40,9 +47,9 @@ class Kernel extends ConsoleKernel
      *
      * @return void
      */
-    protected function commands()
+    protected function commands(): void
     {
-        require app_path('Routes/console.php');
-        $this->load(__DIR__ . '/Commands');
+        $this->load(__DIR__.'/Commands');
+        $this->load(__DIR__.'/Cron');
     }
 }

app/Console/Logger.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Console;
+
+use Monolog\Handler\StreamHandler;
+
+/**
+ * Just a simple custom logger that dumps to the console
+ */
+class Logger
+{
+    public function __invoke(array $config)
+    {
+        $logger = new \Monolog\Logger('console');
+
+        try {
+            $logger->pushHandler(new StreamHandler('php://stdout'));
+        } catch (\Exception $e) {
+        }
+
+        return $logger;
+    }
+}

app/Console/Services/Database.php

@@ -3,26 +3,26 @@
 namespace App\Console\Services;
 
 use PDO;
-use Doctrine\DBAL\Driver\PDOException;
 
 /**
  * Class Database
- * @package App\Console\Services
  */
 class Database
 {
     /**
      * Create the base connection DSN, optionally include the DB name
-     * @param $host
-     * @param $port
+     *
+     * @param      $host
+     * @param      $port
      * @param null $name
+     *
      * @return string
      */
-    public function createDsn($host, $port, $name=null)
+    public function createDsn($host, $port, $name = null)
     {
         $conn = config('database.default');
         $dsn = "$conn:host=$host;port=$port";
-        if(filled($name)) {
+        if (filled($name)) {
             $dsn .= ';dbname='.$name;
         }
 
@@ -33,8 +33,10 @@ class Database
      * @param $dsn
      * @param $user
      * @param $pass
-     * @return PDO
+     *
      * @throws \PDOException
+     *
+     * @return PDO
      */
     public function createPDO($dsn, $user, $pass)
     {

app/Console/Services/Importer.php

@@ -1,689 +0,0 @@
-<?php
-
-namespace App\Console\Services;
-
-use PDO;
-use Carbon\Carbon;
-use Doctrine\DBAL\Driver\PDOException;
-use Illuminate\Support\Str;
-use Illuminate\Database\QueryException;
-use Illuminate\Support\Facades\Hash;
-use Symfony\Component\Console\Output\ConsoleOutput;
-
-use App\Models\Enums\FlightType;
-use App\Models\Enums\PirepSource;
-use App\Models\Pirep;
-use App\Models\Aircraft;
-use App\Models\Airline;
-use App\Models\Airport;
-use App\Models\Flight;
-use App\Models\Rank;
-use App\Models\Subfleet;
-use App\Models\User;
-use App\Models\Enums\UserState;
-use App\Facades\Utils;
-
-/**
- * Class Importer
- * TODO: Batch import
- * @package App\Console\Services
- */
-class Importer
-{
-    /**
-     * Hold references
-     */
-    private $mappedEntities = [];
-
-    /**
-     * Hold the PDO connection to the old database
-     * @var
-     */
-    private $conn;
-
-    /**
-     * @var array
-     */
-    private $creds = [];
-
-    /**
-     * Hold the instance of the console logger
-     * @var
-     */
-    private $log;
-
-    /**
-     * CONSTANTS
-     */
-
-    const BATCH_READ_ROWS = 300;
-    const SUBFLEET_NAME = 'Imported Aircraft';
-
-    /**
-     * Importer constructor.
-     * @param $db_creds
-     */
-    public function __construct($db_creds)
-    {
-        // Setup the logger
-        $this->log = new ConsoleOutput();
-
-        # The db credentials
-        $this->creds = array_merge([
-            'host' => '127.0.0.1',
-            'port' => 3306,
-            'name' => '',
-            'user' => '',
-            'pass' => '',
-            'table_prefix' => 'phpvms_'
-        ], $db_creds);
-    }
-
-    /**
-     * @return int|void
-     */
-    public function run()
-    {
-        $this->reconnect();
-
-        # Import all the different parts
-        $this->importRanks();
-        $this->importAirlines();
-        $this->importAircraft();
-        $this->importAirports();
-
-        $this->importUsers();
-        $this->importFlights();
-        $this->importPireps();
-
-        # Finish up
-        $this->findLastPireps();
-        $this->recalculateRanks();
-    }
-
-    /**
-     * Reconnect to the old phpVMS DB using PDO
-     */
-    protected function reconnect()
-    {
-        $dsn = 'mysql:' . implode(';', [
-               'host=' . $this->creds['host'],
-               'port=' . $this->creds['port'],
-               'dbname=' . $this->creds['name']
-            ]);
-
-        $this->info('Connection string: ' . $dsn);
-
-        try {
-            $this->conn = new PDO($dsn, $this->creds['user'], $this->creds['pass']);
-            $this->conn->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_OBJ);
-        } catch (\PDOException $e) {
-            $this->error($e);
-            exit();
-        }
-    }
-
-    /**
-     * @param $message
-     */
-    protected function comment($message)
-    {
-        $this->log->writeln('<comment>' . $message . '</comment>');
-    }
-
-    /**
-     * @param $message
-     */
-    protected function error($message) {
-        $this->log->writeln('<error>' . $message . '</error>');
-    }
-
-    /**
-     * @param string $message
-     */
-    protected function info($message)
-    {
-        if(\is_array($message)) {
-            print_r($message);
-        }
-        else {
-            $this->log->writeln('<info>'.$message.'</info>');
-        }
-    }
-
-    /**
-     * Return the table name with the prefix
-     * @param $table
-     * @return string
-     */
-    protected function tableName($table)
-    {
-        if($this->creds['table_prefix'] !== false) {
-            return $this->creds['table_prefix'].$table;
-        }
-
-        return $table;
-    }
-
-    /**
-     *
-     * @param \Illuminate\Database\Eloquent\Model $model
-     * @return bool
-     */
-    protected function saveModel($model)
-    {
-        try {
-            $model->save();
-            return true;
-        } catch (QueryException $e) {
-            if($e->getCode() !== '23000') {
-                $this->error($e);
-            }
-
-            return false;
-        }
-    }
-
-    /**
-     * Create a new mapping between an old ID and the new one
-     * @param $entity
-     * @param $old_id
-     * @param $new_id
-     */
-    protected function addMapping($entity, $old_id, $new_id)
-    {
-        if(!array_key_exists($entity, $this->mappedEntities)) {
-            $this->mappedEntities[$entity] = [];
-        }
-
-        $this->mappedEntities[$entity][$old_id] = $new_id;
-    }
-
-    /**
-     * Return the ID for a mapping
-     * @param $entity
-     * @param $old_id
-     * @return bool
-     */
-    protected function getMapping($entity, $old_id)
-    {
-        if(!array_key_exists($entity, $this->mappedEntities)) {
-            return 0;
-        }
-
-        $entity = $this->mappedEntities[$entity];
-        if(array_key_exists($old_id, $entity)) {
-            return $entity[$old_id];
-        }
-
-        return 0;
-    }
-
-    /**
-     * @param $date
-     * @return Carbon
-     */
-    protected function parseDate($date)
-    {
-        $carbon = Carbon::parse($date);
-        return $carbon;
-    }
-
-    /**
-     * Take a decimal duration and convert it to minutes
-     * @param $duration
-     * @return float|int
-     */
-    protected function convertDuration($duration)
-    {
-        if(strpos($duration, '.') !== false) {
-            $delim = '.';
-        } elseif(strpos($duration, ':')) {
-            $delim = ':';
-        } else {
-            # no delimiter, assume it's just a straight hour
-            return (int) $duration * 60;
-        }
-
-        $hm = explode($delim, $duration);
-        $hours = (int) $hm[0] * 60;
-        $mins = (int) $hm[1];
-
-        return $hours + $mins;
-    }
-
-    /**
-     * @param $table
-     * @return mixed
-     */
-    protected function getTotalRows($table)
-    {
-        $table = $this->tableName($table);
-
-        $sql = 'SELECT COUNT(*) FROM ' . $table;
-        $rows = $this->conn->query($sql)->fetchColumn();
-
-        $this->info('Found '.$rows.' rows in '.$table);
-        return (int) $rows;
-    }
-
-    /**
-     * Read all the rows in a table, but read them in a batched manner
-     * @param string $table The name of the table
-     * @param null $read_rows Number of rows to read
-     * @return \Generator
-     */
-    protected function readRows($table, $read_rows=null)
-    {
-        // Set the table prefix if it has been entered
-        $this->tableName($table);
-
-        $offset = 0;
-        if($read_rows === null) {
-            $read_rows = self::BATCH_READ_ROWS;
-        }
-
-        $total_rows = $this->getTotalRows($table);
-
-        while($offset < $total_rows)
-        {
-            $rows_to_read = $offset + $read_rows;
-            if($rows_to_read > $total_rows) {
-                $rows_to_read = $total_rows;
-            }
-
-            $this->info('Reading '.$offset.' to '.$rows_to_read.' of '.$total_rows);
-
-            $sql = 'SELECT * FROM ' . $this->tableName($table)
-                 . ' LIMIT ' . self::BATCH_READ_ROWS . ' OFFSET ' . $offset;
-
-            try {
-                foreach ($this->conn->query($sql) as $row) {
-                    yield $row;
-                }
-            } catch(PDOException $e) {
-                // Without incrementing the offset, it should re-run the same query
-                $this->error($e);
-
-                if(strpos($e->getMessage(), 'server has gone away') !== false) {
-                    $this->reconnect();
-                    continue;
-                }
-            }
-
-            $offset += self::BATCH_READ_ROWS;
-        }
-    }
-
-    /**
-     * Return the subfleet
-     * @return mixed
-     */
-    protected function getSubfleet()
-    {
-        $airline = Airline::first();
-        $subfleet = Subfleet::firstOrCreate(
-            ['airline_id' => $airline->id, 'name' => self::SUBFLEET_NAME],
-            ['type' => 'PHPVMS']
-        );
-
-        return $subfleet;
-    }
-
-    /**
-     *
-     * All the individual importers, done on a per-table basis
-     * Some tables get saved locally for tables that use FK refs
-     *
-     */
-
-    /**
-     * Import all of the ranks
-     */
-    protected function importRanks()
-    {
-        $this->comment('--- RANK IMPORT ---');
-
-        $count = 0;
-        foreach ($this->readRows('ranks') as $row)
-        {
-            $rank = Rank::firstOrCreate(
-                ['name' => $row->rank],
-                ['image_link' => $row->rankimage, 'hours'=>$row->minhours]
-            );
-
-            $this->addMapping('ranks', $row->rankid, $rank->id);
-            $this->addMapping('ranks', $row->rank, $rank->id);
-
-            if($rank->wasRecentlyCreated) {
-                ++$count;
-            }
-        }
-
-        $this->info('Imported ' . $count . ' ranks');
-    }
-
-    /**
-     * Import all of the airlines. Save them all in the private var $airlines
-     * They're used to lookup from other reference tables
-     */
-    protected function importAirlines()
-    {
-        $this->comment('--- AIRLINE IMPORT ---');
-
-        $count = 0;
-        foreach ($this->readRows('airlines') as $row)
-        {
-            $airline = Airline::firstOrCreate(
-                ['icao' => $row->code],
-                ['iata' => $row->code, 'name' => $row->name, 'active' => $row->enabled]
-            );
-
-            $this->addMapping('airlines', $row->id, $airline->id);
-            $this->addMapping('airlines', $row->code, $airline->id);
-
-            if ($airline->wasRecentlyCreated) {
-                ++$count;
-            }
-        }
-
-        $this->info('Imported '. $count.' airlines');
-    }
-
-    /**
-     * Imported the aircraft
-     */
-    protected function importAircraft()
-    {
-        $this->comment('--- AIRCRAFT IMPORT ---');
-
-        $subfleet = $this->getSubfleet();
-
-        $this->info('Subfleet ID is '.$subfleet->id);
-
-        $count = 0;
-        foreach($this->readRows('aircraft') as $row)
-        {
-            $aircraft = Aircraft::firstOrCreate(
-                ['name' => $row->fullname, 'registration' => $row->registration],
-                ['icao' => $row->icao,
-                 'subfleet_id' => $subfleet->id,
-                 'active' => $row->enabled
-                ]);
-
-            $this->addMapping('aircraft', $row->id, $aircraft->id);
-
-            if($aircraft->wasRecentlyCreated) {
-                ++$count;
-            }
-        }
-
-        $this->info('Imported ' . $count . ' aircraft');
-    }
-
-    /**
-     * Import all of the airports
-     */
-    protected function importAirports()
-    {
-        $this->comment('--- AIRPORT IMPORT ---');
-
-        $count = 0;
-        foreach ($this->readRows('airports') as $row)
-        {
-            $attrs = [
-                'id' => trim($row->icao),
-                'icao' => trim($row->icao),
-                'name' => $row->name,
-                'country' => $row->country,
-                'lat' => $row->lat,
-                'lon' => $row->lng,
-                'hub' => $row->hub,
-            ];
-
-            $airport = Airport::updateOrCreate(
-                ['id' => $attrs['id']],
-                $attrs
-            );
-
-            if($airport->wasRecentlyCreated) {
-                ++$count;
-            }
-        }
-
-        $this->info('Imported ' . $count . ' airports');
-    }
-
-    /**
-     * Import the flights and schedules
-     */
-    protected function importFlights()
-    {
-        $this->comment('--- FLIGHT SCHEDULE IMPORT ---');
-
-        $count = 0;
-        foreach ($this->readRows('schedules') as $row)
-        {
-            $airline_id = $this->getMapping('airlines', $row->code);
-
-            $flight_num = trim($row->flightnum);
-
-            $attrs = [
-                'dpt_airport_id' => $row->depicao,
-                'arr_airport_id' => $row->arricao,
-                'route' => $row->route ?: '',
-                'distance' => round($row->distance ?: 0, 2),
-                'level' => $row->flightlevel ?: 0,
-                'dpt_time' => $row->deptime ?: '',
-                'arr_time' => $row->arrtime ?: '',
-                'flight_time' => $this->convertDuration($row->flighttime) ?: '',
-                'notes' => $row->notes ?: '',
-                'active' => $row->enabled ?: true,
-            ];
-
-            try {
-                $flight = Flight::updateOrCreate(
-                    ['airline_id' => $airline_id, 'flight_number' => $flight_num],
-                    $attrs
-                );
-            } catch (\Exception $e) {
-                #$this->error($e);
-            }
-
-            $this->addMapping('flights', $row->id, $flight->id);
-
-            // TODO: deserialize route_details into ACARS table
-
-            if($flight->wasRecentlyCreated) {
-                ++$count;
-            }
-        }
-
-        $this->info('Imported ' . $count . ' flights');
-    }
-
-    /**
-     * Import all of the PIREPs
-     */
-    protected function importPireps()
-    {
-        $this->comment('--- PIREP IMPORT ---');
-
-        $count = 0;
-        foreach ($this->readRows('pireps') as $row)
-        {
-            $pirep_id = $row->pirepid;
-            $user_id = $this->getMapping('users', $row->pilotid);
-            $airline_id = $this->getMapping('airlines', $row->code);
-            $aircraft_id = $this->getMapping('aircraft', $row->aircraft);
-
-            $attrs = [
-                #'id' => $pirep_id,
-                'user_id' => $user_id,
-                'airline_id' => $airline_id,
-                'aircraft_id' => $aircraft_id,
-                'flight_number' => $row->flightnum ?: '',
-                'dpt_airport_id' => $row->depicao,
-                'arr_airport_id' => $row->arricao,
-                'block_fuel' => $row->fuelused,
-                'route' => $row->route ?: '',
-                'source_name' => $row->source,
-                'created_at' => $this->parseDate($row->submitdate),
-                'updated_at' => $this->parseDate($row->modifieddate),
-            ];
-
-            # Set the distance
-            $distance = round($row->distance ?: 0, 2);
-            $attrs['distance'] = $distance;
-            $attrs['planned_distance'] = $distance;
-
-            # Set the flight time properly
-            $duration = $this->convertDuration($row->flighttime_stamp);
-            $attrs['flight_time'] = $duration;
-            $attrs['planned_flight_time'] = $duration;
-
-            # Set how it was filed
-            if(strtoupper($row->source) === 'MANUAL') {
-                $attrs['source'] = PirepSource::MANUAL;
-            } else {
-                $attrs['source'] = PirepSource::ACARS;
-            }
-
-            # Set the flight type
-            $row->flighttype = strtoupper($row->flighttype);
-            if($row->flighttype === 'P') {
-                $attrs['flight_type'] = FlightType::PASSENGER;
-            } elseif($row->flighttype === 'C') {
-                $attrs['flight_type'] = FlightType::CARGO;
-            } else {
-                $attrs['flight_type'] = FlightType::CHARTER;
-            }
-
-            # Set the flight level of the PIREP is set
-            if(property_exists($row, 'flightlevel')) {
-                $attrs['level'] = $row->flightlevel;
-            } else {
-                $attrs['level'] = 0;
-            }
-
-            $pirep = Pirep::updateOrCreate(
-                ['id' => $pirep_id],
-                $attrs
-            );
-
-            $source = strtoupper($row->source);
-            if($source === 'SMARTCARS') {
-                # TODO: Parse smartcars log into the acars table
-            } elseif($source === 'KACARS') {
-                # TODO: Parse kACARS log into acars table
-            } elseif($source === 'XACARS') {
-                # TODO: Parse XACARS log into acars table
-            }
-
-            # TODO: Add extra fields in as PIREP fields
-            $this->addMapping('pireps', $row->pirepid, $pirep->id);
-
-            if ($pirep->wasRecentlyCreated) {
-                ++$count;
-            }
-        }
-
-        $this->info('Imported ' . $count . ' pireps');
-    }
-
-    protected function importUsers()
-    {
-        $this->comment('--- USER IMPORT ---');
-
-        $count = 0;
-        foreach ($this->readRows('pilots', 50) as $row) {
-
-            # TODO: What to do about pilot ids
-
-            $name = $row->firstname . ' ' . $row->lastname;
-
-            $airline_id = $this->getMapping('airlines', $row->code);
-            $rank_id = $this->getMapping('ranks', $row->rank);
-            $state = $this->getUserState($row->retired);
-
-            $new_password = Str::random(60);
-
-            $attrs = [
-                'name' => $name,
-                'password' => Hash::make($new_password),
-                'api_key' => Utils::generateApiKey(),
-                'airline_id' => $airline_id,
-                'rank_id' => $rank_id,
-                'home_airport_id' => $row->hub,
-                'curr_airport_id' => $row->hub,
-                'flights' => (int)$row->totalflights,
-                'flight_time' => Utils::hoursToMinutes($row->totalhours),
-                'state' => $state,
-                'created_at' => $this->parseDate($row->joindate),
-            ];
-
-            $user = User::updateOrCreate(
-                ['email' => $row->email],
-                $attrs
-            );
-
-            $this->addMapping('users', $row->pilotid, $user->id);
-
-            if ($user->wasRecentlyCreated) {
-                ++$count;
-            }
-        }
-
-        $this->info('Imported ' . $count . ' users');
-    }
-
-    /**
-     * Go through and set the last PIREP ID for the users
-     */
-    protected function findLastPireps()
-    {
-
-    }
-
-    /**
-     * Recalculate all of the user ranks
-     */
-    protected function recalculateRanks()
-    {
-        /*$this->comment('--- RECALCULATING RANKS ---');*/
-    }
-
-    /**
-     * Get the user's new state from their original state
-     * @param $state
-     * @return int
-     */
-    protected function getUserState($state)
-    {
-        // TODO: This state might differ between simpilot and classic version
-
-        $state = (int) $state;
-
-        // Declare array of classic states
-        $phpvms_classic_states = [
-            'ACTIVE' => 0,
-            'INACTIVE' => 1,
-            'BANNED' => 2,
-            'ON_LEAVE' => 3
-        ];
-
-        // Decide which state they will be in accordance with v7
-        if ($state === $phpvms_classic_states['ACTIVE']) {
-            return UserState::ACTIVE;
-        } elseif ($state === $phpvms_classic_states['INACTIVE']) {
-            # TODO: Make an inactive state?
-            return UserState::REJECTED;
-        } elseif ($state === $phpvms_classic_states['BANNED']) {
-            return UserState::SUSPENDED;
-        } elseif ($state === $phpvms_classic_states['ON_LEAVE']) {
-            return UserState::ON_LEAVE;
-        } else {
-            $this->error('Unknown status: '. $state);
-        }
-    }
-}

app/Contracts/AirportLookup.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Contracts;
+
+use App\Models\Airport;
+
+abstract class AirportLookup
+{
+    /**
+     * Lookup the information for an airport. Needs to return an instance of the
+     * Airport model, or an array with the properties listed in the Airport model.
+     *
+     * The in-use implementation can be changed in the config/phpvms.php file, so
+     * different services can be used, in-case vaCentral one isn't working or there
+     * is a better one available. Don't handle any caching in this layer, that happens
+     * at the service layer
+     *
+     * Return null if there's an error or nothing was found
+     *
+     * @example App\Services\AirportLookup\VaCentralLookup
+     *
+     * @param string $icao
+     *
+     * @return Airport|null
+     */
+    abstract public function getAirport($icao);
+}

app/Contracts/Award.php

@@ -0,0 +1,102 @@
+<?php
+
+namespace App\Contracts;
+
+use App\Models\Award as AwardModel;
+use App\Models\User;
+use App\Models\UserAward;
+use App\Support\Utils;
+use Exception;
+use Illuminate\Support\Facades\Log;
+
+/**
+ * Base class for the Awards, you need to extend this, and implement:
+ *  $name
+ *  $param_description (optional)
+ *  public function check($parameter=null)
+ *
+ * See: http://docs.phpvms.net/customizing/awards
+ */
+abstract class Award
+{
+    public $name = '';
+    public $param_description = '';
+
+    /**
+     * Each award class just needs to return true or false if it should actually
+     * be awarded to a user. This is the only method that needs to be implemented
+     *
+     * @param null $parameter Optional parameters that are passed in from the UI
+     *
+     * @return bool
+     */
+    abstract public function check($parameter = null): bool;
+
+    /*
+     * You don't really need to mess with anything below here
+     */
+
+    /** @var \App\Models\Award|null */
+    protected $award;
+
+    /** @var \App\Models\User|null */
+    protected $user;
+
+    public function __construct(AwardModel $award = null, User $user = null)
+    {
+        $this->award = $award;
+        $this->user = $user;
+    }
+
+    /**
+     * Run the main handler for this award class to determine if
+     * it should be awarded or not. Declared as final to prevent a child
+     * from accidentally overriding and breaking something
+     */
+    final public function handle(): void
+    {
+        // Check if the params are a JSON object or array
+        $param = $this->award->ref_model_params;
+        if (Utils::isObject($this->award->ref_model_params)) {
+            $param = json_decode($this->award->ref_model_params);
+        }
+
+        if ($this->check($param)) {
+            $this->addAward();
+        }
+    }
+
+    /**
+     * Add the award to this user, if they don't already have it
+     *
+     * @return bool|UserAward
+     */
+    protected function addAward()
+    {
+        $w = [
+            'user_id'  => $this->user->id,
+            'award_id' => $this->award->id,
+        ];
+
+        $found = UserAward::where($w)->count('id');
+        if ($found > 0) {
+            return true;
+        }
+
+        // Associate this award to the user now
+        $award = new UserAward($w);
+
+        try {
+            $award->save();
+        } catch (Exception $e) {
+            Log::error(
+                'Error saving award: '.$e->getMessage(),
+                $e->getTrace()
+            );
+
+            return false;
+        }
+
+        return $award;
+    }
+}

app/Contracts/Command.php

@@ -0,0 +1,117 @@
+<?php
+
+namespace App\Contracts;
+
+use Illuminate\Support\Facades\Log;
+use function is_array;
+use Symfony\Component\Process\Process;
+
+/**
+ * Class BaseCommand
+ */
+abstract class Command extends \Illuminate\Console\Command
+{
+    /**
+     * @return mixed
+     */
+    abstract public function handle();
+
+    /**
+     * Adjust the logging depending on where we're running from
+     */
+    public function __construct()
+    {
+        parent::__construct();
+
+        // Running in the console but not in the tests
+        if (app()->runningInConsole() && env('APP_ENV') !== 'testing') {
+            $this->redirectLoggingToFile('stdout');
+        }
+    }
+
+    /**
+     * Splice the logger and replace the active handlers with the handlers from the
+     * a stack in config/logging.php
+     *
+     * @param string $channel_name Channel name from config/logging.php
+     */
+    public function redirectLoggingToFile($channel_name): void
+    {
+        $logger = app(\Illuminate\Log\Logger::class);
+
+        // Close the existing loggers
+        try {
+            $handlers = $logger->getHandlers();
+            foreach ($handlers as $handler) {
+                $handler->close();
+            }
+        } catch (\Exception $e) {
+            $this->error('Error closing handlers: '.$e->getMessage());
+        }
+
+        // Open the handlers for the channel name,
+        // and then set them to the main logger
+        try {
+            $logger->setHandlers(
+                Log::channel($channel_name)->getHandlers()
+            );
+        } catch (\Exception $e) {
+            $this->error('Couldn\'t splice the logger: '.$e->getMessage());
+        }
+    }
+
+    /**
+     * Streaming file reader
+     *
+     * @param $filename
+     *
+     * @return \Generator
+     */
+    public function readFile($filename): ?\Generator
+    {
+        $fp = fopen($filename, 'rb');
+        while (($line = fgets($fp)) !== false) {
+            $line = rtrim($line, "\r\n");
+            if ($line[0] === ';') {
+                continue;
+            }
+
+            yield $line;
+        }
+
+        fclose($fp);
+    }
+
+    /**
+     * @param array|string $cmd
+     * @param bool         $return
+     * @param mixed        $verbose
+     *
+     * @throws \Symfony\Component\Process\Exception\RuntimeException
+     * @throws \Symfony\Component\Process\Exception\LogicException
+     *
+     * @return string
+     */
+    public function runCommand($cmd, $return = false, $verbose = true): string
+    {
+        if (is_array($cmd)) {
+            $cmd = implode(' ', $cmd);
+        }
+
+        if ($verbose) {
+            $this->info('Running '.$cmd);
+        }
+
+        $val = '';
+        $process = Process::fromShellCommandline($cmd);
+        $process->run(function ($type, $buffer) use ($return, &$val) {
+            if ($return) {
+                $val .= $buffer;
+            } else {
+                echo $buffer;
+            }
+        });
+
+        return $val;
+    }
+}

app/Contracts/Composer.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Contracts;
+
+use Illuminate\View\View;
+
+abstract class Composer
+{
+    abstract public function compose(View $view);
+}

app/Contracts/Controller.php

@@ -0,0 +1,102 @@
+<?php
+
+namespace App\Contracts;
+
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
+use Illuminate\Foundation\Bus\DispatchesJobs;
+use Illuminate\Foundation\Validation\ValidatesRequests;
+use Illuminate\Http\Request;
+use Laracasts\Flash\Flash;
+
+/**
+ * Class Controller
+ */
+abstract class Controller extends \Illuminate\Routing\Controller
+{
+    use AuthorizesRequests;
+    use DispatchesJobs;
+    use ValidatesRequests;
+
+    /**
+     * Write a error to the flash and redirect the user to a route
+     *
+     * @param $message
+     * @param $route
+     *
+     * @return mixed
+     */
+    public function flashError($message, $route)
+    {
+        Flash::error($message);
+        return redirect(route($route))->withInput();
+    }
+
+    /**
+     * Shortcut function to get the attributes from a request while running the validations
+     *
+     * @param Request $request
+     * @param array   $attrs_or_validations
+     * @param array   $addtl_fields
+     *
+     * @throws \Symfony\Component\HttpKernel\Exception\BadRequestHttpException
+     *
+     * @return array
+     */
+    public function getFromReq($request, $attrs_or_validations, $addtl_fields = null)
+    {
+        // See if a list of values is passed in, or if a validation list is passed in
+        $is_validation = false;
+        if (\count(array_filter(array_keys($attrs_or_validations), '\is_string')) > 0) {
+            $is_validation = true;
+        }
+
+        if ($is_validation) {
+            $this->validate($request, $attrs_or_validations);
+        }
+
+        $fields = [];
+        foreach ($attrs_or_validations as $idx => $field) {
+            if ($is_validation) {
+                $field = $idx;
+            }
+
+            if ($request instanceof Request) {
+                if ($request->filled($field)) {
+                    $fields[$field] = $request->input($field);
+                }
+            } else {
+                /* @noinspection NestedPositiveIfStatementsInspection */
+                if (array_key_exists($field, $request)) {
+                    $fields[$field] = $request[$field];
+                }
+            }
+        }
+
+        if (!empty($addtl_fields) && \is_array($addtl_fields)) {
+            $fields = array_merge($fields, $addtl_fields);
+        }
+
+        return $fields;
+    }
+
+    /**
+     * Simple normalized method for forming the JSON responses
+     *
+     * @param $message
+     * @param null|mixed $count
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function message($message, $count = null)
+    {
+        $attrs = [
+            'message' => $message,
+        ];
+
+        if ($count !== null) {
+            $attrs['count'] = $count;
+        }
+
+        return response()->json($attrs);
+    }
+}

app/Contracts/Enum.php

@@ -0,0 +1,172 @@
+<?php
+
+namespace App\Contracts;
+
+/**
+ * Borrowed some ideas from myclabs/php-enum after this was created
+ */
+abstract class Enum
+{
+    protected static $cache = [];
+    protected static $codes = [];
+    protected static $labels = [];
+
+    /**
+     * @var int
+     */
+    protected $value;
+
+    /**
+     * Create an instance of this Enum
+     *
+     * @param $val
+     */
+    public function __construct($val)
+    {
+        $this->value = $val;
+    }
+
+    /**
+     * Return the value that's been set if this is an instance
+     *
+     * @return mixed
+     */
+    final public function getValue()
+    {
+        return $this->value;
+    }
+
+    /**
+     * Return the label, try to return the translated version as well
+     *
+     * @param $value
+     *
+     * @return mixed
+     */
+    final public static function label($value)
+    {
+        if (isset(static::$labels[$value])) {
+            $val = static::$labels[$value];
+            if (strpos($val, '.') !== false) {
+                return trans($val);
+            }
+
+            return $val;
+        }
+    }
+
+    /**
+     * Return all of the (translated) labels
+     */
+    final public static function labels(): array
+    {
+        $labels = [];
+        foreach (static::$labels as $key => $label) {
+            $labels[$key] = trans($label);
+        }
+
+        return $labels;
+    }
+
+    /**
+     * Get the numeric value from a string code
+     *
+     * @param $code
+     *
+     * @return mixed|null
+     */
+    public static function getFromCode($code)
+    {
+        return array_search($code, static::$codes, true);
+    }
+
+    /**
+     * Convert the integer value into one of the codes
+     *
+     * @param $value
+     *
+     * @return false|int|string
+     */
+    public static function convertToCode($value)
+    {
+        $value = (int) $value;
+        if (!array_key_exists($value, static::$codes)) {
+            return;
+        }
+
+        return static::$codes[$value];
+    }
+
+    /**
+     * Select box entry items
+     *
+     * @param bool $add_blank
+     *
+     * @return array
+     */
+    public static function select($add_blank = false): array
+    {
+        $labels = [];
+        if ($add_blank) {
+            $labels[] = '';
+        }
+
+        foreach (static::$labels as $key => $label) {
+            $labels[$key] = trans($label);
+        }
+
+        return $labels;
+    }
+
+    /**
+     * Returns all possible values as an array
+     *
+     * @throws \ReflectionException
+     *
+     * @return array Constant name in key, constant value in value
+     */
+    public static function toArray(): array
+    {
+        $class = static::class;
+        if (!array_key_exists($class, static::$cache)) {
+            $reflection = new \ReflectionClass($class);
+            static::$cache[$class] = $reflection->getConstants();
+        }
+
+        return static::$cache[$class];
+    }
+
+    /**
+     * @param Enum $enum
+     *
+     * @return bool
+     */
+    final public function equals(self $enum): bool
+    {
+        return $this->getValue() === $enum->getValue() && static::class === \get_class($enum);
+    }
+
+    /**
+     * Returns a value when called statically like so: MyEnum::SOME_VALUE() given SOME_VALUE is a
+     * class constant
+     *
+     * @param string $name
+     * @param array  $arguments
+     *
+     * @throws \BadMethodCallException
+     * @throws \ReflectionException
+     *
+     * @return static
+     */
+    public static function __callStatic($name, $arguments)
+    {
+        $array = static::toArray();
+        if (isset($array[$name])) {
+            return new static($array[$name]);
+        }
+
+        throw new \BadMethodCallException(
+            "No static method or enum constant '$name' in class ".static::class
+        );
+    }
+}

app/Contracts/Event.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace App\Contracts;
+
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
+
+class Event
+{
+    use Dispatchable;
+    use SerializesModels;
+}

app/Contracts/FormRequest.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Contracts;
+
+use Illuminate\Validation\Rule;
+
+class FormRequest extends \Illuminate\Foundation\Http\FormRequest
+{
+    /**
+     * Authorized by default
+     *
+     * @return bool
+     */
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    /**
+     * @return array
+     */
+    public function rules(): array
+    {
+        return [];
+    }
+
+    /**
+     * Set a given column as being unique
+     *
+     * @param $table
+     *
+     * @return array
+     */
+    public function unique($table)
+    {
+        return [
+            Rule::unique($table)->ignore($this->id, 'id'),
+        ];
+    }
+}

app/Contracts/ImportExport.php

@@ -0,0 +1,246 @@
+<?php
+
+namespace App\Contracts;
+
+use App\Models\Airline;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Validator;
+use Illuminate\Validation\ValidationException;
+
+/**
+ * Common functionality used across all of the importers
+ */
+class ImportExport
+{
+    public $assetType;
+    public $status = [
+        'success' => [],
+        'errors'  => [],
+    ];
+
+    /**
+     * Hold the columns for the particular table
+     */
+    public static $columns = [];
+
+    /**
+     * @param mixed $row
+     *
+     * @return array
+     */
+    public function export($row): array
+    {
+        throw new \RuntimeException('export not implemented');
+    }
+
+    /**
+     * @param array $row
+     * @param mixed $index
+     *
+     * @throws \RuntimeException
+     *
+     * @return bool
+     */
+    public function import(array $row, $index): bool
+    {
+        throw new \RuntimeException('import not implemented');
+    }
+
+    /**
+     * Get the airline from the ICAO. Create it if it doesn't exist
+     *
+     * @param $code
+     *
+     * @return Airline
+     */
+    public function getAirline($code): Airline
+    {
+        $airline = Airline::firstOrCreate([
+            'icao' => $code,
+        ], ['name' => $code]);
+
+        return $airline;
+    }
+
+    /**
+     * @return array
+     */
+    public function getColumns()
+    {
+        return static::$columns;
+    }
+
+    /**
+     * Do a basic check that the number of columns match
+     *
+     * @param $row
+     *
+     * @return bool
+     */
+    public function checkColumns($row): bool
+    {
+        return \count($row) === \count($this->getColumns());
+    }
+
+    /**
+     * Bubble up an error to the interface that we need to stop
+     *
+     * @param $error
+     * @param $e
+     *
+     * @throws ValidationException
+     */
+    protected function throwError($error, \Exception $e = null): void
+    {
+        Log::error($error);
+        if ($e) {
+            Log::error($e->getMessage());
+        }
+
+        $validator = Validator::make([], []);
+        $validator->errors()->add('csv_file', $error);
+
+        throw new ValidationException($validator);
+    }
+
+    /**
+     * Add to the log messages for this importer
+     *
+     * @param $msg
+     */
+    public function log($msg): void
+    {
+        $this->status['success'][] = $msg;
+        Log::info($msg);
+    }
+
+    /**
+     * Add to the error log for this import
+     *
+     * @param $msg
+     */
+    public function errorLog($msg): void
+    {
+        $this->status['errors'][] = $msg;
+        Log::error($msg);
+    }
+
+    /**
+     * Set a key-value pair to an array
+     *
+     * @param       $kvp_str
+     * @param array $arr
+     */
+    protected function kvpToArray($kvp_str, array &$arr)
+    {
+        $item = explode('=', $kvp_str);
+        if (\count($item) === 1) {  // just a list?
+            $arr[] = trim($item[0]);
+        } else {  // actually a key-value pair
+            $k = trim($item[0]);
+            $v = trim($item[1]);
+            $arr[$k] = $v;
+        }
+    }
+
+    /**
+     * Parse a multi column values field. E.g:
+     * Y?price=200&cost=100; F?price=1200
+     *    or
+     * gate=B32;cost index=100
+     *
+     * Converted into a multi-dimensional array
+     *
+     * @param $field
+     *
+     * @return array|string
+     */
+    public function parseMultiColumnValues($field)
+    {
+        $ret = [];
+        $split_values = explode(';', $field);
+
+        // No multiple values in here, just a straight value
+        if (\count($split_values) === 1) {
+            if (trim($split_values[0]) === '') {
+                return [];
+            }
+
+            return [$split_values[0]];
+        }
+
+        foreach ($split_values as $value) {
+            // This isn't in the query string format, so it's
+            // just a straight key-value pair set
+            if (strpos($value, '?') === false) {
+                $this->kvpToArray($value, $ret);
+                continue;
+            }
+
+            // This contains the query string, which turns it
+            // into the multi-level array
+
+            $query_str = explode('?', $value);
+            $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;
+    }
+
+    /**
+     * @param $obj
+     *
+     * @return mixed
+     */
+    public function objectToMultiString($obj)
+    {
+        if (!\is_array($obj)) {
+            return $obj;
+        }
+
+        $ret_list = [];
+        foreach ($obj as $key => $val) {
+            if (is_numeric($key) && !\is_array($val)) {
+                $ret_list[] = $val;
+                continue;
+            }
+
+            $key = trim($key);
+
+            if (!\is_array($val)) {
+                $val = trim($val);
+                $ret_list[] = "{$key}={$val}";
+            } else {
+                $q = [];
+                foreach ($val as $subkey => $subval) {
+                    if (is_numeric($subkey)) {
+                        $q[] = $subval;
+                    } else {
+                        $q[] = "{$subkey}={$subval}";
+                    }
+                }
+
+                $q = implode('&', $q);
+                if (!empty($q)) {
+                    $ret_list[] = "{$key}?{$q}";
+                } else {
+                    $ret_list[] = $key;
+                }
+            }
+        }
+
+        return implode(';', $ret_list);
+    }
+}

app/Contracts/Listener.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Contracts;
+
+use Illuminate\Contracts\Events\Dispatcher;
+
+abstract class Listener
+{
+    public static $callbacks = [];
+
+    /**
+     * Sets up any callbacks that are defined in the child class
+     *
+     * @param $events
+     */
+    public function subscribe(Dispatcher $events): void
+    {
+        foreach (static::$callbacks as $klass => $cb) {
+            $events->listen($klass, static::class.'@'.$cb);
+        }
+    }
+}

app/Contracts/Metar.php

@@ -0,0 +1,99 @@
+<?php
+
+namespace App\Contracts;
+
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Log;
+
+/**
+ * Base class for implementing retrieving METARs
+ */
+abstract class Metar
+{
+    /**
+     * Implement retrieving the METAR - return the METAR string. Needs to be protected,
+     * since this shouldn't be directly called. Call `metar($icao)`. If not implemented,
+     * return a blank string
+     *
+     * @param $icao
+     *
+     * @return mixed
+     */
+    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
+     *
+     * @param $icao
+     *
+     * @return string
+     */
+    public function metar($icao): string
+    {
+        $cache = config('cache.keys.METAR_WEATHER_LOOKUP');
+        $key = $cache['key'].$icao;
+
+        if (Cache::has($key)) {
+            $raw_metar = Cache::get($key);
+            if ($raw_metar !== '') {
+                return $raw_metar;
+            }
+        }
+
+        try {
+            $raw_metar = $this->get_metar($icao);
+        } catch (\Exception $e) {
+            Log::error('Error getting METAR: '.$e->getMessage(), $e->getTrace());
+            return '';
+        }
+
+        if ($raw_metar !== '') {
+            Cache::put($key, $raw_metar, $cache['time']);
+        }
+
+        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/Middleware.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Contracts;
+
+use Closure;
+use Illuminate\Http\Request;
+
+interface Middleware
+{
+    public function handle(Request $request, Closure $next);
+}

app/Contracts/Migration.php

@@ -0,0 +1,107 @@
+<?php
+
+namespace App\Contracts;
+
+use App\Support\Database;
+use Exception;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Validator;
+use Illuminate\Validation\ValidationException;
+
+/**
+ * Class Migration
+ */
+abstract class Migration extends \Illuminate\Database\Migrations\Migration
+{
+    /**
+     * At a minimum, this function needs to be implemented
+     *
+     * @return mixed
+     */
+    abstract public function up();
+
+    /**
+     * A method to reverse a migration doesn't need to be made
+     */
+    public function down()
+    {
+    }
+
+    /**
+     * Add a module and enable it
+     *
+     * @param array $attrs
+     */
+    public function addModule(array $attrs)
+    {
+        $module = array_merge([
+            'enabled'    => true,
+            'created_at' => DB::raw('NOW()'),
+            'updated_at' => DB::raw('NOW()'),
+        ], $attrs);
+
+        try {
+            DB::table('modules')->insert($module);
+        } catch (Exception $e) {
+            // setting already exists, just ignore it
+            if ($e->getCode() === 23000) {
+                return;
+            }
+        }
+    }
+
+    /**
+     * Seed a YAML file into the database
+     *
+     * @param string $file Full path to yml file to seed
+     */
+    public function seedFile($file): void
+    {
+        try {
+            $path = base_path($file);
+            Database::seed_from_yaml_file($path, false);
+        } catch (Exception $e) {
+            Log::error('Unable to load '.$file.' file');
+            Log::error($e);
+        }
+    }
+
+    /**
+     * Add rows to a table
+     *
+     * @param $table
+     * @param $rows
+     */
+    public function addData($table, $rows)
+    {
+        foreach ($rows as $row) {
+            try {
+                DB::table($table)->insert($row);
+            } catch (Exception $e) {
+                // setting already exists, just ignore it
+                if ($e->getCode() === 23000) {
+                    continue;
+                }
+            }
+        }
+    }
+
+    /**
+     * Add an award from the migrations (for example, if you're adding an award module)
+     *
+     * @param array $award See \App\Models\Awardv
+     *
+     * @throws \Illuminate\Validation\ValidationException
+     */
+    public function addAward(array $award)
+    {
+        $validator = Validator::make($award, \App\Models\Award::$rules);
+        if ($validator->fails()) {
+            throw new ValidationException($validator);
+        }
+
+        $awardModel = new \App\Models\Award($award);
+        $awardModel->save();
+    }
+}

app/Contracts/Model.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Contracts;
+
+/**
+ * @property mixed $id
+ * @property bool  $skip_mutator
+ *
+ * @mixin \Illuminate\Database\Eloquent\Builder
+ */
+abstract class Model extends \Illuminate\Database\Eloquent\Model
+{
+    /**
+     * Max length of ID for string columns
+     */
+    public const ID_MAX_LENGTH = 16;
+
+    /**
+     * For the factories, skip the mutators. Only apply to one instance
+     */
+    public $skip_mutator = false;
+}

app/Contracts/Modules/ServiceProvider.php

@@ -0,0 +1,49 @@
+<?php
+
+namespace App\Contracts\Modules;
+
+/**
+ * Base class for module service providers
+ * Add-on module service providers must extend this class. Docs on Service Providers:
+ * https://laravel.com/docs/7.x/providers
+ *
+ * For a sample service provider, view the sample module one:
+ * https://github.com/nabeelio/phpvms-module/blob/master/Providers/SampleServiceProvider.php
+ */
+abstract class ServiceProvider extends \Illuminate\Support\ServiceProvider
+{
+    /**
+     * A boot method is required, even if it doesn't do anything.
+     * https://laravel.com/docs/7.x/providers#the-boot-method
+     *
+     * This is normally where you'd register the routes or other startup tasks for your module
+     */
+    public function boot(): void
+    {
+    }
+
+    /**
+     * This is required to register the links in either the public or admin toolbar
+     * For example, adding a frontend link:
+     *
+     * $this->moduleSvc->addFrontendLink('Sample', '/sample', '', $logged_in=true);
+     *
+     * Or an admin link:
+     *
+     * $this->moduleSvc->addAdminLink('Sample', '/admin/sample');
+     */
+    public function registerLinks(): void
+    {
+    }
+
+    /**
+     * Deferred providers:
+     * https://laravel.com/docs/7.x/providers#deferred-providers
+     *
+     * @return array
+     */
+    public function provides(): array
+    {
+        return [];
+    }
+}

app/Contracts/Notification.php

@@ -0,0 +1,41 @@
+<?php
+
+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
+{
+    use Queueable;
+
+    public $channels = [];
+    public $requires_opt_in = false;
+
+    public function __construct()
+    {
+        // Look in the notifications.channels config and see where this particular
+        // notification can go. Map it to $channels
+        $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;
+    }
+}

app/Contracts/Repository.php

@@ -0,0 +1,140 @@
+<?php
+
+namespace App\Contracts;
+
+use Illuminate\Validation\Validator;
+use Prettus\Repository\Eloquent\BaseRepository;
+
+/**
+ * @mixin \Prettus\Repository\Eloquent\BaseRepository
+ */
+abstract class Repository extends BaseRepository
+{
+    /**
+     * @param       $id
+     * @param array $columns
+     *
+     * @return mixed|null
+     */
+    public function findWithoutFail($id, array $columns = ['*'])
+    {
+        try {
+            return $this->find($id, $columns);
+        } catch (\Exception $e) {
+            return;
+        }
+    }
+
+    /**
+     * @param $values
+     *
+     * @return bool
+     */
+    public function validate($values)
+    {
+        $validator = Validator::make(
+            $values,
+            $this->model()->rules
+        );
+
+        if ($validator->fails()) {
+            return $validator->messages();
+        }
+
+        return true;
+    }
+
+    /**
+     * Return N most recent items, sorted by created_at
+     *
+     * @param int    $count
+     * @param string $sort_by created_at (default) or updated_at
+     *
+     * @return mixed
+     */
+    public function recent($count = null, $sort_by = 'created_at')
+    {
+        return $this->orderBy($sort_by, 'desc')->paginate($count);
+    }
+
+    /**
+     * Find records with a WHERE clause but also sort them
+     *
+     * @param $where
+     * @param $sort_by
+     * @param $order_by
+     *
+     * @return $this
+     */
+    public function whereOrder($where, $sort_by, $order_by = 'asc')
+    {
+        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)) {
+                foreach ($sort_by as $key => $sort) {
+                    $q = $q->orderBy($key, $sort);
+                }
+            } else {
+                $q = $q->orderBy($sort_by, $order_by);
+            }
+
+            return $q;
+        });
+    }
+
+    /**
+     * Find records where values don't match a list but sort the rest
+     *
+     * @param string $col
+     * @param array  $values
+     * @param string $sort_by
+     * @param string $order_by
+     *
+     * @return $this
+     */
+    public function whereNotInOrder($col, $values, $sort_by, $order_by = 'asc')
+    {
+        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)) {
+                foreach ($sort_by as $key => $sort) {
+                    $q = $q->orderBy($key, $sort);
+                }
+            } else {
+                $q = $q->orderBy($sort_by, $order_by);
+            }
+
+            return $q;
+        });
+    }
+
+    /**
+     * Retrieve all data of repository, paginated. Added in extra parameter to read from the
+     * request which page it should be on
+     *
+     * @param null   $limit
+     * @param array  $columns
+     * @param string $method
+     *
+     * @throws \Prettus\Repository\Exceptions\RepositoryException
+     *
+     * @return mixed
+     */
+    public function paginate($limit = null, $columns = ['*'], $method = 'paginate')
+    {
+        $this->applyCriteria();
+        $this->applyScope();
+
+        $max = config('repository.pagination.limit', 50);
+        $limit = (int) ($limit ?? request()->query('limit') ?? $max);
+        $page = (int) request()->query('page', 1);
+
+        $results = $this->model->{$method}($limit, $columns, 'page', $page);
+        $results->appends(app('request')->query());
+        $this->resetModel();
+
+        return $this->parserResult($results);
+    }
+}

app/Contracts/Resource.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Contracts;
+
+use Illuminate\Http\Resources\Json\JsonResource;
+
+/**
+ * Base class for a resource/response
+ */
+class Resource extends JsonResource
+{
+    /**
+     * Iterate through the list of $fields and check if they're a "Unit"
+     * If they are, then add the response
+     *
+     * @param       $response
+     * @param array $fields
+     */
+    public function checkUnitFields(&$response, array $fields): void
+    {
+        foreach ($fields as $f) {
+            if ($this->{$f} instanceof Unit) {
+                $response[$f] = $this->{$f}->getResponseUnits();
+            } else {
+                $response[$f] = $this->{$f};
+            }
+        }
+    }
+}

app/Contracts/RouteFinder.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Contracts;
+
+/**
+ * Abstract class for finding a route from a departure airport to an arrival airport
+ * Can allow for multiple, configurable methods for finding a route, whether it reaches
+ * out to a REST API or implement some sort of internal logic to look through a file
+ * or whatever the logic might be.
+ *
+ * Just one public-facing method needs to be implemented
+ */
+abstract class RouteFinder
+{
+    /**
+     * Find a route from the departure ICAO to the arrival ICAO
+     *
+     * @param $dptIcao
+     * @param $arrIcao
+     *
+     * @return string
+     */
+    abstract public function findRoute($dptIcao, $arrIcao): string;
+}

app/Contracts/Service.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Contracts;
+
+/**
+ * Class Service
+ */
+abstract class Service
+{
+}

app/Contracts/Unit.php

@@ -0,0 +1,129 @@
+<?php
+
+namespace App\Contracts;
+
+use ArrayAccess;
+use PhpUnitsOfMeasure\Exception\UnknownUnitOfMeasure;
+
+/**
+ * Abstract unit wrapper
+ */
+class Unit implements ArrayAccess
+{
+    /**
+     * The unit this is kept as
+     */
+    public $unit;
+
+    /**
+     * All of the units of this class
+     */
+    public $units;
+
+    /**
+     * Holds an instance of the PhpUnit type
+     *
+     * @var \PhpUnitsOfMeasure\AbstractPhysicalQuantity
+     */
+    protected $instance;
+
+    /**
+     * Units that are included as part of the REST response
+     */
+    public $responseUnits = [];
+
+    /**
+     * @return mixed
+     */
+    public function value()
+    {
+        return $this->__toString();
+    }
+
+    /**
+     * Just call toUnit() on the PhpUnitOfMeasure instance
+     *
+     * @param string $unit
+     *
+     * @return mixed
+     */
+    public function toUnit($unit)
+    {
+        return $this->instance->toUnit($unit);
+    }
+
+    /**
+     * Return all of the units that get sent back in a response
+     */
+    public function getResponseUnits(): array
+    {
+        $response = [];
+        foreach ($this->responseUnits as $unit) {
+            $response[$unit] = $this[$unit] ?? 0;
+        }
+
+        return $response;
+    }
+
+    /**
+     * Implements ArrayAccess
+     *
+     * @param $offset
+     *
+     * @return bool
+     */
+    public function offsetExists($offset)
+    {
+        return $this->offsetGet($offset) !== null;
+    }
+
+    /**
+     * Implements ArrayAccess
+     *
+     * @param $offset
+     *
+     * @return mixed
+     */
+    public function offsetGet($offset)
+    {
+        try {
+            $value = $this->instance->toUnit($offset);
+            if (!$value) {
+                return;
+            }
+        } catch (UnknownUnitOfMeasure $e) {
+            return;
+        }
+
+        return round($value, 2);
+    }
+
+    /**
+     * Implements ArrayAccess
+     *
+     * @param $offset
+     * @param $value
+     */
+    public function offsetSet($offset, $value)
+    {
+        // $this->units[$offset] = $value;
+    }
+
+    /**
+     * Implements ArrayAccess
+     *
+     * @param $offset
+     */
+    public function offsetUnset($offset)
+    {
+        // $this->units[$offset] = null;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function __toString()
+    {
+        return (string) $this->offsetGet($this->unit);
+    }
+}

app/Contracts/Widget.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Contracts;
+
+use Arrilot\Widgets\AbstractWidget;
+
+/**
+ * Class Widget
+ */
+abstract class Widget extends AbstractWidget
+{
+    public $cacheTime = 0;
+
+    /**
+     * Render the template
+     *
+     * @param string $template
+     * @param array  $vars
+     *
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     */
+    public function view(string $template, array $vars = [])
+    {
+        return view($template, $vars);
+    }
+}

app/Cron/Hourly/DeletePireps.php

@@ -0,0 +1,52 @@
+<?php
+
+namespace App\Cron\Hourly;
+
+use App\Contracts\Listener;
+use App\Events\CronHourly;
+use App\Models\Enums\PirepState;
+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
+{
+    /**
+     * Remove expired bids
+     *
+     * @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()->subHours($expire_time_hours);
+        $pireps = Pirep::whereDate('created_at', '<', $dt)->where(['state' => $state])->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

@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Cron\Hourly;
+
+use App\Contracts\Listener;
+use App\Events\CronHourly;
+use App\Models\Bid;
+use Carbon\Carbon;
+
+/**
+ * Remove expired bids
+ */
+class RemoveExpiredBids extends Listener
+{
+    /**
+     * Remove expired bids
+     *
+     * @param CronHourly $event
+     *
+     * @throws \Exception
+     */
+    public function handle(CronHourly $event): void
+    {
+        if (setting('bids.expire_time') === 0) {
+            return;
+        }
+
+        $date = Carbon::now()->subHours(setting('bids.expire_time'));
+        Bid::whereDate('created_at', '<', $date)->delete();
+    }
+}

app/Cron/Hourly/RemoveExpiredLiveFlights.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Cron\Hourly;
+
+use App\Contracts\Listener;
+use App\Events\CronHourly;
+use App\Models\Enums\PirepState;
+use App\Models\Pirep;
+use Carbon\Carbon;
+
+/**
+ * Remove expired live flights
+ */
+class RemoveExpiredLiveFlights extends Listener
+{
+    /**
+     * Remove expired live flights that haven't had an update in the live time
+     *
+     * @param CronHourly $event
+     *
+     * @throws \Exception
+     */
+    public function handle(CronHourly $event): void
+    {
+        if (setting('acars.live_time') === 0) {
+            return;
+        }
+
+        $date = Carbon::now()->subHours(setting('acars.live_time'));
+        Pirep::whereDate('updated_at', '<', $date)
+            ->where('state', PirepState::IN_PROGRESS)
+            ->delete();
+    }
+}

app/Cron/Monthly/ApplyExpenses.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Cron\Monthly;
+
+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;
+
+    /**
+     * ApplyExpenses constructor.
+     *
+     * @param RecurringFinanceService $financeSvc
+     */
+    public function __construct(RecurringFinanceService $financeSvc)
+    {
+        $this->financeSvc = $financeSvc;
+    }
+
+    /**
+     * Apply all of the expenses for a month
+     *
+     * @param CronMonthly $event
+     *
+     * @throws \UnexpectedValueException
+     * @throws \InvalidArgumentException
+     * @throws \Prettus\Validator\Exceptions\ValidatorException
+     */
+    public function handle(CronMonthly $event): void
+    {
+        Log::info('Monthly: Applying monthly expenses');
+        $this->financeSvc->processExpenses(ExpenseType::MONTHLY);
+    }
+}

app/Cron/Nightly/ApplyExpenses.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Cron\Nightly;
+
+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;
+
+    /**
+     * ApplyExpenses constructor.
+     *
+     * @param RecurringFinanceService $financeSvc
+     */
+    public function __construct(RecurringFinanceService $financeSvc)
+    {
+        $this->financeSvc = $financeSvc;
+    }
+
+    /**
+     * Apply all of the expenses for a day
+     *
+     * @param CronNightly $event
+     *
+     * @throws \UnexpectedValueException
+     * @throws \InvalidArgumentException
+     * @throws \Prettus\Validator\Exceptions\ValidatorException
+     */
+    public function handle(CronNightly $event): void
+    {
+        Log::info('Nightly: Applying daily expenses');
+        $this->financeSvc->processExpenses(ExpenseType::DAILY);
+    }
+}

app/Cron/Nightly/ClearExpiredSimbrief.php

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

app/Cron/Nightly/NewVersionCheck.php

@@ -0,0 +1,35 @@
+<?php
+
+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;
+
+    /**
+     * @param VersionService $versionSvc
+     */
+    public function __construct(VersionService $versionSvc)
+    {
+        $this->versionSvc = $versionSvc;
+    }
+
+    /**
+     * Set any users to being on leave after X days
+     *
+     * @param CronNightly $event
+     */
+    public function handle(CronNightly $event): void
+    {
+        Log::info('Nightly: Checking for new version');
+        $this->versionSvc->isNewVersionAvailable();
+    }
+}

app/Cron/Nightly/PilotLeave.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace App\Cron\Nightly;
+
+use App\Contracts\Listener;
+use App\Events\CronNightly;
+use App\Services\UserService;
+use Illuminate\Support\Facades\Log;
+
+/**
+ * Determine if any pilots should be set to ON LEAVE status
+ */
+class PilotLeave extends Listener
+{
+    private $userSvc;
+
+    /**
+     * PilotLeave constructor.
+     *
+     * @param UserService $userSvc
+     */
+    public function __construct(UserService $userSvc)
+    {
+        $this->userSvc = $userSvc;
+    }
+
+    /**
+     * Set any users to being on leave after X days
+     *
+     * @param CronNightly $event
+     *
+     * @throws \UnexpectedValueException
+     * @throws \InvalidArgumentException
+     */
+    public function handle(CronNightly $event): void
+    {
+        Log::info('Cron: Running pilot leave check');
+        $users = $this->userSvc->findUsersOnLeave();
+        Log::info('Found '.count($users).' users on leave');
+
+        foreach ($users as $user) {
+            Log::info('Setting user '.$user->ident.' to ON LEAVE status');
+            $this->userSvc->setStatusOnLeave($user);
+        }
+    }
+}

app/Cron/Nightly/RecalculateBalances.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Cron\Nightly;
+
+use App\Contracts\Listener;
+use App\Events\CronNightly;
+use App\Models\Journal;
+use App\Repositories\JournalRepository;
+use Log;
+
+/**
+ * This recalculates the balances on all of the journals
+ */
+class RecalculateBalances extends Listener
+{
+    private $journalRepo;
+
+    /**
+     * Nightly constructor.
+     *
+     * @param JournalRepository $journalRepo
+     */
+    public function __construct(JournalRepository $journalRepo)
+    {
+        $this->journalRepo = $journalRepo;
+    }
+
+    /**
+     * Recalculate all the balances for the different ledgers
+     *
+     * @param CronNightly $event
+     *
+     * @throws \UnexpectedValueException
+     * @throws \InvalidArgumentException
+     */
+    public function handle(CronNightly $event): void
+    {
+        Log::info('Nightly: Recalculating balances');
+
+        $journals = Journal::all();
+        foreach ($journals as $journal) {
+            $old_balance = $journal->balance;
+
+            $this->journalRepo->recalculateBalance($journal);
+            $journal->refresh();
+
+            Log::info('Adjusting balance on '.
+                $journal->morphed_type.':'.$journal->morphed_id
+                .' from '.$old_balance.' to '.$journal->balance);
+        }
+
+        Log::info('Done calculating balances');
+    }
+}

app/Cron/Nightly/RecalculateStats.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Cron\Nightly;
+
+use App\Contracts\Listener;
+use App\Events\CronNightly;
+use App\Services\AircraftService;
+use App\Services\UserService;
+use Illuminate\Support\Facades\Log;
+
+/**
+ * This recalculates the balances on all of the journals
+ */
+class RecalculateStats extends Listener
+{
+    private $aircraftSvc;
+    private $userSvc;
+
+    public function __construct(AircraftService $aircraftSvc, UserService $userSvc)
+    {
+        $this->aircraftSvc = $aircraftSvc;
+        $this->userSvc = $userSvc;
+    }
+
+    /**
+     * Recalculate the stats for active users
+     *
+     * @param CronNightly $event
+     *
+     * @throws \UnexpectedValueException
+     * @throws \InvalidArgumentException
+     */
+    public function handle(CronNightly $event): void
+    {
+        Log::info('Nightly: Recalculating user stats');
+        $this->userSvc->recalculateAllUserStats();
+
+        Log::info('Nightly: Recalcuating aircraft status');
+        $this->aircraftSvc->recalculateStats();
+    }
+}

app/Cron/Nightly/SetActiveFlights.php

@@ -0,0 +1,85 @@
+<?php
+
+namespace App\Cron\Nightly;
+
+use App\Contracts\Listener;
+use App\Events\CronNightly;
+use App\Models\Enums\Days;
+use App\Models\Flight;
+use Carbon\Carbon;
+use Illuminate\Support\Facades\Log;
+
+/**
+ * Figure out what flights need to be active for today
+ */
+class SetActiveFlights extends Listener
+{
+    /**
+     * @param CronNightly $event
+     */
+    public function handle(CronNightly $event): void
+    {
+        Log::info('Nightly: Setting active flights');
+
+        $this->checkFlights();
+    }
+
+    /**
+     * Look through every single flight, check the start/end dates,
+     * as well of the days of week if this flight is active on this day
+     *
+     * TODO: Option to check the flight active/inactive against departure TZ
+     * TODO: Move to FlightService
+     */
+    public function checkFlights(): void
+    {
+        $today = Carbon::now('UTC');
+        $flights = Flight::all();
+
+        /**
+         * @var Flight $flight
+         */
+        foreach ($flights as $flight) {
+            if (!$flight->active) {
+                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) {
+                    $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')]));
+                    }
+                }
+
+                $flight->save();
+                continue;
+            }
+
+            // Check the day of week now first
+
+            // Start/end date is set, so make sure today is valid for it to be alive
+            // 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) {
+                    $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 {
+                $flight->visible = false;
+                Log::info('Toggling flight '.$flight->ident.' to hidden, outside of start/end boundary');
+            }
+
+            $flight->save();
+        }
+    }
+}

app/Database/factories/AcarsFactory.php

@@ -4,18 +4,20 @@ use Faker\Generator as Faker;
 
 $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,
-        'heading' => $faker->numberBetween(0, 359),
-        'altitude' => $faker->numberBetween(20, 400),
-        'vs' => $faker->numberBetween(-5000, 5000),
-        'gs' => $faker->numberBetween(300, 500),
+        '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_flow' => $faker->randomFloat(2, 100, 1000),
-        'sim_time' => $faker->dateTime('now', 'UTC'),
+        'autopilot'   => $faker->text(10),
+        'fuel'        => $faker->randomFloat(2, 100, 1000),
+        'fuel_flow'   => $faker->randomFloat(2, 100, 1000),
+        'sim_time'    => $faker->dateTime('now', 'UTC'),
     ];
 });

app/Database/factories/AircraftFactory.php

@@ -1,23 +1,32 @@
 <?php
 
+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;
 
 $factory->define(App\Models\Aircraft::class, function (Faker $faker) {
     return [
-        #'id' => $faker->unique()->numberBetween(10, 100000),
-        'subfleet_id' => function() {
-            return factory(App\Models\Subfleet::class)->create()->id;
+        'id'          => null,
+        'subfleet_id' => function () {
+            return factory(Subfleet::class)->create()->id;
         },
         'airport_id' => function () {
-            return factory(App\Models\Airport::class)->create()->id;
+            return factory(Airport::class)->create()->id;
         },
-        'icao' => $faker->unique()->text(5),
-        'name' => $faker->unique()->text(50),
+        'iata'         => $faker->unique()->text(5),
+        'icao'         => $faker->unique()->text(5),
+        'name'         => $faker->text(50),
         'registration' => $faker->unique()->text(10),
-        'tail_number' => $faker->unique()->text(10),
-        'active' => true,
-        'created_at' => $faker->dateTimeBetween('-1 week', 'now'),
-        'updated_at' => function (array $pirep) {
+        'hex_code'     => ICAO::createHexCode(),
+        'mtow'         => $faker->randomFloat(2, 0, 50000),
+        'zfw'          => $faker->randomFloat(2, 0, 50000),
+        'status'       => AircraftStatus::ACTIVE,
+        'state'        => AircraftState::PARKED,
+        'created_at'   => $faker->dateTimeBetween('-1 week', 'now'),
+        'updated_at'   => function (array $pirep) {
             return $pirep['created_at'];
         },
     ];

app/Database/factories/AirlineFactory.php

@@ -3,20 +3,23 @@
 use Faker\Generator as Faker;
 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' => $faker->unique()->numberBetween(10, 10000),
-        'icao' => function (array $apt) use ($faker) {
+        'id'   => null,
+        'icao' => function (array $apt) {
             $hashids = new Hashids(microtime(), 5);
             $mt = str_replace('.', '', microtime(true));
+
             return $hashids->encode($mt);
         },
-        'iata' => function (array $apt) { return $apt['icao']; },
-        'name' => $faker->sentence(3),
+        'iata' => function (array $apt) {
+            return $apt['icao'];
+        },
+        'name'    => $faker->sentence(3),
         'country' => $faker->country,
-        'active' => 1
+        'active'  => 1,
     ];
 });

app/Database/factories/AirportFactory.php

@@ -1,37 +1,56 @@
 <?php
 
-use Hashids\Hashids;
 use Faker\Generator as Faker;
 
-/**
+/*
+ * Create an ICAO for use in the factory.
+ */
+if (!function_exists('createFactoryICAO')) {
+    function createFactoryICAO(): string
+    {
+        $characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+        $max = strlen($characters) - 1;
+        $string = '';
+        for ($i = 0; $i < 4; $i++) {
+            try {
+                $string .= $characters[random_int(0, $max)];
+            } catch (Exception $e) {
+            }
+        }
+
+        return $string;
+    }
+}
+
+/*
  * 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(array $apt) use ($faker) {
-            $characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
-            $string = '';
-            $max = strlen($characters) - 1;
-            for ($i = 0; $i < 5; $i++) {
-                $string .= $characters[random_int(0, $max)];
-            }
+        'id' => function () use ($usedIcaos) {
+            do {
+                $airport = createFactoryICAO();
+            } while (in_array($airport, $usedIcaos, true));
 
-            return $string;
-            #return $faker->unique()->text(5);
-            /*$hashids = new Hashids(microtime(), 5);
-            $mt = str_replace('.', '', microtime(true));
-            return $hashids->encode($mt);*/
+            return $airport;
         },
-        'icao' => function(array $apt) { return $apt['id']; },
-        'iata' => function (array $apt) { return $apt['id']; },
-        'name' => $faker->sentence(3),
-        'country' => $faker->country,
-        'tz' => $faker->timezone,
-        'lat' => $faker->latitude,
-        'lon' => $faker->longitude,
-        'fuel_100ll_cost' => $faker->randomFloat(2),
-        'fuel_jeta_cost' => $faker->randomFloat(2),
-        'fuel_mogas_cost' => $faker->randomFloat(2),
+        '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/AwardsFactory.php

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

app/Database/factories/ExpenseFactory.php

@@ -0,0 +1,18 @@
+<?php
+
+use App\Models\Enums\ExpenseType;
+use Faker\Generator as Faker;
+
+$factory->define(App\Models\Expense::class, function (Faker $faker) {
+    return [
+        'id'           => null,
+        'airline_id'   => null,
+        'name'         => $faker->text(20),
+        'amount'       => $faker->randomFloat(2, 100, 1000),
+        'type'         => ExpenseType::FLIGHT,
+        'multiplier'   => false,
+        'ref_model'    => \App\Models\Expense::class,
+        'ref_model_id' => null,
+        'active'       => true,
+    ];
+});

app/Database/factories/FareFactory.php

@@ -4,10 +4,13 @@ use Faker\Generator as Faker;
 
 $factory->define(App\Models\Fare::class, function (Faker $faker) {
     return [
-        #'id' => $faker->unique()->numberBetween(10, 10000),
-        'code' => $faker->text(5),
-        'name' => $faker->text(20),
+        'id'    => null,
+        'code'  => $faker->unique()->text(50),
+        'name'  => $faker->text(50),
         'price' => $faker->randomFloat(2, 100, 1000),
+        'cost'  => function (array $fare) {
+            return round($fare['price'] / 2);
+        },
         'capacity' => $faker->randomFloat(0, 20, 500),
     ];
 });

app/Database/factories/FlightFactory.php

@@ -1,36 +1,44 @@
 <?php
-
+/**
+ * Create flights
+ */
 use Faker\Generator as Faker;
 
-# Match the list available in tests/data/*.yml
-
-$airlinesAvailable = [1];
-
-$factory->define(App\Models\Flight::class, function (Faker $faker) use ($airlinesAvailable) {
+$factory->define(App\Models\Flight::class, function (Faker $faker) {
     return [
-        'id' => substr($faker->unique()->sha1, 28, 12),
-        'airline_id' => $faker->randomElement($airlinesAvailable),
-        'flight_number' => $faker->unique()->numberBetween(10, 1000000),
-        'route_code' => $faker->randomElement(['', $faker->text(5)]),
-        'route_leg' => $faker->randomElement(['', $faker->text(5)]),
-        'dpt_airport_id' => function() {
-            return factory(App\Models\Airport::class)->create()->id;
+        '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;
+            return factory(\App\Models\Airport::class)->create()->id;
         },
         'alt_airport_id' => function () {
-            return factory(App\Models\Airport::class)->create()->id;
+            return factory(\App\Models\Airport::class)->create()->id;
         },
-        'route' => $faker->randomElement(['', $faker->text(5)]),
-        'dpt_time' => $faker->time(),
-        'arr_time' => $faker->time(),
-        'flight_time' => $faker->randomFloat(2),
-        'has_bid' => false,
-        'active' => true,
-        'created_at' => $faker->dateTimeBetween('-1 week', 'now'),
-        'updated_at' => function (array $pirep) {
-            return $pirep['created_at'];
+        'distance'             => $faker->numberBetween(1, 1000),
+        'route'                => null,
+        'level'                => 0,
+        'dpt_time'             => $faker->time(),
+        'arr_time'             => $faker->time(),
+        'flight_time'          => $faker->numberBetween(60, 360),
+        'load_factor'          => $faker->randomElement([15, 20, 50, 90, 100]),
+        'load_factor_variance' => $faker->randomElement([15, 20, 50, 90, 100]),
+        'has_bid'              => false,
+        'active'               => true,
+        'visible'              => true,
+        'days'                 => 0,
+        'start_date'           => null,
+        'end_date'             => null,
+        'created_at'           => $faker->dateTimeBetween('-1 week', 'now'),
+        'updated_at'           => static function (array $flight) {
+            return $flight['created_at'];
         },
     ];
 });

app/Database/factories/JournalFactory.php

@@ -0,0 +1,9 @@
+<?php
+
+use Faker\Generator as Faker;
+
+$factory->define(App\Models\Journal::class, function (Faker $faker) {
+    return [
+        'currency' => 'USD',
+    ];
+});

app/Database/factories/JournalTransactionsFactory.php

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