Refinement

- Add middleware suffix - Move interface to root of the package
tyx · Oct 19, 2023 · fe008fa · fe008fa
1 parent 44ba41d
commit fe008fa
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/...re/MessageDeduplicationAwareInterface.php → ...qs/MessageDeduplicationAwareInterface.php b/...re/MessageDeduplicationAwareInterface.php → ...qs/MessageDeduplicationAwareInterface.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Messenger\Bridge\AmazonSqs\Middleware;
+namespace Symfony\Component\Messenger\Bridge\AmazonSqs;
 
 /**
  * @see https://docs.aws.amazon.com/en_gb/AWSSimpleQueueService/latest/SQSDeveloperGuide/using-messagededuplicationid-property.html

diff --git a/...Middleware/MessageGroupAwareInterface.php → .../AmazonSqs/MessageGroupAwareInterface.php b/...Middleware/MessageGroupAwareInterface.php → .../AmazonSqs/MessageGroupAwareInterface.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Messenger\Bridge\AmazonSqs\Middleware;
+namespace Symfony\Component\Messenger\Bridge\AmazonSqs;
 
 /**
  * @see https://docs.aws.amazon.com/en_gb/AWSSimpleQueueService/latest/SQSDeveloperGuide/using-messagegroupid-property.html

diff --git a/...dge/AmazonSqs/Middleware/AddFifoStamp.php → ...Sqs/Middleware/AddFifoStampMiddleware.php b/...dge/AmazonSqs/Middleware/AddFifoStamp.php → ...Sqs/Middleware/AddFifoStampMiddleware.php
@@ -11,12 +11,14 @@
 
 namespace Symfony\Component\Messenger\Bridge\AmazonSqs\Middleware;
 
+use Symfony\Component\Messenger\Bridge\AmazonSqs\MessageDeduplicationAwareInterface;
+use Symfony\Component\Messenger\Bridge\AmazonSqs\MessageGroupAwareInterface;
 use Symfony\Component\Messenger\Bridge\AmazonSqs\Transport\AmazonSqsFifoStamp;
 use Symfony\Component\Messenger\Envelope;
 use Symfony\Component\Messenger\Middleware\MiddlewareInterface;
 use Symfony\Component\Messenger\Middleware\StackInterface;
 
-final class AddFifoStamp implements MiddlewareInterface
+final class AddFifoStampMiddleware implements MiddlewareInterface
 {
     public function handle(Envelope $envelope, StackInterface $stack): Envelope
     {

diff --git a/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Tests/Middleware/AddFifoStampTest.php b/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Tests/Middleware/AddFifoStampTest.php
@@ -11,9 +11,9 @@
 
 namespace Symfony\Component\Messenger\Bridge\AmazonSqs\Tests\Middleware;
 
-use Symfony\Component\Messenger\Bridge\AmazonSqs\Middleware\AddFifoStamp;
-use Symfony\Component\Messenger\Bridge\AmazonSqs\Middleware\MessageDeduplicationAwareInterface;
-use Symfony\Component\Messenger\Bridge\AmazonSqs\Middleware\MessageGroupAwareInterface;
+use Symfony\Component\Messenger\Bridge\AmazonSqs\Middleware\AddFifoStampMiddleware;
+use Symfony\Component\Messenger\Bridge\AmazonSqs\MessageDeduplicationAwareInterface;
+use Symfony\Component\Messenger\Bridge\AmazonSqs\MessageGroupAwareInterface;
 use Symfony\Component\Messenger\Bridge\AmazonSqs\Transport\AmazonSqsFifoStamp;
 use Symfony\Component\Messenger\Envelope;
 use Symfony\Component\Messenger\Test\Middleware\MiddlewareTestCase;
@@ -22,7 +22,7 @@ class AddFifoStampTest extends MiddlewareTestCase
 {
     public function testAddStampWithGroupIdOnly()
     {
-        $middleware = new AddFifoStamp();
+        $middleware = new AddFifoStampMiddleware();
         $envelope = new Envelope(new WithMessageGroupIdMessage('groupId'));
         $finalEnvelope = $middleware->handle($envelope, $this->getStackMock());
         $stamp = $finalEnvelope->last(AmazonSqsFifoStamp::class);
@@ -33,7 +33,7 @@ public function testAddStampWithGroupIdOnly()
 
     public function testHandleWithDeduplicationIdOnly()
     {
-        $middleware = new AddFifoStamp();
+        $middleware = new AddFifoStampMiddleware();
         $envelope = new Envelope(new WithMessageDeduplicationIdMessage('deduplicationId'));
         $finalEnvelope = $middleware->handle($envelope, $this->getStackMock());
         $stamp = $finalEnvelope->last(AmazonSqsFifoStamp::class);
@@ -44,7 +44,7 @@ public function testHandleWithDeduplicationIdOnly()
 
     public function testHandleWithGroupIdAndDeduplicationId()
     {
-        $middleware = new AddFifoStamp();
+        $middleware = new AddFifoStampMiddleware();
         $envelope = new Envelope(new WithMessageDeduplicationIdAndMessageGroupIdMessage('my_group', 'my_random_id'));
         $finalEnvelope = $middleware->handle($envelope, $this->getStackMock());
         $stamp = $finalEnvelope->last(AmazonSqsFifoStamp::class);
@@ -55,7 +55,7 @@ public function testHandleWithGroupIdAndDeduplicationId()
 
     public function testHandleWithoutId()
     {
-        $middleware = new AddFifoStamp();
+        $middleware = new AddFifoStampMiddleware();
         $envelope = new Envelope(new WithoutIdMessage());
         $finalEnvelope = $middleware->handle($envelope, $this->getStackMock());
         $stamp = $finalEnvelope->last(AmazonSqsFifoStamp::class);