Fix error description formatting for NotFoundHttpException in EntityV…

…alueResolver (#48)
stfalcon-studio · Nov 8, 2023 · 1e89fdd · 1e89fdd
1 parent cfa4adb
commit 1e89fdd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/EventListener/Kernel/ApiExceptionFormatterListener.php b/EventListener/Kernel/ApiExceptionFormatterListener.php
@@ -101,7 +101,7 @@ public function __invoke(ExceptionEvent $event): void
                 $errorName = BaseErrorNames::RESOURCE_NOT_FOUND;
 
                 if (preg_match('/^(.+) object not found by the @(.+) annotation\.$/', $message)
-                    || preg_match('/^(.+) object not found by (.+). The expression (.+) returned null\.$/', $message)) {
+                    || preg_match('/^(.+) object not found by (.+)\..*$/', $message)) {
                     $message = 'resource_not_found_exception_message';
                 }
                 break;

diff --git a/Tests/EventListener/Kernel/ApiExceptionFormatterListenerTest.php b/Tests/EventListener/Kernel/ApiExceptionFormatterListenerTest.php
@@ -278,9 +278,17 @@ public function testOnKernelExceptionOnPaymentRequired(): void
         self::assertInstanceOf(HttpException::class, $exceptionEvent->getThrowable());
     }
 
-    public function testOnKernelExceptionWhenResourceNotFoundCausedByMapEntityAttribute(): void
+    public function resourceNotFoundExceptionMessageDataProvider(): array
+    {
+        return [
+            ['"App\\Entity\\Event\\Event\" object not found by \"Symfony\\Bridge\\Doctrine\\ArgumentResolver\\EntityValueResolver\". The expression \"repository.findClosedEventById(id)\" returned null.'],
+            ['"App\\Entity\\Event\\Event" object not found by "Symfony\\Bridge\\Doctrine\\ArgumentResolver\\EntityValueResolver".'],
+        ];
+    }
+
+    /** @dataProvider resourceNotFoundExceptionMessageDataProvider */
+    public function testOnKernelExceptionWhenResourceNotFoundCausedByMapEntityAttribute(string $exceptionMessage): void
     {
-        $exceptionMessage = '"App\\Entity\\Event\\Event\" object not found by \"Symfony\\Bridge\\Doctrine\\ArgumentResolver\\EntityValueResolver\". The expression \"repository.findClosedEventById(id)\" returned null.';
         $httpException = new NotFoundHttpException($exceptionMessage);
         $resourceNotFoundMessage = 'Resource not found';