Merge pull request #48 from Bl00D4NGEL/fix-messenger-exception-handling

fix: logic to throw first wrapped exception in messenger busses

Author: janvt

src/Infrastructure/Messenger/CommandBus.php

@@ -25,7 +25,12 @@ public function dispatch(Command $command): mixed
             return $this->handle($command);
         } catch (HandlerFailedException $e) {
             $exceptions = $e->getWrappedExceptions();
-            throw $exceptions[0];
+            $first = array_shift($exceptions);
+            if ($first) {
+                throw $first;
+            }
+
+            throw $e;
         }
     }
 }

src/Infrastructure/Messenger/QueryBus.php

@@ -25,7 +25,12 @@ public function dispatch(Query $query): mixed
             return $this->handle($query);
         } catch (HandlerFailedException $e) {
             $exceptions = $e->getWrappedExceptions();
-            throw $exceptions[0];
+            $first = array_shift($exceptions);
+            if ($first) {
+                throw $first;
+            }
+
+            throw $e;
         }
     }
 }

tests/Unit/Infrastructure/Messenger/CommandBusTest.php

@@ -11,16 +11,10 @@
 use Symfony\Component\Messenger\MessageBus;
 use Symfony\Component\Messenger\Middleware\HandleMessageMiddleware;
 
-/**
- * Test fixture for CommandBus.
- */
 class TestCommand implements Command
 {
 }
 
-/**
- * Test fixture for CommandBus.
- */
 class TestCommandHandler
 {
     public function __invoke(TestCommand $command): mixed
@@ -29,6 +23,18 @@ public function __invoke(TestCommand $command): mixed
     }
 }
 
+class ThrowingCommandHandler
+{
+    public function __construct(private readonly \Exception $exceptionToThrow)
+    {
+    }
+
+    public function __invoke(TestCommand $command): mixed
+    {
+        throw $this->exceptionToThrow;
+    }
+}
+
 class CommandBusTest extends TestCase
 {
     public function testDispatch(): void
@@ -47,6 +53,23 @@ public function testDispatch(): void
         $this->assertSame(TestCommand::class, $result);
     }
 
+    public function testDispatchFailsAndRethrowsException(): void
+    {
+        // Given
+        $expectedException = new \Exception('Not good enough');
+        $bus = $this->createMessageBus(
+            TestCommand::class,
+            new ThrowingCommandHandler($expectedException)
+        );
+        $commandBus = new CommandBus($bus);
+
+        // Then
+        $this->expectExceptionObject($expectedException);
+
+        // When
+        $commandBus->dispatch(new TestCommand());
+    }
+
     private function createMessageBus(
         string $type,
         callable $handler

tests/Unit/Infrastructure/Messenger/QueryBusTest.php

@@ -5,22 +5,29 @@
 namespace GeekCell\DddBundle\Tests\Unit\Infrastructure\Messenger;
 
 use GeekCell\Ddd\Contracts\Application\Query;
+use GeekCell\DddBundle\Infrastructure\Messenger\CommandBus;
 use GeekCell\DddBundle\Infrastructure\Messenger\QueryBus;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Messenger\Handler\HandlersLocator;
 use Symfony\Component\Messenger\MessageBus;
 use Symfony\Component\Messenger\Middleware\HandleMessageMiddleware;
 
-/**
- * Test fixture for QueryBus.
- */
 class TestQuery implements Query
 {
 }
 
-/**
- * Test fixture for CommandBus.
- */
+class ThrowingQueryHandler
+{
+    public function __construct(private readonly \Exception $exceptionToThrow)
+    {
+    }
+
+    public function __invoke(TestQuery $query): mixed
+    {
+        throw $this->exceptionToThrow;
+    }
+}
+
 class TestQueryHandler
 {
     public function __invoke(TestQuery $query): mixed
@@ -47,6 +54,23 @@ public function testDispatch(): void
         $this->assertSame(TestQuery::class, $result);
     }
 
+    public function testDispatchFailsAndRethrowsException(): void
+    {
+        // Given
+        $expectedException = new \Exception('Not good enough');
+        $bus = $this->createMessageBus(
+            TestQuery::class,
+            new ThrowingQueryHandler($expectedException)
+        );
+        $commandBus = new QueryBus($bus);
+
+        // Then
+        $this->expectExceptionObject($expectedException);
+
+        // When
+        $commandBus->dispatch(new TestQuery());
+    }
+
     private function createMessageBus(
         string $type,
         callable $handler