Better exception handling (#883)

mailgun · Dec 1, 2023 · 3dbdc2f · 3dbdc2f
1 parent 888d70f
commit 3dbdc2f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/src/Hydrator/ArrayHydrator.php b/src/Hydrator/ArrayHydrator.php
@@ -33,9 +33,10 @@ public function hydrate(ResponseInterface $response, string $class)
             throw new HydrationException('The ArrayHydrator cannot hydrate response with Content-Type:'.$response->getHeaderLine('Content-Type'));
         }
 
-        $content = json_decode($body, true, 512, JSON_THROW_ON_ERROR);
-        if (JSON_ERROR_NONE !== json_last_error()) {
-            throw new HydrationException(sprintf('Error (%d) when trying to json_decode response', json_last_error()));
+        try {
+            $content = json_decode($body, true, 512, JSON_THROW_ON_ERROR);
+        } catch (\JsonException $exception) {
+            throw new HydrationException(sprintf('Error (%d) when trying to json_decode response: %s', $exception->getCode(), $exception->getMessage()));
         }
 
         return $content;

diff --git a/src/Hydrator/ModelHydrator.php b/src/Hydrator/ModelHydrator.php
@@ -36,10 +36,10 @@ public function hydrate(ResponseInterface $response, string $class)
             throw new HydrationException('The ModelHydrator cannot hydrate response with Content-Type: '.$contentType);
         }
 
-        $data = json_decode($body, true, 512, JSON_THROW_ON_ERROR);
-
-        if (JSON_ERROR_NONE !== json_last_error()) {
-            throw new HydrationException(sprintf('Error (%d) when trying to json_decode response', json_last_error()));
+        try {
+            $data = json_decode($body, true, 512, JSON_THROW_ON_ERROR);
+        } catch (\JsonException $exception) {
+            throw new HydrationException(sprintf('Error (%d) when trying to json_decode response: %s', $exception->getCode(), $exception->getMessage()));
         }
 
         if (is_subclass_of($class, ApiResponse::class)) {