update

AurelienPillevesse · AurelienPillevesse · commit e326e92fc15f · 2025-01-17T12:59:09.000+01:00
diff --git a/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/AmqpReceiver.php b/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/AmqpReceiver.php
@@ -86,7 +86,9 @@ private function getEnvelope(string $queueName): iterable
         }
 
         if (null !== $amqpEnvelope->getMessageId()) {
-            $envelope = $envelope->with(new TransportMessageIdStamp($amqpEnvelope->getMessageId()));
+            $envelope = $envelope
+                ->withoutAll(TransportMessageIdStamp::class)
+                ->with(new TransportMessageIdStamp($amqpEnvelope->getMessageId()));
         }
 
         yield $envelope->with(new AmqpReceivedStamp($amqpEnvelope, $queueName));
diff --git a/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/AmqpSender.php b/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/AmqpSender.php
@@ -55,8 +55,7 @@ public function send(Envelope $envelope): Envelope
             }
         }
 
-        $transportMessageIdStamp = $envelope->last(TransportMessageIdStamp::class);
-        if (!$transportMessageIdStamp && $amqpStamp instanceof AmqpStamp && isset($amqpStamp->getAttributes()['message_id'])) {
+        if ($amqpStamp instanceof AmqpStamp && isset($amqpStamp->getAttributes()['message_id'])) {
             $envelope = $envelope->with(new TransportMessageIdStamp($amqpStamp->getAttributes()['message_id']));
         }
 

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,9 @@ private function getEnvelope(string $queueName): iterable`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`if (null !== $amqpEnvelope->getMessageId()) {`
`89`		`- $envelope = $envelope->with(new TransportMessageIdStamp($amqpEnvelope->getMessageId()));`
	`89`	`+ $envelope = $envelope`
	`90`	`+ ->withoutAll(TransportMessageIdStamp::class)`
	`91`	`+ ->with(new TransportMessageIdStamp($amqpEnvelope->getMessageId()));`
`90`	`92`	`}`
`91`	`93`
`92`	`94`	`yield $envelope->with(new AmqpReceivedStamp($amqpEnvelope, $queueName));`
Original file line number	Diff line number	Diff line change
`@@ -55,8 +55,7 @@ public function send(Envelope $envelope): Envelope`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`
`58`		`- $transportMessageIdStamp = $envelope->last(TransportMessageIdStamp::class);`
`59`		`- if (!$transportMessageIdStamp && $amqpStamp instanceof AmqpStamp && isset($amqpStamp->getAttributes()['message_id'])) {`
	`58`	`+ if ($amqpStamp instanceof AmqpStamp && isset($amqpStamp->getAttributes()['message_id'])) {`
`60`	`59`	`$envelope = $envelope->with(new TransportMessageIdStamp($amqpStamp->getAttributes()['message_id']));`
`61`	`60`	`}`
`62`	`61`