[gearman] Do not use deprecated classes

Author: makasim

GearmanConnectionFactory.php

@@ -4,10 +4,10 @@
 
 namespace Enqueue\Gearman;
 
-use Interop\Queue\PsrConnectionFactory;
-use Interop\Queue\PsrContext;
+use Interop\Queue\ConnectionFactory;
+use Interop\Queue\Context;
 
-class GearmanConnectionFactory implements PsrConnectionFactory
+class GearmanConnectionFactory implements ConnectionFactory
 {
     /**
      * @var array
@@ -45,7 +45,7 @@ public function __construct($config = 'gearman:')
     /**
      * @return GearmanContext
      */
-    public function createContext(): PsrContext
+    public function createContext(): Context
     {
         return new GearmanContext($this->config);
     }

GearmanConsumer.php

@@ -4,11 +4,11 @@
 
 namespace Enqueue\Gearman;
 
-use Interop\Queue\PsrConsumer;
-use Interop\Queue\PsrMessage;
-use Interop\Queue\PsrQueue;
+use Interop\Queue\Consumer;
+use Interop\Queue\Message;
+use Interop\Queue\Queue;
 
-class GearmanConsumer implements PsrConsumer
+class GearmanConsumer implements Consumer
 {
     /**
      * @var \GearmanWorker
@@ -36,15 +36,15 @@ public function __construct(GearmanContext $context, GearmanDestination $destina
     /**
      * @return GearmanDestination
      */
-    public function getQueue(): PsrQueue
+    public function getQueue(): Queue
     {
         return $this->destination;
     }
 
     /**
      * @return GearmanMessage
      */
-    public function receive(int $timeout = 0): ?PsrMessage
+    public function receive(int $timeout = 0): ?Message
     {
         set_error_handler(function ($severity, $message, $file, $line) {
             throw new \ErrorException($message, 0, $severity, $file, $line);
@@ -70,22 +70,22 @@ public function receive(int $timeout = 0): ?PsrMessage
     /**
      * @return GearmanMessage
      */
-    public function receiveNoWait(): ?PsrMessage
+    public function receiveNoWait(): ?Message
     {
         return $this->receive(100);
     }
 
     /**
      * @param GearmanMessage $message
      */
-    public function acknowledge(PsrMessage $message): void
+    public function acknowledge(Message $message): void
     {
     }
 
     /**
      * @param GearmanMessage $message
      */
-    public function reject(PsrMessage $message, bool $requeue = false): void
+    public function reject(Message $message, bool $requeue = false): void
     {
         if ($requeue) {
             $this->context->createProducer()->send($this->destination, $message);

GearmanContext.php

@@ -4,20 +4,20 @@
 
 namespace Enqueue\Gearman;
 
-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\PurgeQueueNotSupportedException;
-use Interop\Queue\SubscriptionConsumerNotSupportedException;
-use Interop\Queue\TemporaryQueueNotSupportedException;
-
-class GearmanContext implements PsrContext
+use Interop\Queue\Consumer;
+use Interop\Queue\Context;
+use Interop\Queue\Destination;
+use Interop\Queue\Exception\InvalidDestinationException;
+use Interop\Queue\Exception\PurgeQueueNotSupportedException;
+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;
+
+class GearmanContext implements Context
 {
     /**
      * @var \GearmanClient
@@ -42,36 +42,36 @@ public function __construct(array $config)
     /**
      * @return GearmanMessage
      */
-    public function createMessage(string $body = '', array $properties = [], array $headers = []): PsrMessage
+    public function createMessage(string $body = '', array $properties = [], array $headers = []): Message
     {
         return new GearmanMessage($body, $properties, $headers);
     }
 
     /**
      * @return GearmanDestination
      */
-    public function createTopic(string $topicName): PsrTopic
+    public function createTopic(string $topicName): Topic
     {
         return new GearmanDestination($topicName);
     }
 
     /**
      * @return GearmanDestination
      */
-    public function createQueue(string $queueName): PsrQueue
+    public function createQueue(string $queueName): Queue
     {
         return new GearmanDestination($queueName);
     }
 
-    public function createTemporaryQueue(): PsrQueue
+    public function createTemporaryQueue(): Queue
     {
         throw TemporaryQueueNotSupportedException::providerDoestNotSupportIt();
     }
 
     /**
      * @return GearmanProducer
      */
-    public function createProducer(): PsrProducer
+    public function createProducer(): Producer
     {
         return new GearmanProducer($this->getClient());
     }
@@ -81,7 +81,7 @@ public function createProducer(): PsrProducer
      *
      * @return GearmanConsumer
      */
-    public function createConsumer(PsrDestination $destination): PsrConsumer
+    public function createConsumer(Destination $destination): Consumer
     {
         InvalidDestinationException::assertDestinationInstanceOf($destination, GearmanDestination::class);
 
@@ -99,12 +99,12 @@ public function close(): void
         }
     }
 
-    public function createSubscriptionConsumer(): PsrSubscriptionConsumer
+    public function createSubscriptionConsumer(): SubscriptionConsumer
     {
         throw SubscriptionConsumerNotSupportedException::providerDoestNotSupportIt();
     }
 
-    public function purgeQueue(PsrQueue $queue): void
+    public function purgeQueue(Queue $queue): void
     {
         throw PurgeQueueNotSupportedException::providerDoestNotSupportIt();
     }

GearmanDestination.php

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

GearmanMessage.php

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

GearmanProducer.php

@@ -4,13 +4,13 @@
 
 namespace Enqueue\Gearman;
 
-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 GearmanProducer implements PsrProducer
+class GearmanProducer implements Producer
 {
     /**
      * @var \GearmanClient
@@ -26,7 +26,7 @@ public function __construct(\GearmanClient $client)
      * @param GearmanDestination $destination
      * @param GearmanMessage     $message
      */
-    public function send(PsrDestination $destination, PsrMessage $message): void
+    public function send(Destination $destination, Message $message): void
     {
         InvalidDestinationException::assertDestinationInstanceOf($destination, GearmanDestination::class);
         InvalidMessageException::assertMessageInstanceOf($message, GearmanMessage::class);
@@ -39,7 +39,7 @@ public function send(PsrDestination $destination, PsrMessage $message): void
         }
     }
 
-    public function setDeliveryDelay(int $deliveryDelay = null): PsrProducer
+    public function setDeliveryDelay(int $deliveryDelay = null): Producer
     {
         if (null === $deliveryDelay) {
             return $this;
@@ -53,7 +53,7 @@ public function getDeliveryDelay(): ?int
         return null;
     }
 
-    public function setPriority(int $priority = null): PsrProducer
+    public function setPriority(int $priority = null): Producer
     {
         if (null === $priority) {
             return $this;
@@ -67,7 +67,7 @@ public function getPriority(): ?int
         return null;
     }
 
-    public function setTimeToLive(int $timeToLive = null): PsrProducer
+    public function setTimeToLive(int $timeToLive = null): Producer
     {
         if (null === $timeToLive) {
             return $this;

Tests/GearmanContextTest.php

@@ -5,9 +5,9 @@
 use Enqueue\Gearman\GearmanContext;
 use Enqueue\Null\NullQueue;
 use Enqueue\Test\ClassExtensionTrait;
-use Interop\Queue\InvalidDestinationException;
-use Interop\Queue\PsrContext;
-use Interop\Queue\TemporaryQueueNotSupportedException;
+use Interop\Queue\Context;
+use Interop\Queue\Exception\InvalidDestinationException;
+use Interop\Queue\Exception\TemporaryQueueNotSupportedException;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -18,9 +18,9 @@ class GearmanContextTest extends TestCase
     use ClassExtensionTrait;
     use SkipIfGearmanExtensionIsNotInstalledTrait;
 
-    public function testShouldImplementPsrContextInterface()
+    public function testShouldImplementContextInterface()
     {
-        $this->assertClassImplements(PsrContext::class, GearmanContext::class);
+        $this->assertClassImplements(Context::class, GearmanContext::class);
     }
 
     public function testCouldBeConstructedWithConnectionConfigAsFirstArgument()

Tests/GearmanDestinationTest.php

@@ -4,23 +4,23 @@
 
 use Enqueue\Gearman\GearmanDestination;
 use Enqueue\Test\ClassExtensionTrait;
-use Interop\Queue\PsrQueue;
-use Interop\Queue\PsrTopic;
+use Interop\Queue\Queue;
+use Interop\Queue\Topic;
 use PHPUnit\Framework\TestCase;
 
 class GearmanDestinationTest extends TestCase
 {
     use ClassExtensionTrait;
     use SkipIfGearmanExtensionIsNotInstalledTrait;
 
-    public function testShouldImplementPsrQueueInterface()
+    public function testShouldImplementQueueInterface()
     {
-        $this->assertClassImplements(PsrQueue::class, GearmanDestination::class);
+        $this->assertClassImplements(Queue::class, GearmanDestination::class);
     }
 
-    public function testShouldImplementPsrTopicInterface()
+    public function testShouldImplementTopicInterface()
     {
-        $this->assertClassImplements(PsrTopic::class, GearmanDestination::class);
+        $this->assertClassImplements(Topic::class, GearmanDestination::class);
     }
 
     public function testShouldAllowGetNameSetInConstructor()

Tests/GearmanProducerTest.php

@@ -8,8 +8,8 @@
 use Enqueue\Null\NullMessage;
 use Enqueue\Null\NullQueue;
 use Enqueue\Test\ClassExtensionTrait;
-use Interop\Queue\InvalidDestinationException;
-use Interop\Queue\InvalidMessageException;
+use Interop\Queue\Exception\InvalidDestinationException;
+use Interop\Queue\Exception\InvalidMessageException;
 use PHPUnit\Framework\TestCase;
 
 class GearmanProducerTest extends TestCase

Tests/Spec/GearmanSendToAndReceiveFromQueueTest.php

@@ -3,8 +3,8 @@
 namespace Enqueue\Gearman\Tests\Spec;
 
 use Enqueue\Gearman\GearmanConnectionFactory;
-use Interop\Queue\PsrContext;
-use Interop\Queue\PsrQueue;
+use Interop\Queue\Context;
+use Interop\Queue\Queue;
 use Interop\Queue\Spec\SendToAndReceiveFromQueueSpec;
 
 /**
@@ -23,12 +23,12 @@ protected function createContext()
     }
 
     /**
-     * @param PsrContext $context
-     * @param string     $queueName
+     * @param Context $context
+     * @param string  $queueName
      *
-     * @return PsrQueue
+     * @return Queue
      */
-    protected function createQueue(PsrContext $context, $queueName)
+    protected function createQueue(Context $context, $queueName)
     {
         return $context->createQueue($queueName.time());
     }

Tests/Spec/GearmanSendToAndReceiveNoWaitFromQueueTest.php

@@ -3,7 +3,7 @@
 namespace Enqueue\Gearman\Tests\Spec;
 
 use Enqueue\Gearman\GearmanConnectionFactory;
-use Interop\Queue\PsrContext;
+use Interop\Queue\Context;
 use Interop\Queue\Spec\SendToAndReceiveNoWaitFromQueueSpec;
 
 /**
@@ -24,7 +24,7 @@ protected function createContext()
     /**
      * {@inheritdoc}
      */
-    protected function createQueue(PsrContext $context, $queueName)
+    protected function createQueue(Context $context, $queueName)
     {
         return $context->createQueue($queueName.time());
     }