Refactors for better type safety

Updates the methods of the `ErrorResponseGeneratorTrait` to accept the
renderer and debug flag as arguments instead of relying on internal
state; this ensures that they are of the type expected.

Updated both implementations to pass the new arguments.

Author: weierophinney

src/Middleware/ErrorResponseGenerator.php

@@ -40,15 +40,21 @@ public function __invoke(
         $response = $response->withStatus(Utils::getStatusCode($e, $response));
 
         if ($this->renderer) {
-            return $this->prepareTemplatedResponse($e, $response, [
-                'response' => $response,
-                'request'  => $request,
-                'uri'      => (string) $request->getUri(),
-                'status'   => $response->getStatusCode(),
-                'reason'   => $response->getReasonPhrase(),
-            ]);
+            return $this->prepareTemplatedResponse(
+                $e,
+                $this->renderer,
+                [
+                    'response' => $response,
+                    'request'  => $request,
+                    'uri'      => (string) $request->getUri(),
+                    'status'   => $response->getStatusCode(),
+                    'reason'   => $response->getReasonPhrase(),
+                ],
+                $this->debug,
+                $response
+            );
         }
 
-        return $this->prepareDefaultResponse($e, $response);
+        return $this->prepareDefaultResponse($e, $this->debug, $response);
     }
 }

src/Response/ErrorResponseGeneratorTrait.php

@@ -47,24 +47,29 @@ trait ErrorResponseGeneratorTrait
 
     private function prepareTemplatedResponse(
         Throwable $e,
-        ResponseInterface $response,
-        array $templateData
+        TemplateRendererInterface $renderer,
+        array $templateData,
+        bool $debug,
+        ResponseInterface $response
     ) : ResponseInterface {
-        if ($this->debug) {
+        if ($debug) {
             $templateData['error'] = $e;
         }
 
         $response->getBody()
-            ->write($this->renderer->render($this->template, $templateData));
+            ->write($renderer->render($this->template, $templateData));
 
         return $response;
     }
 
-    private function prepareDefaultResponse(Throwable $e, ResponseInterface $response) : ResponseInterface
-    {
+    private function prepareDefaultResponse(
+        Throwable $e,
+        bool $debug,
+        ResponseInterface $response
+    ) : ResponseInterface {
         $message = 'An unexpected error occurred';
 
-        if ($this->debug) {
+        if ($debug) {
             $message .= "; stack trace:\n\n" . $this->prepareStackTrace($e);
         }
 

src/Response/ServerRequestErrorResponseGenerator.php

@@ -51,13 +51,19 @@ public function __invoke(Throwable $e) : ResponseInterface
         $response = $response->withStatus(Utils::getStatusCode($e, $response));
 
         if ($this->renderer) {
-            return $this->prepareTemplatedResponse($e, $response, [
-                'response' => $response,
-                'status'   => $response->getStatusCode(),
-                'reason'   => $response->getReasonPhrase(),
-            ]);
+            return $this->prepareTemplatedResponse(
+                $e,
+                $this->renderer,
+                [
+                    'response' => $response,
+                    'status'   => $response->getStatusCode(),
+                    'reason'   => $response->getReasonPhrase(),
+                ],
+                $this->debug,
+                $response
+            );
         }
 
-        return $this->prepareDefaultResponse($e, $response);
+        return $this->prepareDefaultResponse($e, $this->debug, $response);
     }
 }