use json_decode_with_error/json_encode_with_error internally - closes #4

nuxed · Nov 22, 2020 · ea8156f · ea8156f
1 parent fc07cf2
commit ea8156f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/src/Nuxed/Json/decode.hack b/src/Nuxed/Json/decode.hack
@@ -5,8 +5,10 @@ namespace Nuxed\Json;
  */
 function decode(string $json, bool $assoc = true): dynamic {
   try {
-    $value = \json_decode(
+    $error = null;
+    $value = \json_decode_with_error(
       $json,
+      inout $error,
       $assoc,
       512,
       \JSON_BIGINT_AS_STRING |
@@ -26,9 +28,8 @@ function decode(string $json, bool $assoc = true): dynamic {
     );
   }
 
-  $error = \json_last_error();
-  if (\JSON_ERROR_NONE !== $error) {
-    throw new Exception\JsonDecodeException(Errors[$error], $error);
+  if ($error is nonnull && \JSON_ERROR_NONE !== $error[0]) {
+    throw new Exception\JsonDecodeException(Errors[$error[0]], $error[0]);
   }
 
   return $value;

diff --git a/src/Nuxed/Json/encode.hack b/src/Nuxed/Json/encode.hack
@@ -12,10 +12,10 @@ function encode(mixed $value, bool $pretty = false, int $flags = 0): string {
     $flags |= \JSON_PRETTY_PRINT;
   }
 
-  $json = \json_encode($value, $flags);
-  $error = \json_last_error();
-  if (\JSON_ERROR_NONE !== $error) {
-    throw new Exception\JsonEncodeException(Errors[$error], $error);
+  $error = null;
+  $json = \json_encode_with_error($value, inout $error, $flags);
+  if ($error is nonnull && \JSON_ERROR_NONE !== $error[0]) {
+    throw new Exception\JsonEncodeException(Errors[$error[0]], $error[0]);
   }
 
   return $json;