[amqp-lib] Do not use deprecated classes.

Author: makasim

AmqpConnectionFactory.php

@@ -9,7 +9,7 @@
 use Enqueue\AmqpTools\DelayStrategyAwareTrait;
 use Enqueue\AmqpTools\RabbitMqDlxDelayStrategy;
 use Interop\Amqp\AmqpConnectionFactory as InteropAmqpConnectionFactory;
-use Interop\Queue\PsrContext;
+use Interop\Queue\Context;
 use PhpAmqpLib\Connection\AbstractConnection;
 use PhpAmqpLib\Connection\AMQPLazyConnection;
 use PhpAmqpLib\Connection\AMQPLazySocketConnection;
@@ -58,7 +58,7 @@ public function __construct($config = 'amqp:')
     /**
      * @return AmqpContext
      */
-    public function createContext(): PsrContext
+    public function createContext(): Context
     {
         $context = new AmqpContext($this->establishConnection(), $this->config->getConfig());
         $context->setDelayStrategy($this->delayStrategy);

AmqpConsumer.php

@@ -7,9 +7,9 @@
 use Interop\Amqp\AmqpConsumer as InteropAmqpConsumer;
 use Interop\Amqp\AmqpMessage as InteropAmqpMessage;
 use Interop\Amqp\AmqpQueue as InteropAmqpQueue;
-use Interop\Queue\InvalidMessageException;
-use Interop\Queue\PsrMessage;
-use Interop\Queue\PsrQueue;
+use Interop\Queue\Exception\InvalidMessageException;
+use Interop\Queue\Message;
+use Interop\Queue\Queue;
 use PhpAmqpLib\Channel\AMQPChannel;
 
 class AmqpConsumer implements InteropAmqpConsumer
@@ -80,15 +80,15 @@ public function setFlags(int $flags): void
     /**
      * @return InteropAmqpQueue
      */
-    public function getQueue(): PsrQueue
+    public function getQueue(): Queue
     {
         return $this->queue;
     }
 
     /**
      * @return InteropAmqpMessage
      */
-    public function receive(int $timeout = 0): ?PsrMessage
+    public function receive(int $timeout = 0): ?Message
     {
         $end = microtime(true) + ($timeout / 1000);
 
@@ -106,7 +106,7 @@ public function receive(int $timeout = 0): ?PsrMessage
     /**
      * @return InteropAmqpMessage
      */
-    public function receiveNoWait(): ?PsrMessage
+    public function receiveNoWait(): ?Message
     {
         if ($message = $this->channel->basic_get($this->queue->getQueueName(), (bool) ($this->getFlags() & InteropAmqpConsumer::FLAG_NOACK))) {
             return $this->context->convertMessage($message);
@@ -118,7 +118,7 @@ public function receiveNoWait(): ?PsrMessage
     /**
      * @param InteropAmqpMessage $message
      */
-    public function acknowledge(PsrMessage $message): void
+    public function acknowledge(Message $message): void
     {
         InvalidMessageException::assertMessageInstanceOf($message, InteropAmqpMessage::class);
 
@@ -129,7 +129,7 @@ public function acknowledge(PsrMessage $message): void
      * @param InteropAmqpMessage $message
      * @param bool               $requeue
      */
-    public function reject(PsrMessage $message, bool $requeue = false): void
+    public function reject(Message $message, bool $requeue = false): void
     {
         InvalidMessageException::assertMessageInstanceOf($message, InteropAmqpMessage::class);
 

AmqpContext.php

@@ -15,15 +15,15 @@
 use Interop\Amqp\Impl\AmqpMessage;
 use Interop\Amqp\Impl\AmqpQueue;
 use Interop\Amqp\Impl\AmqpTopic;
-use Interop\Queue\Exception;
-use Interop\Queue\InvalidDestinationException;
-use Interop\Queue\PsrConsumer;
-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\Consumer;
+use Interop\Queue\Destination;
+use Interop\Queue\Exception\Exception;
+use Interop\Queue\Exception\InvalidDestinationException;
+use Interop\Queue\Message;
+use Interop\Queue\Producer;
+use Interop\Queue\Queue;
+use Interop\Queue\SubscriptionConsumer;
+use Interop\Queue\Topic;
 use PhpAmqpLib\Channel\AMQPChannel;
 use PhpAmqpLib\Connection\AbstractConnection;
 use PhpAmqpLib\Message\AMQPMessage as LibAMQPMessage;
@@ -62,23 +62,23 @@ public function __construct(AbstractConnection $connection, array $config)
     /**
      * @return InteropAmqpMessage
      */
-    public function createMessage(string $body = '', array $properties = [], array $headers = []): PsrMessage
+    public function createMessage(string $body = '', array $properties = [], array $headers = []): Message
     {
         return new AmqpMessage($body, $properties, $headers);
     }
 
     /**
      * @return InteropAmqpQueue
      */
-    public function createQueue(string $name): PsrQueue
+    public function createQueue(string $name): Queue
     {
         return new AmqpQueue($name);
     }
 
     /**
      * @return InteropAmqpTopic
      */
-    public function createTopic(string $name): PsrTopic
+    public function createTopic(string $name): Topic
     {
         return new AmqpTopic($name);
     }
@@ -88,9 +88,9 @@ public function createTopic(string $name): PsrTopic
      *
      * @return AmqpConsumer
      */
-    public function createConsumer(PsrDestination $destination): PsrConsumer
+    public function createConsumer(Destination $destination): Consumer
     {
-        $destination instanceof PsrTopic
+        $destination instanceof Topic
             ? InvalidDestinationException::assertDestinationInstanceOf($destination, InteropAmqpTopic::class)
             : InvalidDestinationException::assertDestinationInstanceOf($destination, InteropAmqpQueue::class)
         ;
@@ -108,15 +108,15 @@ public function createConsumer(PsrDestination $destination): PsrConsumer
     /**
      * @return AmqpSubscriptionConsumer
      */
-    public function createSubscriptionConsumer(): PsrSubscriptionConsumer
+    public function createSubscriptionConsumer(): SubscriptionConsumer
     {
         return new AmqpSubscriptionConsumer($this);
     }
 
     /**
      * @return AmqpProducer
      */
-    public function createProducer(): PsrProducer
+    public function createProducer(): Producer
     {
         $producer = new AmqpProducer($this->getLibChannel(), $this);
         $producer->setDelayStrategy($this->delayStrategy);
@@ -127,7 +127,7 @@ public function createProducer(): PsrProducer
     /**
      * @return InteropAmqpQueue
      */
-    public function createTemporaryQueue(): PsrQueue
+    public function createTemporaryQueue(): Queue
     {
         list($name) = $this->getLibChannel()->queue_declare('', false, false, true, false);
 
@@ -188,7 +188,7 @@ public function deleteQueue(InteropAmqpQueue $queue): void
     /**
      * @param AmqpQueue $queue
      */
-    public function purgeQueue(PsrQueue $queue): void
+    public function purgeQueue(Queue $queue): void
     {
         InvalidDestinationException::assertDestinationInstanceOf($queue, InteropAmqpQueue::class);
 

AmqpProducer.php

@@ -11,14 +11,14 @@
 use Interop\Amqp\AmqpProducer as InteropAmqpProducer;
 use Interop\Amqp\AmqpQueue as InteropAmqpQueue;
 use Interop\Amqp\AmqpTopic as InteropAmqpTopic;
-use Interop\Queue\DeliveryDelayNotSupportedException;
-use Interop\Queue\Exception;
-use Interop\Queue\InvalidDestinationException;
-use Interop\Queue\InvalidMessageException;
-use Interop\Queue\PsrDestination;
-use Interop\Queue\PsrMessage;
-use Interop\Queue\PsrProducer;
-use Interop\Queue\PsrTopic;
+use Interop\Queue\Destination;
+use Interop\Queue\Exception\DeliveryDelayNotSupportedException;
+use Interop\Queue\Exception\Exception;
+use Interop\Queue\Exception\InvalidDestinationException;
+use Interop\Queue\Exception\InvalidMessageException;
+use Interop\Queue\Message;
+use Interop\Queue\Producer;
+use Interop\Queue\Topic;
 use PhpAmqpLib\Channel\AMQPChannel;
 use PhpAmqpLib\Message\AMQPMessage as LibAMQPMessage;
 use PhpAmqpLib\Wire\AMQPTable;
@@ -62,9 +62,9 @@ public function __construct(AMQPChannel $channel, AmqpContext $context)
      * @param InteropAmqpTopic|InteropAmqpQueue $destination
      * @param InteropAmqpMessage                $message
      */
-    public function send(PsrDestination $destination, PsrMessage $message): void
+    public function send(Destination $destination, Message $message): void
     {
-        $destination instanceof PsrTopic
+        $destination instanceof Topic
             ? InvalidDestinationException::assertDestinationInstanceOf($destination, InteropAmqpTopic::class)
             : InvalidDestinationException::assertDestinationInstanceOf($destination, InteropAmqpQueue::class)
         ;
@@ -81,7 +81,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
     {
         if (null === $this->delayStrategy) {
             throw DeliveryDelayNotSupportedException::providerDoestNotSupportIt();
@@ -100,7 +100,7 @@ public function getDeliveryDelay(): ?int
     /**
      * @return self
      */
-    public function setPriority(int $priority = null): PsrProducer
+    public function setPriority(int $priority = null): Producer
     {
         $this->priority = $priority;
 
@@ -115,7 +115,7 @@ public function getPriority(): ?int
     /**
      * @return self
      */
-    public function setTimeToLive(int $timeToLive = null): PsrProducer
+    public function setTimeToLive(int $timeToLive = null): Producer
     {
         $this->timeToLive = $timeToLive;
 

AmqpSubscriptionConsumer.php

@@ -7,8 +7,8 @@
 use Enqueue\AmqpTools\SignalSocketHelper;
 use Interop\Amqp\AmqpConsumer as InteropAmqpConsumer;
 use Interop\Amqp\AmqpSubscriptionConsumer as InteropAmqpSubscriptionConsumer;
-use Interop\Queue\Exception;
-use Interop\Queue\PsrConsumer;
+use Interop\Queue\Consumer;
+use Interop\Queue\Exception\Exception;
 use PhpAmqpLib\Exception\AMQPIOWaitException;
 use PhpAmqpLib\Exception\AMQPTimeoutException;
 use PhpAmqpLib\Message\AMQPMessage as LibAMQPMessage;
@@ -75,7 +75,7 @@ public function consume(int $timeout = 0): void
     /**
      * @param AmqpConsumer $consumer
      */
-    public function subscribe(PsrConsumer $consumer, callable $callback): void
+    public function subscribe(Consumer $consumer, callable $callback): void
     {
         if (false == $consumer instanceof AmqpConsumer) {
             throw new \InvalidArgumentException(sprintf('The consumer must be instance of "%s" got "%s"', AmqpConsumer::class, get_class($consumer)));
@@ -122,7 +122,7 @@ public function subscribe(PsrConsumer $consumer, callable $callback): void
     /**
      * @param AmqpConsumer $consumer
      */
-    public function unsubscribe(PsrConsumer $consumer): void
+    public function unsubscribe(Consumer $consumer): void
     {
         if (false == $consumer instanceof AmqpConsumer) {
             throw new \InvalidArgumentException(sprintf('The consumer must be instance of "%s" got "%s"', AmqpConsumer::class, get_class($consumer)));

Tests/AmqpConnectionFactoryTest.php

@@ -5,7 +5,7 @@
 use Enqueue\AmqpLib\AmqpConnectionFactory;
 use Enqueue\AmqpTools\RabbitMqDlxDelayStrategy;
 use Enqueue\Test\ClassExtensionTrait;
-use Interop\Queue\PsrConnectionFactory;
+use Interop\Queue\ConnectionFactory;
 use PHPUnit\Framework\TestCase;
 
 class AmqpConnectionFactoryTest extends TestCase
@@ -14,7 +14,7 @@ class AmqpConnectionFactoryTest extends TestCase
 
     public function testShouldImplementConnectionFactoryInterface()
     {
-        $this->assertClassImplements(PsrConnectionFactory::class, AmqpConnectionFactory::class);
+        $this->assertClassImplements(ConnectionFactory::class, AmqpConnectionFactory::class);
     }
 
     public function testShouldSetRabbitMqDlxDelayStrategyIfRabbitMqSchemeExtensionPresent()

Tests/AmqpConsumerTest.php

@@ -9,8 +9,8 @@
 use Enqueue\Test\WriteAttributeTrait;
 use Interop\Amqp\Impl\AmqpMessage;
 use Interop\Amqp\Impl\AmqpQueue;
-use Interop\Queue\InvalidMessageException;
-use Interop\Queue\PsrConsumer;
+use Interop\Queue\Consumer;
+use Interop\Queue\Exception\InvalidMessageException;
 use PhpAmqpLib\Channel\AMQPChannel;
 use PHPUnit\Framework\TestCase;
 
@@ -21,7 +21,7 @@ class AmqpConsumerTest extends TestCase
 
     public function testShouldImplementConsumerInterface()
     {
-        $this->assertClassImplements(PsrConsumer::class, AmqpConsumer::class);
+        $this->assertClassImplements(Consumer::class, AmqpConsumer::class);
     }
 
     public function testCouldBeConstructedWithContextAndQueueAsArguments()

Tests/AmqpProducerTest.php

@@ -8,11 +8,11 @@
 use Interop\Amqp\Impl\AmqpMessage;
 use Interop\Amqp\Impl\AmqpQueue;
 use Interop\Amqp\Impl\AmqpTopic;
-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;
 use PhpAmqpLib\Channel\AMQPChannel;
 use PhpAmqpLib\Message\AMQPMessage as LibAMQPMessage;
 use PhpAmqpLib\Wire\AMQPTable;
@@ -27,9 +27,9 @@ public function testCouldBeConstructedWithRequiredArguments()
         new AmqpProducer($this->createAmqpChannelMock(), $this->createContextMock());
     }
 
-    public function testShouldImplementPsrProducerInterface()
+    public function testShouldImplementProducerInterface()
     {
-        $this->assertClassImplements(PsrProducer::class, AmqpProducer::class);
+        $this->assertClassImplements(Producer::class, AmqpProducer::class);
     }
 
     public function testShouldThrowExceptionWhenDestinationTypeIsInvalid()
@@ -142,19 +142,19 @@ public function testShouldSetMessageProperties()
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|PsrMessage
+     * @return \PHPUnit_Framework_MockObject_MockObject|Message
      */
     private function createMessageMock()
     {
-        return $this->createMock(PsrMessage::class);
+        return $this->createMock(Message::class);
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|PsrDestination
+     * @return \PHPUnit_Framework_MockObject_MockObject|Destination
      */
     private function createDestinationMock()
     {
-        return $this->createMock(PsrDestination::class);
+        return $this->createMock(Destination::class);
     }
 
     /**

Tests/AmqpSubscriptionConsumerTest.php

@@ -4,16 +4,16 @@
 
 use Enqueue\AmqpLib\AmqpContext;
 use Enqueue\AmqpLib\AmqpSubscriptionConsumer;
-use Interop\Queue\PsrSubscriptionConsumer;
+use Interop\Queue\SubscriptionConsumer;
 use PHPUnit\Framework\TestCase;
 
 class AmqpSubscriptionConsumerTest extends TestCase
 {
-    public function testShouldImplementPsrSubscriptionConsumerInterface()
+    public function testShouldImplementSubscriptionConsumerInterface()
     {
         $rc = new \ReflectionClass(AmqpSubscriptionConsumer::class);
 
-        $this->assertTrue($rc->implementsInterface(PsrSubscriptionConsumer::class));
+        $this->assertTrue($rc->implementsInterface(SubscriptionConsumer::class));
     }
 
     public function testCouldBeConstructedWithAmqpContextAsFirstArgument()

Tests/Spec/AmqpSendAndReceiveDelayedMessageWithDelayPluginStrategyTest.php

@@ -5,7 +5,7 @@
 use Enqueue\AmqpLib\AmqpConnectionFactory;
 use Enqueue\AmqpLib\AmqpContext;
 use Enqueue\AmqpTools\RabbitMqDelayPluginDelayStrategy;
-use Interop\Queue\PsrContext;
+use Interop\Queue\Context;
 use Interop\Queue\Spec\SendAndReceiveDelayedMessageFromQueueSpec;
 
 /**
@@ -29,7 +29,7 @@ protected function createContext()
      *
      * {@inheritdoc}
      */
-    protected function createQueue(PsrContext $context, $queueName)
+    protected function createQueue(Context $context, $queueName)
     {
         $queue = parent::createQueue($context, $queueName);