Fix for #36715

mcneely · mcneely · commit 6cae9b64e76e · 2020-05-05T16:25:17.000-05:00
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'));
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -48,10 +48,11 @@ final class MimeTypes implements MimeTypesInterface`
`48`	`48`	`public function __construct(array $map = [])`
`49`	`49`	`{`
`50`	`50`	`foreach ($map as $mimeType => $extensions) {`
`51`		`- $this->extensions[$mimeType] = $extensions;`
	`51`	`+ $this->extensions[$mimeType] = \is_string($extensions) ? [$extensions] : $extensions;`
`52`	`52`
`53`	`53`	`foreach ($extensions as $extension) {`
`54`		`- $this->mimeTypes[$extension] = $mimeType;`
	`54`	`+ $this->mimeTypes[$extension] = $this->mimeTypes[$extension] ?? [];`
	`55`	`+ array_push($this->mimeTypes[$extension], $mimeType);`
`55`	`56`	`}`
`56`	`57`	`}`
`57`	`58`	`$this->registerGuesser(new FileBinaryMimeTypeGuesser());`