Merge branch '5.0'

* 5.0:
  [HttpClient] test that timeout is not fatal

Author: nicolas-grekas

Tests/HttpClientTestCase.php

@@ -12,6 +12,7 @@
 namespace Symfony\Component\HttpClient\Tests;
 
 use Symfony\Component\HttpClient\Exception\ClientException;
+use Symfony\Component\HttpClient\Exception\TransportException;
 use Symfony\Component\HttpClient\Response\StreamWrapper;
 use Symfony\Component\Process\Exception\ProcessFailedException;
 use Symfony\Component\Process\Process;
@@ -104,6 +105,23 @@ public function testNonBlockingStream()
         $this->assertTrue(feof($stream));
     }
 
+    public function testTimeoutIsNotAFatalError()
+    {
+        $client = $this->getHttpClient(__FUNCTION__);
+        $response = $client->request('GET', 'http://localhost:8057/timeout-body', [
+            'timeout' => 0.1,
+        ]);
+
+        try {
+            $response->getContent();
+            $this->fail(TransportException::class.' expected');
+        } catch (TransportException $e) {
+        }
+
+        usleep(400000);
+        $this->assertSame('<1><2>', $response->getContent());
+    }
+
     public function testResponseStreamRewind()
     {
         $client = $this->getHttpClient(__FUNCTION__);

Tests/MockHttpClientTest.php

@@ -253,6 +253,7 @@ protected function getHttpClient(string $testCase): HttpClientInterface
 
             case 'testTimeoutOnStream':
             case 'testUncheckedTimeoutThrows':
+            case 'testTimeoutIsNotAFatalError':
                 $body = ['<1>', '', '<2>'];
                 $responses[] = new MockResponse($body, ['response_headers' => $headers]);
                 break;