Skip to content

Commit 6cc82e7

Browse files
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]>
1 parent 5f5b191 commit 6cc82e7

37 files changed

+4748
-2635
lines changed

app/Exceptions/Handler.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace App\Exceptions;
44

5-
use Exception;
5+
use Throwable;
66
use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
77

88
class Handler extends ExceptionHandler
@@ -29,10 +29,10 @@ class Handler extends ExceptionHandler
2929
/**
3030
* Report or log an exception.
3131
*
32-
* @param \Exception $exception
32+
* @param \Throwable $exception
3333
* @return void
3434
*/
35-
public function report(Exception $exception)
35+
public function report(Throwable $exception)
3636
{
3737
parent::report($exception);
3838
}
@@ -41,10 +41,10 @@ public function report(Exception $exception)
4141
* Render an exception into an HTTP response.
4242
*
4343
* @param \Illuminate\Http\Request $request
44-
* @param \Exception $exception
44+
* @param \Throwable $exception
4545
* @return \Illuminate\Http\Response
4646
*/
47-
public function render($request, Exception $exception)
47+
public function render($request, Throwable $exception)
4848
{
4949
return parent::render($request, $exception);
5050
}

composer.json

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,20 @@
88
],
99
"license": "MIT",
1010
"require": {
11-
"php": "^7.1.3",
11+
"php": "^7.3 || ^8.0",
1212
"fideloper/proxy": "^4.0",
13-
"laravel/framework": "^6.2",
14-
"laravel/tinker": "^1.0",
15-
"statamic/cms": "3.0.*@beta"
13+
"laravel/framework": "^8.0",
14+
"laravel/tinker": "^2.0",
15+
"statamic/cms": "3.1.16"
1616
},
1717
"require-dev": {
18-
"beyondcode/laravel-dump-server": "^1.0",
19-
"facade/ignition": "^1.3",
18+
"beyondcode/laravel-dump-server": "^1.7",
19+
"facade/ignition": "^2.3.6",
2020
"filp/whoops": "^2.0",
21-
"fzaninotto/faker": "^1.4",
21+
"fakerphp/faker": "^1.4",
2222
"mockery/mockery": "^1.0",
23-
"nunomaduro/collision": "^3.0",
24-
"phpunit/phpunit": "^7.5"
23+
"nunomaduro/collision": "^5.0",
24+
"phpunit/phpunit": "^9.0"
2525
},
2626
"config": {
2727
"optimize-autoloader": true,
@@ -50,6 +50,9 @@
5050
"minimum-stability": "dev",
5151
"prefer-stable": true,
5252
"scripts": {
53+
"pre-update-cmd": [
54+
"Statamic\\Console\\Composer\\Scripts::preUpdateCmd"
55+
],
5356
"post-autoload-dump": [
5457
"Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
5558
"@php artisan package:discover --ansi",

0 commit comments

Comments
 (0)