bug #34474 [Messenger] Ignore stamps in in-memory transport (tienvx)

sroze · sroze · commit bfae515d521a · 2019-11-21T18:00:24.000+01:00
This PR was merged into the 4.4 branch. Discussion ---------- [Messenger] Ignore stamps in in-memory transport | Q | A | ------------- | --- | Branch? | 4.4  | Bug fix? | yes | New feature? | no  | Deprecations? | no  | Tickets | N/A  | License | MIT | Doc PR | N/A  Stamps can be added/removed to/from message during handling. Ignore stamps so that we can ack/reject them correctly.  Commits ------- b435b1a [Messenger] Ignore stamps in in-memory transport
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;

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public function get(): iterable`
`55`	`55`	`public function ack(Envelope $envelope): void`
`56`	`56`	`{`
`57`	`57`	`$this->acknowledged[] = $envelope;`
`58`		`- $id = spl_object_hash($envelope);`
	`58`	`+ $id = spl_object_hash($envelope->getMessage());`
`59`	`59`	`unset($this->queue[$id]);`
`60`	`60`	`}`
`61`	`61`
`@@ -65,7 +65,7 @@ public function ack(Envelope $envelope): void`
`65`	`65`	`public function reject(Envelope $envelope): void`
`66`	`66`	`{`
`67`	`67`	`$this->rejected[] = $envelope;`
`68`		`- $id = spl_object_hash($envelope);`
	`68`	`+ $id = spl_object_hash($envelope->getMessage());`
`69`	`69`	`unset($this->queue[$id]);`
`70`	`70`	`}`
`71`	`71`
`@@ -75,7 +75,7 @@ public function reject(Envelope $envelope): void`
`75`	`75`	`public function send(Envelope $envelope): Envelope`
`76`	`76`	`{`
`77`	`77`	`$this->sent[] = $envelope;`
`78`		`- $id = spl_object_hash($envelope);`
	`78`	`+ $id = spl_object_hash($envelope->getMessage());`
`79`	`79`	`$this->queue[$id] = $envelope;`
`80`	`80`
`81`	`81`	`return $envelope;`