diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[HttpClient] Fix exception triggered with AsyncResponse

Browse Source
This commit is contained in:
Jérémy Derussé 2020-10-02 11:04:50 +02:00 committed by Nicolas Grekas
parent d0ded920e6
commit 3aedb51dd8
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Symfony/Component/HttpClient/Response/AsyncResponse.php
View File

@ -206,6 +206,11 @@ final class AsyncResponse implements ResponseInterface, StreamableInterface
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 @@ final class AsyncResponse implements ResponseInterface, StreamableInterface
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;
}

16
src/Symfony/Component/HttpClient/Tests/AsyncDecoratorTraitTest.php
View File

@ -62,6 +62,22 @@ class AsyncDecoratorTraitTest extends NativeHttpClientTest
$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) {