[HttpClient] Fix exception triggered with AsyncResponse

jderusse · nicolas-grekas · commit 3aedb51dd8f7 · 2020-10-02T15:57:08.000+02:00
diff --git a/src/Symfony/Component/HttpClient/Response/AsyncResponse.php b/src/Symfony/Component/HttpClient/Response/AsyncResponse.php
@@ -206,6 +206,11 @@ public static function stream(iterable $responses, float $timeout = null, string
             foreach ($client->stream($wrappedResponses, $timeout) as $response => $chunk) {
                 $r = $asyncMap[$response];
 
+                if (null === $chunk->getError() && $chunk->isFirst()) {
+                    // Ensure no exception is thrown on destruct for the wrapped response
+                    $r->response->getStatusCode();
+                }
+
                 if (!$r->passthru) {
                     if (null !== $chunk->getError() || $chunk->isLast()) {
                         unset($asyncMap[$response]);
@@ -219,11 +224,6 @@ public static function stream(iterable $responses, float $timeout = null, string
                     continue;
                 }
 
-                if (null === $chunk->getError() && $chunk->isFirst()) {
-                    // Ensure no exception is thrown on destruct for the wrapped response
-                    $r->response->getStatusCode();
-                }
-
                 foreach (self::passthru($r->client, $r, $chunk, $asyncMap) as $chunk) {
                     yield $r => $chunk;
                 }
diff --git a/src/Symfony/Component/HttpClient/Tests/AsyncDecoratorTraitTest.php b/src/Symfony/Component/HttpClient/Tests/AsyncDecoratorTraitTest.php
@@ -62,6 +62,22 @@ public function testRetry404()
         $this->assertSame(200, $response->getStatusCode());
     }
 
+    public function testRetry404WithThrow()
+    {
+        $client = $this->getHttpClient(__FUNCTION__, function (ChunkInterface $chunk, AsyncContext $context) {
+            $this->assertTrue($chunk->isFirst());
+            $this->assertSame(404, $context->getStatusCode());
+            $context->getResponse()->cancel();
+            $context->replaceRequest('GET', 'http://localhost:8057/404');
+            $context->passthru();
+        });
+
+        $response = $client->request('GET', 'http://localhost:8057/404');
+
+        $this->expectException(ClientExceptionInterface::class);
+        $response->getContent(true);
+    }
+
     public function testRetryTransportError()
     {
         $client = $this->getHttpClient(__FUNCTION__, function (ChunkInterface $chunk, AsyncContext $context) {
