Update exception displayers

This commit is contained in:
James Brooks 2018-06-17 00:32:53 +01:00
parent 726ded7746
commit 5f1a624cb9
4 changed files with 8 additions and 8 deletions

View File

@ -29,7 +29,7 @@ class JsonValidationDisplayer extends JsonDisplayer implements DisplayerInterfac
*
* @return \Symfony\Component\HttpFoundation\Response
*/
public function display(Exception $exception, $id, $code, array $headers)
public function display(Exception $exception, string $id, int $code, array $headers)
{
$info = $this->info->generate($exception, $id, 400);
@ -47,7 +47,7 @@ class JsonValidationDisplayer extends JsonDisplayer implements DisplayerInterfac
*
* @return bool
*/
public function canDisplay(Exception $original, Exception $transformed, $code)
public function canDisplay(Exception $original, Exception $transformed, int $code)
{
return $transformed instanceof ValidationException;
}

View File

@ -53,7 +53,7 @@ class MaintenanceDisplayer implements DisplayerInterface
*
* @return \Symfony\Component\HttpFoundation\Response
*/
public function display(Exception $exception, $id, $code, array $headers)
public function display(Exception $exception, string $id, int $code, array $headers)
{
return new Response($this->render(), $code, array_merge($headers, ['Content-Type' => $this->contentType()]));
}
@ -87,7 +87,7 @@ class MaintenanceDisplayer implements DisplayerInterface
*
* @return bool
*/
public function canDisplay(Exception $original, Exception $transformed, $code)
public function canDisplay(Exception $original, Exception $transformed, int $code)
{
return $transformed instanceof MaintenanceModeException;
}

View File

@ -47,7 +47,7 @@ class RedirectDisplayer implements DisplayerInterface
*
* @return \Symfony\Component\HttpFoundation\Response
*/
public function display(Exception $exception, $id, $code, array $headers)
public function display(Exception $exception, string $id, int $code, array $headers)
{
return redirect()->guest('auth/login');
}
@ -71,7 +71,7 @@ class RedirectDisplayer implements DisplayerInterface
*
* @return bool
*/
public function canDisplay(Exception $original, Exception $transformed, $code)
public function canDisplay(Exception $original, Exception $transformed, int $code)
{
$redirect = $transformed instanceof HttpExceptionInterface && $transformed->getStatusCode() === 401;

View File

@ -47,7 +47,7 @@ class ThrottleDisplayer implements DisplayerInterface
*
* @return \Symfony\Component\HttpFoundation\Response
*/
public function display(Exception $exception, $id, $code, array $headers)
public function display(Exception $exception, string $id, int $code, array $headers)
{
return cachet_redirect('auth.login')->withError(trans('forms.login.rate-limit'));
}
@ -71,7 +71,7 @@ class ThrottleDisplayer implements DisplayerInterface
*
* @return bool
*/
public function canDisplay(Exception $original, Exception $transformed, $code)
public function canDisplay(Exception $original, Exception $transformed, int $code)
{
return $transformed instanceof TooManyRequestsHttpException && $this->request->is('auth*');
}