Skip json_last_error check when JSON_THROW_ON_ERROR flag is set i…

…n `json_decode`
thecodingmachine · Nov 28, 2024 · 710b6aa · 710b6aa
1 parent 4b73aa4
commit 710b6aa
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/lib/special_cases.php b/lib/special_cases.php
@@ -37,7 +37,7 @@
 function json_decode(string $json, bool $assoc = false, int $depth = 512, int $flags = 0): mixed
 {
     $data = \json_decode($json, $assoc, $depth, $flags);
-    if (JSON_ERROR_NONE !== json_last_error()) {
+    if (!($flags & JSON_THROW_ON_ERROR) && JSON_ERROR_NONE !== json_last_error()) {
         throw JsonException::createFromPhpError();
     }
     return $data;

diff --git a/tests/JsonDecodeTest.php b/tests/JsonDecodeTest.php
@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+use PHPUnit\Framework\TestCase;
+
+final class JsonDecodeTest extends TestCase
+{
+    public function testJsonLastErrorIsNotCheckedIfFlagIsSet(): void
+    {
+        \json_decode('{');
+        self::assertNotSame(JSON_ERROR_NONE, \json_last_error());
+
+        \Safe\json_decode('[]', flags: \JSON_THROW_ON_ERROR);
+    }
+}