Merge pull request #94 from swisnl/feature/throw-json-exceptions

Throw JsonExceptions on errors in all json_encode and json_decode calls

Author: JaZo

src/Concerns/HasAttributes.php

@@ -426,7 +426,7 @@ protected function setMutatedAttributeValue($key, $value)
      */
     protected function asJson($value)
     {
-        return json_encode($value);
+        return json_encode($value, JSON_THROW_ON_ERROR);
     }
 
     /**
@@ -439,7 +439,7 @@ protected function asJson($value)
      */
     public function fromJson(string $value, $asObject = false)
     {
-        return json_decode($value, !$asObject);
+        return json_decode($value, !$asObject, 512, JSON_THROW_ON_ERROR);
     }
 
     /**

src/DocumentClient.php

@@ -116,7 +116,7 @@ public function delete(string $endpoint, array $headers = []): DocumentInterface
      */
     protected function prepareBody(ItemDocumentInterface $body): string
     {
-        return $this->sanitizeJson(json_encode($body));
+        return $this->sanitizeJson(json_encode($body, JSON_THROW_ON_ERROR));
     }
 
     /**

src/Item.php

@@ -168,7 +168,7 @@ public function toJsonApiArray(): array
      */
     public function toJson($options = 0)
     {
-        return json_encode($this->jsonSerialize(), $options);
+        return json_encode($this->jsonSerialize(), JSON_THROW_ON_ERROR | $options);
     }
 
     /**

src/Jsonapi.php

@@ -65,7 +65,7 @@ public function toArray(): array
      */
     public function toJson($options = 0)
     {
-        return json_encode($this->jsonSerialize(), $options);
+        return json_encode($this->jsonSerialize(), JSON_THROW_ON_ERROR | $options);
     }
 
     /**

src/Links.php

@@ -130,7 +130,7 @@ static function (?Link $link) {
      */
     public function toJson($options = 0)
     {
-        return json_encode($this->jsonSerialize(), $options);
+        return json_encode($this->jsonSerialize(), JSON_THROW_ON_ERROR | $options);
     }
 
     /**

src/Meta.php

@@ -125,7 +125,7 @@ public function toArray()
      */
     public function toJson($options = 0)
     {
-        return json_encode($this->jsonSerialize(), $options);
+        return json_encode($this->jsonSerialize(), JSON_THROW_ON_ERROR | $options);
     }
 
     /**

src/Parsers/DocumentParser.php

@@ -4,6 +4,7 @@
 
 namespace Swis\JsonApi\Client\Parsers;
 
+use JsonException;
 use Swis\JsonApi\Client\Collection;
 use Swis\JsonApi\Client\CollectionDocument;
 use Swis\JsonApi\Client\Document;
@@ -152,13 +153,11 @@ public function parse(string $json): DocumentInterface
      */
     private function decodeJson(string $json)
     {
-        $data = json_decode($json, false);
-
-        if (json_last_error() !== JSON_ERROR_NONE) {
-            throw new ValidationException(sprintf('Unable to parse JSON data: %s', json_last_error_msg()), json_last_error());
+        try {
+            return json_decode($json, false, 512, JSON_THROW_ON_ERROR);
+        } catch (JsonException $exception) {
+            throw new ValidationException(sprintf('Unable to parse JSON data: %s', $exception->getMessage()), 0, $exception);
         }
-
-        return $data;
     }
 
     /**