Merge pull request #32 from PcComponentes/feature/symfony-7.4-support

Fix Symfony 7 exception unwrapping and require Symfony 6.4+

Author: calmohallag

composer.json

@@ -30,8 +30,8 @@
     "pccomponentes/ddd": "^4.0",
     "beberlei/assert": "^3.3",
     "ramsey/uuid": "^4.5",
-    "symfony/framework-bundle": "^6.0 || ^7.0",
-    "symfony/amqp-messenger": "^6.0 || ^7.0"
+    "symfony/framework-bundle": "^6.4 || ^7.0",
+    "symfony/amqp-messenger": "^6.4 || ^7.0"
   },
   "require-dev": {
     "pccomponentes/coding-standard": "^2.0",

src/Middleware/HandlerExceptionCatcherMiddleware.php

@@ -15,7 +15,9 @@ public function handle(Envelope $envelope, StackInterface $stack): Envelope
         try {
             return $stack->next()->handle($envelope, $stack);
         } catch (HandlerFailedException $exception) {
-            throw $exception->getNestedExceptions()[0];
+            $wrappedExceptions = $exception->getWrappedExceptions();
+
+            throw \array_values($wrappedExceptions)[0];
         }
     }
 }

tests/Middleware/HandlerExceptionCatcherMiddlewareTest.php

@@ -0,0 +1,50 @@
+<?php
+declare(strict_types=1);
+
+namespace PcComponentes\SymfonyMessengerBundle\Tests\Middleware;
+
+use PcComponentes\SymfonyMessengerBundle\Middleware\HandlerExceptionCatcherMiddleware;
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Messenger\Envelope;
+use Symfony\Component\Messenger\Exception\HandlerFailedException;
+use Symfony\Component\Messenger\Middleware\MiddlewareInterface;
+use Symfony\Component\Messenger\Middleware\StackInterface;
+
+final class HandlerExceptionCatcherMiddlewareTest extends TestCase
+{
+    public function test_given_a_handler_failed_exception_with_named_wrapped_exceptions_then_it_throws_the_first_wrapped_exception(): void
+    {
+        $wrappedException = new \RuntimeException('expected');
+        $middleware = new HandlerExceptionCatcherMiddleware();
+        $envelope = new Envelope(new \stdClass());
+        $nextMiddleware = new class($envelope, $wrappedException) implements MiddlewareInterface {
+            public function __construct(
+                private readonly Envelope $envelope,
+                private readonly \RuntimeException $wrappedException,
+            ) {
+            }
+
+            public function handle(Envelope $envelope, StackInterface $stack): Envelope
+            {
+                throw new HandlerFailedException(
+                    $this->envelope,
+                    ['handler_name' => $this->wrappedException],
+                );
+            }
+        };
+        $stack = new class($nextMiddleware) implements StackInterface {
+            public function __construct(private readonly MiddlewareInterface $middleware)
+            {
+            }
+
+            public function next(): MiddlewareInterface
+            {
+                return $this->middleware;
+            }
+        };
+
+        $this->expectExceptionObject($wrappedException);
+
+        $middleware->handle($envelope, $stack);
+    }
+}