[Request] Fix support of custom mime types with parameters

GuilhemN · GuilhemN · commit 855cd91078db · 2016-03-22T14:27:20.000+01:00
diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
@@ -1232,22 +1232,25 @@ public function getMimeType($format)
     /**
      * Gets the format associated with the mime type.
      *
-     * @param string $mimeType The associated mime type
+     * @param string $extendedMimeType The associated mime type
      *
      * @return string|null The format (null if not found)
      */
-    public function getFormat($mimeType)
+    public function getFormat($extendedMimeType)
     {
-        if (false !== $pos = strpos($mimeType, ';')) {
-            $mimeType = substr($mimeType, 0, $pos);
+        if (false !== $pos = strpos($extendedMimeType, ';')) {
+            $mimeType = substr($extendedMimeType, 0, $pos);
         }
 
         if (null === static::$formats) {
             static::initializeFormats();
         }
 
         foreach (static::$formats as $format => $mimeTypes) {
-            if (in_array($mimeType, (array) $mimeTypes)) {
+            if (in_array($extendedMimeType, (array) $mimeTypes)) {
+                return $format;
+            }
+            if (isset($mimeType) && in_array($mimeType, (array) $mimeTypes)) {
                 return $format;
             }
         }
diff --git a/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php b/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(

Original file line number	Diff line number	Diff line change
`@@ -1232,22 +1232,25 @@ public function getMimeType($format)`
`1232`	`1232`	`/**`
`1233`	`1233`	`* Gets the format associated with the mime type.`
`1234`	`1234`	`*`
`1235`		`- * @param string $mimeType The associated mime type`
	`1235`	`+ * @param string $extendedMimeType The associated mime type`
`1236`	`1236`	`*`
`1237`	`1237`	`* @return string\|null The format (null if not found)`
`1238`	`1238`	`*/`
`1239`		`- public function getFormat($mimeType)`
	`1239`	`+ public function getFormat($extendedMimeType)`
`1240`	`1240`	`{`
`1241`		`- if (false !== $pos = strpos($mimeType, ';')) {`
`1242`		`- $mimeType = substr($mimeType, 0, $pos);`
	`1241`	`+ if (false !== $pos = strpos($extendedMimeType, ';')) {`
	`1242`	`+ $mimeType = substr($extendedMimeType, 0, $pos);`
`1243`	`1243`	`}`
`1244`	`1244`
`1245`	`1245`	`if (null === static::$formats) {`
`1246`	`1246`	`static::initializeFormats();`
`1247`	`1247`	`}`
`1248`	`1248`
`1249`	`1249`	`foreach (static::$formats as $format => $mimeTypes) {`
`1250`		`- if (in_array($mimeType, (array) $mimeTypes)) {`
	`1250`	`+ if (in_array($extendedMimeType, (array) $mimeTypes)) {`
	`1251`	`+ return $format;`
	`1252`	`+ }`
	`1253`	`+ if (isset($mimeType) && in_array($mimeType, (array) $mimeTypes)) {`
`1251`	`1254`	`return $format;`
`1252`	`1255`	`}`
`1253`	`1256`	`}`
Original file line number	Diff line number	Diff line change
`@@ -325,6 +325,13 @@ public function testGetMimeTypeFromFormat($format, $mimeTypes)`
`325`	`325`	`}`
`326`	`326`	`}`
`327`	`327`
	`328`	`+ public function testGetFormatWithCustomMimeType()`
	`329`	`+ {`
	`330`	`+ $request = new Request();`
	`331`	`+ $request->setFormat('custom', 'application/vnd.foo.api;myversion=2.3');`
	`332`	`+ $this->assertEquals('custom', $request->getFormat('application/vnd.foo.api;myversion=2.3'));`
	`333`	`+ }`
	`334`	`+`
`328`	`335`	`public function getFormatToMimeTypeMapProvider()`
`329`	`336`	`{`
`330`	`337`	`return array(`