Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade from 6 to laravel.7.2 #9

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Upgrade from 6 to laravel.7.2 #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5ead678
upgrade to laravel 7.2
saber13812002 Sep 6, 2020
63f16f6
upgrade to laravel 7.2
saber13812002 Sep 6, 2020
b5ae4b6
Merge branch 'upgrade-from-6-to-laravel.7.2' of https://github.com/sa…
saber13812002 Sep 6, 2020
f117d7c
composer update
saber13812002 Sep 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions app/Exceptions/Handler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

namespace App\Exceptions;

use Throwable;
use Exception;
use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;

Expand Down Expand Up @@ -32,7 +33,7 @@ class Handler extends ExceptionHandler
* @param \Exception $exception
* @return void
*/
public function report(Exception $exception)
public function report(Throwable $exception)
{
parent::report($exception);
}
Expand All @@ -44,7 +45,7 @@ public function report(Exception $exception)
* @param \Exception $exception
* @return \Illuminate\Http\Response
*/
public function render($request, Exception $exception)
public function render($request, Throwable $exception)
{
return parent::render($request, $exception);
}
Expand Down
12 changes: 6 additions & 6 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,18 @@
],
"license": "MIT",
"require": {
"php": "^7.2",
"php": "^7.2.5",
"fideloper/proxy": "^4.0",
"laravel/framework": "^6.2",
"laravel/framework": "^7.2",
"laravel/tinker": "^2.0",
"laravel/ui": "^1.1"
"laravel/ui": "^2.0"
},
"require-dev": {
"facade/ignition": "^1.4",
"facade/ignition": "^2.0",
"fzaninotto/faker": "^1.4",
"mockery/mockery": "^1.0",
"nunomaduro/collision": "^3.0",
"phpunit/phpunit": "^8.0"
"nunomaduro/collision": "^4.1",
"phpunit/phpunit": "^8.5"
},
"config": {
"optimize-autoloader": true,
Expand Down
Loading