Make MimeTypeExtensionGuesser case insensitive

vermeirentony · vermeirentony · commit e294ee6b9a89 · 2019-04-16T08:01:19.000+02:00
diff --git a/src/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeExtensionGuesser.php b/src/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeExtensionGuesser.php
@@ -808,6 +808,12 @@ class MimeTypeExtensionGuesser implements ExtensionGuesserInterface
      */
     public function guess($mimeType)
     {
-        return isset($this->defaultExtensions[$mimeType]) ? $this->defaultExtensions[$mimeType] : null;
+        if (isset($this->defaultExtensions[$mimeType])) {
+            return $this->defaultExtensions[$mimeType];
+        }
+
+        $lcMimeType = strtolower($mimeType);
+
+        return isset($this->defaultExtensions[$lcMimeType]) ? $this->defaultExtensions[$lcMimeType] : null;
     }
 }
diff --git a/src/Symfony/Component/HttpFoundation/Tests/File/Fixtures/case-sensitive-mime-type.xlsm b/src/Symfony/Component/HttpFoundation/Tests/File/Fixtures/case-sensitive-mime-type.xlsm
diff --git a/src/Symfony/Component/HttpFoundation/Tests/File/UploadedFileTest.php b/src/Symfony/Component/HttpFoundation/Tests/File/UploadedFileTest.php
@@ -90,6 +90,19 @@ public function testGuessClientExtensionWithIncorrectMimeType()
         $this->assertEquals('jpeg', $file->guessClientExtension());
     }
 
+    public function testCaseSensitiveMimeType()
+    {
+        $file = new UploadedFile(
+            __DIR__.'/Fixtures/case-sensitive-mime-type.xlsm',
+            'test.xlsm',
+            'application/vnd.ms-excel.sheet.macroEnabled.12',
+            filesize(__DIR__.'/Fixtures/case-sensitive-mime-type.xlsm'),
+            null
+        );
+
+        $this->assertEquals('xlsm', $file->guessClientExtension());
+    }
+
     public function testErrorIsOkByDefault()
     {
         $file = new UploadedFile(

Original file line number	Diff line number	Diff line change
`@@ -808,6 +808,12 @@ class MimeTypeExtensionGuesser implements ExtensionGuesserInterface`
`808`	`808`	`*/`
`809`	`809`	`public function guess($mimeType)`
`810`	`810`	`{`
`811`		`- return isset($this->defaultExtensions[$mimeType]) ? $this->defaultExtensions[$mimeType] : null;`
	`811`	`+ if (isset($this->defaultExtensions[$mimeType])) {`
	`812`	`+ return $this->defaultExtensions[$mimeType];`
	`813`	`+ }`
	`814`	`+`
	`815`	`+ $lcMimeType = strtolower($mimeType);`
	`816`	`+`
	`817`	`+ return isset($this->defaultExtensions[$lcMimeType]) ? $this->defaultExtensions[$lcMimeType] : null;`
`812`	`818`	`}`
`813`	`819`	`}`