Fix Utils::json*() for native \JSON_THROW_ON_ERROR option (#3184)

If a user passes the native `\JSON_THROW_ON_ERROR` option, these functions would throw a `\JsonException` instead of the expected `\InvalidArgumentException`.
guzzle · Mar 31, 2024 · db32c20 · db32c20
1 parent 2fe9fd4
commit db32c20
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 11 deletions.
diff --git a/src/Utils.php b/src/Utils.php
@@ -272,12 +272,11 @@ public static function isHostInNoProxy(string $host, array $noProxyArray): bool
      */
     public static function jsonDecode(string $json, bool $assoc = false, int $depth = 512, int $options = 0)
     {
-        $data = \json_decode($json, $assoc, $depth, $options);
-        if (\JSON_ERROR_NONE !== \json_last_error()) {
-            throw new InvalidArgumentException('json_decode error: '.\json_last_error_msg());
+        try {
+            return \json_decode($json, $assoc, $depth, $options | \JSON_THROW_ON_ERROR);
+        } catch (\JsonException $e) {
+            throw new InvalidArgumentException('json_decode error: '.$e->getMessage(), 0, $e);
         }
-
-        return $data;
     }
 
     /**
@@ -293,13 +292,11 @@ public static function jsonDecode(string $json, bool $assoc = false, int $depth
      */
     public static function jsonEncode($value, int $options = 0, int $depth = 512): string
     {
-        $json = \json_encode($value, $options, $depth);
-        if (\JSON_ERROR_NONE !== \json_last_error()) {
-            throw new InvalidArgumentException('json_encode error: '.\json_last_error_msg());
+        try {
+            return \json_encode($value, $options | \JSON_THROW_ON_ERROR, $depth);
+        } catch (\JsonException $e) {
+            throw new InvalidArgumentException('json_encode error: '.$e->getMessage(), 0, $e);
         }
-
-        /** @var string */
-        return $json;
     }
 
     /**

diff --git a/tests/UtilsTest.php b/tests/UtilsTest.php
@@ -168,6 +168,13 @@ public function testEncodesJsonAndThrowsOnErrorLegacy()
         \GuzzleHttp\json_encode("\x99");
     }
 
+    public function testEncodesJsonAndThrowsOnErrorWithNativeOption()
+    {
+        $this->expectException(\InvalidArgumentException::class);
+
+        Utils::jsonEncode("\x99", \JSON_THROW_ON_ERROR);
+    }
+
     public function testDecodesJson()
     {
         self::assertTrue(Utils::jsonDecode('true'));
@@ -187,6 +194,13 @@ public function testDecodesJsonAndThrowsOnErrorLegacy()
 
         \GuzzleHttp\json_decode('{{]]');
     }
+
+    public function testDecodesJsonAndThrowsOnErrorWithNativeOption()
+    {
+        $this->expectException(\InvalidArgumentException::class);
+
+        Utils::jsonDecode('{{]]', false, 512, \JSON_THROW_ON_ERROR);
+    }
 }
 
 final class StrClass