Skip to content

Commit

Permalink
laravel6から7にアップグレードする。
Browse files Browse the repository at this point in the history
  • Loading branch information
akira345 committed Mar 14, 2020
1 parent cc73e25 commit f605b2d
Show file tree
Hide file tree
Showing 4 changed files with 1,034 additions and 691 deletions.
16 changes: 10 additions & 6 deletions app/Exceptions/Handler.php
Expand Up @@ -2,8 +2,8 @@

namespace App\Exceptions;

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

class Handler extends ExceptionHandler
{
Expand All @@ -29,10 +29,12 @@ class Handler extends ExceptionHandler
/**
* Report or log an exception.
*
* @param \Exception $exception
* @param \Throwable $exception
* @return void
*
* @throws \Exception
*/
public function report(Exception $exception)
public function report(Throwable $exception)
{
parent::report($exception);
}
Expand All @@ -41,10 +43,12 @@ public function report(Exception $exception)
* Render an exception into an HTTP response.
*
* @param \Illuminate\Http\Request $request
* @param \Exception $exception
* @return \Illuminate\Http\Response
* @param \Throwable $exception
* @return \Symfony\Component\HttpFoundation\Response
*
* @throws \Throwable
*/
public function render($request, Exception $exception)
public function render($request, Throwable $exception)
{
return parent::render($request, $exception);
}
Expand Down
11 changes: 6 additions & 5 deletions composer.json
Expand Up @@ -5,23 +5,24 @@
"license": "MIT",
"type": "project",
"require": {
"php": "^7.1.3",
"php": "^7.2.5",
"ext-mbstring": "*",
"ext-pdo": "*",
"doctrine/dbal": "2.10.1",
"fideloper/proxy": "4.3.0",
"laravel/framework": "6.18.1",
"laravel/helpers": "1.1.1",
"laravel/framework": "7.1.2",
"laravel/helpers": "1.2.0",
"laravel/tinker": "2.2.0",
"laravelcollective/html": "6.1.0",
"willvincent/feeds": "2.0.0"
"willvincent/feeds": "2.1.0",
"laravel/ui": "~2.0"
},
"require-dev": {
"barryvdh/laravel-ide-helper": "2.6.7",
"filp/whoops": "2.7.1",
"fzaninotto/faker": "1.9.1",
"mockery/mockery": "1.3.1",
"nunomaduro/collision": "3.0.1",
"nunomaduro/collision": "4.1.3",
"nunomaduro/larastan": "0.5.2",
"phpstan/phpstan": "0.12.14",
"phpunit/php-code-coverage": "8.0.1",
Expand Down

0 comments on commit f605b2d

Please sign in to comment.