Merge branch '2.3' into 2.7

* 2.3:
  [Request] Fix support of custom mime types with parameters

Author: fabpot

src/Symfony/Component/HttpFoundation/Request.php

@@ -1337,8 +1337,9 @@ public function getMimeType($format)
      */
     public function getFormat($mimeType)
     {
+        $canonicalMimeType = null;
         if (false !== $pos = strpos($mimeType, ';')) {
-            $mimeType = substr($mimeType, 0, $pos);
+            $canonicalMimeType = substr($mimeType, 0, $pos);
         }
 
         if (null === static::$formats) {
@@ -1349,6 +1350,9 @@ public function getFormat($mimeType)
             if (in_array($mimeType, (array) $mimeTypes)) {
                 return $format;
             }
+            if (null !== $canonicalMimeType && in_array($canonicalMimeType, (array) $mimeTypes)) {
+                return $format;
+            }
         }
     }
 

src/Symfony/Component/HttpFoundation/Tests/RequestTest.php

@@ -325,6 +325,13 @@ public function testGetMimeTypeFromFormat($format, $mimeTypes)
         }
     }
 
+    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(