move to json exception

juliangut · Feb 2, 2022 · 3f37c3d · 3f37c3d
1 parent f8f938a
commit 3f37c3d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/src/Driver/Traits/JsonMappingTrait.php b/src/Driver/Traits/JsonMappingTrait.php
@@ -14,6 +14,7 @@
 namespace Jgut\Mapping\Driver\Traits;
 
 use Jgut\Mapping\Exception\DriverException;
+use JsonException;
 
 trait JsonMappingTrait
 {
@@ -32,11 +33,18 @@ protected function getExtensions(): array
      */
     protected function loadMappingFile(string $mappingFile): array
     {
-        $mappingData = json_decode(file_get_contents($mappingFile), true, 512, \JSON_BIGINT_AS_STRING);
-
-        if (json_last_error() !== \JSON_ERROR_NONE) {
+        try {
+            $mappingData = json_decode(
+                file_get_contents($mappingFile),
+                true,
+                512,
+                \JSON_BIGINT_AS_STRING | \JSON_THROW_ON_ERROR,
+            );
+        } catch (JsonException $exception) {
             throw new DriverException(
-                sprintf('JSON mapping file "%s" parsing error: %s.', $mappingFile, rtrim(json_last_error_msg(), '.')),
+                sprintf('JSON mapping file "%s" parsing error.', $mappingFile),
+                0,
+                $exception,
             );
         }
 

diff --git a/tests/Mapping/Driver/Traits/JsonMappingTraitTest.php b/tests/Mapping/Driver/Traits/JsonMappingTraitTest.php
@@ -40,7 +40,7 @@ public function testExtensions(): void
     public function testLoadError(): void
     {
         $this->expectException(DriverException::class);
-        $this->expectExceptionMessageMatches('/^JSON mapping file ".+" parsing error: Syntax error\.$/');
+        $this->expectExceptionMessageMatches('/^JSON mapping file ".+" parsing error\.$/');
 
         $this->mapping->loadMappingFile(__DIR__ . '/../../Files/files/invalid/invalid.json');
     }