Upgrade to Laravel 8 and Statamic 3.1 (statamic#478)

* Upgrade dependencies * Statamic upgrade changes * Revert "Statamic upgrade changes" This reverts commit 692e51d. * Upgrade to v3-beta38 To run https://gist.github.com/jasonvarga/ce4f0ad8e3b6d934f8d9da489f2ef64b * Upgrade to v3-beta45 To run https://gist.github.com/jasonvarga/68b48fbb1fabcd288059df63ecd2f982 * Upgrade to L8 and S3.1 (again) * Run php please updates:run 3.0 * Fix Extending Docs side nav * Adjust route * Move into docs Co-authored-by: Jason Varga <[email protected]>
montemartin · May 27, 2021 · 6cc82e7 · 6cc82e7
1 parent 5f5b191
commit 6cc82e7
Show file tree

Hide file tree

Showing 37 changed files with 4,748 additions and 2,635 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 Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 
 class Handler extends ExceptionHandler
@@ -29,10 +29,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)
     {
         parent::report($exception);
     }
@@ -41,10 +41,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)
     {
         return parent::render($request, $exception);
     }

diff --git a/composer.json b/composer.json
@@ -8,20 +8,20 @@
     ],
     "license": "MIT",
     "require": {
-        "php": "^7.1.3",
+        "php": "^7.3 || ^8.0",
         "fideloper/proxy": "^4.0",
-        "laravel/framework": "^6.2",
-        "laravel/tinker": "^1.0",
-        "statamic/cms": "3.0.*@beta"
+        "laravel/framework": "^8.0",
+        "laravel/tinker": "^2.0",
+        "statamic/cms": "3.1.16"
     },
     "require-dev": {
-        "beyondcode/laravel-dump-server": "^1.0",
-        "facade/ignition": "^1.3",
+        "beyondcode/laravel-dump-server": "^1.7",
+        "facade/ignition": "^2.3.6",
         "filp/whoops": "^2.0",
-        "fzaninotto/faker": "^1.4",
+        "fakerphp/faker": "^1.4",
         "mockery/mockery": "^1.0",
-        "nunomaduro/collision": "^3.0",
-        "phpunit/phpunit": "^7.5"
+        "nunomaduro/collision": "^5.0",
+        "phpunit/phpunit": "^9.0"
     },
     "config": {
         "optimize-autoloader": true,
@@ -50,6 +50,9 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "scripts": {
+        "pre-update-cmd": [
+            "Statamic\\Console\\Composer\\Scripts::preUpdateCmd"
+        ],
         "post-autoload-dump": [
             "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
             "@php artisan package:discover --ansi",