improve exceptions

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

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/src/Driver/AbstractDriverFactory.php b/src/Driver/AbstractDriverFactory.php
@@ -163,6 +163,6 @@ protected function getAttributeDriver(array $paths): DriverInterface
      */
     protected function getAnnotationDriver(array $paths): DriverInterface
     {
-        throw new DriverException('Annotation metadata mapping driver is not supported.');
+        throw new DriverException('PHP class annotation metadata mapping driver is not supported.');
     }
 }
diff --git a/src/Driver/Traits/JsonMappingTrait.php b/src/Driver/Traits/JsonMappingTrait.php
@@ -42,7 +42,7 @@ protected function loadMappingFile(string $mappingFile): array
             );
         } catch (JsonException $exception) {
             throw new DriverException(
-                sprintf('JSON mapping file "%s" parsing error.', $mappingFile),
+                sprintf('JSON mapping file "%s" parsing error: %s.', $mappingFile, $exception->getMessage()),
                 0,
                 $exception,
             );

diff --git a/src/Driver/Traits/YamlMappingTrait.php b/src/Driver/Traits/YamlMappingTrait.php
@@ -46,6 +46,8 @@ protected function loadMappingFile(string $mappingFile): array
         } catch (ParseException $exception) {
             throw new DriverException(
                 sprintf('YAML mapping file "%s" parsing error: %s.', $mappingFile, rtrim($exception->getMessage())),
+                0,
+                $exception,
             );
         }
         // @codeCoverageIgnoreEnd

diff --git a/tests/Mapping/Driver/AbstractDriverFactoryTest.php b/tests/Mapping/Driver/AbstractDriverFactoryTest.php
@@ -42,7 +42,7 @@ protected function setUp(): void
     public function testAnnotationDriverNotImplemented(): void
     {
         $this->expectException(DriverException::class);
-        $this->expectExceptionMessage('Annotation metadata mapping driver is not supported.');
+        $this->expectExceptionMessage('PHP class annotation metadata mapping driver is not supported.');
 
         (new EmptyDriverFactoryStub())->getDriver(['type' => DriverFactoryInterface::DRIVER_ANNOTATION, 'path' => []]);
     }

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\.$/');
+        $this->expectExceptionMessageMatches('/^JSON mapping file ".+" parsing error: Syntax error\.$/');
 
         $this->mapping->loadMappingFile(__DIR__ . '/../../Files/files/invalid/invalid.json');
     }