Merge branch 'hotfix/464'

Close #464

Author: weierophinney

CHANGELOG.md

@@ -18,7 +18,9 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#464](https://github.com/zendframework/zend-expressive/pull/464) fixes the
+  `WhoopsErrorResponseGenerator` to provide a correct `Content-Type` header to
+  the response when a JSON request occurs.
 
 ## 2.0.0 - 2017-03-07
 

src/Middleware/WhoopsErrorResponseGenerator.php

@@ -10,6 +10,7 @@
 use InvalidArgumentException;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use Whoops\Handler\JsonResponseHandler;
 use Whoops\Handler\PrettyPageHandler;
 use Whoops\Run;
 use Whoops\RunInterface;
@@ -55,6 +56,18 @@ public function __invoke($e, ServerRequestInterface $request, ResponseInterface
             if ($handler instanceof PrettyPageHandler) {
                 $this->prepareWhoopsHandler($request, $handler);
             }
+
+            // Set Json content type header
+            if ($handler instanceof JsonResponseHandler) {
+                $contentType = 'application/json';
+
+                // Whoops < 2.1.5 does not provide contentType method
+                if (method_exists($handler, 'contentType')) {
+                    $contentType = $handler->contentType();
+                }
+
+                $response = $response->withHeader('Content-Type', $contentType);
+            }
         }
 
         $response

test/Middleware/WhoopsErrorResponseGeneratorTest.php

@@ -13,6 +13,7 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\StreamInterface;
 use RuntimeException;
+use Whoops\Handler\JsonResponseHandler;
 use Whoops\Handler\PrettyPageHandler;
 use Whoops\Run;
 use Whoops\RunInterface;
@@ -111,4 +112,40 @@ public function testAddsRequestMetadataToWhoopsPrettyPageHandler()
             $generator($error, $this->request->reveal(), $this->response->reveal())
         );
     }
+
+    public function testJsonContentTypeResponseWithJsonResponseHandler()
+    {
+        $error = new RuntimeException();
+
+        $handler = $this->prophesize(JsonResponseHandler::class);
+
+        if (method_exists(JsonResponseHandler::class, 'contentType')) {
+            $handler->contentType()->willReturn('application/json');
+        }
+
+        $this->whoops->getHandlers()->willReturn([$handler->reveal()]);
+        $this->whoops->handleException($error)->willReturn('error');
+
+        $this->request->getAttribute('originalUri', false)->willReturn('https://example.com/foo');
+        $this->request->getAttribute('originalRequest', false)->will([$this->request, 'reveal']);
+        $this->request->getMethod()->willReturn('POST');
+        $this->request->getServerParams()->willReturn(['SCRIPT_NAME' => __FILE__]);
+        $this->request->getHeaders()->willReturn([]);
+        $this->request->getCookieParams()->willReturn([]);
+        $this->request->getAttributes()->willReturn([]);
+        $this->request->getQueryParams()->willReturn([]);
+        $this->request->getParsedBody()->willReturn([]);
+
+        $this->response->withHeader('Content-Type', 'application/json')->will([$this->response, 'reveal']);
+        $this->response->getBody()->will([$this->stream, 'reveal']);
+
+        $this->stream->write('error')->shouldBeCalled();
+
+        $generator = new WhoopsErrorResponseGenerator($this->whoops->reveal());
+
+        $this->assertSame(
+            $this->response->reveal(),
+            $generator($error, $this->request->reveal(), $this->response->reveal())
+        );
+    }
 }