[Debug] PSR-7 support

nicolas-grekas · nicolas-grekas · commit 87d2b74968d8 · 2015-07-31T09:23:08.000+02:00
diff --git a/composer.json b/composer.json
@@ -76,6 +76,7 @@
         "monolog/monolog": "~1.11",
         "ircmaxell/password-compat": "~1.0",
         "ocramius/proxy-manager": "~0.4|~1.0",
+        "psr/http-message": "~1.0",
         "egulias/email-validator": "~1.2"
     },
     "autoload": {
diff --git a/src/Symfony/Component/Debug/ExceptionHandler.php b/src/Symfony/Component/Debug/ExceptionHandler.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Debug;
 
+use Psr\Http\Message\ResponseInterface;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Debug\Exception\FlattenException;
 use Symfony\Component\Debug\Exception\OutOfMemoryException;
@@ -197,15 +198,27 @@ public function sendPhpResponse($exception)
      * Creates the error Response associated with the given Exception.
      *
      * @param \Exception|FlattenException $exception An \Exception instance
+     * @param ResponseInterface           $response  An optional prototype PSR-7 response
      *
-     * @return Response A Response instance
+     * @return Response|ResponseInterface A response instance
      */
-    public function createResponse($exception)
+    public function createResponse($exception, ResponseInterface $response = null)
     {
         if (!$exception instanceof FlattenException) {
             $exception = FlattenException::create($exception);
         }
 
+        if (null !== $response) {
+            $response = $response->withStatus($exception->getStatusCode());
+            foreach ($exception->getHeaders() as $k => $v) {
+                $response = $response->withAddedHeader($k, $v);
+            }
+            $response = $response->withHeader('Content-Type', 'text/html; charset='.$this->charset);
+            $response->getBody()->write($this->decorate($this->getContent($exception), $this->getStylesheet($exception)));
+
+            return $response;
+        }
+
         return Response::create($this->decorate($this->getContent($exception), $this->getStylesheet($exception)), $exception->getStatusCode(), $exception->getHeaders())->setCharset($this->charset);
     }
 
diff --git a/src/Symfony/Component/Debug/Tests/ExceptionHandlerTest.php b/src/Symfony/Component/Debug/Tests/ExceptionHandlerTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Debug\Tests;
 
 use Symfony\Component\Debug\ExceptionHandler;
+use Symfony\Component\Debug\Exception\FlattenException;
 use Symfony\Component\Debug\Exception\OutOfMemoryException;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@@ -89,6 +90,46 @@ public function testHandle()
         $handler->handle($exception);
     }
 
+    public function testPsr7()
+    {
+        $exception = FlattenException::create(new \Exception('foo'), 123, array('Header' => 'Value'));
+
+        $body = $this->getMock('Psr\Http\Message\StreamInterface', array('write'));
+        $body
+            ->expects($this->exactly(1))
+            ->method('write')
+            ->with($this->stringContains('Whoops, looks like something went wrong.'));
+
+        $response0 = $this->getMock('Psr\Http\Message\ResponseInterface', array('withStatus'));
+        $response1 = $this->getMock('Psr\Http\Message\ResponseInterface', array('withAddedHeader'));
+        $response2 = $this->getMock('Psr\Http\Message\ResponseInterface', array('withHeader'));
+        $response3 = $this->getMock('Psr\Http\Message\ResponseInterface', array('getBody'));
+        $response0
+            ->expects($this->exactly(1))
+            ->method('withStatus')
+            ->with(123)
+            ->will($this->returnValue($response1));
+        $response1
+            ->expects($this->exactly(1))
+            ->method('withAddedHeader')
+            ->with('Header', 'Value')
+            ->will($this->returnValue($response2));
+        $response2
+            ->expects($this->exactly(1))
+            ->method('withHeader')
+            ->with('Content-Type', 'text/html; charset=UTF-8')
+            ->will($this->returnValue($response3));
+        $response3
+            ->expects($this->exactly(1))
+            ->method('getBody')
+            ->will($this->returnValue($body));
+
+        $handler = new ExceptionHandler(false);
+        $response = $handler->createResponse($exception, $response0);
+
+        $this->assertSame($response3, $response);
+    }
+
     public function testHandleOutOfMemoryException()
     {
         $exception = new OutOfMemoryException('foo', 0, E_ERROR, __FILE__, __LINE__);
diff --git a/src/Symfony/Component/Debug/composer.json b/src/Symfony/Component/Debug/composer.json
@@ -23,6 +23,7 @@
         "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2"
     },
     "require-dev": {
+        "psr/http-message": "~1.0",
         "symfony/phpunit-bridge": "~2.7|~3.0.0",
         "symfony/class-loader": "~2.2|~3.0.0",
         "symfony/http-kernel": "~2.3.24|~2.5.9|~2.6,>=2.6.2|~3.0.0",
