⬆️ Upgrade Laravel 6.x -> 7.x

crock · Apr 24, 2020 · 201d155 · 201d155
1 parent 6e290f3
commit 201d155
Show file tree

Hide file tree

Showing 28 changed files with 1,252 additions and 579 deletions.
diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
@@ -2,11 +2,12 @@
 
 namespace App\Exceptions;
 
-use Exception;
+use Throwable;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 
 class Handler extends ExceptionHandler
 {
+
     /**
      * A list of the exception types that are not reported.
      *
@@ -32,7 +33,7 @@ class Handler extends ExceptionHandler
      * @param  \Exception  $exception
      * @return void
      */
-    public function report(Exception $exception)
+    public function report(Throwable $exception)
     {
         parent::report($exception);
     }
@@ -44,7 +45,7 @@ public function report(Exception $exception)
      * @param  \Exception  $exception
      * @return \Illuminate\Http\Response
      */
-    public function render($request, Exception $exception)
+    public function render($request, Throwable $exception)
     {
         return parent::render($request, $exception);
     }

diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
@@ -20,6 +20,7 @@ class Kernel extends HttpKernel
         \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
 		\App\Http\Middleware\TrustProxies::class,
         \App\Http\Middleware\StripTags::class,
+		\Fruitcake\Cors\HandleCors::class,
     ];
 
     /**
@@ -38,11 +39,7 @@ class Kernel extends HttpKernel
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
         ],
 
-        'api' => [
-            'throttle:60,1',
-            'bindings',
-            \Barryvdh\Cors\HandleCors::class,
-        ],
+        'api' => [],
     ];
 
     /**

diff --git a/composer.json b/composer.json
@@ -5,24 +5,25 @@
     "license": "MIT",
     "type": "project",
     "require": {
-        "php": "^7.2",
-        "barryvdh/laravel-cors": "^0.11.4",
+        "php": "^7.2.5",
         "doctrine/dbal": "^2.9",
         "fideloper/proxy": "^4.0",
+        "fruitcake/laravel-cors": "^1.0",
         "google/cloud-videointelligence": "^1.3",
         "guzzlehttp/guzzle": "~6.0",
-        "laravel/framework": "^6.0",
+        "laravel/framework": "^7.0",
         "laravel/helpers": "^1.2",
-        "laravel/tinker": "^1.0",
+        "laravel/tinker": "^2.0",
+        "laravel/ui": "^2.0",
         "spatie/laravel-sitemap": "^5.4",
         "spatie/regex": "^1.3"
     },
     "require-dev": {
         "filp/whoops": "^2.0",
         "fzaninotto/faker": "^1.4",
         "mockery/mockery": "^1.0",
-        "nunomaduro/collision": "^2.0",
-        "phpunit/phpunit": "^7.0"
+        "nunomaduro/collision": "^4.1",
+        "phpunit/phpunit": "^8.5"
     },
     "autoload": {
         "classmap": [