[Messenger] Do not throw 'no handlers' exception when skipping due to duplicate handling

wouterj · wouterj · commit 0e4455b3cfd6 · 2022-11-05T17:59:17.000+01:00
diff --git a/src/Symfony/Component/Messenger/Middleware/HandleMessageMiddleware.php b/src/Symfony/Component/Messenger/Middleware/HandleMessageMiddleware.php
@@ -53,8 +53,10 @@ public function handle(Envelope $envelope, StackInterface $stack): Envelope
         ];
 
         $exceptions = [];
+        $alreadyHandled = false;
         foreach ($this->handlersLocator->getHandlers($envelope) as $handlerDescriptor) {
             if ($this->messageHasAlreadyBeenHandled($envelope, $handlerDescriptor)) {
+                $alreadyHandled = true;
                 continue;
             }
 
@@ -68,7 +70,7 @@ public function handle(Envelope $envelope, StackInterface $stack): Envelope
             }
         }
 
-        if (null === $handler) {
+        if (null === $handler && !$alreadyHandled) {
             if (!$this->allowNoHandlers) {
                 throw new NoHandlerForMessageException(sprintf('No handler for message "%s".', $context['class']));
             }
diff --git a/src/Symfony/Component/Messenger/Tests/Middleware/HandleMessageMiddlewareTest.php b/src/Symfony/Component/Messenger/Tests/Middleware/HandleMessageMiddlewareTest.php
@@ -123,6 +123,24 @@ public function testThrowsNoHandlerException()
         $middleware->handle(new Envelope(new DummyMessage('Hey')), new StackMiddleware());
     }
 
+    public function testMessageAlreadyHandled()
+    {
+        $handler = $this->createPartialMock(HandleMessageMiddlewareTestCallable::class, ['__invoke']);
+
+        $middleware = new HandleMessageMiddleware(new HandlersLocator([
+            DummyMessage::class => [$handler],
+        ]));
+
+        $envelope = new Envelope(new DummyMessage('Hey'));
+
+        $envelope = $middleware->handle($envelope, $this->getStackMock());
+        $handledStamp = $envelope->all(HandledStamp::class);
+
+        $envelope = $middleware->handle($envelope, $this->getStackMock());
+
+        $this->assertSame($envelope->all(HandledStamp::class), $handledStamp);
+    }
+
     public function testAllowNoHandlers()
     {
         $middleware = new HandleMessageMiddleware(new HandlersLocator([]), true);

Original file line number	Diff line number	Diff line change
`@@ -53,8 +53,10 @@ public function handle(Envelope $envelope, StackInterface $stack): Envelope`
`53`	`53`	`];`
`54`	`54`
`55`	`55`	`$exceptions = [];`
	`56`	`+ $alreadyHandled = false;`
`56`	`57`	`foreach ($this->handlersLocator->getHandlers($envelope) as $handlerDescriptor) {`
`57`	`58`	`if ($this->messageHasAlreadyBeenHandled($envelope, $handlerDescriptor)) {`
	`59`	`+ $alreadyHandled = true;`
`58`	`60`	`continue;`
`59`	`61`	`}`
`60`	`62`
`@@ -68,7 +70,7 @@ public function handle(Envelope $envelope, StackInterface $stack): Envelope`
`68`	`70`	`}`
`69`	`71`	`}`
`70`	`72`
`71`		`- if (null === $handler) {`
	`73`	`+ if (null === $handler && !$alreadyHandled) {`
`72`	`74`	`if (!$this->allowNoHandlers) {`
`73`	`75`	`throw new NoHandlerForMessageException(sprintf('No handler for message "%s".', $context['class']));`
`74`	`76`	`}`