symfony
diff --git a/‎src/Symfony/Component/Messenger/Message/SelfStampableInterface.php
Copy file name to clipboard
+13 b/‎src/Symfony/Component/Messenger/Message/SelfStampableInterface.php
Copy file name to clipboard
+13
diff --git a/‎src/Symfony/Component/Messenger/MessageBus.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Messenger/MessageBus.php
+5 b/‎src/Symfony/Component/Messenger/MessageBus.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Messenger/MessageBus.php
+5
diff --git a/‎src/Symfony/Component/Messenger/Tests/Fixtures/SelfStampableDummyMessage.php
Copy file name to clipboard
+26 b/‎src/Symfony/Component/Messenger/Tests/Fixtures/SelfStampableDummyMessage.php
Copy file name to clipboard
+26
diff --git a/‎src/Symfony/Component/Messenger/Tests/MessageBusTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Messenger/Tests/MessageBusTest.php
+10 b/‎src/Symfony/Component/Messenger/Tests/MessageBusTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Messenger/Tests/MessageBusTest.php
+10
@@ -0,0 +1,13 @@
+<?php
+
+namespace Symfony\Component\Messenger\Message;
+
+use Symfony\Component\Messenger\Stamp\StampInterface;
+
+interface SelfStampableInterface
+{
+    /**
+     * @return array<StampInterface>
+     */
+    public function getStamps(): array;
+}
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Messenger;
 
+use Symfony\Component\Messenger\Message\SelfStampableInterface;
 use Symfony\Component\Messenger\Middleware\MiddlewareInterface;
 use Symfony\Component\Messenger\Middleware\StackMiddleware;
 
@@ -54,6 +55,10 @@ public function getIterator(): \Traversable
 
     public function dispatch(object $message, array $stamps = []): Envelope
     {
+        if ($message instanceof SelfStampableInterface) {
+            $stamps = array_merge($message->getStamps(), $stamps);
+        }
+
         $envelope = Envelope::wrap($message, $stamps);
         $middlewareIterator = $this->middlewareAggregate->getIterator();
 
 
@@ -0,0 +1,26 @@
+<?php
+
+namespace Symfony\Component\Messenger\Tests\Fixtures;
+
+use Symfony\Component\Messenger\Message\SelfStampableInterface;
+use Symfony\Component\Messenger\Stamp\DelayStamp;
+
+class SelfStampableDummyMessage implements DummyMessageInterface, SelfStampableInterface
+{
+    private string $message;
+
+    public function __construct(string $message)
+    {
+        $this->message = $message;
+    }
+
+    public function getMessage(): string
+    {
+        return $this->message;
+    }
+
+    public function getStamps(): array
+    {
+        return [new DelayStamp(1)];
+    }
+}
@@ -22,6 +22,8 @@
 use Symfony\Component\Messenger\Stamp\ReceivedStamp;
 use Symfony\Component\Messenger\Tests\Fixtures\AnEnvelopeStamp;
 use Symfony\Component\Messenger\Tests\Fixtures\DummyMessage;
+use Symfony\Component\Messenger\Tests\Fixtures\SelfStambableDummyMessage;
+use Symfony\Component\Messenger\Tests\Fixtures\SelfStampableDummyMessage;
 
 class MessageBusTest extends TestCase
 {
@@ -133,6 +135,14 @@ public function testItAddsTheStampsToEnvelope()
         $this->assertCount(2, $finalEnvelope->all());
     }
 
+    public function testSelfStampableMessage()
+    {
+        $finalEnvelope = (new MessageBus())->dispatch(new SelfStampableDummyMessage(''), [new DelayStamp(5), new BusNameStamp('bar')]);
+        $this->assertCount(2, $finalEnvelope->all());
+        $this->assertCount(2, $finalEnvelope->all()[DelayStamp::class]);
+        $this->assertSame(5, $finalEnvelope->last(DelayStamp::class)->getDelay());
+    }
+
     public static function provideConstructorDataStucture(): iterable
     {
         yield 'iterator' => [new \ArrayObject([