Skip to content

[HttpClient] Fix nesteed stream in AsyncResponse #38520

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nicolas-grekas merged 1 commit into from
Oct 12, 2020
Merged

[HttpClient] Fix nesteed stream in AsyncResponse #38520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/Symfony/Component/HttpClient/Response/AsyncResponse.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -255,7 +256,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.');
}

Expand Down
23 changes: 23 additions & 0 deletions src/Symfony/Component/HttpClient/Tests/AsyncDecoratorTraitTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,4 +230,27 @@ public function testRetryTimeout()

$this->assertSame(200, $response->getStatusCode());
}

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);
}
}