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

[HttpClient] revert bad logic around JSON_THROW_ON_ERROR

Browse Source
This commit is contained in:
Nicolas Grekas 2019-06-05 13:58:47 +02:00
parent d90dd8da98
commit 846116edab
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Symfony/Component/HttpClient/HttpClientTrait.php
View File

@ -301,13 +301,7 @@ trait HttpClientTrait
} }
try { try {
if (\PHP_VERSION_ID >= 70300) { $value = json_encode($value, $flags | (\PHP_VERSION_ID >= 70300 ? \JSON_THROW_ON_ERROR : 0), $maxDepth);
// Work around https://bugs.php.net/77997
json_encode(null);
$flags |= JSON_THROW_ON_ERROR;
}
$value = json_encode($value, $flags, $maxDepth);
} catch (\JsonException $e) { } catch (\JsonException $e) {
throw new InvalidArgumentException(sprintf('Invalid value for "json" option: %s.', $e->getMessage())); throw new InvalidArgumentException(sprintf('Invalid value for "json" option: %s.', $e->getMessage()));
} }

2
src/Symfony/Component/HttpClient/Response/ResponseTrait.php
View File

@ -148,7 +148,7 @@ trait ResponseTrait
} }
try { try {
$content = json_decode($content, true, 512, JSON_BIGINT_AS_STRING | (\PHP_VERSION_ID >= 70300 ? JSON_THROW_ON_ERROR : 0)); $content = json_decode($content, true, 512, JSON_BIGINT_AS_STRING | (\PHP_VERSION_ID >= 70300 ? \JSON_THROW_ON_ERROR : 0));
} catch (\JsonException $e) { } catch (\JsonException $e) {
throw new JsonException($e->getMessage(), $e->getCode()); throw new JsonException($e->getMessage(), $e->getCode());
} }