[HttpClient] revert bad logic around JSON_THROW_ON_ERROR

nicolas-grekas · nicolas-grekas · commit 846116edab4d · 2019-06-05T13:58:47.000+02:00
diff --git a/src/Symfony/Component/HttpClient/HttpClientTrait.php b/src/Symfony/Component/HttpClient/HttpClientTrait.php
@@ -301,13 +301,7 @@ private static function jsonEncode($value, int $flags = null, int $maxDepth = 51
         }
 
         try {
-            if (\PHP_VERSION_ID >= 70300) {
-                // Work around https://bugs.php.net/77997
-                json_encode(null);
-                $flags |= JSON_THROW_ON_ERROR;
-            }
-
-            $value = json_encode($value, $flags, $maxDepth);
+            $value = json_encode($value, $flags | (\PHP_VERSION_ID >= 70300 ? \JSON_THROW_ON_ERROR : 0), $maxDepth);
         } catch (\JsonException $e) {
             throw new InvalidArgumentException(sprintf('Invalid value for "json" option: %s.', $e->getMessage()));
         }
diff --git a/src/Symfony/Component/HttpClient/Response/ResponseTrait.php b/src/Symfony/Component/HttpClient/Response/ResponseTrait.php
@@ -148,7 +148,7 @@ public function toArray(bool $throw = true): array
         }
 
         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) {
             throw new JsonException($e->getMessage(), $e->getCode());
         }

Original file line number	Diff line number	Diff line change
`@@ -301,13 +301,7 @@ private static function jsonEncode($value, int $flags = null, int $maxDepth = 51`
`301`	`301`	`}`
`302`	`302`
`303`	`303`	`try {`
`304`		`- if (\PHP_VERSION_ID >= 70300) {`
`305`		`- // Work around https://bugs.php.net/77997`
`306`		`- json_encode(null);`
`307`		`- $flags \|= JSON_THROW_ON_ERROR;`
`308`		`- }`
`309`		`-`
`310`		`- $value = json_encode($value, $flags, $maxDepth);`
	`304`	`+ $value = json_encode($value, $flags \| (\PHP_VERSION_ID >= 70300 ? \JSON_THROW_ON_ERROR : 0), $maxDepth);`
`311`	`305`	`} catch (\JsonException $e) {`
`312`	`306`	`throw new InvalidArgumentException(sprintf('Invalid value for "json" option: %s.', $e->getMessage()));`
`313`	`307`	`}`
Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ public function toArray(bool $throw = true): array`
`148`	`148`	`}`
`149`	`149`
`150`	`150`	`try {`
`151`		`- $content = json_decode($content, true, 512, JSON_BIGINT_AS_STRING \| (\PHP_VERSION_ID >= 70300 ? JSON_THROW_ON_ERROR : 0));`
	`151`	`+ $content = json_decode($content, true, 512, JSON_BIGINT_AS_STRING \| (\PHP_VERSION_ID >= 70300 ? \JSON_THROW_ON_ERROR : 0));`
`152`	`152`	`} catch (\JsonException $e) {`
`153`	`153`	`throw new JsonException($e->getMessage(), $e->getCode());`
`154`	`154`	`}`