Fix nesteed stream in AsyncResponse

jderusse · jderusse · commit 0f623af9add1 · 2020-10-11T18:45:06.000+02:00
diff --git a/src/Symfony/Component/HttpClient/Response/AsyncResponse.php b/src/Symfony/Component/HttpClient/Response/AsyncResponse.php
@@ -34,6 +34,7 @@ final class AsyncResponse implements ResponseInterface, StreamableInterface
     private $response;
     private $info = ['canceled' => false];
     private $passthru;
+    private $lastYielded = false;
 
     /**
      * @param ?callable(ChunkInterface, AsyncContext): ?\Iterator $passthru
@@ -237,7 +238,10 @@ public static function stream(iterable $responses, float $timeout = null, string
                 }
             }
 
-            if (null === $chunk->getError() && !$chunk->isLast() && $r->response === $response && null !== $r->client) {
+            if (null === $chunk->getError() && $chunk->isLast()) {
+                $r->lastYielded = true;
+            }
+            if (null === $chunk->getError() && !$r->lastYielded && $r->response === $response && null !== $r->client) {
                 throw new \LogicException('A chunk passthru must yield an "isLast()" chunk before ending a stream.');
             }
 
diff --git a/src/Symfony/Component/HttpClient/Tests/AsyncDecoratorTraitTest.php b/src/Symfony/Component/HttpClient/Tests/AsyncDecoratorTraitTest.php
@@ -212,4 +212,27 @@ public function testBufferPurePassthru()
         $this->assertStringContainsString('SERVER_PROTOCOL', $response->getContent());
         $this->assertStringContainsString('HTTP_HOST', $response->getContent());
     }
+
+    public function testRecurciveStream()
+    {
+        $client = new class(parent::getHttpClient(__FUNCTION__)) implements HttpClientInterface {
+            use AsyncDecoratorTrait;
+
+            public function request(string $method, string $url, array $options = []): ResponseInterface
+            {
+                return new AsyncResponse($this->client, $method, $url, $options);
+            }
+        };
+
+        $response = $client->request('GET', 'http://localhost:8057/json');
+        $content = '';
+        foreach($client->stream($response) as $chunk) {
+            $content.=$chunk->getContent();
+            foreach($client->stream($response) as $chunk) {
+                $content.=$chunk->getContent();
+            }
+        }
+
+        $this->assertSame('{"documents":[{"id":"\/json\/1"},{"id":"\/json\/2"},{"id":"\/json\/3"}]}', $content);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ final class AsyncResponse implements ResponseInterface, StreamableInterface`
`34`	`34`	`private $response;`
`35`	`35`	`private $info = ['canceled' => false];`
`36`	`36`	`private $passthru;`
	`37`	`+ private $lastYielded = false;`
`37`	`38`
`38`	`39`	`/**`
`39`	`40`	`* @param ?callable(ChunkInterface, AsyncContext): ?\Iterator $passthru`
`@@ -237,7 +238,10 @@ public static function stream(iterable $responses, float $timeout = null, string`
`237`	`238`	`}`
`238`	`239`	`}`
`239`	`240`
`240`		`- if (null === $chunk->getError() && !$chunk->isLast() && $r->response === $response && null !== $r->client) {`
	`241`	`+ if (null === $chunk->getError() && $chunk->isLast()) {`
	`242`	`+ $r->lastYielded = true;`
	`243`	`+ }`
	`244`	`+ if (null === $chunk->getError() && !$r->lastYielded && $r->response === $response && null !== $r->client) {`
`241`	`245`	`throw new \LogicException('A chunk passthru must yield an "isLast()" chunk before ending a stream.');`
`242`	`246`	`}`
`243`	`247`