Fixing bug where an invalid messageId could be attached to a message

weaverryan · weaverryan · commit f9c20d8c6239 · 2019-04-29T12:29:09.000-04:00
1) send to a "listable receiver" transport and receive from this
2) After all the failures, sent to a non-listable receiver transport for failure handling.

The TransportMessageIdStamp would still be present from the original transport
diff --git a/src/Symfony/Component/Messenger/EventListener/SendFailedMessageToFailureTransportListener.php b/src/Symfony/Component/Messenger/EventListener/SendFailedMessageToFailureTransportListener.php
@@ -20,6 +20,7 @@
 use Symfony\Component\Messenger\Stamp\RedeliveryStamp;
 use Symfony\Component\Messenger\Stamp\SentStamp;
 use Symfony\Component\Messenger\Stamp\SentToFailureTransportStamp;
+use Symfony\Component\Messenger\Stamp\TransportMessageIdStamp;
 
 /**
  * Sends a rejected message to a "failure transport".
@@ -65,6 +66,7 @@ public function onMessageFailed(WorkerMessageFailedEvent $event)
 
         $flattenedException = \class_exists(FlattenException::class) ? FlattenException::createFromThrowable($throwable) : null;
         $envelope = $envelope->withoutAll(ReceivedStamp::class)
+            ->withoutAll(TransportMessageIdStamp::class)
             ->with(new SentToFailureTransportStamp($throwable->getMessage(), $event->getReceiverName(), $flattenedException))
             ->with(new RedeliveryStamp(0, $this->failureSenderAlias));
 
diff --git a/src/Symfony/Component/Messenger/Tests/EventListener/SendFailedMessageToFailureTransportListenerTest.php b/src/Symfony/Component/Messenger/Tests/EventListener/SendFailedMessageToFailureTransportListenerTest.php
@@ -17,9 +17,11 @@
 use Symfony\Component\Messenger\EventListener\SendFailedMessageToFailureTransportListener;
 use Symfony\Component\Messenger\Exception\HandlerFailedException;
 use Symfony\Component\Messenger\MessageBusInterface;
+use Symfony\Component\Messenger\Stamp\ReceivedStamp;
 use Symfony\Component\Messenger\Stamp\RedeliveryStamp;
 use Symfony\Component\Messenger\Stamp\SentStamp;
 use Symfony\Component\Messenger\Stamp\SentToFailureTransportStamp;
+use Symfony\Component\Messenger\Stamp\TransportMessageIdStamp;
 
 class SendFailedMessageToFailureTransportListenerTest extends TestCase
 {
@@ -41,6 +43,9 @@ public function testItDispatchesToTheFailureTransport()
             $redeliveryStamp = $envelope->last(RedeliveryStamp::class);
             $this->assertSame('failure_sender', $redeliveryStamp->getSenderClassOrAlias());
 
+            $this->assertNull($envelope->last(ReceivedStamp::class));
+            $this->assertNull($envelope->last(TransportMessageIdStamp::class));
+
             return true;
         }))->willReturn(new Envelope(new \stdClass()));
         $listener = new SendFailedMessageToFailureTransportListener(
