Merge branch '4.4' into 5.0

nicolas-grekas · nicolas-grekas · commit c794cab0cbad · 2020-05-09T17:57:42.000+02:00
* 4.4: [HttpClient] improve testTimeoutIsNotAFatalError Fix for symfony#36715
diff --git a/src/Symfony/Component/HttpClient/Tests/HttpClientTestCase.php b/src/Symfony/Component/HttpClient/Tests/HttpClientTestCase.php
@@ -97,7 +97,7 @@ public function testTimeoutIsNotAFatalError()
     {
         $client = $this->getHttpClient(__FUNCTION__);
         $response = $client->request('GET', 'http://localhost:8057/timeout-body', [
-            'timeout' => 0.1,
+            'timeout' => 0.3,
         ]);
 
         try {
@@ -106,7 +106,16 @@ public function testTimeoutIsNotAFatalError()
         } catch (TransportException $e) {
         }
 
-        usleep(400000);
-        $this->assertSame('<1><2>', $response->getContent());
+        for ($i = 0; $i < 10; ++$i) {
+            try {
+                $this->assertSame('<1><2>', $response->getContent());
+                break;
+            } catch (TransportException $e) {
+            }
+        }
+
+        if (10 === $i) {
+            throw $e;
+        }
     }
 }
diff --git a/src/Symfony/Component/Mime/MimeTypes.php b/src/Symfony/Component/Mime/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/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
`@@ -51,7 +51,7 @@ public function __construct(array $map = [])`
`51`	`51`	`$this->extensions[$mimeType] = $extensions;`
`52`	`52`
`53`	`53`	`foreach ($extensions as $extension) {`
`54`		`- $this->mimeTypes[$extension] = $mimeType;`
	`54`	`+ $this->mimeTypes[$extension][] = $mimeType;`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`	`$this->registerGuesser(new FileBinaryMimeTypeGuesser());`