Skip to content

Commit 8cce05c

Browse files
committed
upgrade 6.x to 7.3.0 (latest)
This commit is upgrading Laravel 6.x to the latest version (7.3.0). - upgraded to the latest dependencies - replaced `Exception` to `Throwable` in `app\Exceptions\Handler.php`
1 parent 8c3ca5b commit 8cce05c

File tree

5 files changed

+1059
-721
lines changed

5 files changed

+1059
-721
lines changed

app/Exceptions/Handler.php

Lines changed: 7 additions & 5 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
{
@@ -29,10 +29,11 @@ class Handler extends ExceptionHandler
2929
/**
3030
* Report or log an exception.
3131
*
32-
* @param \Exception $exception
32+
* @param \Throwable $exception
3333
* @return void
34+
* @throws \Throwable
3435
*/
35-
public function report(Exception $exception)
36+
public function report(Throwable $exception)
3637
{
3738
parent::report($exception);
3839
}
@@ -41,10 +42,11 @@ public function report(Exception $exception)
4142
* Render an exception into an HTTP response.
4243
*
4344
* @param \Illuminate\Http\Request $request
44-
* @param \Exception $exception
45+
* @param \Throwable $exception
4546
* @return \Illuminate\Http\Response
47+
* @throws \Throwable
4648
*/
47-
public function render($request, Exception $exception)
49+
public function render($request, Throwable $exception)
4850
{
4951
return parent::render($request, $exception);
5052
}

composer.json

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,22 @@
88
],
99
"license": "MIT",
1010
"require": {
11-
"php": "^7.2",
12-
"fideloper/proxy": "^4.0",
13-
"laravel/framework": "^6.0",
14-
"laravel/tinker": "^1.0",
15-
"spatie/laravel-medialibrary": "^7.0.0",
16-
"spatie/laravel-permission": "^3.3"
11+
"php": "^7.2.5",
12+
"fideloper/proxy": "^4.2",
13+
"laravel/framework": "^7.0",
14+
"fruitcake/laravel-cors": "^1.0",
15+
"guzzlehttp/guzzle": "^6.3",
16+
"laravel/tinker": "^2.3.0",
17+
"spatie/laravel-medialibrary": "^8.0.6",
18+
"spatie/laravel-permission": "^3.11.0",
19+
"laravel/ui": "^2.0.1"
1720
},
1821
"require-dev": {
19-
"facade/ignition": "^1.4",
20-
"fzaninotto/faker": "^1.4",
21-
"laravel/ui": "^1.0",
22-
"mockery/mockery": "^1.0",
23-
"nunomaduro/collision": "^3.0",
24-
"phpunit/phpunit": "^8.0"
22+
"facade/ignition": "^2.0",
23+
"fzaninotto/faker": "^1.9.1",
24+
"mockery/mockery": "^1.3.1",
25+
"nunomaduro/collision": "^4.1",
26+
"phpunit/phpunit": "^8.5"
2527
},
2628
"config": {
2729
"optimize-autoloader": true,
@@ -66,4 +68,4 @@
6668
"@php artisan key:generate --ansi"
6769
]
6870
}
69-
}
71+
}

0 commit comments

Comments
 (0)