Upgrade to Laravel ^7.0

zgabievi · Mar 25, 2020 · e619066 · e619066
1 parent 700aa2b
commit e619066
Show file tree

Hide file tree

Showing 7 changed files with 2,287 additions and 1,701 deletions.
diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
@@ -2,7 +2,7 @@
 
 namespace App\Exceptions;
 
-use Exception;
+use Throwable;
 use Inertia\Inertia;
 use Illuminate\Support\Facades\App;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
@@ -31,10 +31,10 @@ class Handler extends ExceptionHandler
     /**
      * Report or log an exception.
      *
-     * @param  \Exception  $exception
+     * @param  \Throwable  $exception
      * @return void
      */
-    public function report(Exception $exception)
+    public function report(Throwable $exception)
     {
 
         if (app()->bound('sentry') && $this->shouldReport($exception)) {
@@ -48,10 +48,10 @@ public function report(Exception $exception)
      * Render an exception into an HTTP response.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @param  \Exception  $exception
+     * @param  \Throwable  $exception
      * @return \Illuminate\Http\Response
      */
-    public function render($request, Exception $exception)
+    public function render($request, Throwable $exception)
     {
         $response = parent::render($request, $exception);
 

diff --git a/app/Model.php b/app/Model.php
@@ -11,10 +11,10 @@ abstract class Model extends Eloquent
 
     protected $perPage = 10;
 
-    public function resolveRouteBinding($value)
+    public function resolveRouteBinding($value, $field = null)
     {
         return in_array(SoftDeletes::class, class_uses($this))
             ? $this->where($this->getRouteKeyName(), $value)->withTrashed()->first()
-            : parent::resolveRouteBinding($value);
+            : parent::resolveRouteBinding($value, $field);
     }
 }
diff --git a/composer.json b/composer.json
@@ -12,16 +12,16 @@
     "ext-exif": "*",
     "ext-gd": "*",
     "beyondcode/laravel-dump-server": "^1.0",
-    "facade/ignition": "^1.4",
+    "facade/ignition": "^2.0",
     "fideloper/proxy": "^4.0",
     "fzaninotto/faker": "^1.4",
     "inertiajs/inertia-laravel": "^0.1",
-    "laravel/framework": "^6.0",
-    "laravel/tinker": "^1.0",
+    "laravel/framework": "^7.0",
+    "laravel/tinker": "^2.0",
     "league/glide": "2.0.x-dev",
     "mockery/mockery": "^1.0",
-    "nunomaduro/collision": "^3.0",
-    "phpunit/phpunit": "^8.0",
+    "nunomaduro/collision": "^4.1",
+    "phpunit/phpunit": "^8.5",
     "reinink/remember-query-strings": "^0.1.0",
     "sentry/sentry-laravel": "^1.5",
     "tightenco/ziggy": "^0.8.0",