diff --git a/app/Exceptions/Displayers/RedirectDisplayer.php b/app/Exceptions/Displayers/RedirectDisplayer.php index 00166c0b..f7b94206 100644 --- a/app/Exceptions/Displayers/RedirectDisplayer.php +++ b/app/Exceptions/Displayers/RedirectDisplayer.php @@ -67,10 +67,11 @@ class RedirectDisplayer implements DisplayerInterface * * @param \Exception $original * @param \Exception $transformed + * @param int $code * * @return bool */ - public function canDisplay(Exception $original, Exception $transformed) + public function canDisplay(Exception $original, Exception $transformed, $code) { $redirect = $transformed instanceof HttpExceptionInterface && $transformed->getStatusCode() === 401; diff --git a/app/Exceptions/Filters/ApiFilter.php b/app/Exceptions/Filters/ApiFilter.php index 223d9d20..d0610699 100644 --- a/app/Exceptions/Filters/ApiFilter.php +++ b/app/Exceptions/Filters/ApiFilter.php @@ -41,10 +41,11 @@ class ApiFilter * @param \GrahamCampbell\Exceptions\Displayers\DisplayerInterface[] $displayers * @param \Exception $original * @param \Exception $transformed + * @param int $code * * @return \GrahamCampbell\Exceptions\Displayers\DisplayerInterface[] */ - public function filter(array $displayers, Exception $original, Exception $transformed) + public function filter(array $displayers, Exception $original, Exception $transformed, $code) { if ($this->request->is('api*')) { foreach ($displayers as $index => $displayer) { diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php deleted file mode 100644 index 2eda79d9..00000000 --- a/app/Exceptions/Handler.php +++ /dev/null @@ -1,27 +0,0 @@ -singleton( $app->singleton( 'Illuminate\Contracts\Debug\ExceptionHandler', - 'CachetHQ\Cachet\Exceptions\Handler' + 'GrahamCampbell\Exceptions\ExceptionHandler' ); /* diff --git a/composer.json b/composer.json index 8edbc39a..1747cf30 100644 --- a/composer.json +++ b/composer.json @@ -30,7 +30,7 @@ "graham-campbell/core": "^4.1", "graham-campbell/markdown": "^5.1", "graham-campbell/throttle": "^4.1", - "graham-campbell/exceptions": "^4.0", + "graham-campbell/exceptions": "^5.0", "guzzlehttp/guzzle": "^6.1", "jenssegers/date": "^3.0", "mccool/laravel-auto-presenter": "^3.1",