Inital upgrade to 5.5

This simply updates dependencies and gets all of the providers and config files updated based on what  the laravel/laravel currently ships with

Author: DaneEveritt

CHANGELOG.md

@@ -15,6 +15,8 @@ This project follows [Semantic Versioning](http://semver.org) guidelines.
 
 ### Changed
 * Revoking the administrative status for an admin will revoke all authentication tokens currently assigned to their account.
+* Updated core framework to Laravel 5.5. This includes many dependency updates.
+* Certain AWS specific environment keys were changed, this should have minimal impact on users unless you specifically enabled AWS specific features. The renames are: `AWS_KEY -> AWS_ACCESS_KEY_ID`, `AWS_SECRET -> AWS_SECRET_ACCESS_KEY`, `AWS_REGION -> AWS_DEFAULT_REGION`
 
 ### Added
 * Added star indicators to user listing in Admin CP to indicate users who are set as a root admin.

app/Console/Kernel.php

@@ -3,41 +3,17 @@
 namespace Pterodactyl\Console;
 
 use Illuminate\Console\Scheduling\Schedule;
-use Pterodactyl\Console\Commands\InfoCommand;
-use Pterodactyl\Console\Commands\User\MakeUserCommand;
-use Pterodactyl\Console\Commands\User\DeleteUserCommand;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
-use Pterodactyl\Console\Commands\Server\RebuildServerCommand;
-use Pterodactyl\Console\Commands\Location\MakeLocationCommand;
-use Pterodactyl\Console\Commands\User\DisableTwoFactorCommand;
-use Pterodactyl\Console\Commands\Environment\AppSettingsCommand;
-use Pterodactyl\Console\Commands\Location\DeleteLocationCommand;
-use Pterodactyl\Console\Commands\Schedule\ProcessRunnableCommand;
-use Pterodactyl\Console\Commands\Environment\EmailSettingsCommand;
-use Pterodactyl\Console\Commands\Environment\DatabaseSettingsCommand;
-use Pterodactyl\Console\Commands\Maintenance\CleanServiceBackupFilesCommand;
 
 class Kernel extends ConsoleKernel
 {
     /**
-     * The Artisan commands provided by your application.
-     *
-     * @var array
+     * Register the commands for the application.
      */
-    protected $commands = [
-        AppSettingsCommand::class,
-        CleanServiceBackupFilesCommand::class,
-        DatabaseSettingsCommand::class,
-        DeleteLocationCommand::class,
-        DeleteUserCommand::class,
-        DisableTwoFactorCommand::class,
-        EmailSettingsCommand::class,
-        InfoCommand::class,
-        MakeLocationCommand::class,
-        MakeUserCommand::class,
-        ProcessRunnableCommand::class,
-        RebuildServerCommand::class,
-    ];
+    protected function commands()
+    {
+        $this->load(__DIR__ . '/Commands');
+    }
 
     /**
      * Define the application's command schedule.

app/Http/Kernel.php

@@ -2,10 +2,10 @@
 
 namespace Pterodactyl\Http;
 
-use Fideloper\Proxy\TrustProxies;
 use Illuminate\Auth\Middleware\Authorize;
 use Illuminate\Auth\Middleware\Authenticate;
 use Pterodactyl\Http\Middleware\TrimStrings;
+use Pterodactyl\Http\Middleware\TrustProxies;
 use Illuminate\Session\Middleware\StartSession;
 use Pterodactyl\Http\Middleware\EncryptCookies;
 use Pterodactyl\Http\Middleware\VerifyCsrfToken;
@@ -23,6 +23,7 @@
 use Illuminate\Auth\Middleware\AuthenticateWithBasicAuth;
 use Pterodactyl\Http\Middleware\API\AuthenticateIPAccess;
 use Pterodactyl\Http\Middleware\Daemon\DaemonAuthenticate;
+use Illuminate\Foundation\Http\Middleware\ValidatePostSize;
 use Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse;
 use Pterodactyl\Http\Middleware\API\HasPermissionToResource;
 use Pterodactyl\Http\Middleware\Server\AuthenticateAsSubuser;
@@ -31,6 +32,7 @@
 use Pterodactyl\Http\Middleware\Server\DatabaseBelongsToServer;
 use Pterodactyl\Http\Middleware\Server\ScheduleBelongsToServer;
 use Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode;
+use Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull;
 use Pterodactyl\Http\Middleware\DaemonAuthenticate as OldDaemonAuthenticate;
 
 class Kernel extends HttpKernel
@@ -42,9 +44,9 @@ class Kernel extends HttpKernel
      */
     protected $middleware = [
         CheckForMaintenanceMode::class,
-        EncryptCookies::class,
-        AddQueuedCookiesToResponse::class,
+        ValidatePostSize::class,
         TrimStrings::class,
+        ConvertEmptyStringsToNull::class,
         TrustProxies::class,
     ];
 

app/Http/Middleware/TrustProxies.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace Pterodactyl\Http\Middleware;
+
+use Illuminate\Http\Request;
+use Fideloper\Proxy\TrustProxies as Middleware;
+
+class TrustProxies extends Middleware
+{
+    /**
+     * The trusted proxies for this application.
+     *
+     * @var array
+     */
+    protected $proxies;
+
+    /**
+     * The current proxy header mappings.
+     *
+     * @var array
+     */
+    protected $headers = [
+        Request::HEADER_FORWARDED => 'FORWARDED',
+        Request::HEADER_X_FORWARDED_FOR => 'X_FORWARDED_FOR',
+        Request::HEADER_X_FORWARDED_HOST => 'X_FORWARDED_HOST',
+        Request::HEADER_X_FORWARDED_PORT => 'X_FORWARDED_PORT',
+        Request::HEADER_X_FORWARDED_PROTO => 'X_FORWARDED_PROTO',
+    ];
+}

app/Providers/AppServiceProvider.php

@@ -12,8 +12,6 @@
 use Pterodactyl\Observers\UserObserver;
 use Pterodactyl\Observers\ServerObserver;
 use Pterodactyl\Observers\SubuserObserver;
-use Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider;
-use Barryvdh\Debugbar\ServiceProvider as DebugbarServiceProvider;
 
 class AppServiceProvider extends ServiceProvider
 {
@@ -32,17 +30,6 @@ public function boot()
         View::share('appIsGit', $this->versionData()['is_git'] ?? false);
     }
 
-    /**
-     * Register any application services.
-     */
-    public function register()
-    {
-        if ($this->app->environment() !== 'production') {
-            $this->app->register(DebugbarServiceProvider::class);
-            $this->app->register(IdeHelperServiceProvider::class);
-        }
-    }
-
     /**
      * Return version information for the footer.
      *

app/Providers/EventServiceProvider.php

@@ -12,12 +12,4 @@ class EventServiceProvider extends ServiceProvider
      * @var array
      */
     protected $listen = [];
-
-    /**
-     * Register any other events for your application.
-     */
-    public function boot()
-    {
-        parent::boot();
-    }
 }

composer.json

@@ -15,43 +15,40 @@
         "ext-mbstring": "*",
         "ext-pdo_mysql": "*",
         "ext-zip": "*",
-        "appstract/laravel-blade-directives": "^0.6.0",
-        "aws/aws-sdk-php": "^3.29",
-        "daneeveritt/login-notifications": "^1.0",
+        "appstract/laravel-blade-directives": "^0.7",
+        "aws/aws-sdk-php": "^3.48",
         "doctrine/dbal": "^2.5",
-        "edvinaskrucas/settings": "^2.0",
         "fideloper/proxy": "^3.3",
-        "guzzlehttp/guzzle": "~6.3.0",
+        "guzzlehttp/guzzle": "^6.3",
         "hashids/hashids": "^2.0",
         "igaster/laravel-theme": "^1.16",
         "laracasts/utilities": "^3.0",
-        "laravel/framework": "5.4.27",
-        "laravel/tinker": "1.0.1",
-        "lord/laroute": "~2.4.5",
+        "laravel/framework": "5.5.*",
+        "laravel/tinker": "^1.0",
+        "lord/laroute": "^2.4",
         "matriphe/iso-639": "^1.2",
         "mtdowling/cron-expression": "^1.2",
         "nesbot/carbon": "^1.22",
-        "nicolaslopezj/searchable": "^1.9",
         "pragmarx/google2fa": "^2.0",
         "predis/predis": "^1.1",
         "prologue/alerts": "^0.4",
         "ramsey/uuid": "^3.7",
         "s1lentium/iptools": "^1.1",
-        "sofa/eloquence": "~5.4.1",
-        "spatie/laravel-fractal": "^4.0",
-        "watson/validating": "^3.0",
+        "sofa/eloquence-base": "v5.5",
+        "sofa/eloquence-validable": "v5.5",
+        "spatie/laravel-fractal": "^5.3",
         "webmozart/assert": "^1.2",
-        "webpatser/laravel-uuid": "^2.0",
         "znck/belongs-to-through": "^2.3"
     },
     "require-dev": {
-        "barryvdh/laravel-debugbar": "^2.4",
+        "barryvdh/laravel-debugbar": "^3.1",
         "barryvdh/laravel-ide-helper": "^2.4",
+        "filp/whoops": "^2.1",
         "friendsofphp/php-cs-fixer": "^2.8.0",
         "fzaninotto/faker": "^1.6",
-        "mockery/mockery": "^0.9",
-        "php-mock/php-mock-phpunit": "^1.1",
-        "phpunit/phpunit": "^5.7"
+        "mockery/mockery": "^1.0",
+        "php-mock/php-mock-phpunit": "^2.0",
+        "phpunit/phpunit": "^6.5"
     },
     "autoload": {
         "classmap": [
@@ -70,13 +67,15 @@
         }
     },
     "scripts": {
-        "post-install-cmd": [
-            "Illuminate\\Foundation\\ComposerScripts::postInstall",
-            "php artisan optimize"
+        "post-root-package-install": [
+            "@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
         ],
-        "post-update-cmd": [
-            "Illuminate\\Foundation\\ComposerScripts::postUpdate",
-            "php artisan optimize"
+        "post-create-project-cmd": [
+            "@php artisan key:generate"
+        ],
+        "post-autoload-dump": [
+            "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
+            "@php artisan package:discover"
         ]
     },
     "prefer-stable": true,