Upgrading Laravel framework from 5.8 to 6.0

.editorconfig

@@ -19,9 +19,5 @@ indent_size = 2
 [*.md]
 trim_trailing_whitespace = false
 
-<<<<<<< HEAD
 [*.{yml,yaml}]
-=======
-[*.yml]
->>>>>>> bd96b84e... Upgrading Laravel Framework (#1071)
 indent_size = 2

.env.example

@@ -22,11 +22,13 @@ REDIS_URL=redis://h:null@127.0.0.1:6379
 
 # AWS
 AWS_ACCESS_KEY_ID=
-AWS_REGION=us-east-1
+AWS_DEFAULT_REGION=us-east-1
 AWS_SECRET_ACCESS_KEY=
 AWS_S3_BUCKET=
 AWS_S3_REGION=us-east-1
 AWS_S3_URL=
+AWS_SQS_PREFIX=
+AWS_SQS_QUEUE=
 AWS_SQS_REGION=us-east-1
 
 # Northstar

app/Exceptions/Handler.php

@@ -30,6 +30,8 @@ class Handler extends ExceptionHandler
      *
      * @param  \Exception  $exceptionxception
      * @return void
+     *
+     * @throws \Exception
      */
     public function report(Exception $exception)
     {
@@ -41,7 +43,9 @@ public function report(Exception $exception)
      *
      * @param  \Illuminate\Http\Request  $request
      * @param  \Exception  $exception
-     * @return \Illuminate\Http\Response | \Symfony\Component\HttpFoundation\Response
+     * @return \Symfony\Component\HttpFoundation\Response
+     *
+     * @throws \Exception
      */
     public function render($request, Exception $exception)
     {

app/Http/Kernel.php

@@ -55,14 +55,14 @@ class Kernel extends HttpKernel
     protected $routeMiddleware = [
         'auth' => \Illuminate\Auth\Middleware\Authenticate::class,
         'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
-        'guard' => \DoSomething\Gateway\Server\Middleware\SetGuard::class,
-        'scopes' => \DoSomething\Gateway\Server\Middleware\RequireScope::class,
         'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
         'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class,
         'can' => \Illuminate\Auth\Middleware\Authorize::class,
+        'guard' => \DoSomething\Gateway\Server\Middleware\SetGuard::class,
         'guest' => \Rogue\Http\Middleware\RedirectIfAuthenticated::class,
-        'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class,
         'role' => \Rogue\Http\Middleware\CheckRole::class,
+        'scopes' => \DoSomething\Gateway\Server\Middleware\RequireScope::class,
+        'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class,
         'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
     ];
 
@@ -77,6 +77,7 @@ class Kernel extends HttpKernel
         \Illuminate\Session\Middleware\StartSession::class,
         \Illuminate\View\Middleware\ShareErrorsFromSession::class,
         \Illuminate\Auth\Middleware\Authenticate::class,
+        \Illuminate\Routing\Middleware\ThrottleRequests::class,
         \Illuminate\Session\Middleware\AuthenticateSession::class,
         \Illuminate\Routing\Middleware\SubstituteBindings::class,
         \Illuminate\Auth\Middleware\Authorize::class,

composer.json

@@ -11,14 +11,14 @@
     "ext-newrelic": "*",
     "algolia/algoliasearch-client-php": "^2.6",
     "aws/aws-sdk-php-laravel": "^3.1",
-    "dfurnes/environmentalist": "0.0.2",
+    "dfurnes/environmentalist": "0.0.6",
     "doctrine/dbal": "~2.5.13",
     "dosomething/gateway": "^3.0",
     "fideloper/proxy": "^4.0",
     "guzzlehttp/guzzle": "^6.2",
     "hashids/hashids": "^4.0",
     "intervention/image": "^2.3",
-    "laravel/framework": "5.8.*",
+    "laravel/framework": "^6.0",
     "laravel/scout": "^7.2.1",
     "laravel/slack-notification-channel": "^2.1",
     "league/csv": "^9.0",
@@ -33,13 +33,13 @@
   },
   "require-dev": {
     "beyondcode/laravel-dump-server": "^1.0",
-    "filp/whoops": "^2.0",
-    "fzaninotto/faker": "^1.6",
-    "itsgoingd/clockwork": "^3.0",
-    "laravel/tinker": "^1.0",
+    "facade/ignition": "^1.4",
+    "fzaninotto/faker": "^1.9.1",
+    "itsgoingd/clockwork": "^4.0",
+    "laravel/tinker": "^2.0",
     "mockery/mockery": "^1.0",
     "nunomaduro/collision": "^3.0",
-    "phpunit/phpunit": "^7.5",
+    "phpunit/phpunit": "^8.0",
     "symfony/css-selector": "3.1.*",
     "symfony/dom-crawler": "3.1.*"
   },
@@ -74,7 +74,7 @@
   "scripts": {
     "post-autoload-dump": [
       "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
-      "@php artisan package:discover"
+      "@php artisan package:discover --ansi"
     ],
     "warmup": [
       "@php artisan gateway:key",