add content-type header on exception response

rchoquet · rchoquet · commit 9e2b408f255f · 2017-06-15T11:47:56.000+02:00
diff --git a/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php b/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php
@@ -74,7 +74,7 @@ public function showAction(Request $request, FlattenException $exception, DebugL
                 'logger' => $logger,
                 'currentContent' => $currentContent,
             )
-        ));
+        ), 200, array('Content-Type' => $request->getMimeType($request->getRequestFormat()) ?: 'text/html'));
     }
 
     /**
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/Controller/ExceptionControllerTest.php b/src/Symfony/Bundle/TwigBundle/Tests/Controller/ExceptionControllerTest.php
@@ -22,40 +22,57 @@ class ExceptionControllerTest extends TestCase
 {
     public function testShowActionCanBeForcedToShowErrorPage()
     {
-        $twig = new Environment(
-            new ArrayLoader(array(
-                'TwigBundle:Exception:error404.html.twig' => 'ok',
-            ))
-        );
+        $twig = $this->createTwigEnv(array('TwigBundle:Exception:error404.html.twig' => '<html>not found</html>'));
 
-        $request = Request::create('whatever', 'GET');
-        $request->headers->set('X-Php-Ob-Level', 1);
+        $request = $this->createRequest('html');
         $request->attributes->set('showException', false);
         $exception = FlattenException::create(new \Exception(), 404);
         $controller = new ExceptionController($twig, /* "showException" defaults to --> */ true);
 
         $response = $controller->showAction($request, $exception, null);
 
         $this->assertEquals(200, $response->getStatusCode()); // successful request
-        $this->assertEquals('ok', $response->getContent());  // content of the error404.html template
+        $this->assertEquals('<html>not found</html>', $response->getContent());
     }
 
     public function testFallbackToHtmlIfNoTemplateForRequestedFormat()
     {
-        $twig = new Environment(
-            new ArrayLoader(array(
-                'TwigBundle:Exception:error.html.twig' => 'html',
-            ))
-        );
+        $twig = $this->createTwigEnv(array('TwigBundle:Exception:error.html.twig' => '<html></html>'));
 
-        $request = Request::create('whatever');
-        $request->headers->set('X-Php-Ob-Level', 1);
-        $request->setRequestFormat('txt');
+        $request = $this->createRequest('txt');
         $exception = FlattenException::create(new \Exception());
         $controller = new ExceptionController($twig, false);
 
-        $response = $controller->showAction($request, $exception);
+        $controller->showAction($request, $exception);
 
         $this->assertEquals('html', $request->getRequestFormat());
     }
+
+    public function testResponseHasRequestedMimeType()
+    {
+        $twig = $this->createTwigEnv(array('TwigBundle:Exception:error.json.twig' => '{}'));
+
+        $request = $this->createRequest('json');
+        $exception = FlattenException::create(new \Exception());
+        $controller = new ExceptionController($twig, false);
+
+        $response = $controller->showAction($request, $exception);
+
+        $this->assertEquals('json', $request->getRequestFormat());
+        $this->assertEquals($request->getMimeType('json'), $response->headers->get('Content-Type'));
+    }
+
+    private function createRequest($requestFormat)
+    {
+        $request = Request::create('whatever');
+        $request->headers->set('X-Php-Ob-Level', 1);
+        $request->setRequestFormat($requestFormat);
+
+        return $request;
+    }
+
+    private function createTwigEnv(array $templates)
+    {
+        return new Environment(new ArrayLoader($templates));
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public function showAction(Request $request, FlattenException $exception, DebugL`
`74`	`74`	`'logger' => $logger,`
`75`	`75`	`'currentContent' => $currentContent,`
`76`	`76`	`)`
`77`		`- ));`
	`77`	`+ ), 200, array('Content-Type' => $request->getMimeType($request->getRequestFormat()) ?: 'text/html'));`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`/**`