From 5f1a624cb9af9b2956262c9d9ac21b0551b62a98 Mon Sep 17 00:00:00 2001
From: James Brooks <jbrooksuk@me.com>
Date: Sun, 17 Jun 2018 00:32:53 +0100
Subject: [PATCH] Update exception displayers

---
 .../Exceptions/Displayers/JsonValidationDisplayer.php         | 4 ++--
 app/Foundation/Exceptions/Displayers/MaintenanceDisplayer.php | 4 ++--
 app/Foundation/Exceptions/Displayers/RedirectDisplayer.php    | 4 ++--
 app/Foundation/Exceptions/Displayers/ThrottleDisplayer.php    | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/Foundation/Exceptions/Displayers/JsonValidationDisplayer.php b/app/Foundation/Exceptions/Displayers/JsonValidationDisplayer.php
index 02fd20ad3..c87a21d2d 100644
--- a/app/Foundation/Exceptions/Displayers/JsonValidationDisplayer.php
+++ b/app/Foundation/Exceptions/Displayers/JsonValidationDisplayer.php
@@ -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;
     }
diff --git a/app/Foundation/Exceptions/Displayers/MaintenanceDisplayer.php b/app/Foundation/Exceptions/Displayers/MaintenanceDisplayer.php
index 77c583f7a..255d1b639 100644
--- a/app/Foundation/Exceptions/Displayers/MaintenanceDisplayer.php
+++ b/app/Foundation/Exceptions/Displayers/MaintenanceDisplayer.php
@@ -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;
     }
diff --git a/app/Foundation/Exceptions/Displayers/RedirectDisplayer.php b/app/Foundation/Exceptions/Displayers/RedirectDisplayer.php
index 147a2c976..34c898c8a 100644
--- a/app/Foundation/Exceptions/Displayers/RedirectDisplayer.php
+++ b/app/Foundation/Exceptions/Displayers/RedirectDisplayer.php
@@ -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;
 
diff --git a/app/Foundation/Exceptions/Displayers/ThrottleDisplayer.php b/app/Foundation/Exceptions/Displayers/ThrottleDisplayer.php
index 7d2989275..e900c077a 100644
--- a/app/Foundation/Exceptions/Displayers/ThrottleDisplayer.php
+++ b/app/Foundation/Exceptions/Displayers/ThrottleDisplayer.php
@@ -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*');
     }