Final handler return prev exceptions in development mode

zendframework · Dec 30, 2015 · d56bbdf · d56bbdf
1 parent 61adbe7
commit d56bbdf
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/FinalHandler.php b/src/FinalHandler.php
@@ -168,8 +168,7 @@ private function create404(RequestInterface $request, ResponseInterface $respons
     private function createDevelopmentErrorMessage($error)
     {
         if ($error instanceof Exception) {
-            $message  = $error->getMessage() . "\n";
-            $message .= $error->getTraceAsString();
+            $message  = $error;
         } elseif (is_object($error) && ! method_exists($error, '__toString')) {
             $message = sprintf('Error of type "%s" occurred', get_class($error));
         } else {

diff --git a/test/FinalHandlerTest.php b/test/FinalHandlerTest.php
@@ -74,6 +74,18 @@ public function testInvokingWithExceptionInNonProductionModeIncludesTraceInRespo
         $this->assertContains($expected, (string) $response->getBody());
     }
 
+    public function testInvokingWithExceptionInNonProductionModeIncludesPrevTraceInResponseBody()
+    {
+        $prev     = new \Exception('boobar', 500);
+        $error    = new Exception('foo', 400, $prev);
+        $response = call_user_func($this->final, $this->request, $this->response, $error);
+        $expected = $this->escaper->escapeHtml($error->getTraceAsString());
+        $body = (string) $response->getBody();
+        $this->assertContains($expected, $body);
+        $this->assertContains('boobar', $body);
+        $this->assertContains('foo', $body);
+    }
+
     public function testInvokingWithErrorInProductionSetsResponseToReasonPhrase()
     {
         $final = new FinalHandler([