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

[HttpClient] Check status code before decoding content in TraceableResponse

Browse Source
This commit is contained in:
Robin Chalas 2020-11-03 17:55:17 +01:00
parent a29af81af4
commit e5595dae73
2 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/Symfony/Component/HttpClient/Response/TraceableResponse.php
View File

@ -52,24 +52,24 @@ class TraceableResponse implements ResponseInterface
public function getContent(bool $throw = true): string public function getContent(bool $throw = true): string
{ {
$this->content = $this->response->getContent(false); try {
return $this->content = $this->response->getContent(false);
if ($throw) { } finally {
$this->checkStatusCode($this->response->getStatusCode()); if ($throw) {
$this->checkStatusCode($this->response->getStatusCode());
}
} }
return $this->content;
} }
public function toArray(bool $throw = true): array public function toArray(bool $throw = true): array
{ {
$this->content = $this->response->toArray(false); try {
return $this->content = $this->response->toArray(false);
if ($throw) { } finally {
$this->checkStatusCode($this->response->getStatusCode()); if ($throw) {
$this->checkStatusCode($this->response->getStatusCode());
}
} }
return $this->content;
} }
public function cancel(): void public function cancel(): void

13
src/Symfony/Component/HttpClient/Tests/TraceableHttpClientTest.php
View File

@ -16,6 +16,7 @@ use Symfony\Component\HttpClient\MockHttpClient;
use Symfony\Component\HttpClient\NativeHttpClient; use Symfony\Component\HttpClient\NativeHttpClient;
use Symfony\Component\HttpClient\Response\MockResponse; use Symfony\Component\HttpClient\Response\MockResponse;
use Symfony\Component\HttpClient\TraceableHttpClient; use Symfony\Component\HttpClient\TraceableHttpClient;
use Symfony\Contracts\HttpClient\Exception\ClientExceptionInterface;
use Symfony\Contracts\HttpClient\HttpClientInterface; use Symfony\Contracts\HttpClient\HttpClientInterface;
use Symfony\Contracts\HttpClient\Test\TestHttpServer; use Symfony\Contracts\HttpClient\Test\TestHttpServer;
@ -100,4 +101,16 @@ class TraceableHttpClientTest extends TestCase
$this->assertGreaterThan(1, \count($chunks)); $this->assertGreaterThan(1, \count($chunks));
$this->assertSame('Symfony is awesome!', implode('', $chunks)); $this->assertSame('Symfony is awesome!', implode('', $chunks));
} }
public function testToArrayChecksStatusCodeBeforeDecoding()
{
$this->expectException(ClientExceptionInterface::class);
$sut = new TraceableHttpClient(new MockHttpClient($responseFactory = function (): MockResponse {
return new MockResponse('Errored.', ['http_code' => 400]);
}));
$response = $sut->request('GET', 'https://example.com/foo/bar');
$response->toArray();
}
} }