review

tyx · Oct 18, 2023 · 1bf1c9c · 1bf1c9c
1 parent 87ab459
commit 1bf1c9c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 20 deletions.
diff --git a/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Middleware/AddFifoStamp.php b/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Middleware/AddFifoStamp.php
@@ -32,12 +32,7 @@ public function handle(Envelope $envelope, StackInterface $stack): Envelope
         }
 
         if (null !== $messageGroupId || null !== $messageDeduplicationId) {
-            $envelope = $envelope->with(
-                new AmazonSqsFifoStamp(
-                    $messageGroupId,
-                    $messageDeduplicationId,
-                )
-            );
+            $envelope = $envelope->with(new AmazonSqsFifoStamp($messageGroupId, $messageDeduplicationId));
         }
 
         return $stack->next()->handle($envelope, $stack);

diff --git a/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Tests/Middleware/AddFifoStampTest.php b/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Tests/Middleware/AddFifoStampTest.php
@@ -26,9 +26,8 @@ public function testAddStampWithGroupIdOnly()
         $envelope = new Envelope(new WithMessageGroupIdMessage('groupId'));
         $finalEnvelope = $middleware->handle($envelope, $this->getStackMock());
         $stamp = $finalEnvelope->last(AmazonSqsFifoStamp::class);
-        $this->assertNotNull($stamp);
-        /* @var AmazonSqsFifoStamp $stamp */
-        $this->assertEquals('groupId', $stamp->getMessageGroupId());
+        $this->assertInstanceOf(AmazonSqsFifoStamp::class, $stamp);
+        $this->assertSame('groupId', $stamp->getMessageGroupId());
         $this->assertNull($stamp->getMessageDeduplicationId());
     }
 
@@ -38,9 +37,8 @@ public function testHandleWithDeduplicationIdOnly()
         $envelope = new Envelope(new WithMessageDeduplicationIdMessage('deduplicationId'));
         $finalEnvelope = $middleware->handle($envelope, $this->getStackMock());
         $stamp = $finalEnvelope->last(AmazonSqsFifoStamp::class);
-        $this->assertNotNull($stamp);
-        /* @var AmazonSqsFifoStamp $stamp */
-        $this->assertEquals('deduplicationId', $stamp->getMessageDeduplicationId());
+        $this->assertInstanceOf(AmazonSqsFifoStamp::class, $stamp);
+        $this->assertSame('deduplicationId', $stamp->getMessageDeduplicationId());
         $this->assertNull($stamp->getMessageGroupId());
     }
 
@@ -50,10 +48,9 @@ public function testHandleWithGroupIdAndDeduplicationId()
         $envelope = new Envelope(new WithMessageDeduplicationIdAndMessageGroupIdMessage('my_group', 'my_random_id'));
         $finalEnvelope = $middleware->handle($envelope, $this->getStackMock());
         $stamp = $finalEnvelope->last(AmazonSqsFifoStamp::class);
-        $this->assertNotNull($stamp);
-        /* @var AmazonSqsFifoStamp $stamp */
-        $this->assertEquals('my_random_id', $stamp->getMessageDeduplicationId());
-        $this->assertEquals('my_group', $stamp->getMessageGroupId());
+        $this->assertInstanceOf(AmazonSqsFifoStamp::class, $stamp);
+        $this->assertSame('my_random_id', $stamp->getMessageDeduplicationId());
+        $this->assertSame('my_group', $stamp->getMessageGroupId());
     }
 
     public function testHandleWithoutId()
@@ -62,7 +59,6 @@ public function testHandleWithoutId()
         $envelope = new Envelope(new WithoutIdMessage());
         $finalEnvelope = $middleware->handle($envelope, $this->getStackMock());
         $stamp = $finalEnvelope->last(AmazonSqsFifoStamp::class);
-        /* @var AmazonSqsFifoStamp $stamp */
         $this->assertNull($stamp);
     }
 }
@@ -71,7 +67,7 @@ class WithMessageDeduplicationIdAndMessageGroupIdMessage implements WithMessageD
 {
     public function __construct(
         private string $messageGroupId,
-        private string $messageDeduplicationId
+        private string $messageDeduplicationId,
     ) {
     }
 
@@ -89,7 +85,7 @@ public function messageGroupId(): string
 class WithMessageDeduplicationIdMessage implements WithMessageDeduplicationId
 {
     public function __construct(
-        private string $messageDeduplicationId
+        private string $messageDeduplicationId,
     ) {
     }
 
@@ -102,7 +98,7 @@ public function messageDeduplicationId(): string
 class WithMessageGroupIdMessage implements WithMessageGroupId
 {
     public function __construct(
-        private string $messageGroupId
+        private string $messageGroupId,
     ) {
     }