Manage JSON_THROW_ON_ERROR conflict

thecodingmachine · Dec 14, 2020 · c36263e · c36263e
1 parent a8ab087
commit c36263e
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/lib/special_cases.php b/lib/special_cases.php
@@ -30,6 +30,15 @@
  */
 function json_decode(string $json, bool $assoc = false, int $depth = 512, int $options = 0)
 {
+    if ($options & 4194304) { // options has JSON_THROW_ON_ERROR
+        try {
+            $data = \json_decode($json, $assoc, $depth, $options);
+        } catch (\Exception $e) {
+            throw new JsonException($e->getMessage(), (int) $e->getCode());
+        }
+        return $data;
+    }
+
     $data = \json_decode($json, $assoc, $depth, $options);
     if (JSON_ERROR_NONE !== json_last_error()) {
         throw JsonException::createFromPhpError();