[redis] Do not use deprecated classes.

Author: makasim

pkg/redis/README.md

@@ -5,7 +5,7 @@
 [![Total Downloads](https://poser.pugx.org/enqueue/redis/d/total.png)](https://packagist.org/packages/enqueue/redis)
 [![Latest Stable Version](https://poser.pugx.org/enqueue/redis/version.png)](https://packagist.org/packages/enqueue/redis)
 
-This is an implementation of PSR specification. It allows you to send and consume message with Redis store as a broker.  
+This is an implementation of Queue Interop specification. It allows you to send and consume message with Redis store as a broker.  
 
 ## Resources
 

pkg/redis/RedisConnectionFactory.php

@@ -5,10 +5,10 @@
 namespace Enqueue\Redis;
 
 use Enqueue\Dsn\Dsn;
-use Interop\Queue\PsrConnectionFactory;
-use Interop\Queue\PsrContext;
+use Interop\Queue\ConnectionFactory;
+use Interop\Queue\Context;
 
-class RedisConnectionFactory implements PsrConnectionFactory
+class RedisConnectionFactory implements ConnectionFactory
 {
     /**
      * @var array
@@ -80,7 +80,7 @@ public function __construct($config = 'redis:')
     /**
      * @return RedisContext
      */
-    public function createContext(): PsrContext
+    public function createContext(): Context
     {
         if ($this->config['lazy']) {
             return new RedisContext(function () {

pkg/redis/RedisConsumer.php

@@ -4,12 +4,12 @@
 
 namespace Enqueue\Redis;
 
-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 RedisConsumer implements PsrConsumer
+class RedisConsumer implements Consumer
 {
     /**
      * @var RedisDestination
@@ -30,15 +30,15 @@ public function __construct(RedisContext $context, RedisDestination $queue)
     /**
      * @return RedisDestination
      */
-    public function getQueue(): PsrQueue
+    public function getQueue(): Queue
     {
         return $this->queue;
     }
 
     /**
      * @return RedisMessage
      */
-    public function receive(int $timeout = 0): ?PsrMessage
+    public function receive(int $timeout = 0): ?Message
     {
         $timeout = (int) ($timeout / 1000);
         if (empty($timeout)) {
@@ -59,7 +59,7 @@ public function receive(int $timeout = 0): ?PsrMessage
     /**
      * @return RedisMessage
      */
-    public function receiveNoWait(): ?PsrMessage
+    public function receiveNoWait(): ?Message
     {
         if ($result = $this->getRedis()->rpop($this->queue->getName())) {
             return RedisMessage::jsonUnserialize($result->getMessage());
@@ -71,15 +71,15 @@ public function receiveNoWait(): ?PsrMessage
     /**
      * @param RedisMessage $message
      */
-    public function acknowledge(PsrMessage $message): void
+    public function acknowledge(Message $message): void
     {
         // do nothing. redis transport always works in auto ack mode
     }
 
     /**
      * @param RedisMessage $message
      */
-    public function reject(PsrMessage $message, bool $requeue = false): void
+    public function reject(Message $message, bool $requeue = false): void
     {
         InvalidMessageException::assertMessageInstanceOf($message, RedisMessage::class);
 

pkg/redis/RedisContext.php

@@ -4,18 +4,18 @@
 
 namespace Enqueue\Redis;
 
-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\TemporaryQueueNotSupportedException;
-
-class RedisContext implements PsrContext
+use Interop\Queue\Consumer;
+use Interop\Queue\Context;
+use Interop\Queue\Destination;
+use Interop\Queue\Exception\InvalidDestinationException;
+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;
+
+class RedisContext implements Context
 {
     /**
      * @var Redis
@@ -50,31 +50,31 @@ public function __construct($redis)
     /**
      * @return RedisMessage
      */
-    public function createMessage(string $body = '', array $properties = [], array $headers = []): PsrMessage
+    public function createMessage(string $body = '', array $properties = [], array $headers = []): Message
     {
         return new RedisMessage($body, $properties, $headers);
     }
 
     /**
      * @return RedisDestination
      */
-    public function createTopic(string $topicName): PsrTopic
+    public function createTopic(string $topicName): Topic
     {
         return new RedisDestination($topicName);
     }
 
     /**
      * @return RedisDestination
      */
-    public function createQueue(string $queueName): PsrQueue
+    public function createQueue(string $queueName): Queue
     {
         return new RedisDestination($queueName);
     }
 
     /**
      * @param RedisDestination $queue
      */
-    public function deleteQueue(PsrQueue $queue): void
+    public function deleteQueue(Queue $queue): void
     {
         InvalidDestinationException::assertDestinationInstanceOf($queue, RedisDestination::class);
 
@@ -84,22 +84,22 @@ public function deleteQueue(PsrQueue $queue): void
     /**
      * @param RedisDestination $topic
      */
-    public function deleteTopic(PsrTopic $topic): void
+    public function deleteTopic(Topic $topic): void
     {
         InvalidDestinationException::assertDestinationInstanceOf($topic, RedisDestination::class);
 
         $this->getRedis()->del($topic->getName());
     }
 
-    public function createTemporaryQueue(): PsrQueue
+    public function createTemporaryQueue(): Queue
     {
         throw TemporaryQueueNotSupportedException::providerDoestNotSupportIt();
     }
 
     /**
      * @return RedisProducer
      */
-    public function createProducer(): PsrProducer
+    public function createProducer(): Producer
     {
         return new RedisProducer($this->getRedis());
     }
@@ -109,7 +109,7 @@ public function createProducer(): PsrProducer
      *
      * @return RedisConsumer
      */
-    public function createConsumer(PsrDestination $destination): PsrConsumer
+    public function createConsumer(Destination $destination): Consumer
     {
         InvalidDestinationException::assertDestinationInstanceOf($destination, RedisDestination::class);
 
@@ -119,15 +119,15 @@ public function createConsumer(PsrDestination $destination): PsrConsumer
     /**
      * @return RedisSubscriptionConsumer
      */
-    public function createSubscriptionConsumer(): PsrSubscriptionConsumer
+    public function createSubscriptionConsumer(): SubscriptionConsumer
     {
         return new RedisSubscriptionConsumer($this);
     }
 
     /**
      * @param RedisDestination $queue
      */
-    public function purgeQueue(PsrQueue $queue): void
+    public function purgeQueue(Queue $queue): void
     {
         $this->getRedis()->del($queue->getName());
     }

pkg/redis/RedisDestination.php

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

pkg/redis/RedisMessage.php

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

pkg/redis/RedisProducer.php

@@ -4,13 +4,13 @@
 
 namespace Enqueue\Redis;
 
-use Interop\Queue\InvalidDestinationException;
-use Interop\Queue\InvalidMessageException;
-use Interop\Queue\PsrDestination;
-use Interop\Queue\PsrMessage;
-use Interop\Queue\PsrProducer;
+use Interop\Queue\Destination;
+use Interop\Queue\Exception\InvalidDestinationException;
+use Interop\Queue\Exception\InvalidMessageException;
+use Interop\Queue\Message;
+use Interop\Queue\Producer;
 
-class RedisProducer implements PsrProducer
+class RedisProducer implements Producer
 {
     /**
      * @var Redis
@@ -29,7 +29,7 @@ public function __construct(Redis $redis)
      * @param RedisDestination $destination
      * @param RedisMessage     $message
      */
-    public function send(PsrDestination $destination, PsrMessage $message): void
+    public function send(Destination $destination, Message $message): void
     {
         InvalidDestinationException::assertDestinationInstanceOf($destination, RedisDestination::class);
         InvalidMessageException::assertMessageInstanceOf($message, RedisMessage::class);
@@ -40,7 +40,7 @@ public function send(PsrDestination $destination, PsrMessage $message): void
     /**
      * @return RedisProducer
      */
-    public function setDeliveryDelay(int $deliveryDelay = null): PsrProducer
+    public function setDeliveryDelay(int $deliveryDelay = null): Producer
     {
         if (null === $deliveryDelay) {
             return $this;
@@ -57,7 +57,7 @@ public function getDeliveryDelay(): ?int
     /**
      * @return RedisProducer
      */
-    public function setPriority(int $priority = null): PsrProducer
+    public function setPriority(int $priority = null): Producer
     {
         if (null === $priority) {
             return $this;
@@ -74,7 +74,7 @@ public function getPriority(): ?int
     /**
      * @return RedisProducer
      */
-    public function setTimeToLive(int $timeToLive = null): PsrProducer
+    public function setTimeToLive(int $timeToLive = null): Producer
     {
         if (null === $timeToLive) {
             return $this;

pkg/redis/RedisSubscriptionConsumer.php

@@ -4,10 +4,10 @@
 
 namespace Enqueue\Redis;
 
-use Interop\Queue\PsrConsumer;
-use Interop\Queue\PsrSubscriptionConsumer;
+use Interop\Queue\Consumer;
+use Interop\Queue\SubscriptionConsumer;
 
-class RedisSubscriptionConsumer implements PsrSubscriptionConsumer
+class RedisSubscriptionConsumer implements SubscriptionConsumer
 {
     /**
      * @var RedisContext
@@ -52,8 +52,8 @@ public function consume(int $timeout = 0): void
 
             /**
              * @var string
-             * @var PsrConsumer $consumer
-             * @var callable    $processor
+             * @var Consumer $consumer
+             * @var callable $processor
              */
             $result = $this->context->getRedis()->brpop($currentQueueNames, $timeout ?: 5);
             if ($result) {
@@ -81,7 +81,7 @@ public function consume(int $timeout = 0): void
     /**
      * @param RedisConsumer $consumer
      */
-    public function subscribe(PsrConsumer $consumer, callable $callback): void
+    public function subscribe(Consumer $consumer, callable $callback): void
     {
         if (false == $consumer instanceof RedisConsumer) {
             throw new \InvalidArgumentException(sprintf('The consumer must be instance of "%s" got "%s"', RedisConsumer::class, get_class($consumer)));
@@ -102,7 +102,7 @@ public function subscribe(PsrConsumer $consumer, callable $callback): void
     /**
      * @param RedisConsumer $consumer
      */
-    public function unsubscribe(PsrConsumer $consumer): void
+    public function unsubscribe(Consumer $consumer): void
     {
         if (false == $consumer instanceof RedisConsumer) {
             throw new \InvalidArgumentException(sprintf('The consumer must be instance of "%s" got "%s"', RedisConsumer::class, get_class($consumer)));

pkg/redis/ServerException.php

@@ -4,7 +4,7 @@
 
 namespace Enqueue\Redis;
 
-use Interop\Queue\Exception;
+use Interop\Queue\Exception\Exception;
 
 class ServerException extends Exception
 {

pkg/redis/Tests/Functional/ConsumptionUseCasesTrait.php

@@ -9,7 +9,7 @@
 use Enqueue\Consumption\QueueConsumer;
 use Enqueue\Consumption\Result;
 use Enqueue\Redis\RedisContext;
-use Interop\Queue\PsrMessage;
+use Interop\Queue\Message;
 
 trait ConsumptionUseCasesTrait
 {
@@ -30,7 +30,7 @@ public function testConsumeOneMessageAndExit()
 
         $queueConsumer->consume();
 
-        $this->assertInstanceOf(PsrMessage::class, $processor->lastProcessedMessage);
+        $this->assertInstanceOf(Message::class, $processor->lastProcessedMessage);
         $this->assertEquals(__METHOD__, $processor->lastProcessedMessage->getBody());
     }
 
@@ -61,10 +61,10 @@ public function testConsumeOneMessageAndSendReplyExit()
         $queueConsumer->bind($replyQueue, $replyProcessor);
         $queueConsumer->consume();
 
-        $this->assertInstanceOf(PsrMessage::class, $processor->lastProcessedMessage);
+        $this->assertInstanceOf(Message::class, $processor->lastProcessedMessage);
         $this->assertEquals(__METHOD__, $processor->lastProcessedMessage->getBody());
 
-        $this->assertInstanceOf(PsrMessage::class, $replyProcessor->lastProcessedMessage);
+        $this->assertInstanceOf(Message::class, $replyProcessor->lastProcessedMessage);
         $this->assertEquals(__METHOD__.'.reply', $replyProcessor->lastProcessedMessage->getBody());
     }