Use the detected mime type as Content-Type (#1683)

FriendsOfSymfony · Mar 16, 2017 · 66b66dd · 66b66dd
1 parent 6ecf0e7
commit 66b66dd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/Tests/Functional/VersionTest.php b/Tests/Functional/VersionTest.php
@@ -65,7 +65,10 @@ public function testAcceptHeaderVersion()
             [],
             ['HTTP_Accept' => 'application/vnd.foo.api+json;myversion=2.3']
         );
-        $this->assertEquals('{"version":"2.3"}', $this->client->getResponse()->getContent());
+
+        $response = $this->client->getResponse();
+        $this->assertEquals('{"version":"2.3"}', $response->getContent());
+        $this->assertEquals('application/vnd.foo.api+json;myversion=2.3', $response->headers->get('Content-Type'));
     }
 
     public function testDefaultVersion()

diff --git a/View/ViewHandler.php b/View/ViewHandler.php
@@ -415,7 +415,12 @@ public function createResponse(View $view, Request $request, $format)
         $response = $this->initResponse($view, $format);
 
         if (!$response->headers->has('Content-Type')) {
-            $response->headers->set('Content-Type', $request->getMimeType($format));
+            $mimeType = $request->attributes->get('media_type');
+            if (null === $mimeType) {
+                $mimeType = $request->getMimeType($format);
+            }
+
+            $response->headers->set('Content-Type', $mimeType);
         }
 
         return $response;