Add PHP 7.4 support (#464)

* Add PHP 7.4 to build matrix * DB fix * YAML parser fix in test data * Show versions * Package updates * Track used ICAOs * 7.4 METAR parsing fix * METAR parser fix * Formatting * Add meters to response units * Call instance for unit conversion * Return value * Catch exception for unknown quantity * Comment fix * Formatting * METAR parsing fixes on PHP 7.4 * Package updates * More random airport ID * More random airport ID * Properly disable toolbar * Semver written out to version file * Use dev as default identifier
2019-12-11 12:57:18 -05:00
parent 1f65b744a0
commit e6d38f9338
18 changed files with 256 additions and 211 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,12 +6,11 @@ language: php
 php:
  - '7.2'
  - '7.3'
+  - '7.4'

-matrix:
-  include:
-    - php: '7.2'
-    - php: '7.3'
-  fast_finish: true
+env:
+  - DB=mysql
+  - DB=mariadb

 cache:
  # Cache lives for 10 min
@@ -24,7 +23,12 @@ cache:
 services:
 - mysql

+addons:
+  mariadb: '10.2'
+
 install:
+  - php --version
+  - mysql --version
  - composer install --dev --no-interaction --verbose
  - cp .travis/env.travis.php env.php
  - cp .travis/phpunit.travis.xml phpunit.xml
@@ -41,6 +45,7 @@ after_failure:
  - cat storage/logs/*.log

 jobs:
+  fast_finish: true
  include:
    # Just packages up a release
    - stage: package
--- a/.travis/deploy_script.sh
+++ b/.travis/deploy_script.sh
@@ -2,140 +2,127 @@

 if [ "$TRAVIS" = "true" ]; then

-    cd $TRAVIS_BUILD_DIR
+  cd $TRAVIS_BUILD_DIR

-    if test "$TRAVIS_TAG"; then
-        PKG_NAME=$TRAVIS_TAG
-    else
-        echo "On branch $TRAVIS_BRANCH"
+  if test "$TRAVIS_TAG"; then
+    PKG_NAME=$TRAVIS_TAG
+    VERSION=$TRAVIS_TAG

-        if [ "$TRAVIS_BRANCH" != "master" ] && [ "$TRAVIS_BRANCH" != "dev" ]; then
-            echo "Not on valid branch, exiting"
-            exit 0;
-        fi;
+    # Pass in the tag as the version to write out
+    php artisan phpvms:version --write $VERSION
+  else
+    echo "On branch $TRAVIS_BRANCH"

-        BASE_VERSION=$(php artisan phpvms:version --base-only)
-        PKG_NAME=${BASE_VERSION}-${TRAVIS_BRANCH}
+    if [ "$TRAVIS_BRANCH" != "master" ] && [ "$TRAVIS_BRANCH" != "dev" ]; then
+      echo "Not on valid branch, exiting"
+      exit 0
    fi

-    FILE_NAME="phpvms-$PKG_NAME"
-    TAR_NAME="$FILE_NAME.tar.gz"
-    echo "Writing $TAR_NAME"
+    BASE_VERSION=$(php artisan phpvms:version --base-only)
+    PKG_NAME=${BASE_VERSION}-${TRAVIS_BRANCH}

+    # Don't pass in a version here, just write out the latest hash
    php artisan phpvms:version --write > VERSION
    VERSION=$(cat VERSION)
-    echo "Version: $VERSION"
+  fi

-    echo "Cleaning files"
+  echo "Version: $VERSION"

-    rm -rf vendor
-    composer install --no-dev --prefer-dist --no-interaction --verbose
+  FILE_NAME="phpvms-$PKG_NAME"
+  TAR_NAME="$FILE_NAME.tar.gz"

-    # Clean up the dependencies to remove some of the dev packages
-#    declare -a remove_packages=(
-#        'barryvdh/laravel-ide-helper'
-#        'bpocallaghan/generators'
-#        'codedungeon/phpunit-result-printer'
-#        'fzaninotto/faker'
-#        'nikic/php-parser'
-#        'phpstan/phpstan'
-#        'phpunit/phpunit',
-#        'weebly/phpstan-laravel'
-#    )
-#
-#    for pkg in "${remove_packages[@]}"
-#    do
-#        composer --optimize-autoloader --no-interaction remove $pkg
-#    done
+  echo "Cleaning files"

-    # Leftover individual files to delete
-    declare -a remove_files=(
-        .git
-        .github
-        .sass-cache
-        .idea
-        .travis
-        docker
-        tests
-        _ide_helper.php
-        .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
-    )
+  rm -rf vendor
+  composer install --no-dev --prefer-dist --no-interaction --verbose

-    for file in "${remove_files[@]}"
-    do
-        rm -rf $file
-    done
+  # Leftover individual files to delete
+  declare -a remove_files=(
+    .git
+    .github
+    .sass-cache
+    .idea
+    .travis
+    docker
+    _ide_helper.php
+    .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
+  )

-    find ./vendor -type d -name ".git" -print0 | xargs rm -rf
-    find . -type d -name "sass-cache" -print0 | xargs rm -rf
+  for file in "${remove_files[@]}"; do
+    rm -rf $file
+  done

-    # 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 {} +
+  find ./vendor -type d -name ".git" -print0 | xargs rm -rf
+  find . -type d -name "sass-cache" -print0 | xargs 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
+  # 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 {} +

-    # Regenerate the autoloader and classes
-    composer dump-autoload
-    make clean
+  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

-    echo "Creating Tarball"
-    cd /tmp
-    tar -czf $TAR_NAME -C $TRAVIS_BUILD_DIR/../ phpvms
-    sha256sum $TAR_NAME > "$TAR_NAME.sha256"
+  # Regenerate the autoloader and classes
+  composer dump-autoload
+  make clean

-    echo "Uploading to S3"
-    mkdir -p $TRAVIS_BUILD_DIR/build
-    cd $TRAVIS_BUILD_DIR/build
+  echo "Writing $TAR_NAME"

-    mv "/tmp/$TAR_NAME" "/tmp/$TAR_NAME.sha256" .
-    artifacts upload --target-paths "/" $TAR_NAME $TRAVIS_BUILD_DIR/VERSION $TAR_NAME.sha256
+  cd /tmp
+  tar -czf $TAR_NAME -C $TRAVIS_BUILD_DIR/../ phpvms
+  sha256sum $TAR_NAME >"$TAR_NAME.sha256"

-    # Upload the version for a tagged release. Move to a version file in different
-    # tags. Within phpVMS, we have an option of which version to track in the admin
-    if test "$TRAVIS_TAG"; then
-        echo "Uploading release version file"
-        cp "$TRAVIS_BUILD_DIR/VERSION" release_version
-        artifacts upload --target-paths "/" release_version
-    else
-        echo "Uploading ${TRAVIS_BRANCH}_version file"
-        cp $TRAVIS_BUILD_DIR/VERSION ${TRAVIS_BRANCH}_version
-        artifacts upload --target-paths "/" ${TRAVIS_BRANCH}_version
-    fi
+  echo "Uploading to S3"
+  mkdir -p $TRAVIS_BUILD_DIR/build
+  cd $TRAVIS_BUILD_DIR/build

-    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
+  mv "/tmp/$TAR_NAME" "/tmp/$TAR_NAME.sha256" .
+  artifacts upload --target-paths "/" $TAR_NAME $TRAVIS_BUILD_DIR/VERSION $TAR_NAME.sha256
+
+  # Upload the version for a tagged release. Move to a version file in different
+  # tags. Within phpVMS, we have an option of which version to track in the admin
+  if test "$TRAVIS_TAG"; then
+    echo "Uploading release version file"
+    cp "$TRAVIS_BUILD_DIR/VERSION" release_version
+    artifacts upload --target-paths "/" release_version
+  else
+    echo "Uploading ${TRAVIS_BRANCH}_version file"
+    cp $TRAVIS_BUILD_DIR/VERSION ${TRAVIS_BRANCH}_version
+    artifacts upload --target-paths "/" ${TRAVIS_BRANCH}_version
+  fi
+
+  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
--- a/app/Console/Commands/Version.php
+++ b/app/Console/Commands/Version.php
@@ -8,7 +8,7 @@ use Symfony\Component\Yaml\Yaml;

 class Version extends Command
 {
-    protected $signature = 'phpvms:version {--write} {--base-only}';
+    protected $signature = 'phpvms:version {--write} {--base-only} {--write-full-version} {version?}';

    private $versionSvc;

@@ -26,11 +26,32 @@ class Version extends Command
     */
    public function handle()
    {
-        // Write the updated build number out to the 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;
+                }
+            }
+
            $build_number = $this->versionSvc->getBuildId($cfg);
+            $cfg['current']['commit'] = $build_number;
            $cfg['build']['number'] = $build_number;

            file_put_contents($version_file, Yaml::dump($cfg, 4, 2));
--- a/app/Contracts/Unit.php
+++ b/app/Contracts/Unit.php
@@ -3,13 +3,10 @@
 namespace App\Contracts;

 use ArrayAccess;
+use PhpUnitsOfMeasure\Exception\UnknownUnitOfMeasure;

 /**
- * Class Unit
- *
- * @property mixed  $instance
- * @property string $unit
- * @property array  $units
+ * Abstract unit wrapper
 */
 class Unit implements ArrayAccess
 {
@@ -25,6 +22,8 @@ class Unit implements ArrayAccess

    /**
     * Holds an instance of the PhpUnit type
+     *
+     * @var \PhpUnitsOfMeasure\AbstractPhysicalQuantity
     */
    protected $instance;

@@ -75,7 +74,7 @@ class Unit implements ArrayAccess
     */
    public function offsetExists($offset)
    {
-        return array_key_exists($offset, $this->units);
+        return $this->offsetGet($offset) !== null;
    }

    /**
@@ -87,7 +86,16 @@ class Unit implements ArrayAccess
     */
    public function offsetGet($offset)
    {
-        return round($this->instance->toUnit($offset), 2);
+        try {
+            $value = $this->instance->toUnit($offset);
+            if (!$value) {
+                return;
+            }
+        } catch (UnknownUnitOfMeasure $e) {
+            return;
+        }
+
+        return round($value, 2);
    }

    /**
@@ -116,6 +124,6 @@ class Unit implements ArrayAccess
     */
    public function __toString()
    {
-        return (string) $this->units[$this->unit];
+        return (string) $this->offsetGet($this->unit);
    }
 }
--- a/app/Database/factories/AirportFactory.php
+++ b/app/Database/factories/AirportFactory.php
@@ -8,7 +8,7 @@ use Faker\Generator as Faker;
 if (!function_exists('createFactoryICAO')) {
    function createFactoryICAO(): string
    {
-        $characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+        $characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
        $max = strlen($characters) - 1;
        $string = '';
        for ($i = 0; $i < 4; $i++) {
@@ -26,14 +26,15 @@ if (!function_exists('createFactoryICAO')) {
 * Add any number of airports. Don't really care if they're real or not
 */
 $factory->define(App\Models\Airport::class, function (Faker $faker) {
-    $used = [];
-    return [
-        'id' => function () use ($used) {
-            do {
-                $string = createFactoryICAO();
-            } while (in_array($string, $used, true));
+    $usedIcaos = [];

-            return $string;
+    return [
+        'id' => function () use ($usedIcaos) {
+            do {
+                $airport = createFactoryICAO();
+            } while (in_array($airport, $usedIcaos, true));
+
+            return $airport;
        },
        'icao' => function (array $apt) {
            return $apt['id'];
--- a/app/Database/seeds/dev/sample.yml
+++ b/app/Database/seeds/dev/sample.yml
@@ -307,10 +307,10 @@ flights:
    dpt_airport_id: MKJP
    arr_airport_id: MWCR
    flight_time: 70
-    flight_type: J
-    dpt_time: 0800
-    arr_time: 0900
-    route: MLY5 KEMBO UG442 SIA UG633 OTEKO UR640 NALRO GUBEL3
+    flight_type: 'J'
+    dpt_time: '0800'
+    arr_time: '0900'
+    route: 'MLY5 KEMBO UG442 SIA UG633 OTEKO UR640 NALRO GUBEL3'
    created_at: NOW
    updated_at: NOW

--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -74,6 +74,12 @@ class AppServiceProvider extends ServiceProvider
                /* @noinspection PhpFullyQualifiedNameUsageInspection */
                $this->app->register(\Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider::class);
            }
+
+            if (config('app.debug_toolbar') === true) {
+                app('debugbar')->enable();
+            } else {
+                app('debugbar')->disable();
+            }
        }
    }
 }
--- a/app/Services/VersionService.php
+++ b/app/Services/VersionService.php
@@ -153,6 +153,12 @@ class VersionService extends Service

        $c = $cfg['current'];
        $version = "{$c['major']}.{$c['minor']}.{$c['patch']}";
+        if ($c['prerelease'] !== '') {
+            $version .= "-{$c['prerelease']}";
+            if ($c['buildmetadata'] !== '') {
+                $version .= ".{$c['buildmetadata']}";
+            }
+        }

        if ($include_build) {
            // Get the current build id
--- a/app/Support/Metar.php
+++ b/app/Support/Metar.php
@@ -520,13 +520,16 @@ class Metar implements \ArrayAccess
                }
            }
        }
+
        // Finally determine if it's VFR or IFR conditions
        // https://www.aviationweather.gov/cva/help
+        $this->result['category'] = 'VFR';
+
        if (array_key_exists('cavok', $this->result) && $this->result['cavok']) {
            $this->result['category'] = 'VFR';
        } else {
            /* @noinspection NestedPositiveIfStatementsInspection */
-            if (array_key_exists('cloud_height', $this->result) && array_key_exists('visibility', $this->result)) {
+            if (array_key_exists('cloud_height', $this->result) && $this->result['cloud_height'] !== null) {
                if ($this->result['cloud_height']['ft'] > 3000 && $this->result['visibility']['nmi'] > 5) {
                    $this->result['category'] = 'VFR';
                } else {
@@ -902,7 +905,7 @@ class Metar implements \ArrayAccess
            }

            $this->set_result_value('visibility', $visibility);
-            $this->set_result_value('visibility_report', $prefix.$visibility.$unit);
+            $this->set_result_value('visibility_report', $prefix.$visibility['m'].$unit);
        }

        return true;
@@ -1086,7 +1089,7 @@ class Metar implements \ArrayAccess
            $observed['height'] = $this->createAltitude($found[5] * 100, 'feet');

            // Cloud height
-            if (null === $this->result['cloud_height']['m'] || $observed['height']['m'] < $this->result['cloud_height']['m']) {
+            if (null === $this->result['cloud_height'] || $observed['height']['m'] < $this->result['cloud_height']['m']) {
                $this->set_result_value('cloud_height', $observed['height']);
            }

--- a/app/Support/Units/Distance.php
+++ b/app/Support/Units/Distance.php
@@ -8,6 +8,7 @@ use PhpUnitsOfMeasure\PhysicalQuantity\Length;
 class Distance extends Unit
 {
    public $responseUnits = [
+        'm',
        'km',
        'mi',
        'nmi',
--- a/composer.json
+++ b/composer.json
@@ -57,7 +57,7 @@
        "bpocallaghan/generators": "5.0.1",
        "codedungeon/phpunit-result-printer": "^0.13.0",
        "filp/whoops": "~2.0",
-        "fzaninotto/faker": "~1.8.0",
+        "fzaninotto/faker": "~1.9.0",
        "friendsofphp/php-cs-fixer": "^2.15",
        "mockery/mockery": "0.9.*",
        "nunomaduro/collision": "^3.0",
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
-    "content-hash": "de3570051ae52b54dc313e93abcfc877",
+    "content-hash": "0e1a4708258d0302ac1d45fc0d190772",
    "packages": [
        {
            "name": "akaunting/money",
@@ -558,16 +558,16 @@
        },
        {
            "name": "composer/ca-bundle",
-            "version": "1.2.4",
+            "version": "1.2.5",
            "source": {
                "type": "git",
                "url": "https://github.com/composer/ca-bundle.git",
-                "reference": "10bb96592168a0f8e8f6dcde3532d9fa50b0b527"
+                "reference": "62e8fc2dc550e5d6d8c9360c7721662670f58149"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/composer/ca-bundle/zipball/10bb96592168a0f8e8f6dcde3532d9fa50b0b527",
-                "reference": "10bb96592168a0f8e8f6dcde3532d9fa50b0b527",
+                "url": "https://api.github.com/repos/composer/ca-bundle/zipball/62e8fc2dc550e5d6d8c9360c7721662670f58149",
+                "reference": "62e8fc2dc550e5d6d8c9360c7721662670f58149",
                "shasum": ""
            },
            "require": {
@@ -578,7 +578,7 @@
            "require-dev": {
                "phpunit/phpunit": "^4.8.35 || ^5.7 || 6.5 - 8",
                "psr/log": "^1.0",
-                "symfony/process": "^2.5 || ^3.0 || ^4.0"
+                "symfony/process": "^2.5 || ^3.0 || ^4.0 || ^5.0"
            },
            "type": "library",
            "extra": {
@@ -610,7 +610,7 @@
                "ssl",
                "tls"
            ],
-            "time": "2019-08-30T08:44:50+00:00"
+            "time": "2019-12-11T14:44:42+00:00"
        },
        {
            "name": "composer/composer",
@@ -2376,16 +2376,16 @@
        },
        {
            "name": "laravel/framework",
-            "version": "v6.6.0",
+            "version": "v6.7.0",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/framework.git",
-                "reference": "b48528ba5422ac909dbabf0b1cc34534928e7bce"
+                "reference": "ba4204f3a8b9672b6116398c165bd9c0c6eac077"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/b48528ba5422ac909dbabf0b1cc34534928e7bce",
-                "reference": "b48528ba5422ac909dbabf0b1cc34534928e7bce",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/ba4204f3a8b9672b6116398c165bd9c0c6eac077",
+                "reference": "ba4204f3a8b9672b6116398c165bd9c0c6eac077",
                "shasum": ""
            },
            "require": {
@@ -2481,7 +2481,7 @@
                "league/flysystem-sftp": "Required to use the Flysystem SFTP driver (^1.0).",
                "moontoast/math": "Required to use ordered UUIDs (^1.1).",
                "pda/pheanstalk": "Required to use the beanstalk queue driver (^4.0).",
-                "psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0)",
+                "psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0).",
                "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^4.0).",
                "symfony/cache": "Required to PSR-6 cache bridge (^4.3.4).",
                "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^1.2).",
@@ -2518,7 +2518,7 @@
                "framework",
                "laravel"
            ],
-            "time": "2019-11-26T15:33:08+00:00"
+            "time": "2019-12-10T16:01:57+00:00"
        },
        {
            "name": "laravel/helpers",
@@ -2710,16 +2710,16 @@
        },
        {
            "name": "league/flysystem",
-            "version": "1.0.57",
+            "version": "1.0.61",
            "source": {
                "type": "git",
                "url": "https://github.com/thephpleague/flysystem.git",
-                "reference": "0e9db7f0b96b9f12dcf6f65bc34b72b1a30ea55a"
+                "reference": "4fb13c01784a6c9f165a351e996871488ca2d8c9"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/0e9db7f0b96b9f12dcf6f65bc34b72b1a30ea55a",
-                "reference": "0e9db7f0b96b9f12dcf6f65bc34b72b1a30ea55a",
+                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/4fb13c01784a6c9f165a351e996871488ca2d8c9",
+                "reference": "4fb13c01784a6c9f165a351e996871488ca2d8c9",
                "shasum": ""
            },
            "require": {
@@ -2790,7 +2790,7 @@
                "sftp",
                "storage"
            ],
-            "time": "2019-10-16T21:01:05+00:00"
+            "time": "2019-12-08T21:46:50+00:00"
        },
        {
            "name": "league/geotools",
@@ -3116,16 +3116,16 @@
        },
        {
            "name": "nabeel/vacentral",
-            "version": "2.0.3",
+            "version": "2.0.4",
            "source": {
                "type": "git",
                "url": "https://github.com/nabeelio/vacentral-library.git",
-                "reference": "a6e9dcc0f20b729634d2a27651f5feba472d4937"
+                "reference": "af0d4f6db1bff455ce1eeaf1b544e2e26ffbdd81"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/nabeelio/vacentral-library/zipball/a6e9dcc0f20b729634d2a27651f5feba472d4937",
-                "reference": "a6e9dcc0f20b729634d2a27651f5feba472d4937",
+                "url": "https://api.github.com/repos/nabeelio/vacentral-library/zipball/af0d4f6db1bff455ce1eeaf1b544e2e26ffbdd81",
+                "reference": "af0d4f6db1bff455ce1eeaf1b544e2e26ffbdd81",
                "shasum": ""
            },
            "require": {
@@ -3149,7 +3149,7 @@
            "license": [
                "MIT"
            ],
-            "time": "2019-10-01T16:32:12+00:00"
+            "time": "2019-12-11T14:44:00+00:00"
        },
        {
            "name": "nesbot/carbon",
@@ -3568,16 +3568,16 @@
        },
        {
            "name": "phpoption/phpoption",
-            "version": "1.6.0",
+            "version": "1.6.1",
            "source": {
                "type": "git",
                "url": "https://github.com/schmittjoh/php-option.git",
-                "reference": "f4e7a6a1382183412246f0d361078c29fb85089e"
+                "reference": "a8593bf5176bf3d3f2966942c530be19b44ec87c"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/f4e7a6a1382183412246f0d361078c29fb85089e",
-                "reference": "f4e7a6a1382183412246f0d361078c29fb85089e",
+                "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/a8593bf5176bf3d3f2966942c530be19b44ec87c",
+                "reference": "a8593bf5176bf3d3f2966942c530be19b44ec87c",
                "shasum": ""
            },
            "require": {
@@ -3618,7 +3618,7 @@
                "php",
                "type"
            ],
-            "time": "2019-11-30T20:20:49+00:00"
+            "time": "2019-12-11T13:45:14+00:00"
        },
        {
            "name": "pragmarx/version",
@@ -3743,16 +3743,16 @@
        },
        {
            "name": "prettus/l5-repository",
-            "version": "2.6.36",
+            "version": "2.6.37",
            "source": {
                "type": "git",
                "url": "https://github.com/andersao/l5-repository.git",
-                "reference": "c4f56cffbd23d61e16d2a8a9df0c651037313b54"
+                "reference": "3442bb47354ff5b4aaeb36b79c37a5b6cc91fc82"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/andersao/l5-repository/zipball/c4f56cffbd23d61e16d2a8a9df0c651037313b54",
-                "reference": "c4f56cffbd23d61e16d2a8a9df0c651037313b54",
+                "url": "https://api.github.com/repos/andersao/l5-repository/zipball/3442bb47354ff5b4aaeb36b79c37a5b6cc91fc82",
+                "reference": "3442bb47354ff5b4aaeb36b79c37a5b6cc91fc82",
                "shasum": ""
            },
            "require": {
@@ -3804,7 +3804,7 @@
                "model",
                "repository"
            ],
-            "time": "2019-09-11T14:09:40+00:00"
+            "time": "2019-12-09T14:10:15+00:00"
        },
        {
            "name": "prettus/laravel-validation",
@@ -4696,16 +4696,16 @@
        },
        {
            "name": "spatie/laravel-backup",
-            "version": "6.7.4",
+            "version": "6.7.5",
            "source": {
                "type": "git",
                "url": "https://github.com/spatie/laravel-backup.git",
-                "reference": "e3ea9bc9994be5cf8d9e10b202ed838380e0b4e4"
+                "reference": "81e10ccb9f22307fb0ed548f895264ba5dcfff82"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/spatie/laravel-backup/zipball/e3ea9bc9994be5cf8d9e10b202ed838380e0b4e4",
-                "reference": "e3ea9bc9994be5cf8d9e10b202ed838380e0b4e4",
+                "url": "https://api.github.com/repos/spatie/laravel-backup/zipball/81e10ccb9f22307fb0ed548f895264ba5dcfff82",
+                "reference": "81e10ccb9f22307fb0ed548f895264ba5dcfff82",
                "shasum": ""
            },
            "require": {
@@ -4767,7 +4767,7 @@
                "laravel-backup",
                "spatie"
            ],
-            "time": "2019-11-07T22:11:24+00:00"
+            "time": "2019-12-02T21:58:43+00:00"
        },
        {
            "name": "spatie/temporary-directory",
@@ -7472,16 +7472,16 @@
        },
        {
            "name": "fzaninotto/faker",
-            "version": "v1.8.0",
+            "version": "v1.9.0",
            "source": {
                "type": "git",
                "url": "https://github.com/fzaninotto/Faker.git",
-                "reference": "f72816b43e74063c8b10357394b6bba8cb1c10de"
+                "reference": "27a216cbe72327b2d6369fab721a5843be71e57d"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/f72816b43e74063c8b10357394b6bba8cb1c10de",
-                "reference": "f72816b43e74063c8b10357394b6bba8cb1c10de",
+                "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/27a216cbe72327b2d6369fab721a5843be71e57d",
+                "reference": "27a216cbe72327b2d6369fab721a5843be71e57d",
                "shasum": ""
            },
            "require": {
@@ -7490,13 +7490,11 @@
            "require-dev": {
                "ext-intl": "*",
                "phpunit/phpunit": "^4.8.35 || ^5.7",
-                "squizlabs/php_codesniffer": "^1.5"
+                "squizlabs/php_codesniffer": "^2.9.2"
            },
            "type": "library",
            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.8-dev"
-                }
+                "branch-alias": []
            },
            "autoload": {
                "psr-4": {
@@ -7518,7 +7516,7 @@
                "faker",
                "fixtures"
            ],
-            "time": "2018-07-12T10:23:15+00:00"
+            "time": "2019-11-14T13:13:06+00:00"
        },
        {
            "name": "hamcrest/hamcrest-php",
@@ -8520,16 +8518,16 @@
        },
        {
            "name": "phpunit/phpunit",
-            "version": "8.4.3",
+            "version": "8.5.0",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "67f9e35bffc0dd52d55d565ddbe4230454fd6a4e"
+                "reference": "3ee1c1fd6fc264480c25b6fb8285edefe1702dab"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/67f9e35bffc0dd52d55d565ddbe4230454fd6a4e",
-                "reference": "67f9e35bffc0dd52d55d565ddbe4230454fd6a4e",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3ee1c1fd6fc264480c25b6fb8285edefe1702dab",
+                "reference": "3ee1c1fd6fc264480c25b6fb8285edefe1702dab",
                "shasum": ""
            },
            "require": {
@@ -8573,7 +8571,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "8.4-dev"
+                    "dev-master": "8.5-dev"
                }
            },
            "autoload": {
@@ -8599,7 +8597,7 @@
                "testing",
                "xunit"
            ],
-            "time": "2019-11-06T09:42:23+00:00"
+            "time": "2019-12-06T05:41:38+00:00"
        },
        {
            "name": "sebastian/code-unit-reverse-lookup",
@@ -9218,16 +9216,16 @@
        },
        {
            "name": "squizlabs/php_codesniffer",
-            "version": "3.5.2",
+            "version": "3.5.3",
            "source": {
                "type": "git",
                "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
-                "reference": "65b12cdeaaa6cd276d4c3033a95b9b88b12701e7"
+                "reference": "557a1fc7ac702c66b0bbfe16ab3d55839ef724cb"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/65b12cdeaaa6cd276d4c3033a95b9b88b12701e7",
-                "reference": "65b12cdeaaa6cd276d4c3033a95b9b88b12701e7",
+                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/557a1fc7ac702c66b0bbfe16ab3d55839ef724cb",
+                "reference": "557a1fc7ac702c66b0bbfe16ab3d55839ef724cb",
                "shasum": ""
            },
            "require": {
@@ -9265,7 +9263,7 @@
                "phpcs",
                "standards"
            ],
-            "time": "2019-10-28T04:36:32+00:00"
+            "time": "2019-12-04T04:46:47+00:00"
        },
        {
            "name": "symfony/options-resolver",
--- a/config/version.yml
+++ b/config/version.yml
@@ -3,13 +3,15 @@ current:
  major: 7
  minor: 0
  patch: 0
+  prerelease: 'dev'
+  buildmetadata: ''
+  commit: ''
  git_absorb: git-local
  format: '{$major}.{$minor}.{$patch}'
 build:
  mode: number
  length: 6
-  increment_by: 1
-  number: 180212-2f8a69
+  number:
  git_absorb: git-local
 git:
  git-local: 'git rev-parse --verify HEAD'
--- a/modules/Installer/Http/Controllers/ImporterController.php
+++ b/modules/Installer/Http/Controllers/ImporterController.php
@@ -14,6 +14,8 @@ class ImporterController extends Controller
    public function __construct(ImporterService $importerSvc)
    {
        $this->importerSvc = $importerSvc;
+
+        app('debugbar')->disable();
    }

    /**
--- a/modules/Installer/Http/Controllers/InstallerController.php
+++ b/modules/Installer/Http/Controllers/InstallerController.php
@@ -62,6 +62,8 @@ class InstallerController extends Controller
        $this->reqSvc = $reqSvc;
        $this->seederSvc = $seederSvc;
        $this->userService = $userService;
+
+        app('debugbar')->disable();
    }

    /**
--- a/resources/stubs/installer/config.stub
+++ b/resources/stubs/installer/config.stub
@@ -17,7 +17,8 @@ return [

        // debug as true shows the Laravel debug bar, which is helpful for
        // debugging templates and other internals
-        'debug' => true,
+        'debug'         => true,
+        'debug_toolbar' => false,
    ],

    // Overrides config/phpvms.php
--- a/tests/MetarTest.php
+++ b/tests/MetarTest.php
@@ -112,7 +112,7 @@ class MetarTest extends TestCase
        $this->assertEquals(1000, $parsed['clouds'][0]['height']['ft']);
        $this->assertEquals(1600, $parsed['clouds'][1]['height']['ft']);
        $this->assertEquals(4000, $parsed['clouds'][2]['height']['ft']);
-        $this->assertNull($parsed['clouds'][3]['height']['ft']);
+        $this->assertNull($parsed['clouds'][3]['height']);
    }

    public function testMetar3()
--- a/tests/VersionTest.php
+++ b/tests/VersionTest.php
@@ -20,10 +20,12 @@ class VersionTest extends TestCase
    public function testGreaterThanVersionStrings(): void
    {
        $test = [
-            '7.0.0'        => '6.0.0',
-            '7.0.0-beta'   => '7.0.0-alpha',
-            '7.0.0-beta.1' => '7.0.0-beta',
-            '7.0.0-beta.2' => '7.0.0-beta.1',
+            '7.0.0'               => '6.0.0',
+            '7.0.0+1231s'         => '6.0.0',
+            '7.0.0-beta'          => '7.0.0-alpha',
+            '7.0.0-beta.1'        => '7.0.0-beta',
+            '7.0.0-beta.2'        => '7.0.0-beta.1',
+            '7.0.0-beta.2+a34sdf' => '7.0.0-beta.1',
        ];

        $versionSvc = app(VersionService::class);