[pheastalk] Do not use depreacted classes.

makasim · makasim · commit 8e24a4a6a699 · 2018-09-28T14:36:47.000+03:00
diff --git a/PheanstalkConnectionFactory.php b/PheanstalkConnectionFactory.php
@@ -4,11 +4,11 @@
 
 namespace Enqueue\Pheanstalk;
 
-use Interop\Queue\PsrConnectionFactory;
-use Interop\Queue\PsrContext;
+use Interop\Queue\ConnectionFactory;
+use Interop\Queue\Context;
 use Pheanstalk\Pheanstalk;
 
-class PheanstalkConnectionFactory implements PsrConnectionFactory
+class PheanstalkConnectionFactory implements ConnectionFactory
 {
     /**
      * @var array
@@ -54,7 +54,7 @@ public function __construct($config = 'beanstalk:')
     /**
      * @return PheanstalkContext
      */
-    public function createContext(): PsrContext
+    public function createContext(): Context
     {
         return new PheanstalkContext($this->establishConnection());
     }
diff --git a/PheanstalkConsumer.php b/PheanstalkConsumer.php
@@ -4,14 +4,14 @@
 
 namespace Enqueue\Pheanstalk;
 
-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;
 use Pheanstalk\Job;
 use Pheanstalk\Pheanstalk;
 
-class PheanstalkConsumer implements PsrConsumer
+class PheanstalkConsumer implements Consumer
 {
     /**
      * @var PheanstalkDestination
@@ -32,15 +32,15 @@ public function __construct(PheanstalkDestination $destination, Pheanstalk $phea
     /**
      * @return PheanstalkDestination
      */
-    public function getQueue(): PsrQueue
+    public function getQueue(): Queue
     {
         return $this->destination;
     }
 
     /**
      * @return PheanstalkMessage
      */
-    public function receive(int $timeout = 0): ?PsrMessage
+    public function receive(int $timeout = 0): ?Message
     {
         if (0 === $timeout) {
             while (true) {
@@ -60,7 +60,7 @@ public function receive(int $timeout = 0): ?PsrMessage
     /**
      * @return PheanstalkMessage
      */
-    public function receiveNoWait(): ?PsrMessage
+    public function receiveNoWait(): ?Message
     {
         if ($job = $this->pheanstalk->reserveFromTube($this->destination->getName(), 0)) {
             return $this->convertJobToMessage($job);
@@ -72,7 +72,7 @@ public function receiveNoWait(): ?PsrMessage
     /**
      * @param PheanstalkMessage $message
      */
-    public function acknowledge(PsrMessage $message): void
+    public function acknowledge(Message $message): void
     {
         InvalidMessageException::assertMessageInstanceOf($message, PheanstalkMessage::class);
 
@@ -86,7 +86,7 @@ public function acknowledge(PsrMessage $message): void
     /**
      * @param PheanstalkMessage $message
      */
-    public function reject(PsrMessage $message, bool $requeue = false): void
+    public function reject(Message $message, bool $requeue = false): void
     {
         $this->acknowledge($message);
 
diff --git a/PheanstalkContext.php b/PheanstalkContext.php
@@ -4,21 +4,21 @@
 
 namespace Enqueue\Pheanstalk;
 
-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;
+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;
 use Pheanstalk\Pheanstalk;
 
-class PheanstalkContext implements PsrContext
+class PheanstalkContext implements Context
 {
     /**
      * @var Pheanstalk
@@ -33,36 +33,36 @@ public function __construct(Pheanstalk $pheanstalk)
     /**
      * @return PheanstalkMessage
      */
-    public function createMessage(string $body = '', array $properties = [], array $headers = []): PsrMessage
+    public function createMessage(string $body = '', array $properties = [], array $headers = []): Message
     {
         return new PheanstalkMessage($body, $properties, $headers);
     }
 
     /**
      * @return PheanstalkDestination
      */
-    public function createTopic(string $topicName): PsrTopic
+    public function createTopic(string $topicName): Topic
     {
         return new PheanstalkDestination($topicName);
     }
 
     /**
      * @return PheanstalkDestination
      */
-    public function createQueue(string $queueName): PsrQueue
+    public function createQueue(string $queueName): Queue
     {
         return new PheanstalkDestination($queueName);
     }
 
-    public function createTemporaryQueue(): PsrQueue
+    public function createTemporaryQueue(): Queue
     {
         throw TemporaryQueueNotSupportedException::providerDoestNotSupportIt();
     }
 
     /**
      * @return PheanstalkProducer
      */
-    public function createProducer(): PsrProducer
+    public function createProducer(): Producer
     {
         return new PheanstalkProducer($this->pheanstalk);
     }
@@ -72,7 +72,7 @@ public function createProducer(): PsrProducer
      *
      * @return PheanstalkConsumer
      */
-    public function createConsumer(PsrDestination $destination): PsrConsumer
+    public function createConsumer(Destination $destination): Consumer
     {
         InvalidDestinationException::assertDestinationInstanceOf($destination, PheanstalkDestination::class);
 
@@ -84,12 +84,12 @@ public function close(): void
         $this->pheanstalk->getConnection()->disconnect();
     }
 
-    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();
     }
diff --git a/PheanstalkDestination.php b/PheanstalkDestination.php
@@ -4,10 +4,10 @@
 
 namespace Enqueue\Pheanstalk;
 
-use Interop\Queue\PsrQueue;
-use Interop\Queue\PsrTopic;
+use Interop\Queue\Queue;
+use Interop\Queue\Topic;
 
-class PheanstalkDestination implements PsrQueue, PsrTopic
+class PheanstalkDestination implements Queue, Topic
 {
     /**
      * @var string
diff --git a/PheanstalkMessage.php b/PheanstalkMessage.php
@@ -4,11 +4,11 @@
 
 namespace Enqueue\Pheanstalk;
 
-use Interop\Queue\PsrMessage;
+use Interop\Queue\Message;
 use Pheanstalk\Job;
 use Pheanstalk\Pheanstalk;
 
-class PheanstalkMessage implements PsrMessage, \JsonSerializable
+class PheanstalkMessage implements Message, \JsonSerializable
 {
     /**
      * @var string
diff --git a/PheanstalkProducer.php b/PheanstalkProducer.php
@@ -4,14 +4,14 @@
 
 namespace Enqueue\Pheanstalk;
 
-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 Pheanstalk\Pheanstalk;
 
-class PheanstalkProducer implements PsrProducer
+class PheanstalkProducer implements Producer
 {
     /**
      * @var Pheanstalk
@@ -27,7 +27,7 @@ public function __construct(Pheanstalk $pheanstalk)
      * @param PheanstalkDestination $destination
      * @param PheanstalkMessage     $message
      */
-    public function send(PsrDestination $destination, PsrMessage $message): void
+    public function send(Destination $destination, Message $message): void
     {
         InvalidDestinationException::assertDestinationInstanceOf($destination, PheanstalkDestination::class);
         InvalidMessageException::assertMessageInstanceOf($message, PheanstalkMessage::class);
@@ -52,7 +52,7 @@ public function send(PsrDestination $destination, PsrMessage $message): void
     /**
      * @return PheanstalkProducer
      */
-    public function setDeliveryDelay(int $deliveryDelay = null): PsrProducer
+    public function setDeliveryDelay(int $deliveryDelay = null): Producer
     {
         if (null === $deliveryDelay) {
             return $this;
@@ -69,7 +69,7 @@ public function getDeliveryDelay(): ?int
     /**
      * @return PheanstalkProducer
      */
-    public function setPriority(int $priority = null): PsrProducer
+    public function setPriority(int $priority = null): Producer
     {
         if (null === $priority) {
             return $this;
@@ -86,7 +86,7 @@ public function getPriority(): ?int
     /**
      * @return PheanstalkProducer
      */
-    public function setTimeToLive(int $timeToLive = null): PsrProducer
+    public function setTimeToLive(int $timeToLive = null): Producer
     {
         if (null === $timeToLive) {
             return $this;
diff --git a/Tests/PheanstalkContextTest.php b/Tests/PheanstalkContextTest.php
@@ -5,9 +5,9 @@
 use Enqueue\Null\NullQueue;
 use Enqueue\Pheanstalk\PheanstalkContext;
 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 Pheanstalk\Connection;
 use Pheanstalk\Pheanstalk;
 use PHPUnit\Framework\TestCase;
@@ -16,9 +16,9 @@ class PheanstalkContextTest extends TestCase
 {
     use ClassExtensionTrait;
 
-    public function testShouldImplementPsrContextInterface()
+    public function testShouldImplementContextInterface()
     {
-        $this->assertClassImplements(PsrContext::class, PheanstalkContext::class);
+        $this->assertClassImplements(Context::class, PheanstalkContext::class);
     }
 
     public function testCouldBeConstructedWithPheanstalkAsFirstArgument()
diff --git a/Tests/PheanstalkDestinationTest.php b/Tests/PheanstalkDestinationTest.php
@@ -4,22 +4,22 @@
 
 use Enqueue\Pheanstalk\PheanstalkDestination;
 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 PheanstalkDestinationTest extends TestCase
 {
     use ClassExtensionTrait;
 
-    public function testShouldImplementPsrQueueInterface()
+    public function testShouldImplementQueueInterface()
     {
-        $this->assertClassImplements(PsrQueue::class, PheanstalkDestination::class);
+        $this->assertClassImplements(Queue::class, PheanstalkDestination::class);
     }
 
-    public function testShouldImplementPsrTopicInterface()
+    public function testShouldImplementTopicInterface()
     {
-        $this->assertClassImplements(PsrTopic::class, PheanstalkDestination::class);
+        $this->assertClassImplements(Topic::class, PheanstalkDestination::class);
     }
 
     public function testShouldAllowGetNameSetInConstructor()
diff --git a/Tests/PheanstalkProducerTest.php b/Tests/PheanstalkProducerTest.php
@@ -8,8 +8,8 @@
 use Enqueue\Pheanstalk\PheanstalkMessage;
 use Enqueue\Pheanstalk\PheanstalkProducer;
 use Enqueue\Test\ClassExtensionTrait;
-use Interop\Queue\InvalidDestinationException;
-use Interop\Queue\InvalidMessageException;
+use Interop\Queue\Exception\InvalidDestinationException;
+use Interop\Queue\Exception\InvalidMessageException;
 use Pheanstalk\Pheanstalk;
 use PHPUnit\Framework\TestCase;
 
diff --git a/Tests/Spec/PheanstalkSendToAndReceiveFromQueueTest.php b/Tests/Spec/PheanstalkSendToAndReceiveFromQueueTest.php
@@ -3,8 +3,8 @@
 namespace Enqueue\Pheanstalk\Tests\Spec;
 
 use Enqueue\Pheanstalk\PheanstalkConnectionFactory;
-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());
     }
diff --git a/Tests/Spec/PheanstalkSendToAndReceiveNoWaitFromQueueTest.php b/Tests/Spec/PheanstalkSendToAndReceiveNoWaitFromQueueTest.php
@@ -3,7 +3,7 @@
 namespace Enqueue\Pheanstalk\Tests\Spec;
 
 use Enqueue\Pheanstalk\PheanstalkConnectionFactory;
-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());
     }
diff --git a/Tests/Spec/PheanstalkSendToTopicAndReceiveFromQueueTest.php b/Tests/Spec/PheanstalkSendToTopicAndReceiveFromQueueTest.php
diff --git a/Tests/Spec/PheanstalkSendToTopicAndReceiveNoWaitFromQueueTest.php b/Tests/Spec/PheanstalkSendToTopicAndReceiveNoWaitFromQueueTest.php

Original file line number	Diff line number	Diff line change
`@@ -4,21 +4,21 @@`
`4`	`4`
`5`	`5`	`namespace Enqueue\Pheanstalk;`
`6`	`6`
`7`		`-use Interop\Queue\InvalidDestinationException;`
`8`		`-use Interop\Queue\PsrConsumer;`
`9`		`-use Interop\Queue\PsrContext;`
`10`		`-use Interop\Queue\PsrDestination;`
`11`		`-use Interop\Queue\PsrMessage;`
`12`		`-use Interop\Queue\PsrProducer;`
`13`		`-use Interop\Queue\PsrQueue;`
`14`		`-use Interop\Queue\PsrSubscriptionConsumer;`
`15`		`-use Interop\Queue\PsrTopic;`
`16`		`-use Interop\Queue\PurgeQueueNotSupportedException;`
`17`		`-use Interop\Queue\SubscriptionConsumerNotSupportedException;`
`18`		`-use Interop\Queue\TemporaryQueueNotSupportedException;`
	`7`	`+use Interop\Queue\Consumer;`
	`8`	`+use Interop\Queue\Context;`
	`9`	`+use Interop\Queue\Destination;`
	`10`	`+use Interop\Queue\Exception\InvalidDestinationException;`
	`11`	`+use Interop\Queue\Exception\PurgeQueueNotSupportedException;`
	`12`	`+use Interop\Queue\Exception\SubscriptionConsumerNotSupportedException;`
	`13`	`+use Interop\Queue\Exception\TemporaryQueueNotSupportedException;`
	`14`	`+use Interop\Queue\Message;`
	`15`	`+use Interop\Queue\Producer;`
	`16`	`+use Interop\Queue\Queue;`
	`17`	`+use Interop\Queue\SubscriptionConsumer;`
	`18`	`+use Interop\Queue\Topic;`
`19`	`19`	`use Pheanstalk\Pheanstalk;`
`20`	`20`
`21`		`-class PheanstalkContext implements PsrContext`
	`21`	`+class PheanstalkContext implements Context`
`22`	`22`	`{`
`23`	`23`	`/**`
`24`	`24`	`* @var Pheanstalk`
`@@ -33,36 +33,36 @@ public function __construct(Pheanstalk $pheanstalk)`
`33`	`33`	`/**`
`34`	`34`	`* @return PheanstalkMessage`
`35`	`35`	`*/`
`36`		`- public function createMessage(string $body = '', array $properties = [], array $headers = []): PsrMessage`
	`36`	`+ public function createMessage(string $body = '', array $properties = [], array $headers = []): Message`
`37`	`37`	`{`
`38`	`38`	`return new PheanstalkMessage($body, $properties, $headers);`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`/**`
`42`	`42`	`* @return PheanstalkDestination`
`43`	`43`	`*/`
`44`		`- public function createTopic(string $topicName): PsrTopic`
	`44`	`+ public function createTopic(string $topicName): Topic`
`45`	`45`	`{`
`46`	`46`	`return new PheanstalkDestination($topicName);`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`/**`
`50`	`50`	`* @return PheanstalkDestination`
`51`	`51`	`*/`
`52`		`- public function createQueue(string $queueName): PsrQueue`
	`52`	`+ public function createQueue(string $queueName): Queue`
`53`	`53`	`{`
`54`	`54`	`return new PheanstalkDestination($queueName);`
`55`	`55`	`}`
`56`	`56`
`57`		`- public function createTemporaryQueue(): PsrQueue`
	`57`	`+ public function createTemporaryQueue(): Queue`
`58`	`58`	`{`
`59`	`59`	`throw TemporaryQueueNotSupportedException::providerDoestNotSupportIt();`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`/**`
`63`	`63`	`* @return PheanstalkProducer`
`64`	`64`	`*/`
`65`		`- public function createProducer(): PsrProducer`
	`65`	`+ public function createProducer(): Producer`
`66`	`66`	`{`
`67`	`67`	`return new PheanstalkProducer($this->pheanstalk);`
`68`	`68`	`}`
`@@ -72,7 +72,7 @@ public function createProducer(): PsrProducer`
`72`	`72`	`*`
`73`	`73`	`* @return PheanstalkConsumer`
`74`	`74`	`*/`
`75`		`- public function createConsumer(PsrDestination $destination): PsrConsumer`
	`75`	`+ public function createConsumer(Destination $destination): Consumer`
`76`	`76`	`{`
`77`	`77`	`InvalidDestinationException::assertDestinationInstanceOf($destination, PheanstalkDestination::class);`
`78`	`78`
`@@ -84,12 +84,12 @@ public function close(): void`
`84`	`84`	`$this->pheanstalk->getConnection()->disconnect();`
`85`	`85`	`}`
`86`	`86`
`87`		`- public function createSubscriptionConsumer(): PsrSubscriptionConsumer`
	`87`	`+ public function createSubscriptionConsumer(): SubscriptionConsumer`
`88`	`88`	`{`
`89`	`89`	`throw SubscriptionConsumerNotSupportedException::providerDoestNotSupportIt();`
`90`	`90`	`}`
`91`	`91`
`92`		`- public function purgeQueue(PsrQueue $queue): void`
	`92`	`+ public function purgeQueue(Queue $queue): void`
`93`	`93`	`{`
`94`	`94`	`throw PurgeQueueNotSupportedException::providerDoestNotSupportIt();`
`95`	`95`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,22 +4,22 @@`
`4`	`4`
`5`	`5`	`use Enqueue\Pheanstalk\PheanstalkDestination;`
`6`	`6`	`use Enqueue\Test\ClassExtensionTrait;`
`7`		`-use Interop\Queue\PsrQueue;`
`8`		`-use Interop\Queue\PsrTopic;`
	`7`	`+use Interop\Queue\Queue;`
	`8`	`+use Interop\Queue\Topic;`
`9`	`9`	`use PHPUnit\Framework\TestCase;`
`10`	`10`
`11`	`11`	`class PheanstalkDestinationTest extends TestCase`
`12`	`12`	`{`
`13`	`13`	`use ClassExtensionTrait;`
`14`	`14`
`15`		`- public function testShouldImplementPsrQueueInterface()`
	`15`	`+ public function testShouldImplementQueueInterface()`
`16`	`16`	`{`
`17`		`- $this->assertClassImplements(PsrQueue::class, PheanstalkDestination::class);`
	`17`	`+ $this->assertClassImplements(Queue::class, PheanstalkDestination::class);`
`18`	`18`	`}`
`19`	`19`
`20`		`- public function testShouldImplementPsrTopicInterface()`
	`20`	`+ public function testShouldImplementTopicInterface()`
`21`	`21`	`{`
`22`		`- $this->assertClassImplements(PsrTopic::class, PheanstalkDestination::class);`
	`22`	`+ $this->assertClassImplements(Topic::class, PheanstalkDestination::class);`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`public function testShouldAllowGetNameSetInConstructor()`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@`
`3`	`3`	`namespace Enqueue\Pheanstalk\Tests\Spec;`
`4`	`4`
`5`	`5`	`use Enqueue\Pheanstalk\PheanstalkConnectionFactory;`
`6`		`-use Interop\Queue\PsrContext;`
`7`		`-use Interop\Queue\PsrQueue;`
	`6`	`+use Interop\Queue\Context;`
	`7`	`+use Interop\Queue\Queue;`
`8`	`8`	`use Interop\Queue\Spec\SendToAndReceiveFromQueueSpec;`
`9`	`9`
`10`	`10`	`/**`
`@@ -23,12 +23,12 @@ protected function createContext()`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`/**`
`26`		`- * @param PsrContext $context`
`27`		`- * @param string $queueName`
	`26`	`+ * @param Context $context`
	`27`	`+ * @param string $queueName`
`28`	`28`	`*`
`29`		`- * @return PsrQueue`
	`29`	`+ * @return Queue`
`30`	`30`	`*/`
`31`		`- protected function createQueue(PsrContext $context, $queueName)`
	`31`	`+ protected function createQueue(Context $context, $queueName)`
`32`	`32`	`{`
`33`	`33`	`return $context->createQueue($queueName.time());`
`34`	`34`	`}`