Merge branch '5.0'

* 5.0: [HttpClient] improve testTimeoutIsNotAFatalError Fix for #36715
symfony · May 9, 2020 · b439f55 · b439f55
2 parents 34809eb + 9509b35
commit b439f55
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/MimeTypes.php b/MimeTypes.php
@@ -51,7 +51,7 @@ public function __construct(array $map = [])
             $this->extensions[$mimeType] = $extensions;
 
             foreach ($extensions as $extension) {
-                $this->mimeTypes[$extension] = $mimeType;
+                $this->mimeTypes[$extension][] = $mimeType;
             }
         }
         $this->registerGuesser(new FileBinaryMimeTypeGuesser());

diff --git a/Tests/MimeTypesTest.php b/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'));
+    }
 }