symfony
diff --git a/‎src/Symfony/Component/Messenger/Middleware/DispatchAfterCurrentBusMiddleware.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Messenger/Middleware/DispatchAfterCurrentBusMiddleware.php
+1-1Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/Messenger/Middleware/DispatchAfterCurrentBusMiddleware.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Messenger/Middleware/DispatchAfterCurrentBusMiddleware.php
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/Messenger/Tests/Middleware/DispatchAfterCurrentBusMiddlewareTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Messenger/Tests/Middleware/DispatchAfterCurrentBusMiddlewareTest.php
+47Lines changed: 47 additions & 0 deletions b/‎src/Symfony/Component/Messenger/Tests/Middleware/DispatchAfterCurrentBusMiddlewareTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Messenger/Tests/Middleware/DispatchAfterCurrentBusMiddlewareTest.php
+47Lines changed: 47 additions & 0 deletions
@@ -112,7 +112,7 @@ final class QueuedEnvelope
 
     public function __construct(Envelope $envelope, StackInterface $stack)
     {
-        $this->envelope = $envelope;
+        $this->envelope = $envelope->withoutAll(DispatchAfterCurrentBusStamp::class);
         $this->stack = $stack;
     }
 
 
@@ -99,6 +99,53 @@ public function testThrowingEventsHandlingWontStopExecution()
         $messageBus->dispatch($message);
     }
 
+    public function testHandleDelayedEventFromQueue()
+    {
+        $message = new DummyMessage('Hello');
+        $event = new DummyEvent('Event on queue');
+
+        $middleware = new DispatchAfterCurrentBusMiddleware();
+        $commandHandlingMiddleware = $this->createMock(MiddlewareInterface::class);
+        $eventHandlingMiddleware = $this->createMock(MiddlewareInterface::class);
+
+        // This bus simulates the bus that are used when messages come back form the queue
+        $messageBusAfterQueue = new MessageBus([
+            // Create a new middleware
+            new DispatchAfterCurrentBusMiddleware(),
+            $eventHandlingMiddleware,
+        ]);
+
+        $fakePutMessageOnQueue = $this->createMock(MiddlewareInterface::class);
+        $fakePutMessageOnQueue->expects($this->any())
+            ->method('handle')
+            ->with($this->callback(function ($envelope) use ($messageBusAfterQueue) {
+                // Fake putting the message on the queue
+                // Fake reading the queue
+                // Now, we add the message back to a new bus.
+                $messageBusAfterQueue->dispatch($envelope);
+
+                return true;
+            }))
+            ->willReturnArgument(0);
+
+        $eventBus = new MessageBus([
+            $middleware,
+            $fakePutMessageOnQueue,
+        ]);
+
+        $messageBus = new MessageBus([
+            $middleware,
+            new DispatchingMiddleware($eventBus, [
+                new Envelope($event, [new DispatchAfterCurrentBusStamp()]),
+            ]),
+            $commandHandlingMiddleware,
+        ]);
+
+        $this->expectHandledMessage($commandHandlingMiddleware, 0, $message);
+        $this->expectHandledMessage($eventHandlingMiddleware, 0, $event);
+        $messageBus->dispatch($message);
+    }
+
     /**
      * @param MiddlewareInterface|MockObject $handlingMiddleware
      */
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ final class QueuedEnvelope`
`112`	`112`
`113`	`113`	`public function __construct(Envelope $envelope, StackInterface $stack)`
`114`	`114`	`{`
`115`		`- $this->envelope = $envelope;`
	`115`	`+ $this->envelope = $envelope->withoutAll(DispatchAfterCurrentBusStamp::class);`
`116`	`116`	`$this->stack = $stack;`
`117`	`117`	`}`
`118`	`118`