Merge branch 'hotfix/39' into develop

Forward port #39

CHANGELOG.md

@@ -15,7 +15,11 @@ errors. Starting with 1.2.0, they now raise a `RuntimeException`.
 
 ### Added
 
-- Nothing.
+- [#36](https://github.com/zendframework/zend-stratigility/pull/36) adds a new
+  `InvalidMiddlewareException`, with the static factory `fromValue()` that
+  provides an exception message detailing the invalid type. `MiddlewarePipe` now
+  throws this exception from the `pipe()` method when a non-callable value is
+  provided.
 
 ### Deprecated
 
@@ -35,11 +39,7 @@ errors. Starting with 1.2.0, they now raise a `RuntimeException`.
 
 ### Added
 
-- [#36](https://github.com/zendframework/zend-stratigility/pull/36) adds a new
-  `InvalidMiddlewareException`, with the static factory `fromValue()` that
-  provides an exception message detailing the invalid type. `MiddlewarePipe` now
-  throws this exception from the `pipe()` method when a non-callable value is
-  provided.
+- Nothing.
 
 ### Deprecated
 
@@ -51,7 +51,9 @@ errors. Starting with 1.2.0, they now raise a `RuntimeException`.
 
 ### Fixed
 
-- Nothing.
+- [#39](https://github.com/zendframework/zend-stratigility/pull/39) updates the
+  FinalHandler to ensure that emitted exception messages include previous
+  exceptions.
 
 ## 1.1.2 - 2015-10-09
 

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 {

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([