[mongodb] Do not use deprecated classes.

Author: makasim

MongodbConnectionFactory.php

@@ -4,11 +4,11 @@
 
 namespace Enqueue\Mongodb;
 
-use Interop\Queue\PsrConnectionFactory;
-use Interop\Queue\PsrContext;
+use Interop\Queue\ConnectionFactory;
+use Interop\Queue\Context;
 use MongoDB\Client;
 
-class MongodbConnectionFactory implements PsrConnectionFactory
+class MongodbConnectionFactory implements ConnectionFactory
 {
     /**
      * @var array
@@ -54,7 +54,7 @@ public function __construct($config = 'mongodb:')
     /**
      * @return MongodbContext
      */
-    public function createContext(): PsrContext
+    public function createContext(): Context
     {
         $client = new Client($this->config['dsn']);
 

MongodbConsumer.php

@@ -4,12 +4,12 @@
 
 namespace Enqueue\Mongodb;
 
-use Interop\Queue\InvalidMessageException;
-use Interop\Queue\PsrConsumer;
-use Interop\Queue\PsrMessage;
-use Interop\Queue\PsrQueue;
+use Interop\Queue\Consumer;
+use Interop\Queue\Exception\InvalidMessageException;
+use Interop\Queue\Message;
+use Interop\Queue\Queue;
 
-class MongodbConsumer implements PsrConsumer
+class MongodbConsumer implements Consumer
 {
     /**
      * @var MongodbContext
@@ -53,15 +53,15 @@ public function getPollingInterval(): int
     /**
      * @return MongodbDestination
      */
-    public function getQueue(): PsrQueue
+    public function getQueue(): Queue
     {
         return $this->queue;
     }
 
     /**
      * @return MongodbMessage
      */
-    public function receive(int $timeout = 0): ?PsrMessage
+    public function receive(int $timeout = 0): ?Message
     {
         $timeout /= 1000;
         $startAt = microtime(true);
@@ -88,23 +88,23 @@ public function receive(int $timeout = 0): ?PsrMessage
     /**
      * @return MongodbMessage
      */
-    public function receiveNoWait(): ?PsrMessage
+    public function receiveNoWait(): ?Message
     {
         return $this->receiveMessage();
     }
 
     /**
      * @param MongodbMessage $message
      */
-    public function acknowledge(PsrMessage $message): void
+    public function acknowledge(Message $message): void
     {
         // does nothing
     }
 
     /**
      * @param MongodbMessage $message
      */
-    public function reject(PsrMessage $message, bool $requeue = false): void
+    public function reject(Message $message, bool $requeue = false): void
     {
         InvalidMessageException::assertMessageInstanceOf($message, MongodbMessage::class);
 

MongodbContext.php

@@ -4,21 +4,21 @@
 
 namespace Enqueue\Mongodb;
 
-use Interop\Queue\InvalidDestinationException;
-use Interop\Queue\PsrConsumer;
-use Interop\Queue\PsrContext;
-use Interop\Queue\PsrDestination;
-use Interop\Queue\PsrMessage;
-use Interop\Queue\PsrProducer;
-use Interop\Queue\PsrQueue;
-use Interop\Queue\PsrSubscriptionConsumer;
-use Interop\Queue\PsrTopic;
-use Interop\Queue\SubscriptionConsumerNotSupportedException;
-use Interop\Queue\TemporaryQueueNotSupportedException;
+use Interop\Queue\Consumer;
+use Interop\Queue\Context;
+use Interop\Queue\Destination;
+use Interop\Queue\Exception\InvalidDestinationException;
+use Interop\Queue\Exception\SubscriptionConsumerNotSupportedException;
+use Interop\Queue\Exception\TemporaryQueueNotSupportedException;
+use Interop\Queue\Message;
+use Interop\Queue\Producer;
+use Interop\Queue\Queue;
+use Interop\Queue\SubscriptionConsumer;
+use Interop\Queue\Topic;
 use MongoDB\Client;
 use MongoDB\Collection;
 
-class MongodbContext implements PsrContext
+class MongodbContext implements Context
 {
     /**
      * @var array
@@ -44,7 +44,7 @@ public function __construct($client, array $config = [])
     /**
      * @return MongodbMessage
      */
-    public function createMessage(string $body = '', array $properties = [], array $headers = []): PsrMessage
+    public function createMessage(string $body = '', array $properties = [], array $headers = []): Message
     {
         $message = new MongodbMessage();
         $message->setBody($body);
@@ -57,28 +57,28 @@ public function createMessage(string $body = '', array $properties = [], array $
     /**
      * @return MongodbDestination
      */
-    public function createTopic(string $name): PsrTopic
+    public function createTopic(string $name): Topic
     {
         return new MongodbDestination($name);
     }
 
     /**
      * @return MongodbDestination
      */
-    public function createQueue(string $queueName): PsrQueue
+    public function createQueue(string $queueName): Queue
     {
         return new MongodbDestination($queueName);
     }
 
-    public function createTemporaryQueue(): PsrQueue
+    public function createTemporaryQueue(): Queue
     {
         throw TemporaryQueueNotSupportedException::providerDoestNotSupportIt();
     }
 
     /**
      * @return MongodbProducer
      */
-    public function createProducer(): PsrProducer
+    public function createProducer(): Producer
     {
         return new MongodbProducer($this);
     }
@@ -88,7 +88,7 @@ public function createProducer(): PsrProducer
      *
      * @return MongodbConsumer
      */
-    public function createConsumer(PsrDestination $destination): PsrConsumer
+    public function createConsumer(Destination $destination): Consumer
     {
         InvalidDestinationException::assertDestinationInstanceOf($destination, MongodbDestination::class);
 
@@ -105,15 +105,15 @@ public function close(): void
     {
     }
 
-    public function createSubscriptionConsumer(): PsrSubscriptionConsumer
+    public function createSubscriptionConsumer(): SubscriptionConsumer
     {
         throw SubscriptionConsumerNotSupportedException::providerDoestNotSupportIt();
     }
 
     /**
      * @param MongodbDestination $queue
      */
-    public function purgeQueue(PsrQueue $queue): void
+    public function purgeQueue(Queue $queue): void
     {
         $this->getCollection()->deleteMany([
             'queue' => $queue->getQueueName(),

MongodbDestination.php

@@ -4,10 +4,10 @@
 
 namespace Enqueue\Mongodb;
 
-use Interop\Queue\PsrQueue;
-use Interop\Queue\PsrTopic;
+use Interop\Queue\Queue;
+use Interop\Queue\Topic;
 
-class MongodbDestination implements PsrTopic, PsrQueue
+class MongodbDestination implements Topic, Queue
 {
     /**
      * @var string

MongodbMessage.php

@@ -4,9 +4,9 @@
 
 namespace Enqueue\Mongodb;
 
-use Interop\Queue\PsrMessage;
+use Interop\Queue\Message;
 
-class MongodbMessage implements PsrMessage
+class MongodbMessage implements Message
 {
     /**
      * @var string

MongodbProducer.php

@@ -4,14 +4,14 @@
 
 namespace Enqueue\Mongodb;
 
-use Interop\Queue\Exception;
-use Interop\Queue\InvalidDestinationException;
-use Interop\Queue\InvalidMessageException;
-use Interop\Queue\PsrDestination;
-use Interop\Queue\PsrMessage;
-use Interop\Queue\PsrProducer;
-
-class MongodbProducer implements PsrProducer
+use Interop\Queue\Destination;
+use Interop\Queue\Exception\Exception;
+use Interop\Queue\Exception\InvalidDestinationException;
+use Interop\Queue\Exception\InvalidMessageException;
+use Interop\Queue\Message;
+use Interop\Queue\Producer;
+
+class MongodbProducer implements Producer
 {
     /**
      * @var int|null
@@ -42,7 +42,7 @@ public function __construct(MongodbContext $context)
      * @param MongodbDestination $destination
      * @param MongodbMessage     $message
      */
-    public function send(PsrDestination $destination, PsrMessage $message): void
+    public function send(Destination $destination, Message $message): void
     {
         InvalidDestinationException::assertDestinationInstanceOf($destination, MongodbDestination::class);
         InvalidMessageException::assertMessageInstanceOf($message, MongodbMessage::class);
@@ -117,7 +117,7 @@ public function send(PsrDestination $destination, PsrMessage $message): void
     /**
      * @return self
      */
-    public function setDeliveryDelay(int $deliveryDelay = null): PsrProducer
+    public function setDeliveryDelay(int $deliveryDelay = null): Producer
     {
         $this->deliveryDelay = $deliveryDelay;
 
@@ -132,7 +132,7 @@ public function getDeliveryDelay(): ?int
     /**
      * @return self
      */
-    public function setPriority(int $priority = null): PsrProducer
+    public function setPriority(int $priority = null): Producer
     {
         $this->priority = $priority;
 
@@ -147,7 +147,7 @@ public function getPriority(): ?int
     /**
      * @return self
      */
-    public function setTimeToLive(int $timeToLive = null): PsrProducer
+    public function setTimeToLive(int $timeToLive = null): Producer
     {
         $this->timeToLive = $timeToLive;
 

Tests/MongodbConnectionFactoryTest.php

@@ -5,7 +5,7 @@
 use Enqueue\Mongodb\MongodbConnectionFactory;
 use Enqueue\Mongodb\MongodbContext;
 use Enqueue\Test\ClassExtensionTrait;
-use Interop\Queue\PsrConnectionFactory;
+use Interop\Queue\ConnectionFactory;
 
 /**
  * @group mongodb
@@ -16,7 +16,7 @@ class MongodbConnectionFactoryTest extends \PHPUnit_Framework_TestCase
 
     public function testShouldImplementConnectionFactoryInterface()
     {
-        $this->assertClassImplements(PsrConnectionFactory::class, MongodbConnectionFactory::class);
+        $this->assertClassImplements(ConnectionFactory::class, MongodbConnectionFactory::class);
     }
 
     public function testCouldBeConstructedWithEmptyConfiguration()

Tests/MongodbConsumerTest.php

@@ -8,9 +8,9 @@
 use Enqueue\Mongodb\MongodbMessage;
 use Enqueue\Mongodb\MongodbProducer;
 use Enqueue\Test\ClassExtensionTrait;
-use Interop\Queue\InvalidMessageException;
-use Interop\Queue\PsrConsumer;
-use Interop\Queue\PsrMessage;
+use Interop\Queue\Consumer;
+use Interop\Queue\Exception\InvalidMessageException;
+use Interop\Queue\Message;
 
 /**
  * @group mongodb
@@ -21,7 +21,7 @@ class MongodbConsumerTest extends \PHPUnit_Framework_TestCase
 
     public function testShouldImplementConsumerInterface()
     {
-        $this->assertClassImplements(PsrConsumer::class, MongodbConsumer::class);
+        $this->assertClassImplements(Consumer::class, MongodbConsumer::class);
     }
 
     public function testCouldBeConstructedWithRequiredArguments()
@@ -128,7 +128,7 @@ private function createContextMock()
     }
 }
 
-class InvalidMessage implements PsrMessage
+class InvalidMessage implements Message
 {
     public function getBody(): string
     {

Tests/MongodbContextTest.php

@@ -8,10 +8,10 @@
 use Enqueue\Mongodb\MongodbMessage;
 use Enqueue\Mongodb\MongodbProducer;
 use Enqueue\Test\ClassExtensionTrait;
-use Interop\Queue\InvalidDestinationException;
-use Interop\Queue\PsrContext;
-use Interop\Queue\PsrDestination;
-use Interop\Queue\TemporaryQueueNotSupportedException;
+use Interop\Queue\Context;
+use Interop\Queue\Destination;
+use Interop\Queue\Exception\InvalidDestinationException;
+use Interop\Queue\Exception\TemporaryQueueNotSupportedException;
 use MongoDB\Client;
 
 /**
@@ -23,7 +23,7 @@ class MongodbContextTest extends \PHPUnit_Framework_TestCase
 
     public function testShouldImplementContextInterface()
     {
-        $this->assertClassImplements(PsrContext::class, MongodbContext::class);
+        $this->assertClassImplements(Context::class, MongodbContext::class);
     }
 
     public function testCouldBeConstructedWithRequiredArguments()
@@ -164,6 +164,6 @@ private function createClientMock()
     }
 }
 
-class NotSupportedDestination2 implements PsrDestination
+class NotSupportedDestination2 implements Destination
 {
 }

Tests/MongodbDestinationTest.php

@@ -4,9 +4,9 @@
 
 use Enqueue\Mongodb\MongodbDestination;
 use Enqueue\Test\ClassExtensionTrait;
-use Interop\Queue\PsrDestination;
-use Interop\Queue\PsrQueue;
-use Interop\Queue\PsrTopic;
+use Interop\Queue\Destination;
+use Interop\Queue\Queue;
+use Interop\Queue\Topic;
 
 /**
  * @group mongodb
@@ -17,17 +17,17 @@ class MongodbDestinationTest extends \PHPUnit_Framework_TestCase
 
     public function testShouldImplementDestinationInterface()
     {
-        $this->assertClassImplements(PsrDestination::class, MongodbDestination::class);
+        $this->assertClassImplements(Destination::class, MongodbDestination::class);
     }
 
     public function testShouldImplementTopicInterface()
     {
-        $this->assertClassImplements(PsrTopic::class, MongodbDestination::class);
+        $this->assertClassImplements(Topic::class, MongodbDestination::class);
     }
 
     public function testShouldImplementQueueInterface()
     {
-        $this->assertClassImplements(PsrQueue::class, MongodbDestination::class);
+        $this->assertClassImplements(Queue::class, MongodbDestination::class);
     }
 
     public function testShouldReturnTopicAndQueuePreviouslySetInConstructor()