[HttpFoundation] Fix trailing space for mime-type with parameters

Sascha Dens · Sascha Dens · commit f4866bc371ca · 2018-11-21T13:53:33.000+01:00
diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
@@ -1326,7 +1326,7 @@ public function getFormat($mimeType)
     {
         $canonicalMimeType = null;
         if (false !== $pos = strpos($mimeType, ';')) {
-            $canonicalMimeType = substr($mimeType, 0, $pos);
+            $canonicalMimeType = trim(substr($mimeType, 0, $pos));
         }
 
         if (null === static::$formats) {
diff --git a/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php b/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
@@ -323,6 +323,9 @@ public function testGetFormatFromMimeTypeWithParameters()
     {
         $request = new Request();
         $this->assertEquals('json', $request->getFormat('application/json; charset=utf-8'));
+        $this->assertEquals('json', $request->getFormat('application/json;charset=utf-8'));
+        $this->assertEquals('json', $request->getFormat('application/json ; charset=utf-8'));
+        $this->assertEquals('json', $request->getFormat('application/json ;charset=utf-8'));
     }
 
     public function testGetFormatWithCustomMimeType()

Original file line number	Diff line number	Diff line change
`@@ -1326,7 +1326,7 @@ public function getFormat($mimeType)`
`1326`	`1326`	`{`
`1327`	`1327`	`$canonicalMimeType = null;`
`1328`	`1328`	`if (false !== $pos = strpos($mimeType, ';')) {`
`1329`		`- $canonicalMimeType = substr($mimeType, 0, $pos);`
	`1329`	`+ $canonicalMimeType = trim(substr($mimeType, 0, $pos));`
`1330`	`1330`	`}`
`1331`	`1331`
`1332`	`1332`	`if (null === static::$formats) {`
Original file line number	Diff line number	Diff line change
`@@ -323,6 +323,9 @@ public function testGetFormatFromMimeTypeWithParameters()`
`323`	`323`	`{`
`324`	`324`	`$request = new Request();`
`325`	`325`	`$this->assertEquals('json', $request->getFormat('application/json; charset=utf-8'));`
	`326`	`+ $this->assertEquals('json', $request->getFormat('application/json;charset=utf-8'));`
	`327`	`+ $this->assertEquals('json', $request->getFormat('application/json ; charset=utf-8'));`
	`328`	`+ $this->assertEquals('json', $request->getFormat('application/json ;charset=utf-8'));`
`326`	`329`	`}`
`327`	`330`
`328`	`331`	`public function testGetFormatWithCustomMimeType()`