Skip to content

Commit 9aa69c6

Browse files
committed
chore: Upgrade laravel to version 7
1 parent 0d06f11 commit 9aa69c6

File tree

4 files changed

+771
-715
lines changed

4 files changed

+771
-715
lines changed

laravel/app/Exceptions/Handler.php

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

33
namespace App\Exceptions;
44

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

88
class Handler extends ExceptionHandler
99
{
@@ -32,7 +32,7 @@ class Handler extends ExceptionHandler
3232
* @param \Exception $exception
3333
* @return void
3434
*/
35-
public function report(Exception $exception)
35+
public function report(Throwable $exception)
3636
{
3737
parent::report($exception);
3838
}
@@ -44,7 +44,7 @@ public function report(Exception $exception)
4444
* @param \Exception $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
}

laravel/composer.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,19 @@
1010
"require": {
1111
"php": "^7.2",
1212
"fideloper/proxy": "^4.0",
13-
"laravel/framework": "^6.0",
14-
"laravel/tinker": "^1.0",
15-
"spatie/laravel-medialibrary": "^7.0.0",
13+
"laravel/framework": "^7.0",
14+
"laravel/tinker": "^2.0",
15+
"spatie/laravel-medialibrary": "^7.19.0",
1616
"spatie/laravel-permission": "^3.6",
17-
"tymon/jwt-auth": "^1.0.0"
17+
"tymon/jwt-auth": "^1.0.0",
18+
"laravel/ui": "^2.0"
1819
},
1920
"require-dev": {
20-
"facade/ignition": "^1.4",
21+
"facade/ignition": "^2.0",
2122
"fzaninotto/faker": "^1.4",
22-
"laravel/ui": "^1.1",
2323
"mockery/mockery": "^1.0",
24-
"nunomaduro/collision": "^3.0",
25-
"phpunit/phpunit": "^8.0"
24+
"nunomaduro/collision": "^4.1",
25+
"phpunit/phpunit": "^8.5"
2626
},
2727
"config": {
2828
"optimize-autoloader": true,

0 commit comments

Comments
 (0)