bug #31861 [HttpClient] work around PHP 7.3 bug related to json_encode() (nicolas-grekas)

fabpot · fabpot · commit 4f7c614ef0c2 · 2019-06-05T04:00:18.000+02:00
This PR was merged into the 4.3 branch. Discussion ---------- [HttpClient] work around PHP 7.3 bug related to json_encode() | Q | A | ------------- | --- | Branch? | 4.3 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - This is the remaining of ##31860 for upper branches. Commits ------- 42904e3 [HttpClient] work around PHP 7.3 bug related to json_encode()
diff --git a/src/Symfony/Component/HttpClient/HttpClientTrait.php b/src/Symfony/Component/HttpClient/HttpClientTrait.php
@@ -301,7 +301,13 @@ private static function jsonEncode($value, int $flags = null, int $maxDepth = 51
         }
 
         try {
-            $value = json_encode($value, $flags | (\PHP_VERSION_ID >= 70300 ? JSON_THROW_ON_ERROR : 0), $maxDepth);
+            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);
         } catch (\JsonException $e) {
             throw new InvalidArgumentException(sprintf('Invalid value for "json" option: %s.', $e->getMessage()));
         }

Original file line number	Diff line number	Diff line change
`@@ -301,7 +301,13 @@ private static function jsonEncode($value, int $flags = null, int $maxDepth = 51`
`301`	`301`	`}`
`302`	`302`
`303`	`303`	`try {`
`304`		`- $value = json_encode($value, $flags \| (\PHP_VERSION_ID >= 70300 ? JSON_THROW_ON_ERROR : 0), $maxDepth);`
	`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);`
`305`	`311`	`} catch (\JsonException $e) {`
`306`	`312`	`throw new InvalidArgumentException(sprintf('Invalid value for "json" option: %s.', $e->getMessage()));`
`307`	`313`	`}`