[Messenger] [Sqs] Make stamp property more generic

Greg0 · Greg0 · commit 647513bef236 · 2025-10-18T08:53:15.000+02:00
diff --git a/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Tests/Transport/AmazonSqsSenderTest.php b/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Tests/Transport/AmazonSqsSenderTest.php
@@ -98,7 +98,7 @@ public function testSendWithAmazonSqsFairQueueStamp()
 
         $connection = $this->createMock(Connection::class);
         $connection->expects($this->once())->method('send')
-            ->with($encoded['body'], $encoded['headers'], 0, $stamp->getTenantIdentifier());
+            ->with($encoded['body'], $encoded['headers'], 0, $stamp->getMessageGroupId());
 
         $serializer = $this->createMock(SerializerInterface::class);
         $serializer->method('encode')->with($envelope)->willReturn($encoded);
diff --git a/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Transport/AmazonSqsFairQueueStamp.php b/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Transport/AmazonSqsFairQueueStamp.php
@@ -16,12 +16,12 @@
 final class AmazonSqsFairQueueStamp implements NonSendableStampInterface
 {
     public function __construct(
-        private ?string $tenantIdentifier = null,
+        private ?string $messageGroupId = null,
     ) {
     }
 
-    public function getTenantIdentifier(): ?string
+    public function getMessageGroupId(): ?string
     {
-        return $this->tenantIdentifier;
+        return $this->messageGroupId;
     }
 }
diff --git a/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Transport/AmazonSqsSender.php b/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Transport/AmazonSqsSender.php
@@ -51,7 +51,7 @@ public function send(Envelope $envelope): Envelope
         /** @var AmazonSqsFairQueueStamp|null $amazonSqsFairQueueStamp */
         $amazonSqsFairQueueStamp = $envelope->last(AmazonSqsFairQueueStamp::class);
         if (null === $amazonSqsFifoStamp && null !== $amazonSqsFairQueueStamp) {
-            $messageGroupId = $amazonSqsFairQueueStamp->getTenantIdentifier();
+            $messageGroupId = $amazonSqsFairQueueStamp->getMessageGroupId();
         }
 
         /** @var AmazonSqsXrayTraceHeaderStamp|null $amazonSqsXrayTraceHeaderStamp */

Original file line number	Diff line number	Diff line change
`@@ -16,12 +16,12 @@`
`16`	`16`	`final class AmazonSqsFairQueueStamp implements NonSendableStampInterface`
`17`	`17`	`{`
`18`	`18`	`public function __construct(`
`19`		`- private ?string $tenantIdentifier = null,`
	`19`	`+ private ?string $messageGroupId = null,`
`20`	`20`	`) {`
`21`	`21`	`}`
`22`	`22`
`23`		`- public function getTenantIdentifier(): ?string`
	`23`	`+ public function getMessageGroupId(): ?string`
`24`	`24`	`{`
`25`		`- return $this->tenantIdentifier;`
	`25`	`+ return $this->messageGroupId;`
`26`	`26`	`}`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public function send(Envelope $envelope): Envelope`
`51`	`51`	`/** @var AmazonSqsFairQueueStamp\|null $amazonSqsFairQueueStamp */`
`52`	`52`	`$amazonSqsFairQueueStamp = $envelope->last(AmazonSqsFairQueueStamp::class);`
`53`	`53`	`if (null === $amazonSqsFifoStamp && null !== $amazonSqsFairQueueStamp) {`
`54`		`- $messageGroupId = $amazonSqsFairQueueStamp->getTenantIdentifier();`
	`54`	`+ $messageGroupId = $amazonSqsFairQueueStamp->getMessageGroupId();`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`/** @var AmazonSqsXrayTraceHeaderStamp\|null $amazonSqsXrayTraceHeaderStamp */`