[Request] Fix support of custom mime types with parameters

GuilhemN · GuilhemN · commit 70d21300907a · 2016-03-23T15:38:13.000+01:00
diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
@@ -1347,7 +1347,7 @@ public static function getMimeTypes($format)
     public function getFormat($mimeType)
     {
         if (false !== $pos = strpos($mimeType, ';')) {
-            $mimeType = substr($mimeType, 0, $pos);
+            $canonicalMimeType = substr($mimeType, 0, $pos);
         }
 
         if (null === static::$formats) {
@@ -1358,6 +1358,9 @@ public function getFormat($mimeType)
             if (in_array($mimeType, (array) $mimeTypes)) {
                 return $format;
             }
+            if (isset($canonicalMimeType) && in_array($canonicalMimeType, (array) $mimeTypes)) {
+                return $format;
+            }
         }
     }
 
diff --git a/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php b/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
@@ -342,6 +342,13 @@ public function testGetMimeTypesFromInexistentFormat()
         $this->assertEquals(array(), Request::getMimeTypes('foo'));
     }
 
+    public function testGetFormatWithCustomMimeType()
+    {
+        $request = new Request();
+        $request->setFormat('custom', 'application/vnd.foo.api;myversion=2.3');
+        $this->assertEquals('custom', $request->getFormat('application/vnd.foo.api;myversion=2.3'));
+    }
+
     public function getFormatToMimeTypeMapProvider()
     {
         return array(
