bug #31610 [HttpClient] fix handling exceptions thrown before first mock chunk (nicolas-grekas)

fabpot · fabpot · commit 6aacfea491df · 2019-05-25T10:31:33.000+02:00
This PR was merged into the 4.3 branch. Discussion ---------- [HttpClient] fix handling exceptions thrown before first mock chunk | Q | A | ------------- | --- | Branch? | 4.3 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Discovered while fixing a 60s timeout on a test case, which this fixes too. Commits ------- 812b017 [HttpClient] fix handling exceptions thrown before first mock chunk
diff --git a/src/Symfony/Component/HttpClient/Response/MockResponse.php b/src/Symfony/Component/HttpClient/Response/MockResponse.php
@@ -25,7 +25,9 @@
  */
 class MockResponse implements ResponseInterface
 {
-    use ResponseTrait;
+    use ResponseTrait {
+        doDestruct as public __destruct;
+    }
 
     private $body;
     private $requestOptions = [];
@@ -162,8 +164,8 @@ protected static function perform(ClientState $multi, array &$responses): void
                     $offset = 0;
                     $chunk[1]->getStatusCode();
                     $response->headers = $chunk[1]->getHeaders(false);
-                    $multi->handlesActivity[$id][] = new FirstChunk();
                     self::readResponse($response, $chunk[0], $chunk[1], $offset);
+                    $multi->handlesActivity[$id][] = new FirstChunk();
                 } catch (\Throwable $e) {
                     $multi->handlesActivity[$id][] = null;
                     $multi->handlesActivity[$id][] = $e;
diff --git a/src/Symfony/Component/HttpClient/Tests/MockHttpClientTest.php b/src/Symfony/Component/HttpClient/Tests/MockHttpClientTest.php
@@ -115,7 +115,7 @@ protected function getHttpClient(string $testCase): HttpClientInterface
             case 'testResolve':
                 $responses[] = new MockResponse($body, ['response_headers' => $headers]);
                 $responses[] = new MockResponse($body, ['response_headers' => $headers]);
-                $responses[] = $client->request('GET', 'http://symfony.com:8057/');
+                $responses[] = new MockResponse((function () { throw new \Exception('Fake connection timeout'); yield ''; })(), ['response_headers' => $headers]);
                 break;
 
             case 'testTimeoutOnStream':
