[Messenger] Ignore stamps in in-memory transport

symfony · sroze · Nov 21, 2019 · Nov 21, 2019 · Nov 21, 2019 · b435b1aab6bd19c5b9b2d3eb9ef6919f97ce83ae
commit b435b1aab6bd19c5b9b2d3eb9ef6919f97ce83ae
diff --git a/src/Symfony/Component/Messenger/Tests/Transport/InMemoryTransportTest.php b/src/Symfony/Component/Messenger/Tests/Transport/InMemoryTransportTest.php
@@ -13,6 +13,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Messenger\Envelope;
+use Symfony\Component\Messenger\Tests\Fixtures\AnEnvelopeStamp;
 use Symfony\Component\Messenger\Transport\InMemoryTransport;
 
 /**
@@ -50,6 +51,19 @@ public function testQueue()
         $this->assertSame([], $this->transport->get());
     }
 
+    public function testAcknowledgeSameMessageWithDifferentStamps()
+    {
+        $envelope1 = new Envelope(new \stdClass(), [new AnEnvelopeStamp()]);
+        $this->transport->send($envelope1);
+        $envelope2 = new Envelope(new \stdClass(), [new AnEnvelopeStamp()]);
+        $this->transport->send($envelope2);
+        $this->assertSame([$envelope1, $envelope2], $this->transport->get());
+        $this->transport->ack($envelope1->with(new AnEnvelopeStamp()));
+        $this->assertSame([$envelope2], $this->transport->get());
+        $this->transport->reject($envelope2->with(new AnEnvelopeStamp()));
+        $this->assertSame([], $this->transport->get());
+    }
+
     public function testAck()
     {
         $envelope = new Envelope(new \stdClass());

diff --git a/src/Symfony/Component/Messenger/Transport/InMemoryTransport.php b/src/Symfony/Component/Messenger/Transport/InMemoryTransport.php
@@ -55,7 +55,7 @@ public function get(): iterable
     public function ack(Envelope $envelope): void
     {
         $this->acknowledged[] = $envelope;
-        $id = spl_object_hash($envelope);
+        $id = spl_object_hash($envelope->getMessage());
         unset($this->queue[$id]);
     }
 
@@ -65,7 +65,7 @@ public function ack(Envelope $envelope): void
     public function reject(Envelope $envelope): void
     {
         $this->rejected[] = $envelope;
-        $id = spl_object_hash($envelope);
+        $id = spl_object_hash($envelope->getMessage());
         unset($this->queue[$id]);
     }
 
@@ -75,7 +75,7 @@ public function reject(Envelope $envelope): void
     public function send(Envelope $envelope): Envelope
     {
         $this->sent[] = $envelope;
-        $id = spl_object_hash($envelope);
+        $id = spl_object_hash($envelope->getMessage());
         $this->queue[$id] = $envelope;
 
         return $envelope;