[Messenger] Simplify code

HypeMC · HypeMC · commit beeb4b9d24eb · 2025-10-19T22:13:32.000+02:00
diff --git a/src/Symfony/Component/Messenger/Event/SendMessageToTransportsEvent.php b/src/Symfony/Component/Messenger/Event/SendMessageToTransportsEvent.php
@@ -19,8 +19,8 @@
  *
  * The event is *only* dispatched if the message will actually
  * be sent to at least one transport. If the message is sent
- * to multiple transports, the message is dispatched only once.
- * This message is only dispatched the first time a message
+ * to multiple transports, the event is dispatched only once.
+ * This event is only dispatched the first time a message
  * is sent to a transport, not also if it is retried.
  *
  * @author Ryan Weaver <ryan@symfonycasts.com>
diff --git a/src/Symfony/Component/Messenger/Middleware/SendMessageMiddleware.php b/src/Symfony/Component/Messenger/Middleware/SendMessageMiddleware.php
@@ -47,17 +47,16 @@ public function handle(Envelope $envelope, StackInterface $stack): Envelope
             // it's a received message, do not send it back
             $this->logger?->info('Received message {class}', $context);
         } else {
-            $shouldDispatchEvent = true;
             $senders = $this->sendersLocator->getSenders($envelope);
             $senders = \is_array($senders) ? $senders : iterator_to_array($senders);
-            foreach ($senders as $alias => $sender) {
-                if (null !== $this->eventDispatcher && $shouldDispatchEvent) {
-                    $event = new SendMessageToTransportsEvent($envelope, $senders);
-                    $this->eventDispatcher->dispatch($event);
-                    $envelope = $event->getEnvelope();
-                    $shouldDispatchEvent = false;
-                }
 
+            if (null !== $this->eventDispatcher && $senders) {
+                $event = new SendMessageToTransportsEvent($envelope, $senders);
+                $this->eventDispatcher->dispatch($event);
+                $envelope = $event->getEnvelope();
+            }
+
+            foreach ($senders as $alias => $sender) {
                 $this->logger?->info('Sending message {class} with {alias} sender using {sender}', $context + ['alias' => $alias, 'sender' => $sender::class]);
                 $envelope = $sender->send($envelope->with(new SentStamp($sender::class, \is_string($alias) ? $alias : null)));
             }

Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,8 @@`
`19`	`19`	`*`
`20`	`20`	`* The event is only dispatched if the message will actually`
`21`	`21`	`* be sent to at least one transport. If the message is sent`
`22`		`- * to multiple transports, the message is dispatched only once.`
`23`		`- * This message is only dispatched the first time a message`
	`22`	`+ * to multiple transports, the event is dispatched only once.`
	`23`	`+ * This event is only dispatched the first time a message`
`24`	`24`	`* is sent to a transport, not also if it is retried.`
`25`	`25`	`*`
`26`	`26`	`* @author Ryan Weaver <[email protected]>`