Commit3aedb51

authored and

committed

[HttpClient] Fix exception triggered with AsyncResponse

1 parentd0ded92 commit3aedb51Copy full SHA for 3aedb51

File tree

+21

-5

lines changed

src/Symfony/Component/HttpClient
- Response
  - AsyncResponse.php
- Tests
  - AsyncDecoratorTraitTest.php

+21

-5

lines changed

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -206,6 +206,11 @@ public static function stream(iterable $responses, float $timeout = null, string`
`206`	`206`	`foreach ($client->stream($wrappedResponses,$timeout)as$response =>$chunk) {`
`207`	`207`	`$r =$asyncMap[$response];`
`208`	`208`
	`209`	`+if (null ===$chunk->getError() &&$chunk->isFirst()) {`
	`210`	`+// Ensure no exception is thrown on destruct for the wrapped response`
	`211`	`+$r->response->getStatusCode();`
	`212`	`+ }`
	`213`	`+`
`209`	`214`	`if (!$r->passthru) {`
`210`	`215`	`if (null !==$chunk->getError() \|\|$chunk->isLast()) {`
`211`	`216`	`unset($asyncMap[$response]);`
`@@ -219,11 +224,6 @@ public static function stream(iterable $responses, float $timeout = null, string`
`219`	`224`	`continue;`
`220`	`225`	`}`
`221`	`226`
`222`		`-if (null ===$chunk->getError() &&$chunk->isFirst()) {`
`223`		`-// Ensure no exception is thrown on destruct for the wrapped response`
`224`		`-$r->response->getStatusCode();`
`225`		`- }`
`226`		`-`
`227`	`227`	`foreach (self::passthru($r->client,$r,$chunk,$asyncMap)as$chunk) {`
`228`	`228`	`yield$r =>$chunk;`
`229`	`229`	`}`

Lines changed: 16 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,22 @@ public function testRetry404()`
`62`	`62`	`$this->assertSame(200,$response->getStatusCode());`
`63`	`63`	`}`
`64`	`64`
	`65`	`+publicfunctiontestRetry404WithThrow()`
	`66`	`+ {`
	`67`	`+$client =$this->getHttpClient(__FUNCTION__,function (ChunkInterface$chunk,AsyncContext$context) {`
	`68`	`+$this->assertTrue($chunk->isFirst());`
	`69`	`+$this->assertSame(404,$context->getStatusCode());`
	`70`	`+$context->getResponse()->cancel();`
	`71`	`+$context->replaceRequest('GET','http://localhost:8057/404');`
	`72`	`+$context->passthru();`
	`73`	`+ });`
	`74`	`+`
	`75`	`+$response =$client->request('GET','http://localhost:8057/404');`
	`76`	`+`
	`77`	`+$this->expectException(ClientExceptionInterface::class);`
	`78`	`+$response->getContent(true);`
	`79`	`+ }`
	`80`	`+`
`65`	`81`	`publicfunctiontestRetryTransportError()`
`66`	`82`	`{`
`67`	`83`	`$client =$this->getHttpClient(__FUNCTION__,function (ChunkInterface$chunk,AsyncContext$context) {`

Comments

(0)