Fix for #36715

symfony · May 5, 2020 · 6cae9b6 · 6cae9b6
1 parent 5c24718
commit 6cae9b6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/Symfony/Component/Mime/MimeTypes.php b/src/Symfony/Component/Mime/MimeTypes.php
@@ -48,10 +48,11 @@ final class MimeTypes implements MimeTypesInterface
     public function __construct(array $map = [])
     {
         foreach ($map as $mimeType => $extensions) {
-            $this->extensions[$mimeType] = $extensions;
+            $this->extensions[$mimeType] = \is_string($extensions) ? [$extensions] : $extensions;
 
             foreach ($extensions as $extension) {
-                $this->mimeTypes[$extension] = $mimeType;
+                $this->mimeTypes[$extension] = $this->mimeTypes[$extension] ?? [];
+                array_push($this->mimeTypes[$extension], $mimeType);
             }
         }
         $this->registerGuesser(new FileBinaryMimeTypeGuesser());

diff --git a/src/Symfony/Component/Mime/Tests/MimeTypesTest.php b/src/Symfony/Component/Mime/Tests/MimeTypesTest.php
@@ -62,4 +62,15 @@ public function testGetMimeTypes()
         $this->assertContains('image/svg', $mt->getMimeTypes('svg'));
         $this->assertSame([], $mt->getMimeTypes('symfony'));
     }
+
+    public function testCustomMimeTypes()
+    {
+        $mt = new MimeTypes([
+            'text/bar' => 'foo',
+            'text/baz' => ['foo', 'moof'],
+        ]);
+        $this->assertContains('text/bar', $mt->getMimeTypes('foo'));
+        $this->assertContains('text/baz', $mt->getMimeTypes('foo'));
+        $this->assertSame(['foo', 'moof'], $mt->getExtensions('text/baz'));
+    }
 }