[amqp-bunny] Do not use deprecated classes in producer and subscription consumer.

Author: makasim

pkg/amqp-bunny/AmqpProducer.php

@@ -12,14 +12,14 @@
 use Interop\Amqp\AmqpProducer as InteropAmqpProducer;
 use Interop\Amqp\AmqpQueue as InteropAmqpQueue;
 use Interop\Amqp\AmqpTopic as InteropAmqpTopic;
+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\PsrDestination;
-use Interop\Queue\PsrMessage;
-use Interop\Queue\PsrProducer;
-use Interop\Queue\PsrTopic;
+use Interop\Queue\Message;
+use Interop\Queue\Producer;
+use Interop\Queue\Topic;
 
 class AmqpProducer implements InteropAmqpProducer, DelayStrategyAware
 {
@@ -60,9 +60,9 @@ public function __construct(Channel $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)
         ;
@@ -79,7 +79,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();
@@ -98,7 +98,7 @@ public function getDeliveryDelay(): ?int
     /**
      * @return self
      */
-    public function setPriority(int $priority = null): PsrProducer
+    public function setPriority(int $priority = null): Producer
     {
         $this->priority = $priority;
 
@@ -113,7 +113,7 @@ public function getPriority(): ?int
     /**
      * @return self
      */
-    public function setTimeToLive(int $timeToLive = null): PsrProducer
+    public function setTimeToLive(int $timeToLive = null): Producer
     {
         $this->timeToLive = $timeToLive;
 

pkg/amqp-bunny/AmqpSubscriptionConsumer.php

@@ -11,8 +11,8 @@
 use Enqueue\AmqpTools\SignalSocketHelper;
 use Interop\Amqp\AmqpConsumer as InteropAmqpConsumer;
 use Interop\Amqp\AmqpSubscriptionConsumer as InteropAmqpSubscriptionConsumer;
+use Interop\Queue\Consumer;
 use Interop\Queue\Exception\Exception;
-use Interop\Queue\PsrConsumer;
 
 class AmqpSubscriptionConsumer implements InteropAmqpSubscriptionConsumer
 {
@@ -60,7 +60,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)));
@@ -107,7 +107,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)));