From f4866bc371cade6a3f492718a1fe0115990b36ad Mon Sep 17 00:00:00 2001
From: Sascha Dens <sascha.dens@proximus.com>
Date: Wed, 21 Nov 2018 13:53:33 +0100
Subject: [PATCH] [HttpFoundation] Fix trailing space for mime-type with
 parameters

---
 src/Symfony/Component/HttpFoundation/Request.php           | 2 +-
 src/Symfony/Component/HttpFoundation/Tests/RequestTest.php | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
index 49121d465148..51187d8557aa 100644
--- 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
index 26335db903dd..ac6f1a74ed0c 100644
--- 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()