diff --git a/pkg/amqp-bunny/AmqpConnectionFactory.php b/pkg/amqp-bunny/AmqpConnectionFactory.php index a55658801..241929abe 100644 --- a/pkg/amqp-bunny/AmqpConnectionFactory.php +++ b/pkg/amqp-bunny/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; class AmqpConnectionFactory implements InteropAmqpConnectionFactory, DelayStrategyAware { @@ -46,7 +46,7 @@ public function __construct($config = 'amqp:') /** * @return AmqpContext */ - public function createContext(): PsrContext + public function createContext(): Context { if ($this->config->isLazy()) { $context = new AmqpContext(function () { diff --git a/pkg/amqp-bunny/AmqpConsumer.php b/pkg/amqp-bunny/AmqpConsumer.php index 52cded16f..f1b52a99d 100644 --- a/pkg/amqp-bunny/AmqpConsumer.php +++ b/pkg/amqp-bunny/AmqpConsumer.php @@ -5,13 +5,13 @@ namespace Enqueue\AmqpBunny; use Bunny\Channel; -use Bunny\Message; +use Bunny\Message as BunnyMessage; 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; class AmqpConsumer implements InteropAmqpConsumer { @@ -81,7 +81,7 @@ public function setFlags(int $flags): void /** * @return InteropAmqpQueue */ - public function getQueue(): PsrQueue + public function getQueue(): Queue { return $this->queue; } @@ -89,7 +89,7 @@ public function getQueue(): PsrQueue /** * @return InteropAmqpMessage */ - public function receive(int $timeout = 0): ?PsrMessage + public function receive(int $timeout = 0): ?Message { $end = microtime(true) + ($timeout / 1000); @@ -107,7 +107,7 @@ public function receive(int $timeout = 0): ?PsrMessage /** * @return InteropAmqpMessage */ - public function receiveNoWait(): ?PsrMessage + public function receiveNoWait(): ?Message { if ($message = $this->channel->get($this->queue->getQueueName(), (bool) ($this->getFlags() & InteropAmqpConsumer::FLAG_NOACK))) { return $this->context->convertMessage($message); @@ -119,22 +119,22 @@ public function receiveNoWait(): ?PsrMessage /** * @param InteropAmqpMessage $message */ - public function acknowledge(PsrMessage $message): void + public function acknowledge(Message $message): void { InvalidMessageException::assertMessageInstanceOf($message, InteropAmqpMessage::class); - $bunnyMessage = new Message('', $message->getDeliveryTag(), '', '', '', [], ''); + $bunnyMessage = new BunnyMessage('', $message->getDeliveryTag(), '', '', '', [], ''); $this->channel->ack($bunnyMessage); } /** * @param InteropAmqpMessage $message */ - public function reject(PsrMessage $message, bool $requeue = false): void + public function reject(Message $message, bool $requeue = false): void { InvalidMessageException::assertMessageInstanceOf($message, InteropAmqpMessage::class); - $bunnyMessage = new Message('', $message->getDeliveryTag(), '', '', '', [], ''); + $bunnyMessage = new BunnyMessage('', $message->getDeliveryTag(), '', '', '', [], ''); $this->channel->reject($bunnyMessage, $requeue); } } diff --git a/pkg/amqp-bunny/AmqpContext.php b/pkg/amqp-bunny/AmqpContext.php index 824245067..9338e12b0 100644 --- a/pkg/amqp-bunny/AmqpContext.php +++ b/pkg/amqp-bunny/AmqpContext.php @@ -5,7 +5,7 @@ namespace Enqueue\AmqpBunny; use Bunny\Channel; -use Bunny\Message; +use Bunny\Message as BunnyMessage; use Enqueue\AmqpTools\DelayStrategyAware; use Enqueue\AmqpTools\DelayStrategyAwareTrait; use Interop\Amqp\AmqpBind as InteropAmqpBind; @@ -18,15 +18,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; class AmqpContext implements InteropAmqpContext, DelayStrategyAware { @@ -73,7 +73,7 @@ public function __construct($bunnyChannel, 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); } @@ -81,7 +81,7 @@ public function createMessage(string $body = '', array $properties = [], array $ /** * @return InteropAmqpQueue */ - public function createQueue(string $name): PsrQueue + public function createQueue(string $name): Queue { return new AmqpQueue($name); } @@ -89,7 +89,7 @@ public function createQueue(string $name): PsrQueue /** * @return InteropAmqpTopic */ - public function createTopic(string $name): PsrTopic + public function createTopic(string $name): Topic { return new AmqpTopic($name); } @@ -99,9 +99,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) ; @@ -119,7 +119,7 @@ public function createConsumer(PsrDestination $destination): PsrConsumer /** * @return AmqpSubscriptionConsumer */ - public function createSubscriptionConsumer(): PsrSubscriptionConsumer + public function createSubscriptionConsumer(): SubscriptionConsumer { return new AmqpSubscriptionConsumer($this); } @@ -127,7 +127,7 @@ public function createSubscriptionConsumer(): PsrSubscriptionConsumer /** * @return AmqpProducer */ - public function createProducer(): PsrProducer + public function createProducer(): Producer { $producer = new AmqpProducer($this->getBunnyChannel(), $this); $producer->setDelayStrategy($this->delayStrategy); @@ -138,7 +138,7 @@ public function createProducer(): PsrProducer /** * @return InteropAmqpQueue */ - public function createTemporaryQueue(): PsrQueue + public function createTemporaryQueue(): Queue { $frame = $this->getBunnyChannel()->queueDeclare('', false, false, true, false); @@ -199,7 +199,7 @@ public function deleteQueue(InteropAmqpQueue $queue): void /** * @param InteropAmqpQueue $queue */ - public function purgeQueue(PsrQueue $queue): void + public function purgeQueue(Queue $queue): void { $this->getBunnyChannel()->queuePurge( $queue->getQueueName(), @@ -309,7 +309,7 @@ public function getBunnyChannel(): Channel /** * @internal It must be used here and in the consumer only */ - public function convertMessage(Message $bunnyMessage): InteropAmqpMessage + public function convertMessage(BunnyMessage $bunnyMessage): InteropAmqpMessage { $headers = $bunnyMessage->headers; diff --git a/pkg/amqp-bunny/AmqpProducer.php b/pkg/amqp-bunny/AmqpProducer.php index e98b2839d..e052cd312 100644 --- a/pkg/amqp-bunny/AmqpProducer.php +++ b/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\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; 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; diff --git a/pkg/amqp-bunny/AmqpSubscriptionConsumer.php b/pkg/amqp-bunny/AmqpSubscriptionConsumer.php index 6aea17c42..6d7a49469 100644 --- a/pkg/amqp-bunny/AmqpSubscriptionConsumer.php +++ b/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\Exception; -use Interop\Queue\PsrConsumer; +use Interop\Queue\Consumer; +use Interop\Queue\Exception\Exception; 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))); diff --git a/pkg/amqp-bunny/Tests/AmqpConnectionFactoryTest.php b/pkg/amqp-bunny/Tests/AmqpConnectionFactoryTest.php index 782003ab8..56d819206 100644 --- a/pkg/amqp-bunny/Tests/AmqpConnectionFactoryTest.php +++ b/pkg/amqp-bunny/Tests/AmqpConnectionFactoryTest.php @@ -5,7 +5,7 @@ use Enqueue\AmqpBunny\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() diff --git a/pkg/amqp-bunny/Tests/AmqpConsumerTest.php b/pkg/amqp-bunny/Tests/AmqpConsumerTest.php index 35c7221e0..4f1f1a4c5 100644 --- a/pkg/amqp-bunny/Tests/AmqpConsumerTest.php +++ b/pkg/amqp-bunny/Tests/AmqpConsumerTest.php @@ -12,8 +12,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 PHPUnit\Framework\TestCase; class AmqpConsumerTest extends TestCase @@ -23,7 +23,7 @@ class AmqpConsumerTest extends TestCase public function testShouldImplementConsumerInterface() { - $this->assertClassImplements(PsrConsumer::class, AmqpConsumer::class); + $this->assertClassImplements(Consumer::class, AmqpConsumer::class); } public function testCouldBeConstructedWithContextAndQueueAsArguments() diff --git a/pkg/amqp-bunny/Tests/AmqpProducerTest.php b/pkg/amqp-bunny/Tests/AmqpProducerTest.php index ef08cad0e..6a476790b 100644 --- a/pkg/amqp-bunny/Tests/AmqpProducerTest.php +++ b/pkg/amqp-bunny/Tests/AmqpProducerTest.php @@ -11,12 +11,12 @@ use Interop\Amqp\Impl\AmqpMessage; use Interop\Amqp\Impl\AmqpQueue; use Interop\Amqp\Impl\AmqpTopic; -use Interop\Queue\DeliveryDelayNotSupportedException; -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\DeliveryDelayNotSupportedException; +use Interop\Queue\Exception\InvalidDestinationException; +use Interop\Queue\Exception\InvalidMessageException; +use Interop\Queue\Message; +use Interop\Queue\Producer; use PHPUnit\Framework\TestCase; class AmqpProducerTest extends TestCase @@ -28,9 +28,9 @@ public function testCouldBeConstructedWithRequiredArguments() new AmqpProducer($this->createBunnyChannelMock(), $this->createContextMock()); } - public function testShouldImplementPsrProducerInterface() + public function testShouldImplementQueueInteropProducerInterface() { - $this->assertClassImplements(PsrProducer::class, AmqpProducer::class); + $this->assertClassImplements(Producer::class, AmqpProducer::class); } public function testShouldThrowExceptionWhenDestinationTypeIsInvalid() @@ -172,19 +172,19 @@ public function testShouldPropagateFlags() } /** - * @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); } /** diff --git a/pkg/amqp-bunny/Tests/AmqpSubscriptionConsumerTest.php b/pkg/amqp-bunny/Tests/AmqpSubscriptionConsumerTest.php index 4ee444175..fbc3bcbce 100644 --- a/pkg/amqp-bunny/Tests/AmqpSubscriptionConsumerTest.php +++ b/pkg/amqp-bunny/Tests/AmqpSubscriptionConsumerTest.php @@ -4,16 +4,16 @@ use Enqueue\AmqpBunny\AmqpContext; use Enqueue\AmqpBunny\AmqpSubscriptionConsumer; -use Interop\Queue\PsrSubscriptionConsumer; +use Interop\Queue\SubscriptionConsumer; use PHPUnit\Framework\TestCase; class AmqpSubscriptionConsumerTest extends TestCase { - public function testShouldImplementPsrSubscriptionConsumerInterface() + public function testShouldImplementQueueInteropSubscriptionConsumerInterface() { $rc = new \ReflectionClass(AmqpSubscriptionConsumer::class); - $this->assertTrue($rc->implementsInterface(PsrSubscriptionConsumer::class)); + $this->assertTrue($rc->implementsInterface(SubscriptionConsumer::class)); } public function testCouldBeConstructedWithAmqpContextAsFirstArgument() diff --git a/pkg/amqp-bunny/Tests/Spec/AmqpConnectionFactoryTest.php b/pkg/amqp-bunny/Tests/Spec/AmqpConnectionFactoryTest.php index d8d481527..6fd12b642 100644 --- a/pkg/amqp-bunny/Tests/Spec/AmqpConnectionFactoryTest.php +++ b/pkg/amqp-bunny/Tests/Spec/AmqpConnectionFactoryTest.php @@ -3,9 +3,9 @@ namespace Enqueue\AmqpBunny\Tests\Spec; use Enqueue\AmqpBunny\AmqpConnectionFactory; -use Interop\Queue\Spec\PsrConnectionFactorySpec; +use Interop\Queue\Spec\ConnectionFactorySpec; -class AmqpConnectionFactoryTest extends PsrConnectionFactorySpec +class AmqpConnectionFactoryTest extends ConnectionFactorySpec { protected function createConnectionFactory() { diff --git a/pkg/amqp-bunny/Tests/Spec/AmqpContextTest.php b/pkg/amqp-bunny/Tests/Spec/AmqpContextTest.php index 1f9c48343..60d4672e0 100644 --- a/pkg/amqp-bunny/Tests/Spec/AmqpContextTest.php +++ b/pkg/amqp-bunny/Tests/Spec/AmqpContextTest.php @@ -4,9 +4,9 @@ use Bunny\Channel; use Enqueue\AmqpBunny\AmqpContext; -use Interop\Queue\Spec\PsrContextSpec; +use Interop\Queue\Spec\ContextSpec; -class AmqpContextTest extends PsrContextSpec +class AmqpContextTest extends ContextSpec { protected function createContext() { diff --git a/pkg/amqp-bunny/Tests/Spec/AmqpSendAndReceiveDelayedMessageWithDelayPluginStrategyTest.php b/pkg/amqp-bunny/Tests/Spec/AmqpSendAndReceiveDelayedMessageWithDelayPluginStrategyTest.php index 1ef23b65b..ae4b74c6a 100644 --- a/pkg/amqp-bunny/Tests/Spec/AmqpSendAndReceiveDelayedMessageWithDelayPluginStrategyTest.php +++ b/pkg/amqp-bunny/Tests/Spec/AmqpSendAndReceiveDelayedMessageWithDelayPluginStrategyTest.php @@ -5,7 +5,7 @@ use Enqueue\AmqpBunny\AmqpConnectionFactory; use Enqueue\AmqpBunny\AmqpContext; use Enqueue\AmqpTools\RabbitMqDelayPluginDelayStrategy; -use Interop\Queue\PsrContext; +use Interop\Queue\Context; use Interop\Queue\Spec\SendAndReceiveDelayedMessageFromQueueSpec; /** @@ -34,7 +34,7 @@ protected function createContext() * * {@inheritdoc} */ - protected function createQueue(PsrContext $context, $queueName) + protected function createQueue(Context $context, $queueName) { $queue = parent::createQueue($context, $queueName); diff --git a/pkg/amqp-bunny/Tests/Spec/AmqpSendAndReceiveDelayedMessageWithDlxStrategyTest.php b/pkg/amqp-bunny/Tests/Spec/AmqpSendAndReceiveDelayedMessageWithDlxStrategyTest.php index 531389a02..00710aad7 100644 --- a/pkg/amqp-bunny/Tests/Spec/AmqpSendAndReceiveDelayedMessageWithDlxStrategyTest.php +++ b/pkg/amqp-bunny/Tests/Spec/AmqpSendAndReceiveDelayedMessageWithDlxStrategyTest.php @@ -5,7 +5,7 @@ use Enqueue\AmqpBunny\AmqpConnectionFactory; use Enqueue\AmqpBunny\AmqpContext; use Enqueue\AmqpTools\RabbitMqDlxDelayStrategy; -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); diff --git a/pkg/amqp-bunny/Tests/Spec/AmqpSendAndReceivePriorityMessagesFromQueueTest.php b/pkg/amqp-bunny/Tests/Spec/AmqpSendAndReceivePriorityMessagesFromQueueTest.php index c70f89079..bf2041c4b 100644 --- a/pkg/amqp-bunny/Tests/Spec/AmqpSendAndReceivePriorityMessagesFromQueueTest.php +++ b/pkg/amqp-bunny/Tests/Spec/AmqpSendAndReceivePriorityMessagesFromQueueTest.php @@ -4,7 +4,7 @@ use Enqueue\AmqpBunny\AmqpConnectionFactory; use Enqueue\AmqpBunny\AmqpContext; -use Interop\Queue\PsrContext; +use Interop\Queue\Context; use Interop\Queue\Spec\SendAndReceivePriorityMessagesFromQueueSpec; /** @@ -27,7 +27,7 @@ protected function createContext() * * @param AmqpContext $context */ - protected function createQueue(PsrContext $context, $queueName) + protected function createQueue(Context $context, $queueName) { $queue = $context->createQueue($queueName); $queue->setArguments(['x-max-priority' => 10]); diff --git a/pkg/amqp-bunny/Tests/Spec/AmqpSendAndReceiveTimeToLiveMessagesFromQueueTest.php b/pkg/amqp-bunny/Tests/Spec/AmqpSendAndReceiveTimeToLiveMessagesFromQueueTest.php index 5f5e07c0f..a50bdf98e 100644 --- a/pkg/amqp-bunny/Tests/Spec/AmqpSendAndReceiveTimeToLiveMessagesFromQueueTest.php +++ b/pkg/amqp-bunny/Tests/Spec/AmqpSendAndReceiveTimeToLiveMessagesFromQueueTest.php @@ -4,7 +4,7 @@ use Enqueue\AmqpBunny\AmqpConnectionFactory; use Enqueue\AmqpBunny\AmqpContext; -use Interop\Queue\PsrContext; +use Interop\Queue\Context; use Interop\Queue\Spec\SendAndReceiveTimeToLiveMessagesFromQueueSpec; /** @@ -27,7 +27,7 @@ protected function createContext() * * @param AmqpContext $context */ - protected function createQueue(PsrContext $context, $queueName) + protected function createQueue(Context $context, $queueName) { $queue = $context->createQueue($queueName); $context->declareQueue($queue); diff --git a/pkg/amqp-bunny/Tests/Spec/AmqpSendToAndReceiveFromQueueTest.php b/pkg/amqp-bunny/Tests/Spec/AmqpSendToAndReceiveFromQueueTest.php index 1111103c1..e715f5c80 100644 --- a/pkg/amqp-bunny/Tests/Spec/AmqpSendToAndReceiveFromQueueTest.php +++ b/pkg/amqp-bunny/Tests/Spec/AmqpSendToAndReceiveFromQueueTest.php @@ -4,7 +4,7 @@ use Enqueue\AmqpBunny\AmqpConnectionFactory; use Enqueue\AmqpBunny\AmqpContext; -use Interop\Queue\PsrContext; +use Interop\Queue\Context; use Interop\Queue\Spec\SendToAndReceiveFromQueueSpec; /** @@ -27,7 +27,7 @@ protected function createContext() * * @param AmqpContext $context */ - protected function createQueue(PsrContext $context, $queueName) + protected function createQueue(Context $context, $queueName) { $queue = $context->createQueue($queueName); $context->declareQueue($queue); diff --git a/pkg/amqp-bunny/Tests/Spec/AmqpSendToAndReceiveFromTopicTest.php b/pkg/amqp-bunny/Tests/Spec/AmqpSendToAndReceiveFromTopicTest.php index 4647239ef..ac7efaf1d 100644 --- a/pkg/amqp-bunny/Tests/Spec/AmqpSendToAndReceiveFromTopicTest.php +++ b/pkg/amqp-bunny/Tests/Spec/AmqpSendToAndReceiveFromTopicTest.php @@ -5,7 +5,7 @@ use Enqueue\AmqpBunny\AmqpConnectionFactory; use Enqueue\AmqpBunny\AmqpContext; use Interop\Amqp\AmqpTopic; -use Interop\Queue\PsrContext; +use Interop\Queue\Context; use Interop\Queue\Spec\SendToAndReceiveFromTopicSpec; /** @@ -28,7 +28,7 @@ protected function createContext() * * @param AmqpContext $context */ - protected function createTopic(PsrContext $context, $topicName) + protected function createTopic(Context $context, $topicName) { $topic = $context->createTopic($topicName); $topic->setType(AmqpTopic::TYPE_FANOUT); diff --git a/pkg/amqp-bunny/Tests/Spec/AmqpSendToAndReceiveNoWaitFromQueueTest.php b/pkg/amqp-bunny/Tests/Spec/AmqpSendToAndReceiveNoWaitFromQueueTest.php index 461e98680..9d37cade4 100644 --- a/pkg/amqp-bunny/Tests/Spec/AmqpSendToAndReceiveNoWaitFromQueueTest.php +++ b/pkg/amqp-bunny/Tests/Spec/AmqpSendToAndReceiveNoWaitFromQueueTest.php @@ -4,7 +4,7 @@ use Enqueue\AmqpBunny\AmqpConnectionFactory; use Enqueue\AmqpBunny\AmqpContext; -use Interop\Queue\PsrContext; +use Interop\Queue\Context; use Interop\Queue\Spec\SendToAndReceiveNoWaitFromQueueSpec; /** @@ -27,7 +27,7 @@ protected function createContext() * * @param AmqpContext $context */ - protected function createQueue(PsrContext $context, $queueName) + protected function createQueue(Context $context, $queueName) { $queue = $context->createQueue($queueName); $context->declareQueue($queue); diff --git a/pkg/amqp-bunny/Tests/Spec/AmqpSendToAndReceiveNoWaitFromTopicTest.php b/pkg/amqp-bunny/Tests/Spec/AmqpSendToAndReceiveNoWaitFromTopicTest.php index 8fa295b52..8947fe9f1 100644 --- a/pkg/amqp-bunny/Tests/Spec/AmqpSendToAndReceiveNoWaitFromTopicTest.php +++ b/pkg/amqp-bunny/Tests/Spec/AmqpSendToAndReceiveNoWaitFromTopicTest.php @@ -5,7 +5,7 @@ use Enqueue\AmqpBunny\AmqpConnectionFactory; use Enqueue\AmqpBunny\AmqpContext; use Interop\Amqp\AmqpTopic; -use Interop\Queue\PsrContext; +use Interop\Queue\Context; use Interop\Queue\Spec\SendToAndReceiveNoWaitFromTopicSpec; /** @@ -28,7 +28,7 @@ protected function createContext() * * @param AmqpContext $context */ - protected function createTopic(PsrContext $context, $topicName) + protected function createTopic(Context $context, $topicName) { $topic = $context->createTopic($topicName); $topic->setType(AmqpTopic::TYPE_FANOUT); diff --git a/pkg/amqp-bunny/Tests/Spec/AmqpSendToTopicAndReceiveFromQueueTest.php b/pkg/amqp-bunny/Tests/Spec/AmqpSendToTopicAndReceiveFromQueueTest.php index d5759a5dd..28deeac86 100644 --- a/pkg/amqp-bunny/Tests/Spec/AmqpSendToTopicAndReceiveFromQueueTest.php +++ b/pkg/amqp-bunny/Tests/Spec/AmqpSendToTopicAndReceiveFromQueueTest.php @@ -6,7 +6,7 @@ use Enqueue\AmqpBunny\AmqpContext; use Interop\Amqp\AmqpTopic; use Interop\Amqp\Impl\AmqpBind; -use Interop\Queue\PsrContext; +use Interop\Queue\Context; use Interop\Queue\Spec\SendToTopicAndReceiveFromQueueSpec; /** @@ -29,7 +29,7 @@ protected function createContext() * * @param AmqpContext $context */ - protected function createQueue(PsrContext $context, $queueName) + protected function createQueue(Context $context, $queueName) { $queue = $context->createQueue($queueName); $context->declareQueue($queue); @@ -45,7 +45,7 @@ protected function createQueue(PsrContext $context, $queueName) * * @param AmqpContext $context */ - protected function createTopic(PsrContext $context, $topicName) + protected function createTopic(Context $context, $topicName) { $topic = $context->createTopic($topicName); $topic->setType(AmqpTopic::TYPE_FANOUT); diff --git a/pkg/amqp-bunny/Tests/Spec/AmqpSendToTopicAndReceiveNoWaitFromQueueTest.php b/pkg/amqp-bunny/Tests/Spec/AmqpSendToTopicAndReceiveNoWaitFromQueueTest.php index 547c3b775..5facc03b2 100644 --- a/pkg/amqp-bunny/Tests/Spec/AmqpSendToTopicAndReceiveNoWaitFromQueueTest.php +++ b/pkg/amqp-bunny/Tests/Spec/AmqpSendToTopicAndReceiveNoWaitFromQueueTest.php @@ -6,7 +6,7 @@ use Enqueue\AmqpBunny\AmqpContext; use Interop\Amqp\AmqpTopic; use Interop\Amqp\Impl\AmqpBind; -use Interop\Queue\PsrContext; +use Interop\Queue\Context; use Interop\Queue\Spec\SendToTopicAndReceiveNoWaitFromQueueSpec; /** @@ -29,7 +29,7 @@ protected function createContext() * * @param AmqpContext $context */ - protected function createQueue(PsrContext $context, $queueName) + protected function createQueue(Context $context, $queueName) { $queue = $context->createQueue($queueName); $context->declareQueue($queue); @@ -45,7 +45,7 @@ protected function createQueue(PsrContext $context, $queueName) * * @param AmqpContext $context */ - protected function createTopic(PsrContext $context, $topicName) + protected function createTopic(Context $context, $topicName) { $topic = $context->createTopic($topicName); $topic->setType(AmqpTopic::TYPE_FANOUT); diff --git a/pkg/amqp-bunny/Tests/Spec/AmqpSslSendToAndReceiveFromQueueTest.php b/pkg/amqp-bunny/Tests/Spec/AmqpSslSendToAndReceiveFromQueueTest.php index 1f53ae398..f22c6d6a7 100644 --- a/pkg/amqp-bunny/Tests/Spec/AmqpSslSendToAndReceiveFromQueueTest.php +++ b/pkg/amqp-bunny/Tests/Spec/AmqpSslSendToAndReceiveFromQueueTest.php @@ -4,7 +4,7 @@ use Enqueue\AmqpBunny\AmqpConnectionFactory; use Enqueue\AmqpBunny\AmqpContext; -use Interop\Queue\PsrContext; +use Interop\Queue\Context; use Interop\Queue\Spec\SendToAndReceiveFromQueueSpec; /** @@ -48,7 +48,7 @@ protected function createContext() * * @param AmqpContext $context */ - protected function createQueue(PsrContext $context, $queueName) + protected function createQueue(Context $context, $queueName) { $queue = $context->createQueue($queueName); $context->declareQueue($queue); diff --git a/pkg/amqp-bunny/Tests/Spec/AmqpSubscriptionConsumerConsumeFromAllSubscribedQueuesTest.php b/pkg/amqp-bunny/Tests/Spec/AmqpSubscriptionConsumerConsumeFromAllSubscribedQueuesTest.php index c2aaec1e9..c2403792b 100644 --- a/pkg/amqp-bunny/Tests/Spec/AmqpSubscriptionConsumerConsumeFromAllSubscribedQueuesTest.php +++ b/pkg/amqp-bunny/Tests/Spec/AmqpSubscriptionConsumerConsumeFromAllSubscribedQueuesTest.php @@ -5,7 +5,7 @@ use Enqueue\AmqpBunny\AmqpConnectionFactory; use Enqueue\AmqpBunny\AmqpContext; use Interop\Amqp\AmqpQueue; -use Interop\Queue\PsrContext; +use Interop\Queue\Context; use Interop\Queue\Spec\SubscriptionConsumerConsumeFromAllSubscribedQueuesSpec; /** @@ -33,7 +33,7 @@ protected function createContext() * * {@inheritdoc} */ - protected function createQueue(PsrContext $context, $queueName) + protected function createQueue(Context $context, $queueName) { /** @var AmqpQueue $queue */ $queue = parent::createQueue($context, $queueName); diff --git a/pkg/amqp-bunny/Tests/Spec/AmqpSubscriptionConsumerConsumeUntilUnsubscribedTest.php b/pkg/amqp-bunny/Tests/Spec/AmqpSubscriptionConsumerConsumeUntilUnsubscribedTest.php index 5164332b2..63a3206be 100644 --- a/pkg/amqp-bunny/Tests/Spec/AmqpSubscriptionConsumerConsumeUntilUnsubscribedTest.php +++ b/pkg/amqp-bunny/Tests/Spec/AmqpSubscriptionConsumerConsumeUntilUnsubscribedTest.php @@ -5,7 +5,7 @@ use Enqueue\AmqpBunny\AmqpConnectionFactory; use Interop\Amqp\AmqpContext; use Interop\Amqp\AmqpQueue; -use Interop\Queue\PsrContext; +use Interop\Queue\Context; use Interop\Queue\Spec\SubscriptionConsumerConsumeUntilUnsubscribedSpec; /** @@ -42,7 +42,7 @@ protected function createContext() * * {@inheritdoc} */ - protected function createQueue(PsrContext $context, $queueName) + protected function createQueue(Context $context, $queueName) { /** @var AmqpQueue $queue */ $queue = parent::createQueue($context, $queueName); diff --git a/pkg/amqp-bunny/Tests/Spec/AmqpSubscriptionConsumerStopOnFalseTest.php b/pkg/amqp-bunny/Tests/Spec/AmqpSubscriptionConsumerStopOnFalseTest.php index 9d3616877..624d0a8f4 100644 --- a/pkg/amqp-bunny/Tests/Spec/AmqpSubscriptionConsumerStopOnFalseTest.php +++ b/pkg/amqp-bunny/Tests/Spec/AmqpSubscriptionConsumerStopOnFalseTest.php @@ -5,7 +5,7 @@ use Enqueue\AmqpBunny\AmqpConnectionFactory; use Interop\Amqp\AmqpContext; use Interop\Amqp\AmqpQueue; -use Interop\Queue\PsrContext; +use Interop\Queue\Context; use Interop\Queue\Spec\SubscriptionConsumerStopOnFalseSpec; /** @@ -33,7 +33,7 @@ protected function createContext() * * {@inheritdoc} */ - protected function createQueue(PsrContext $context, $queueName) + protected function createQueue(Context $context, $queueName) { /** @var AmqpQueue $queue */ $queue = parent::createQueue($context, $queueName); diff --git a/pkg/amqp-ext/AmqpConnectionFactory.php b/pkg/amqp-ext/AmqpConnectionFactory.php index 62460b4b8..177a786d8 100644 --- a/pkg/amqp-ext/AmqpConnectionFactory.php +++ b/pkg/amqp-ext/AmqpConnectionFactory.php @@ -7,7 +7,7 @@ use Enqueue\AmqpTools\DelayStrategyAwareTrait; use Enqueue\AmqpTools\RabbitMqDlxDelayStrategy; use Interop\Amqp\AmqpConnectionFactory as InteropAmqpConnectionFactory; -use Interop\Queue\PsrContext; +use Interop\Queue\Context; class AmqpConnectionFactory implements InteropAmqpConnectionFactory, DelayStrategyAware { @@ -44,7 +44,7 @@ public function __construct($config = 'amqp:') /** * @return AmqpContext */ - public function createContext(): PsrContext + public function createContext(): Context { if ($this->config->isLazy()) { $context = new AmqpContext(function () { diff --git a/pkg/amqp-ext/AmqpConsumer.php b/pkg/amqp-ext/AmqpConsumer.php index 64f4daeb3..03c949714 100644 --- a/pkg/amqp-ext/AmqpConsumer.php +++ b/pkg/amqp-ext/AmqpConsumer.php @@ -5,9 +5,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; class AmqpConsumer implements InteropAmqpConsumer { @@ -76,7 +76,7 @@ public function setFlags(int $flags): void /** * @return InteropAmqpQueue */ - public function getQueue(): PsrQueue + public function getQueue(): Queue { return $this->queue; } @@ -84,7 +84,7 @@ public function getQueue(): PsrQueue /** * @return InteropAmqpMessage */ - public function receive(int $timeout = 0): ?PsrMessage + public function receive(int $timeout = 0): ?Message { $end = microtime(true) + ($timeout / 1000); @@ -102,7 +102,7 @@ public function receive(int $timeout = 0): ?PsrMessage /** * @return InteropAmqpMessage */ - public function receiveNoWait(): ?PsrMessage + public function receiveNoWait(): ?Message { if ($extMessage = $this->getExtQueue()->get(Flags::convertConsumerFlags($this->flags))) { return $this->context->convertMessage($extMessage); @@ -114,7 +114,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); @@ -124,7 +124,7 @@ public function acknowledge(PsrMessage $message): void /** * @param InteropAmqpMessage $message */ - public function reject(PsrMessage $message, bool $requeue = false): void + public function reject(Message $message, bool $requeue = false): void { InvalidMessageException::assertMessageInstanceOf($message, InteropAmqpMessage::class); diff --git a/pkg/amqp-ext/AmqpContext.php b/pkg/amqp-ext/AmqpContext.php index 97b328a5c..5ea099da2 100644 --- a/pkg/amqp-ext/AmqpContext.php +++ b/pkg/amqp-ext/AmqpContext.php @@ -13,15 +13,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; class AmqpContext implements InteropAmqpContext, DelayStrategyAware { @@ -56,7 +56,7 @@ public function __construct($extChannel) /** * @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); } @@ -64,7 +64,7 @@ public function createMessage(string $body = '', array $properties = [], array $ /** * @return InteropAmqpTopic */ - public function createTopic(string $topicName): PsrTopic + public function createTopic(string $topicName): Topic { return new AmqpTopic($topicName); } @@ -89,7 +89,7 @@ public function declareTopic(InteropAmqpTopic $topic): void /** * @return InteropAmqpQueue */ - public function createQueue(string $queueName): PsrQueue + public function createQueue(string $queueName): Queue { return new AmqpQueue($queueName); } @@ -114,7 +114,7 @@ public function declareQueue(InteropAmqpQueue $queue): int /** * @param InteropAmqpQueue $queue */ - public function purgeQueue(PsrQueue $queue): void + public function purgeQueue(Queue $queue): void { InvalidDestinationException::assertDestinationInstanceOf($queue, InteropAmqpQueue::class); @@ -174,7 +174,7 @@ public function unbind(InteropAmqpBind $bind): void /** * @return InteropAmqpQueue */ - public function createTemporaryQueue(): PsrQueue + public function createTemporaryQueue(): Queue { $extQueue = new \AMQPQueue($this->getExtChannel()); $extQueue->setFlags(AMQP_EXCLUSIVE); @@ -190,7 +190,7 @@ public function createTemporaryQueue(): PsrQueue /** * @return AmqpProducer */ - public function createProducer(): PsrProducer + public function createProducer(): Producer { $producer = new AmqpProducer($this->getExtChannel(), $this); $producer->setDelayStrategy($this->delayStrategy); @@ -203,9 +203,9 @@ public function createProducer(): PsrProducer * * @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) ; @@ -220,7 +220,7 @@ public function createConsumer(PsrDestination $destination): PsrConsumer return new AmqpConsumer($this, $destination); } - public function createSubscriptionConsumer(): PsrSubscriptionConsumer + public function createSubscriptionConsumer(): SubscriptionConsumer { return new AmqpSubscriptionConsumer($this); } diff --git a/pkg/amqp-ext/AmqpProducer.php b/pkg/amqp-ext/AmqpProducer.php index 9e0a50b0f..0fe6b7a39 100644 --- a/pkg/amqp-ext/AmqpProducer.php +++ b/pkg/amqp-ext/AmqpProducer.php @@ -9,14 +9,14 @@ use Interop\Amqp\AmqpProducer as InteropAmqpProducer; use Interop\Amqp\AmqpQueue; use Interop\Amqp\AmqpTopic; -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; class AmqpProducer implements InteropAmqpProducer, DelayStrategyAware { @@ -57,9 +57,9 @@ public function __construct(\AMQPChannel $ampqChannel, AmqpContext $context) * @param AmqpTopic|AmqpQueue $destination * @param AmqpMessage $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, AmqpTopic::class) : InvalidDestinationException::assertDestinationInstanceOf($destination, AmqpQueue::class); @@ -72,7 +72,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 === $this->delayStrategy) { throw DeliveryDelayNotSupportedException::providerDoestNotSupportIt(); @@ -88,7 +88,7 @@ public function getDeliveryDelay(): ?int return $this->deliveryDelay; } - public function setPriority(int $priority = null): PsrProducer + public function setPriority(int $priority = null): Producer { $this->priority = $priority; @@ -100,7 +100,7 @@ public function getPriority(): ?int return $this->priority; } - public function setTimeToLive(int $timeToLive = null): PsrProducer + public function setTimeToLive(int $timeToLive = null): Producer { $this->timeToLive = $timeToLive; diff --git a/pkg/amqp-ext/AmqpSubscriptionConsumer.php b/pkg/amqp-ext/AmqpSubscriptionConsumer.php index 87c527683..4b03f6bbb 100644 --- a/pkg/amqp-ext/AmqpSubscriptionConsumer.php +++ b/pkg/amqp-ext/AmqpSubscriptionConsumer.php @@ -3,7 +3,7 @@ namespace Enqueue\AmqpExt; use Interop\Amqp\AmqpSubscriptionConsumer as InteropAmqpSubscriptionConsumer; -use Interop\Queue\PsrConsumer; +use Interop\Queue\Consumer; class AmqpSubscriptionConsumer implements InteropAmqpSubscriptionConsumer { @@ -83,7 +83,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))); @@ -106,7 +106,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))); diff --git a/pkg/amqp-ext/Tests/AmqpConnectionFactoryTest.php b/pkg/amqp-ext/Tests/AmqpConnectionFactoryTest.php index c830b3191..0bceae358 100644 --- a/pkg/amqp-ext/Tests/AmqpConnectionFactoryTest.php +++ b/pkg/amqp-ext/Tests/AmqpConnectionFactoryTest.php @@ -6,7 +6,7 @@ use Enqueue\AmqpExt\AmqpContext; use Enqueue\AmqpTools\RabbitMqDlxDelayStrategy; use Enqueue\Test\ClassExtensionTrait; -use Interop\Queue\PsrConnectionFactory; +use Interop\Queue\ConnectionFactory; use PHPUnit\Framework\TestCase; class AmqpConnectionFactoryTest extends TestCase @@ -15,7 +15,7 @@ class AmqpConnectionFactoryTest extends TestCase public function testShouldImplementConnectionFactoryInterface() { - $this->assertClassImplements(PsrConnectionFactory::class, AmqpConnectionFactory::class); + $this->assertClassImplements(ConnectionFactory::class, AmqpConnectionFactory::class); } public function testShouldSetRabbitMqDlxDelayStrategyIfRabbitMqSchemeExtensionPresent() diff --git a/pkg/amqp-ext/Tests/AmqpConsumerTest.php b/pkg/amqp-ext/Tests/AmqpConsumerTest.php index 6e6f3c828..bb515dda5 100644 --- a/pkg/amqp-ext/Tests/AmqpConsumerTest.php +++ b/pkg/amqp-ext/Tests/AmqpConsumerTest.php @@ -6,7 +6,7 @@ use Enqueue\AmqpExt\AmqpContext; use Enqueue\Test\ClassExtensionTrait; use Interop\Amqp\Impl\AmqpQueue; -use Interop\Queue\PsrConsumer; +use Interop\Queue\Consumer; use PHPUnit\Framework\TestCase; class AmqpConsumerTest extends TestCase @@ -15,7 +15,7 @@ class AmqpConsumerTest extends TestCase public function testShouldImplementConsumerInterface() { - $this->assertClassImplements(PsrConsumer::class, AmqpConsumer::class); + $this->assertClassImplements(Consumer::class, AmqpConsumer::class); } public function testCouldBeConstructedWithContextAndQueueAsArguments() diff --git a/pkg/amqp-ext/Tests/AmqpContextTest.php b/pkg/amqp-ext/Tests/AmqpContextTest.php index 4e2bfff8d..fa5c40969 100644 --- a/pkg/amqp-ext/Tests/AmqpContextTest.php +++ b/pkg/amqp-ext/Tests/AmqpContextTest.php @@ -12,17 +12,17 @@ use Interop\Amqp\Impl\AmqpMessage; use Interop\Amqp\Impl\AmqpQueue; use Interop\Amqp\Impl\AmqpTopic; -use Interop\Queue\InvalidDestinationException; -use Interop\Queue\PsrContext; +use Interop\Queue\Context; +use Interop\Queue\Exception\InvalidDestinationException; use PHPUnit\Framework\TestCase; class AmqpContextTest extends TestCase { use ClassExtensionTrait; - public function testShouldImplementPsrContextInterface() + public function testShouldImplementQueueInteropContextInterface() { - $this->assertClassImplements(PsrContext::class, AmqpContext::class); + $this->assertClassImplements(Context::class, AmqpContext::class); } public function testCouldBeConstructedWithExtChannelAsFirstArgument() diff --git a/pkg/amqp-ext/Tests/AmqpProducerTest.php b/pkg/amqp-ext/Tests/AmqpProducerTest.php index 9d3278123..30c2e99ef 100644 --- a/pkg/amqp-ext/Tests/AmqpProducerTest.php +++ b/pkg/amqp-ext/Tests/AmqpProducerTest.php @@ -4,7 +4,7 @@ use Enqueue\AmqpExt\AmqpProducer; use Enqueue\Test\ClassExtensionTrait; -use Interop\Queue\PsrProducer; +use Interop\Queue\Producer; use PHPUnit\Framework\TestCase; class AmqpProducerTest extends TestCase @@ -13,6 +13,6 @@ class AmqpProducerTest extends TestCase public function testShouldImplementProducerInterface() { - $this->assertClassImplements(PsrProducer::class, AmqpProducer::class); + $this->assertClassImplements(Producer::class, AmqpProducer::class); } } diff --git a/pkg/amqp-ext/Tests/AmqpSubscriptionConsumerTest.php b/pkg/amqp-ext/Tests/AmqpSubscriptionConsumerTest.php index 8ef4964b7..3650d6e1b 100644 --- a/pkg/amqp-ext/Tests/AmqpSubscriptionConsumerTest.php +++ b/pkg/amqp-ext/Tests/AmqpSubscriptionConsumerTest.php @@ -4,16 +4,16 @@ use Enqueue\AmqpExt\AmqpContext; use Enqueue\AmqpExt\AmqpSubscriptionConsumer; -use Interop\Queue\PsrSubscriptionConsumer; +use Interop\Queue\SubscriptionConsumer; use PHPUnit\Framework\TestCase; class AmqpSubscriptionConsumerTest extends TestCase { - public function testShouldImplementPsrSubscriptionConsumerInterface() + public function testShouldImplementQueueInteropSubscriptionConsumerInterface() { $rc = new \ReflectionClass(AmqpSubscriptionConsumer::class); - $this->assertTrue($rc->implementsInterface(PsrSubscriptionConsumer::class)); + $this->assertTrue($rc->implementsInterface(SubscriptionConsumer::class)); } public function testCouldBeConstructedWithAmqpContextAsFirstArgument() diff --git a/pkg/amqp-ext/Tests/Functional/AmqpConsumptionUseCasesTest.php b/pkg/amqp-ext/Tests/Functional/AmqpConsumptionUseCasesTest.php index 905fb6427..b480a1757 100644 --- a/pkg/amqp-ext/Tests/Functional/AmqpConsumptionUseCasesTest.php +++ b/pkg/amqp-ext/Tests/Functional/AmqpConsumptionUseCasesTest.php @@ -11,9 +11,9 @@ use Enqueue\Consumption\Result; use Enqueue\Test\RabbitManagementExtensionTrait; use Enqueue\Test\RabbitmqAmqpExtension; -use Interop\Queue\PsrContext; -use Interop\Queue\PsrMessage; -use Interop\Queue\PsrProcessor; +use Interop\Queue\Context; +use Interop\Queue\Message; +use Interop\Queue\Processor; use PHPUnit\Framework\TestCase; /** @@ -59,7 +59,7 @@ public function testConsumeOneMessageAndExit() $queueConsumer->consume(); - $this->assertInstanceOf(PsrMessage::class, $processor->lastProcessedMessage); + $this->assertInstanceOf(Message::class, $processor->lastProcessedMessage); $this->assertEquals(__METHOD__, $processor->lastProcessedMessage->getBody()); } @@ -92,22 +92,22 @@ 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()); } } -class StubProcessor implements PsrProcessor +class StubProcessor implements Processor { public $result = self::ACK; - /** @var PsrMessage */ + /** @var Message */ public $lastProcessedMessage; - public function process(PsrMessage $message, PsrContext $context) + public function process(Message $message, Context $context) { $this->lastProcessedMessage = $message; diff --git a/pkg/amqp-ext/Tests/Spec/AmqpMessageTest.php b/pkg/amqp-ext/Tests/Spec/AmqpMessageTest.php index ea36b648c..e11afd964 100644 --- a/pkg/amqp-ext/Tests/Spec/AmqpMessageTest.php +++ b/pkg/amqp-ext/Tests/Spec/AmqpMessageTest.php @@ -3,9 +3,9 @@ namespace Enqueue\AmqpExt\Tests\Spec; use Interop\Amqp\Impl\AmqpMessage; -use Interop\Queue\Spec\PsrMessageSpec; +use Interop\Queue\Spec\MessageSpec; -class AmqpMessageTest extends PsrMessageSpec +class AmqpMessageTest extends MessageSpec { /** * {@inheritdoc} diff --git a/pkg/amqp-ext/Tests/Spec/AmqpProducerTest.php b/pkg/amqp-ext/Tests/Spec/AmqpProducerTest.php index 5c988c101..3dead4d9f 100644 --- a/pkg/amqp-ext/Tests/Spec/AmqpProducerTest.php +++ b/pkg/amqp-ext/Tests/Spec/AmqpProducerTest.php @@ -3,12 +3,12 @@ namespace Enqueue\AmqpExt\Tests\Spec; use Enqueue\AmqpExt\AmqpConnectionFactory; -use Interop\Queue\Spec\PsrProducerSpec; +use Interop\Queue\Spec\ProducerSpec; /** * @group functional */ -class AmqpProducerTest extends PsrProducerSpec +class AmqpProducerTest extends ProducerSpec { /** * {@inheritdoc} diff --git a/pkg/amqp-ext/Tests/Spec/AmqpSendAndReceiveDelayedMessageWithDelayPluginStrategyTest.php b/pkg/amqp-ext/Tests/Spec/AmqpSendAndReceiveDelayedMessageWithDelayPluginStrategyTest.php index b3916896b..ac30c510f 100644 --- a/pkg/amqp-ext/Tests/Spec/AmqpSendAndReceiveDelayedMessageWithDelayPluginStrategyTest.php +++ b/pkg/amqp-ext/Tests/Spec/AmqpSendAndReceiveDelayedMessageWithDelayPluginStrategyTest.php @@ -5,7 +5,7 @@ use Enqueue\AmqpExt\AmqpConnectionFactory; use Enqueue\AmqpExt\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); diff --git a/pkg/amqp-ext/Tests/Spec/AmqpSendAndReceiveDelayedMessageWithDlxStrategyTest.php b/pkg/amqp-ext/Tests/Spec/AmqpSendAndReceiveDelayedMessageWithDlxStrategyTest.php index 251ea07db..311f82ab6 100644 --- a/pkg/amqp-ext/Tests/Spec/AmqpSendAndReceiveDelayedMessageWithDlxStrategyTest.php +++ b/pkg/amqp-ext/Tests/Spec/AmqpSendAndReceiveDelayedMessageWithDlxStrategyTest.php @@ -5,7 +5,7 @@ use Enqueue\AmqpExt\AmqpConnectionFactory; use Enqueue\AmqpExt\AmqpContext; use Enqueue\AmqpTools\RabbitMqDlxDelayStrategy; -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); diff --git a/pkg/amqp-ext/Tests/Spec/AmqpSendAndReceivePriorityMessagesFromQueueTest.php b/pkg/amqp-ext/Tests/Spec/AmqpSendAndReceivePriorityMessagesFromQueueTest.php index e8251eea0..0bfab937b 100644 --- a/pkg/amqp-ext/Tests/Spec/AmqpSendAndReceivePriorityMessagesFromQueueTest.php +++ b/pkg/amqp-ext/Tests/Spec/AmqpSendAndReceivePriorityMessagesFromQueueTest.php @@ -4,7 +4,7 @@ use Enqueue\AmqpExt\AmqpConnectionFactory; use Enqueue\AmqpExt\AmqpContext; -use Interop\Queue\PsrContext; +use Interop\Queue\Context; use Interop\Queue\Spec\SendAndReceivePriorityMessagesFromQueueSpec; /** @@ -27,7 +27,7 @@ protected function createContext() * * @param AmqpContext $context */ - protected function createQueue(PsrContext $context, $queueName) + protected function createQueue(Context $context, $queueName) { $queue = $context->createQueue($queueName); $queue->setArguments(['x-max-priority' => 10]); diff --git a/pkg/amqp-ext/Tests/Spec/AmqpSendAndReceiveTimeToLiveMessagesFromQueueTest.php b/pkg/amqp-ext/Tests/Spec/AmqpSendAndReceiveTimeToLiveMessagesFromQueueTest.php index 16a67127c..6f0d7b6cf 100644 --- a/pkg/amqp-ext/Tests/Spec/AmqpSendAndReceiveTimeToLiveMessagesFromQueueTest.php +++ b/pkg/amqp-ext/Tests/Spec/AmqpSendAndReceiveTimeToLiveMessagesFromQueueTest.php @@ -4,7 +4,7 @@ use Enqueue\AmqpExt\AmqpConnectionFactory; use Enqueue\AmqpExt\AmqpContext; -use Interop\Queue\PsrContext; +use Interop\Queue\Context; use Interop\Queue\Spec\SendAndReceiveTimeToLiveMessagesFromQueueSpec; /** @@ -27,7 +27,7 @@ protected function createContext() * * @param AmqpContext $context */ - protected function createQueue(PsrContext $context, $queueName) + protected function createQueue(Context $context, $queueName) { $queue = $context->createQueue($queueName); $context->declareQueue($queue); diff --git a/pkg/amqp-ext/Tests/Spec/AmqpSendToAndReceiveFromQueueTest.php b/pkg/amqp-ext/Tests/Spec/AmqpSendToAndReceiveFromQueueTest.php index 92436483b..9d4713dee 100644 --- a/pkg/amqp-ext/Tests/Spec/AmqpSendToAndReceiveFromQueueTest.php +++ b/pkg/amqp-ext/Tests/Spec/AmqpSendToAndReceiveFromQueueTest.php @@ -4,7 +4,7 @@ use Enqueue\AmqpExt\AmqpConnectionFactory; use Enqueue\AmqpExt\AmqpContext; -use Interop\Queue\PsrContext; +use Interop\Queue\Context; use Interop\Queue\Spec\SendToAndReceiveFromQueueSpec; /** @@ -27,7 +27,7 @@ protected function createContext() * * @param AmqpContext $context */ - protected function createQueue(PsrContext $context, $queueName) + protected function createQueue(Context $context, $queueName) { $queue = $context->createQueue($queueName); $context->declareQueue($queue); diff --git a/pkg/amqp-ext/Tests/Spec/AmqpSendToAndReceiveFromTopicTest.php b/pkg/amqp-ext/Tests/Spec/AmqpSendToAndReceiveFromTopicTest.php index c13da615e..629703303 100644 --- a/pkg/amqp-ext/Tests/Spec/AmqpSendToAndReceiveFromTopicTest.php +++ b/pkg/amqp-ext/Tests/Spec/AmqpSendToAndReceiveFromTopicTest.php @@ -5,7 +5,7 @@ use Enqueue\AmqpExt\AmqpConnectionFactory; use Enqueue\AmqpExt\AmqpContext; use Interop\Amqp\AmqpTopic; -use Interop\Queue\PsrContext; +use Interop\Queue\Context; use Interop\Queue\Spec\SendToAndReceiveFromTopicSpec; /** @@ -28,7 +28,7 @@ protected function createContext() * * @param AmqpContext $context */ - protected function createTopic(PsrContext $context, $topicName) + protected function createTopic(Context $context, $topicName) { $topic = $context->createTopic($topicName); $topic->setType(AmqpTopic::TYPE_FANOUT); diff --git a/pkg/amqp-ext/Tests/Spec/AmqpSendToAndReceiveNoWaitFromQueueTest.php b/pkg/amqp-ext/Tests/Spec/AmqpSendToAndReceiveNoWaitFromQueueTest.php index dd5035efa..c4e602f8d 100644 --- a/pkg/amqp-ext/Tests/Spec/AmqpSendToAndReceiveNoWaitFromQueueTest.php +++ b/pkg/amqp-ext/Tests/Spec/AmqpSendToAndReceiveNoWaitFromQueueTest.php @@ -4,7 +4,7 @@ use Enqueue\AmqpExt\AmqpConnectionFactory; use Enqueue\AmqpExt\AmqpContext; -use Interop\Queue\PsrContext; +use Interop\Queue\Context; use Interop\Queue\Spec\SendToAndReceiveNoWaitFromQueueSpec; /** @@ -27,7 +27,7 @@ protected function createContext() * * @param AmqpContext $context */ - protected function createQueue(PsrContext $context, $queueName) + protected function createQueue(Context $context, $queueName) { $queue = $context->createQueue($queueName); $context->declareQueue($queue); diff --git a/pkg/amqp-ext/Tests/Spec/AmqpSendToAndReceiveNoWaitFromTopicTest.php b/pkg/amqp-ext/Tests/Spec/AmqpSendToAndReceiveNoWaitFromTopicTest.php index 2db18a6ce..6a599c9f7 100644 --- a/pkg/amqp-ext/Tests/Spec/AmqpSendToAndReceiveNoWaitFromTopicTest.php +++ b/pkg/amqp-ext/Tests/Spec/AmqpSendToAndReceiveNoWaitFromTopicTest.php @@ -5,7 +5,7 @@ use Enqueue\AmqpExt\AmqpConnectionFactory; use Enqueue\AmqpExt\AmqpContext; use Interop\Amqp\AmqpTopic; -use Interop\Queue\PsrContext; +use Interop\Queue\Context; use Interop\Queue\Spec\SendToAndReceiveNoWaitFromTopicSpec; /** @@ -28,7 +28,7 @@ protected function createContext() * * @param AmqpContext $context */ - protected function createTopic(PsrContext $context, $topicName) + protected function createTopic(Context $context, $topicName) { $topic = $context->createTopic($topicName); $topic->setType(AmqpTopic::TYPE_FANOUT); diff --git a/pkg/amqp-ext/Tests/Spec/AmqpSendToTopicAndReceiveFromQueueTest.php b/pkg/amqp-ext/Tests/Spec/AmqpSendToTopicAndReceiveFromQueueTest.php index be29f1a4f..2f2e30d6b 100644 --- a/pkg/amqp-ext/Tests/Spec/AmqpSendToTopicAndReceiveFromQueueTest.php +++ b/pkg/amqp-ext/Tests/Spec/AmqpSendToTopicAndReceiveFromQueueTest.php @@ -6,7 +6,7 @@ use Enqueue\AmqpExt\AmqpContext; use Interop\Amqp\AmqpTopic; use Interop\Amqp\Impl\AmqpBind; -use Interop\Queue\PsrContext; +use Interop\Queue\Context; use Interop\Queue\Spec\SendToTopicAndReceiveFromQueueSpec; /** @@ -29,7 +29,7 @@ protected function createContext() * * @param AmqpContext $context */ - protected function createQueue(PsrContext $context, $queueName) + protected function createQueue(Context $context, $queueName) { $queue = $context->createQueue($queueName); $context->declareQueue($queue); @@ -45,7 +45,7 @@ protected function createQueue(PsrContext $context, $queueName) * * @param AmqpContext $context */ - protected function createTopic(PsrContext $context, $topicName) + protected function createTopic(Context $context, $topicName) { $topic = $context->createTopic($topicName); $topic->setType(AmqpTopic::TYPE_FANOUT); diff --git a/pkg/amqp-ext/Tests/Spec/AmqpSendToTopicAndReceiveNoWaitFromQueueTest.php b/pkg/amqp-ext/Tests/Spec/AmqpSendToTopicAndReceiveNoWaitFromQueueTest.php index fa6633052..b9d4510d5 100644 --- a/pkg/amqp-ext/Tests/Spec/AmqpSendToTopicAndReceiveNoWaitFromQueueTest.php +++ b/pkg/amqp-ext/Tests/Spec/AmqpSendToTopicAndReceiveNoWaitFromQueueTest.php @@ -6,7 +6,7 @@ use Enqueue\AmqpExt\AmqpContext; use Interop\Amqp\AmqpTopic; use Interop\Amqp\Impl\AmqpBind; -use Interop\Queue\PsrContext; +use Interop\Queue\Context; use Interop\Queue\Spec\SendToTopicAndReceiveNoWaitFromQueueSpec; /** @@ -29,7 +29,7 @@ protected function createContext() * * @param AmqpContext $context */ - protected function createQueue(PsrContext $context, $queueName) + protected function createQueue(Context $context, $queueName) { $queue = $context->createQueue($queueName); $context->declareQueue($queue); @@ -45,7 +45,7 @@ protected function createQueue(PsrContext $context, $queueName) * * @param AmqpContext $context */ - protected function createTopic(PsrContext $context, $topicName) + protected function createTopic(Context $context, $topicName) { $topic = $context->createTopic($topicName); $topic->setType(AmqpTopic::TYPE_FANOUT); diff --git a/pkg/amqp-ext/Tests/Spec/AmqpSslSendToAndReceiveFromQueueTest.php b/pkg/amqp-ext/Tests/Spec/AmqpSslSendToAndReceiveFromQueueTest.php index 4313b9b5e..31e4e175f 100644 --- a/pkg/amqp-ext/Tests/Spec/AmqpSslSendToAndReceiveFromQueueTest.php +++ b/pkg/amqp-ext/Tests/Spec/AmqpSslSendToAndReceiveFromQueueTest.php @@ -4,7 +4,7 @@ use Enqueue\AmqpExt\AmqpConnectionFactory; use Enqueue\AmqpExt\AmqpContext; -use Interop\Queue\PsrContext; +use Interop\Queue\Context; use Interop\Queue\Spec\SendToAndReceiveFromQueueSpec; /** @@ -41,7 +41,7 @@ protected function createContext() * * @param AmqpContext $context */ - protected function createQueue(PsrContext $context, $queueName) + protected function createQueue(Context $context, $queueName) { $queue = $context->createQueue($queueName); $context->declareQueue($queue); diff --git a/pkg/amqp-ext/Tests/Spec/AmqpSubscriptionConsumerConsumeFromAllSubscribedQueuesTest.php b/pkg/amqp-ext/Tests/Spec/AmqpSubscriptionConsumerConsumeFromAllSubscribedQueuesTest.php index d46f19e67..1adda733d 100644 --- a/pkg/amqp-ext/Tests/Spec/AmqpSubscriptionConsumerConsumeFromAllSubscribedQueuesTest.php +++ b/pkg/amqp-ext/Tests/Spec/AmqpSubscriptionConsumerConsumeFromAllSubscribedQueuesTest.php @@ -5,7 +5,7 @@ use Enqueue\AmqpExt\AmqpConnectionFactory; use Enqueue\AmqpExt\AmqpContext; use Interop\Amqp\AmqpQueue; -use Interop\Queue\PsrContext; +use Interop\Queue\Context; use Interop\Queue\Spec\SubscriptionConsumerConsumeFromAllSubscribedQueuesSpec; /** @@ -33,7 +33,7 @@ protected function createContext() * * {@inheritdoc} */ - protected function createQueue(PsrContext $context, $queueName) + protected function createQueue(Context $context, $queueName) { /** @var AmqpQueue $queue */ $queue = parent::createQueue($context, $queueName); diff --git a/pkg/amqp-ext/Tests/Spec/AmqpSubscriptionConsumerConsumeUntilUnsubscribedTest.php b/pkg/amqp-ext/Tests/Spec/AmqpSubscriptionConsumerConsumeUntilUnsubscribedTest.php index 123bd2e39..e77f657d6 100644 --- a/pkg/amqp-ext/Tests/Spec/AmqpSubscriptionConsumerConsumeUntilUnsubscribedTest.php +++ b/pkg/amqp-ext/Tests/Spec/AmqpSubscriptionConsumerConsumeUntilUnsubscribedTest.php @@ -5,7 +5,7 @@ use Enqueue\AmqpExt\AmqpConnectionFactory; use Interop\Amqp\AmqpContext; use Interop\Amqp\AmqpQueue; -use Interop\Queue\PsrContext; +use Interop\Queue\Context; use Interop\Queue\Spec\SubscriptionConsumerConsumeUntilUnsubscribedSpec; /** @@ -42,7 +42,7 @@ protected function createContext() * * {@inheritdoc} */ - protected function createQueue(PsrContext $context, $queueName) + protected function createQueue(Context $context, $queueName) { /** @var AmqpQueue $queue */ $queue = parent::createQueue($context, $queueName); diff --git a/pkg/amqp-ext/Tests/Spec/AmqpSubscriptionConsumerStopOnFalseTest.php b/pkg/amqp-ext/Tests/Spec/AmqpSubscriptionConsumerStopOnFalseTest.php index bf0aede32..424013f4a 100644 --- a/pkg/amqp-ext/Tests/Spec/AmqpSubscriptionConsumerStopOnFalseTest.php +++ b/pkg/amqp-ext/Tests/Spec/AmqpSubscriptionConsumerStopOnFalseTest.php @@ -5,7 +5,7 @@ use Enqueue\AmqpExt\AmqpConnectionFactory; use Interop\Amqp\AmqpContext; use Interop\Amqp\AmqpQueue; -use Interop\Queue\PsrContext; +use Interop\Queue\Context; use Interop\Queue\Spec\SubscriptionConsumerStopOnFalseSpec; /** @@ -33,7 +33,7 @@ protected function createContext() * * {@inheritdoc} */ - protected function createQueue(PsrContext $context, $queueName) + protected function createQueue(Context $context, $queueName) { /** @var AmqpQueue $queue */ $queue = parent::createQueue($context, $queueName); diff --git a/pkg/amqp-lib/AmqpConnectionFactory.php b/pkg/amqp-lib/AmqpConnectionFactory.php index 3a3d961b8..e6efc9100 100644 --- a/pkg/amqp-lib/AmqpConnectionFactory.php +++ b/pkg/amqp-lib/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); diff --git a/pkg/amqp-lib/AmqpConsumer.php b/pkg/amqp-lib/AmqpConsumer.php index 70071fb07..0218db6b2 100644 --- a/pkg/amqp-lib/AmqpConsumer.php +++ b/pkg/amqp-lib/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,7 +80,7 @@ public function setFlags(int $flags): void /** * @return InteropAmqpQueue */ - public function getQueue(): PsrQueue + public function getQueue(): Queue { return $this->queue; } @@ -88,7 +88,7 @@ public function getQueue(): PsrQueue /** * @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); diff --git a/pkg/amqp-lib/AmqpContext.php b/pkg/amqp-lib/AmqpContext.php index c7f90014a..b88b29b2a 100644 --- a/pkg/amqp-lib/AmqpContext.php +++ b/pkg/amqp-lib/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,7 +62,7 @@ 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); } @@ -70,7 +70,7 @@ public function createMessage(string $body = '', array $properties = [], array $ /** * @return InteropAmqpQueue */ - public function createQueue(string $name): PsrQueue + public function createQueue(string $name): Queue { return new AmqpQueue($name); } @@ -78,7 +78,7 @@ public function createQueue(string $name): PsrQueue /** * @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,7 +108,7 @@ public function createConsumer(PsrDestination $destination): PsrConsumer /** * @return AmqpSubscriptionConsumer */ - public function createSubscriptionConsumer(): PsrSubscriptionConsumer + public function createSubscriptionConsumer(): SubscriptionConsumer { return new AmqpSubscriptionConsumer($this); } @@ -116,7 +116,7 @@ public function createSubscriptionConsumer(): PsrSubscriptionConsumer /** * @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); diff --git a/pkg/amqp-lib/AmqpProducer.php b/pkg/amqp-lib/AmqpProducer.php index 6d7f2ded0..70e876793 100644 --- a/pkg/amqp-lib/AmqpProducer.php +++ b/pkg/amqp-lib/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; diff --git a/pkg/amqp-lib/AmqpSubscriptionConsumer.php b/pkg/amqp-lib/AmqpSubscriptionConsumer.php index 45feda5c9..541d37fd7 100644 --- a/pkg/amqp-lib/AmqpSubscriptionConsumer.php +++ b/pkg/amqp-lib/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))); diff --git a/pkg/amqp-lib/Tests/AmqpConnectionFactoryTest.php b/pkg/amqp-lib/Tests/AmqpConnectionFactoryTest.php index d3cbe537c..9db9f6288 100644 --- a/pkg/amqp-lib/Tests/AmqpConnectionFactoryTest.php +++ b/pkg/amqp-lib/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() diff --git a/pkg/amqp-lib/Tests/AmqpConsumerTest.php b/pkg/amqp-lib/Tests/AmqpConsumerTest.php index 81dc43fcc..854f38cd6 100644 --- a/pkg/amqp-lib/Tests/AmqpConsumerTest.php +++ b/pkg/amqp-lib/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() diff --git a/pkg/amqp-lib/Tests/AmqpProducerTest.php b/pkg/amqp-lib/Tests/AmqpProducerTest.php index 8ccf419ac..44c68b757 100644 --- a/pkg/amqp-lib/Tests/AmqpProducerTest.php +++ b/pkg/amqp-lib/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); } /** diff --git a/pkg/amqp-lib/Tests/AmqpSubscriptionConsumerTest.php b/pkg/amqp-lib/Tests/AmqpSubscriptionConsumerTest.php index 3fd352711..4e24cbdd5 100644 --- a/pkg/amqp-lib/Tests/AmqpSubscriptionConsumerTest.php +++ b/pkg/amqp-lib/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() diff --git a/pkg/amqp-lib/Tests/Spec/AmqpConnectionFactoryTest.php b/pkg/amqp-lib/Tests/Spec/AmqpConnectionFactoryTest.php index ebc3b8a7f..6fd1636e4 100644 --- a/pkg/amqp-lib/Tests/Spec/AmqpConnectionFactoryTest.php +++ b/pkg/amqp-lib/Tests/Spec/AmqpConnectionFactoryTest.php @@ -3,9 +3,9 @@ namespace Enqueue\AmqpLib\Tests\Spec; use Enqueue\AmqpLib\AmqpConnectionFactory; -use Interop\Queue\Spec\PsrConnectionFactorySpec; +use Interop\Queue\Spec\ConnectionFactorySpec; -class AmqpConnectionFactoryTest extends PsrConnectionFactorySpec +class AmqpConnectionFactoryTest extends ConnectionFactorySpec { protected function createConnectionFactory() { diff --git a/pkg/amqp-lib/Tests/Spec/AmqpContextTest.php b/pkg/amqp-lib/Tests/Spec/AmqpContextTest.php index 87a48068b..eb4e4c710 100644 --- a/pkg/amqp-lib/Tests/Spec/AmqpContextTest.php +++ b/pkg/amqp-lib/Tests/Spec/AmqpContextTest.php @@ -3,11 +3,11 @@ namespace Enqueue\AmqpLib\Tests\Spec; use Enqueue\AmqpLib\AmqpContext; -use Interop\Queue\Spec\PsrContextSpec; +use Interop\Queue\Spec\ContextSpec; use PhpAmqpLib\Channel\AMQPChannel; use PhpAmqpLib\Connection\AbstractConnection; -class AmqpContextTest extends PsrContextSpec +class AmqpContextTest extends ContextSpec { protected function createContext() { diff --git a/pkg/amqp-lib/Tests/Spec/AmqpProducerTest.php b/pkg/amqp-lib/Tests/Spec/AmqpProducerTest.php index 9285d598f..510b72ab9 100644 --- a/pkg/amqp-lib/Tests/Spec/AmqpProducerTest.php +++ b/pkg/amqp-lib/Tests/Spec/AmqpProducerTest.php @@ -3,12 +3,12 @@ namespace Enqueue\AmqpLib\Tests\Spec; use Enqueue\AmqpLib\AmqpConnectionFactory; -use Interop\Queue\Spec\PsrProducerSpec; +use Interop\Queue\Spec\ProducerSpec; /** * @group functional */ -class AmqpProducerTest extends PsrProducerSpec +class AmqpProducerTest extends ProducerSpec { /** * {@inheritdoc} diff --git a/pkg/amqp-lib/Tests/Spec/AmqpSendAndReceiveDelayedMessageWithDelayPluginStrategyTest.php b/pkg/amqp-lib/Tests/Spec/AmqpSendAndReceiveDelayedMessageWithDelayPluginStrategyTest.php index 42bc523ce..8b618e912 100644 --- a/pkg/amqp-lib/Tests/Spec/AmqpSendAndReceiveDelayedMessageWithDelayPluginStrategyTest.php +++ b/pkg/amqp-lib/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); diff --git a/pkg/amqp-lib/Tests/Spec/AmqpSendAndReceiveDelayedMessageWithDlxStrategyTest.php b/pkg/amqp-lib/Tests/Spec/AmqpSendAndReceiveDelayedMessageWithDlxStrategyTest.php index e27166695..f3eb0f7c7 100644 --- a/pkg/amqp-lib/Tests/Spec/AmqpSendAndReceiveDelayedMessageWithDlxStrategyTest.php +++ b/pkg/amqp-lib/Tests/Spec/AmqpSendAndReceiveDelayedMessageWithDlxStrategyTest.php @@ -5,7 +5,7 @@ use Enqueue\AmqpLib\AmqpConnectionFactory; use Enqueue\AmqpLib\AmqpContext; use Enqueue\AmqpTools\RabbitMqDlxDelayStrategy; -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); diff --git a/pkg/amqp-lib/Tests/Spec/AmqpSendAndReceivePriorityMessagesFromQueueTest.php b/pkg/amqp-lib/Tests/Spec/AmqpSendAndReceivePriorityMessagesFromQueueTest.php index 881c8dd8c..bd88088a9 100644 --- a/pkg/amqp-lib/Tests/Spec/AmqpSendAndReceivePriorityMessagesFromQueueTest.php +++ b/pkg/amqp-lib/Tests/Spec/AmqpSendAndReceivePriorityMessagesFromQueueTest.php @@ -4,7 +4,7 @@ use Enqueue\AmqpLib\AmqpConnectionFactory; use Enqueue\AmqpLib\AmqpContext; -use Interop\Queue\PsrContext; +use Interop\Queue\Context; use Interop\Queue\Spec\SendAndReceivePriorityMessagesFromQueueSpec; /** @@ -27,7 +27,7 @@ protected function createContext() * * @param AmqpContext $context */ - protected function createQueue(PsrContext $context, $queueName) + protected function createQueue(Context $context, $queueName) { $queue = $context->createQueue($queueName); $queue->setArguments(['x-max-priority' => 10]); diff --git a/pkg/amqp-lib/Tests/Spec/AmqpSendAndReceiveTimeToLiveMessagesFromQueueTest.php b/pkg/amqp-lib/Tests/Spec/AmqpSendAndReceiveTimeToLiveMessagesFromQueueTest.php index b62882fad..39fcb6fc1 100644 --- a/pkg/amqp-lib/Tests/Spec/AmqpSendAndReceiveTimeToLiveMessagesFromQueueTest.php +++ b/pkg/amqp-lib/Tests/Spec/AmqpSendAndReceiveTimeToLiveMessagesFromQueueTest.php @@ -4,7 +4,7 @@ use Enqueue\AmqpLib\AmqpConnectionFactory; use Enqueue\AmqpLib\AmqpContext; -use Interop\Queue\PsrContext; +use Interop\Queue\Context; use Interop\Queue\Spec\SendAndReceiveTimeToLiveMessagesFromQueueSpec; /** @@ -27,7 +27,7 @@ protected function createContext() * * @param AmqpContext $context */ - protected function createQueue(PsrContext $context, $queueName) + protected function createQueue(Context $context, $queueName) { $queue = $context->createQueue($queueName); $context->declareQueue($queue); diff --git a/pkg/amqp-lib/Tests/Spec/AmqpSendToAndReceiveFromQueueTest.php b/pkg/amqp-lib/Tests/Spec/AmqpSendToAndReceiveFromQueueTest.php index 3a31b46cf..a80e91b8a 100644 --- a/pkg/amqp-lib/Tests/Spec/AmqpSendToAndReceiveFromQueueTest.php +++ b/pkg/amqp-lib/Tests/Spec/AmqpSendToAndReceiveFromQueueTest.php @@ -4,7 +4,7 @@ use Enqueue\AmqpLib\AmqpConnectionFactory; use Enqueue\AmqpLib\AmqpContext; -use Interop\Queue\PsrContext; +use Interop\Queue\Context; use Interop\Queue\Spec\SendToAndReceiveFromQueueSpec; /** @@ -27,7 +27,7 @@ protected function createContext() * * @param AmqpContext $context */ - protected function createQueue(PsrContext $context, $queueName) + protected function createQueue(Context $context, $queueName) { $queue = $context->createQueue($queueName); $context->declareQueue($queue); diff --git a/pkg/amqp-lib/Tests/Spec/AmqpSendToAndReceiveFromTopicTest.php b/pkg/amqp-lib/Tests/Spec/AmqpSendToAndReceiveFromTopicTest.php index d1e78e900..72a4eb5c4 100644 --- a/pkg/amqp-lib/Tests/Spec/AmqpSendToAndReceiveFromTopicTest.php +++ b/pkg/amqp-lib/Tests/Spec/AmqpSendToAndReceiveFromTopicTest.php @@ -5,7 +5,7 @@ use Enqueue\AmqpLib\AmqpConnectionFactory; use Enqueue\AmqpLib\AmqpContext; use Interop\Amqp\AmqpTopic; -use Interop\Queue\PsrContext; +use Interop\Queue\Context; use Interop\Queue\Spec\SendToAndReceiveFromTopicSpec; /** @@ -28,7 +28,7 @@ protected function createContext() * * @param AmqpContext $context */ - protected function createTopic(PsrContext $context, $topicName) + protected function createTopic(Context $context, $topicName) { $topic = $context->createTopic($topicName); $topic->setType(AmqpTopic::TYPE_FANOUT); diff --git a/pkg/amqp-lib/Tests/Spec/AmqpSendToAndReceiveNoWaitFromQueueTest.php b/pkg/amqp-lib/Tests/Spec/AmqpSendToAndReceiveNoWaitFromQueueTest.php index d36b168fc..47da126e6 100644 --- a/pkg/amqp-lib/Tests/Spec/AmqpSendToAndReceiveNoWaitFromQueueTest.php +++ b/pkg/amqp-lib/Tests/Spec/AmqpSendToAndReceiveNoWaitFromQueueTest.php @@ -4,7 +4,7 @@ use Enqueue\AmqpLib\AmqpConnectionFactory; use Enqueue\AmqpLib\AmqpContext; -use Interop\Queue\PsrContext; +use Interop\Queue\Context; use Interop\Queue\Spec\SendToAndReceiveNoWaitFromQueueSpec; /** @@ -27,7 +27,7 @@ protected function createContext() * * @param AmqpContext $context */ - protected function createQueue(PsrContext $context, $queueName) + protected function createQueue(Context $context, $queueName) { $queue = $context->createQueue($queueName); $context->declareQueue($queue); diff --git a/pkg/amqp-lib/Tests/Spec/AmqpSendToAndReceiveNoWaitFromTopicTest.php b/pkg/amqp-lib/Tests/Spec/AmqpSendToAndReceiveNoWaitFromTopicTest.php index d237895e0..49a168ba7 100644 --- a/pkg/amqp-lib/Tests/Spec/AmqpSendToAndReceiveNoWaitFromTopicTest.php +++ b/pkg/amqp-lib/Tests/Spec/AmqpSendToAndReceiveNoWaitFromTopicTest.php @@ -5,7 +5,7 @@ use Enqueue\AmqpLib\AmqpConnectionFactory; use Enqueue\AmqpLib\AmqpContext; use Interop\Amqp\AmqpTopic; -use Interop\Queue\PsrContext; +use Interop\Queue\Context; use Interop\Queue\Spec\SendToAndReceiveNoWaitFromTopicSpec; /** @@ -28,7 +28,7 @@ protected function createContext() * * @param AmqpContext $context */ - protected function createTopic(PsrContext $context, $topicName) + protected function createTopic(Context $context, $topicName) { $topic = $context->createTopic($topicName); $topic->setType(AmqpTopic::TYPE_FANOUT); diff --git a/pkg/amqp-lib/Tests/Spec/AmqpSendToTopicAndReceiveFromQueueTest.php b/pkg/amqp-lib/Tests/Spec/AmqpSendToTopicAndReceiveFromQueueTest.php index 1ce55f2eb..d2b2aee06 100644 --- a/pkg/amqp-lib/Tests/Spec/AmqpSendToTopicAndReceiveFromQueueTest.php +++ b/pkg/amqp-lib/Tests/Spec/AmqpSendToTopicAndReceiveFromQueueTest.php @@ -6,7 +6,7 @@ use Enqueue\AmqpLib\AmqpContext; use Interop\Amqp\AmqpTopic; use Interop\Amqp\Impl\AmqpBind; -use Interop\Queue\PsrContext; +use Interop\Queue\Context; use Interop\Queue\Spec\SendToTopicAndReceiveFromQueueSpec; /** @@ -29,7 +29,7 @@ protected function createContext() * * @param AmqpContext $context */ - protected function createQueue(PsrContext $context, $queueName) + protected function createQueue(Context $context, $queueName) { $queue = $context->createQueue($queueName); $context->declareQueue($queue); @@ -45,7 +45,7 @@ protected function createQueue(PsrContext $context, $queueName) * * @param AmqpContext $context */ - protected function createTopic(PsrContext $context, $topicName) + protected function createTopic(Context $context, $topicName) { $topic = $context->createTopic($topicName); $topic->setType(AmqpTopic::TYPE_FANOUT); diff --git a/pkg/amqp-lib/Tests/Spec/AmqpSendToTopicAndReceiveNoWaitFromQueueTest.php b/pkg/amqp-lib/Tests/Spec/AmqpSendToTopicAndReceiveNoWaitFromQueueTest.php index 783496ffa..c42c4213b 100644 --- a/pkg/amqp-lib/Tests/Spec/AmqpSendToTopicAndReceiveNoWaitFromQueueTest.php +++ b/pkg/amqp-lib/Tests/Spec/AmqpSendToTopicAndReceiveNoWaitFromQueueTest.php @@ -6,7 +6,7 @@ use Enqueue\AmqpLib\AmqpContext; use Interop\Amqp\AmqpTopic; use Interop\Amqp\Impl\AmqpBind; -use Interop\Queue\PsrContext; +use Interop\Queue\Context; use Interop\Queue\Spec\SendToTopicAndReceiveNoWaitFromQueueSpec; /** @@ -29,7 +29,7 @@ protected function createContext() * * @param AmqpContext $context */ - protected function createQueue(PsrContext $context, $queueName) + protected function createQueue(Context $context, $queueName) { $queue = $context->createQueue($queueName); $context->declareQueue($queue); @@ -45,7 +45,7 @@ protected function createQueue(PsrContext $context, $queueName) * * @param AmqpContext $context */ - protected function createTopic(PsrContext $context, $topicName) + protected function createTopic(Context $context, $topicName) { $topic = $context->createTopic($topicName); $topic->setType(AmqpTopic::TYPE_FANOUT); diff --git a/pkg/amqp-lib/Tests/Spec/AmqpSslSendToAndReceiveFromQueueTest.php b/pkg/amqp-lib/Tests/Spec/AmqpSslSendToAndReceiveFromQueueTest.php index 87fef80a0..19d6a7030 100644 --- a/pkg/amqp-lib/Tests/Spec/AmqpSslSendToAndReceiveFromQueueTest.php +++ b/pkg/amqp-lib/Tests/Spec/AmqpSslSendToAndReceiveFromQueueTest.php @@ -4,7 +4,7 @@ use Enqueue\AmqpLib\AmqpConnectionFactory; use Enqueue\AmqpLib\AmqpContext; -use Interop\Queue\PsrContext; +use Interop\Queue\Context; use Interop\Queue\Spec\SendToAndReceiveFromQueueSpec; /** @@ -41,7 +41,7 @@ protected function createContext() * * @param AmqpContext $context */ - protected function createQueue(PsrContext $context, $queueName) + protected function createQueue(Context $context, $queueName) { $queue = $context->createQueue($queueName); $context->declareQueue($queue); diff --git a/pkg/amqp-lib/Tests/Spec/AmqpSubscriptionConsumerConsumeFromAllSubscribedQueuesTest.php b/pkg/amqp-lib/Tests/Spec/AmqpSubscriptionConsumerConsumeFromAllSubscribedQueuesTest.php index 6cbab6922..284a03c11 100644 --- a/pkg/amqp-lib/Tests/Spec/AmqpSubscriptionConsumerConsumeFromAllSubscribedQueuesTest.php +++ b/pkg/amqp-lib/Tests/Spec/AmqpSubscriptionConsumerConsumeFromAllSubscribedQueuesTest.php @@ -5,7 +5,7 @@ use Enqueue\AmqpLib\AmqpConnectionFactory; use Enqueue\AmqpLib\AmqpContext; use Interop\Amqp\AmqpQueue; -use Interop\Queue\PsrContext; +use Interop\Queue\Context; use Interop\Queue\Spec\SubscriptionConsumerConsumeFromAllSubscribedQueuesSpec; /** @@ -33,7 +33,7 @@ protected function createContext() * * {@inheritdoc} */ - protected function createQueue(PsrContext $context, $queueName) + protected function createQueue(Context $context, $queueName) { /** @var AmqpQueue $queue */ $queue = parent::createQueue($context, $queueName); diff --git a/pkg/amqp-lib/Tests/Spec/AmqpSubscriptionConsumerConsumeUntilUnsubscribedTest.php b/pkg/amqp-lib/Tests/Spec/AmqpSubscriptionConsumerConsumeUntilUnsubscribedTest.php index aaaa93318..371e9a53c 100644 --- a/pkg/amqp-lib/Tests/Spec/AmqpSubscriptionConsumerConsumeUntilUnsubscribedTest.php +++ b/pkg/amqp-lib/Tests/Spec/AmqpSubscriptionConsumerConsumeUntilUnsubscribedTest.php @@ -5,7 +5,7 @@ use Enqueue\AmqpLib\AmqpConnectionFactory; use Interop\Amqp\AmqpContext; use Interop\Amqp\AmqpQueue; -use Interop\Queue\PsrContext; +use Interop\Queue\Context; use Interop\Queue\Spec\SubscriptionConsumerConsumeUntilUnsubscribedSpec; /** @@ -42,7 +42,7 @@ protected function createContext() * * {@inheritdoc} */ - protected function createQueue(PsrContext $context, $queueName) + protected function createQueue(Context $context, $queueName) { /** @var AmqpQueue $queue */ $queue = parent::createQueue($context, $queueName); diff --git a/pkg/amqp-lib/Tests/Spec/AmqpSubscriptionConsumerStopOnFalseTest.php b/pkg/amqp-lib/Tests/Spec/AmqpSubscriptionConsumerStopOnFalseTest.php index 0a4b47a15..b1987bbe7 100644 --- a/pkg/amqp-lib/Tests/Spec/AmqpSubscriptionConsumerStopOnFalseTest.php +++ b/pkg/amqp-lib/Tests/Spec/AmqpSubscriptionConsumerStopOnFalseTest.php @@ -5,7 +5,7 @@ use Enqueue\AmqpLib\AmqpConnectionFactory; use Interop\Amqp\AmqpContext; use Interop\Amqp\AmqpQueue; -use Interop\Queue\PsrContext; +use Interop\Queue\Context; use Interop\Queue\Spec\SubscriptionConsumerStopOnFalseSpec; /** @@ -33,7 +33,7 @@ protected function createContext() * * {@inheritdoc} */ - protected function createQueue(PsrContext $context, $queueName) + protected function createQueue(Context $context, $queueName) { /** @var AmqpQueue $queue */ $queue = parent::createQueue($context, $queueName); diff --git a/pkg/amqp-tools/RabbitMqDelayPluginDelayStrategy.php b/pkg/amqp-tools/RabbitMqDelayPluginDelayStrategy.php index d36613923..192135965 100644 --- a/pkg/amqp-tools/RabbitMqDelayPluginDelayStrategy.php +++ b/pkg/amqp-tools/RabbitMqDelayPluginDelayStrategy.php @@ -10,7 +10,7 @@ use Interop\Amqp\AmqpQueue; use Interop\Amqp\AmqpTopic; use Interop\Amqp\Impl\AmqpBind; -use Interop\Queue\InvalidDestinationException; +use Interop\Queue\Exception\InvalidDestinationException; class RabbitMqDelayPluginDelayStrategy implements DelayStrategy { diff --git a/pkg/amqp-tools/RabbitMqDlxDelayStrategy.php b/pkg/amqp-tools/RabbitMqDlxDelayStrategy.php index d1a81362b..f0fdd8956 100644 --- a/pkg/amqp-tools/RabbitMqDlxDelayStrategy.php +++ b/pkg/amqp-tools/RabbitMqDlxDelayStrategy.php @@ -9,7 +9,7 @@ use Interop\Amqp\AmqpMessage; use Interop\Amqp\AmqpQueue; use Interop\Amqp\AmqpTopic; -use Interop\Queue\InvalidDestinationException; +use Interop\Queue\Exception\InvalidDestinationException; class RabbitMqDlxDelayStrategy implements DelayStrategy { diff --git a/pkg/amqp-tools/Tests/RabbitMqDelayPluginDelayStrategyTest.php b/pkg/amqp-tools/Tests/RabbitMqDelayPluginDelayStrategyTest.php index 773f9a2b6..17a8b2a5f 100644 --- a/pkg/amqp-tools/Tests/RabbitMqDelayPluginDelayStrategyTest.php +++ b/pkg/amqp-tools/Tests/RabbitMqDelayPluginDelayStrategyTest.php @@ -12,10 +12,10 @@ use Interop\Amqp\Impl\AmqpMessage; use Interop\Amqp\Impl\AmqpQueue; use Interop\Amqp\Impl\AmqpTopic; -use Interop\Queue\InvalidDestinationException; -use Interop\Queue\PsrDestination; -use Interop\Queue\PsrMessage; -use Interop\Queue\PsrProducer; +use Interop\Queue\Destination; +use Interop\Queue\Exception\InvalidDestinationException; +use Interop\Queue\Message; +use Interop\Queue\Producer; use PHPUnit\Framework\TestCase; class RabbitMqDelayPluginDelayStrategyTest extends TestCase @@ -188,11 +188,11 @@ public function delayMessage(AmqpContext $context, AmqpDestination $dest, \Inter { } - public function send(PsrDestination $destination, PsrMessage $message): void + public function send(Destination $destination, Message $message): void { } - public function setDeliveryDelay(int $deliveryDelay = null): PsrProducer + public function setDeliveryDelay(int $deliveryDelay = null): Producer { } @@ -200,7 +200,7 @@ public function getDeliveryDelay(): ?int { } - public function setPriority(int $priority = null): PsrProducer + public function setPriority(int $priority = null): Producer { } @@ -208,7 +208,7 @@ public function getPriority(): ?int { } - public function setTimeToLive(int $timeToLive = null): PsrProducer + public function setTimeToLive(int $timeToLive = null): Producer { } diff --git a/pkg/amqp-tools/Tests/RabbitMqDlxDelayStrategyTest.php b/pkg/amqp-tools/Tests/RabbitMqDlxDelayStrategyTest.php index 9531fe4ce..8a45f8963 100644 --- a/pkg/amqp-tools/Tests/RabbitMqDlxDelayStrategyTest.php +++ b/pkg/amqp-tools/Tests/RabbitMqDlxDelayStrategyTest.php @@ -11,7 +11,7 @@ use Interop\Amqp\Impl\AmqpMessage; use Interop\Amqp\Impl\AmqpQueue; use Interop\Amqp\Impl\AmqpTopic; -use Interop\Queue\InvalidDestinationException; +use Interop\Queue\Exception\InvalidDestinationException; use PHPUnit\Framework\TestCase; class RabbitMqDlxDelayStrategyTest extends TestCase diff --git a/pkg/async-command/RunCommandProcessor.php b/pkg/async-command/RunCommandProcessor.php index 3e34759e2..b093adc5c 100644 --- a/pkg/async-command/RunCommandProcessor.php +++ b/pkg/async-command/RunCommandProcessor.php @@ -4,13 +4,13 @@ use Enqueue\Client\CommandSubscriberInterface; use Enqueue\Consumption\Result; -use Interop\Queue\PsrContext; -use Interop\Queue\PsrMessage; -use Interop\Queue\PsrProcessor; +use Interop\Queue\Context; +use Interop\Queue\Message; +use Interop\Queue\Processor; use Symfony\Component\Process\PhpExecutableFinder; use Symfony\Component\Process\Process; -final class RunCommandProcessor implements PsrProcessor, CommandSubscriberInterface +final class RunCommandProcessor implements Processor, CommandSubscriberInterface { /** * @var string @@ -22,7 +22,7 @@ public function __construct(string $projectDir) $this->projectDir = $projectDir; } - public function process(PsrMessage $message, PsrContext $context): Result + public function process(Message $message, Context $context): Result { $command = RunCommand::jsonUnserialize($message->getBody()); diff --git a/pkg/async-command/Tests/Functional/UseCasesTest.php b/pkg/async-command/Tests/Functional/UseCasesTest.php index a6d3d9419..03eb52543 100644 --- a/pkg/async-command/Tests/Functional/UseCasesTest.php +++ b/pkg/async-command/Tests/Functional/UseCasesTest.php @@ -8,7 +8,7 @@ use Enqueue\Consumption\Result; use Enqueue\Null\NullContext; use Enqueue\Null\NullMessage; -use Interop\Queue\PsrMessage; +use Interop\Queue\Message; use PHPUnit\Framework\TestCase; /** @@ -20,15 +20,15 @@ public function testRunSimpleCommandAndReturnOutput() { $runCommand = new RunCommand('foo'); - $psrMessage = new NullMessage(json_encode($runCommand)); - $psrMessage->setReplyTo('aReplyToQueue'); + $Message = new NullMessage(json_encode($runCommand)); + $Message->setReplyTo('aReplyToQueue'); $processor = new RunCommandProcessor(__DIR__); - $result = $processor->process($psrMessage, new NullContext()); + $result = $processor->process($Message, new NullContext()); $this->assertInstanceOf(Result::class, $result); - $this->assertInstanceOf(PsrMessage::class, $result->getReply()); + $this->assertInstanceOf(Message::class, $result->getReply()); $replyMessage = $result->getReply(); diff --git a/pkg/async-command/Tests/RunCommandProcessorTest.php b/pkg/async-command/Tests/RunCommandProcessorTest.php index c16069998..ce5dc9e4c 100644 --- a/pkg/async-command/Tests/RunCommandProcessorTest.php +++ b/pkg/async-command/Tests/RunCommandProcessorTest.php @@ -5,7 +5,7 @@ use Enqueue\AsyncCommand\Commands; use Enqueue\AsyncCommand\RunCommandProcessor; use Enqueue\Client\CommandSubscriberInterface; -use Interop\Queue\PsrProcessor; +use Interop\Queue\Processor; use PHPUnit\Framework\TestCase; class RunCommandProcessorTest extends TestCase @@ -14,7 +14,7 @@ public function testShouldImplementProcessorInterface() { $rc = new \ReflectionClass(RunCommandProcessor::class); - $this->assertTrue($rc->implementsInterface(PsrProcessor::class)); + $this->assertTrue($rc->implementsInterface(Processor::class)); } public function testShouldImplementCommandSubscriberInterfaceInterface() diff --git a/pkg/async-event-dispatcher/AsyncListener.php b/pkg/async-event-dispatcher/AsyncListener.php index 524fdb2f7..54f4cf24c 100644 --- a/pkg/async-event-dispatcher/AsyncListener.php +++ b/pkg/async-event-dispatcher/AsyncListener.php @@ -2,14 +2,14 @@ namespace Enqueue\AsyncEventDispatcher; -use Interop\Queue\PsrContext; -use Interop\Queue\PsrQueue; +use Interop\Queue\Context; +use Interop\Queue\Queue; use Symfony\Component\EventDispatcher\Event; class AsyncListener { /** - * @var PsrContext + * @var Context */ private $context; @@ -19,7 +19,7 @@ class AsyncListener private $registry; /** - * @var PsrQueue + * @var Queue */ private $eventQueue; @@ -29,15 +29,15 @@ class AsyncListener private $syncMode; /** - * @param PsrContext $context - * @param Registry $registry - * @param PsrQueue|string $eventQueue + * @param Context $context + * @param Registry $registry + * @param Queue|string $eventQueue */ - public function __construct(PsrContext $context, Registry $registry, $eventQueue) + public function __construct(Context $context, Registry $registry, $eventQueue) { $this->context = $context; $this->registry = $registry; - $this->eventQueue = $eventQueue instanceof PsrQueue ? $eventQueue : $context->createQueue($eventQueue); + $this->eventQueue = $eventQueue instanceof Queue ? $eventQueue : $context->createQueue($eventQueue); } public function __invoke(Event $event, $eventName) diff --git a/pkg/async-event-dispatcher/AsyncProcessor.php b/pkg/async-event-dispatcher/AsyncProcessor.php index 000d3056d..3f5780734 100644 --- a/pkg/async-event-dispatcher/AsyncProcessor.php +++ b/pkg/async-event-dispatcher/AsyncProcessor.php @@ -4,12 +4,12 @@ use Enqueue\Client\CommandSubscriberInterface; use Enqueue\Consumption\Result; -use Interop\Queue\PsrContext; -use Interop\Queue\PsrMessage; -use Interop\Queue\PsrProcessor; +use Interop\Queue\Context; +use Interop\Queue\Message; +use Interop\Queue\Processor; use Symfony\Component\EventDispatcher\EventDispatcherInterface; -class AsyncProcessor implements PsrProcessor, CommandSubscriberInterface +class AsyncProcessor implements Processor, CommandSubscriberInterface { /** * @var Registry @@ -36,7 +36,7 @@ public function __construct(Registry $registry, EventDispatcherInterface $dispat $this->dispatcher = $dispatcher; } - public function process(PsrMessage $message, PsrContext $context) + public function process(Message $message, Context $context) { if (false == $eventName = $message->getProperty('event_name')) { return Result::reject('The message is missing "event_name" property'); diff --git a/pkg/async-event-dispatcher/EventTransformer.php b/pkg/async-event-dispatcher/EventTransformer.php index 4aa2360d4..6b6aa0f39 100644 --- a/pkg/async-event-dispatcher/EventTransformer.php +++ b/pkg/async-event-dispatcher/EventTransformer.php @@ -2,7 +2,7 @@ namespace Enqueue\AsyncEventDispatcher; -use Interop\Queue\PsrMessage; +use Interop\Queue\Message; use Symfony\Component\EventDispatcher\Event; interface EventTransformer @@ -11,19 +11,19 @@ interface EventTransformer * @param string $eventName * @param Event|null $event * - * @return PsrMessage + * @return Message */ public function toMessage($eventName, Event $event); /** * If you able to transform message back to event return it. - * If you failed to transform for some reason you can return a string status (@see PsrProcess constants) or an object that implements __toString method. - * The object must have a __toString method is supposed to be used as PsrProcessor::process return value. + * If you failed to transform for some reason you can return a string status (@see Process constants) or an object that implements __toString method. + * The object must have a __toString method is supposed to be used as Processor::process return value. * - * @param string $eventName - * @param PsrMessage $message + * @param string $eventName + * @param Message $message * * @return Event|string|object */ - public function toEvent($eventName, PsrMessage $message); + public function toEvent($eventName, Message $message); } diff --git a/pkg/async-event-dispatcher/PhpSerializerEventTransformer.php b/pkg/async-event-dispatcher/PhpSerializerEventTransformer.php index 0b9e34737..34392c439 100644 --- a/pkg/async-event-dispatcher/PhpSerializerEventTransformer.php +++ b/pkg/async-event-dispatcher/PhpSerializerEventTransformer.php @@ -2,21 +2,21 @@ namespace Enqueue\AsyncEventDispatcher; -use Interop\Queue\PsrContext; -use Interop\Queue\PsrMessage; +use Interop\Queue\Context; +use Interop\Queue\Message; use Symfony\Component\EventDispatcher\Event; class PhpSerializerEventTransformer implements EventTransformer { /** - * @var PsrContext + * @var Context */ private $context; /** - * @param PsrContext $context + * @param Context $context */ - public function __construct(PsrContext $context) + public function __construct(Context $context) { $this->context = $context; } @@ -32,7 +32,7 @@ public function toMessage($eventName, Event $event = null) /** * {@inheritdoc} */ - public function toEvent($eventName, PsrMessage $message) + public function toEvent($eventName, Message $message) { return unserialize($message->getBody()); } diff --git a/pkg/async-event-dispatcher/Tests/AsyncListenerTest.php b/pkg/async-event-dispatcher/Tests/AsyncListenerTest.php index c3e6c0a40..6e019f6de 100644 --- a/pkg/async-event-dispatcher/Tests/AsyncListenerTest.php +++ b/pkg/async-event-dispatcher/Tests/AsyncListenerTest.php @@ -8,8 +8,8 @@ use Enqueue\Null\NullMessage; use Enqueue\Null\NullQueue; use Enqueue\Test\ClassExtensionTrait; -use Interop\Queue\PsrContext; -use Interop\Queue\PsrProducer; +use Interop\Queue\Context; +use Interop\Queue\Producer; use PHPUnit\Framework\TestCase; use Symfony\Component\EventDispatcher\Event; use Symfony\Component\EventDispatcher\GenericEvent; @@ -35,7 +35,7 @@ public function testCouldBeConstructedWithContextAndRegistryAndEventQueueAsStrin $this->assertAttributeSame($eventQueue, 'eventQueue', $listener); } - public function testCouldBeConstructedWithContextAndRegistryAndPsrQueue() + public function testCouldBeConstructedWithContextAndRegistryAndQueue() { $eventQueue = new NullQueue('symfony_events'); @@ -137,19 +137,19 @@ private function createEventTransformerMock() } /** - * @return \PHPUnit_Framework_MockObject_MockObject|PsrProducer + * @return \PHPUnit_Framework_MockObject_MockObject|Producer */ private function createProducerMock() { - return $this->createMock(PsrProducer::class); + return $this->createMock(Producer::class); } /** - * @return \PHPUnit_Framework_MockObject_MockObject|PsrContext + * @return \PHPUnit_Framework_MockObject_MockObject|Context */ private function createContextMock() { - return $this->createMock(PsrContext::class); + return $this->createMock(Context::class); } /** diff --git a/pkg/async-event-dispatcher/Tests/AsyncProcessorTest.php b/pkg/async-event-dispatcher/Tests/AsyncProcessorTest.php index 950290882..334022e92 100644 --- a/pkg/async-event-dispatcher/Tests/AsyncProcessorTest.php +++ b/pkg/async-event-dispatcher/Tests/AsyncProcessorTest.php @@ -10,7 +10,7 @@ use Enqueue\Null\NullContext; use Enqueue\Null\NullMessage; use Enqueue\Test\ClassExtensionTrait; -use Interop\Queue\PsrProcessor; +use Interop\Queue\Processor; use PHPUnit\Framework\TestCase; use Symfony\Component\EventDispatcher\GenericEvent; @@ -20,7 +20,7 @@ class AsyncProcessorTest extends TestCase public function testShouldImplementProcessorInterface() { - $this->assertClassImplements(PsrProcessor::class, AsyncProcessor::class); + $this->assertClassImplements(Processor::class, AsyncProcessor::class); } public function testCouldBeConstructedWithRegistryAndProxyEventDispatcher() diff --git a/pkg/async-event-dispatcher/Tests/Functional/UseCasesTest.php b/pkg/async-event-dispatcher/Tests/Functional/UseCasesTest.php index a2926b88c..e3848858b 100644 --- a/pkg/async-event-dispatcher/Tests/Functional/UseCasesTest.php +++ b/pkg/async-event-dispatcher/Tests/Functional/UseCasesTest.php @@ -8,9 +8,9 @@ use Enqueue\AsyncEventDispatcher\SimpleRegistry; use Enqueue\Bundle\Tests\Functional\App\TestAsyncEventTransformer; use Enqueue\Fs\FsConnectionFactory; -use Interop\Queue\PsrContext; -use Interop\Queue\PsrProcessor; -use Interop\Queue\PsrQueue; +use Interop\Queue\Context; +use Interop\Queue\Processor; +use Interop\Queue\Queue; use PHPUnit\Framework\TestCase; use Symfony\Component\EventDispatcher\EventDispatcher; use Symfony\Component\EventDispatcher\EventDispatcherInterface; @@ -23,12 +23,12 @@ class UseCasesTest extends TestCase { /** - * @var PsrContext + * @var Context */ protected $context; /** - * @var PsrQueue + * @var Queue */ protected $queue; @@ -184,13 +184,13 @@ private function processMessages() $result = $this->asyncProcessor->process($message, $this->context); switch ((string) $result) { - case PsrProcessor::ACK: + case Processor::ACK: $consumer->acknowledge($message); break; - case PsrProcessor::REJECT: + case Processor::REJECT: $consumer->reject($message); break; - case PsrProcessor::REQUEUE: + case Processor::REQUEUE: $consumer->reject($message, true); break; default: diff --git a/pkg/async-event-dispatcher/Tests/PhpSerializerEventTransformerTest.php b/pkg/async-event-dispatcher/Tests/PhpSerializerEventTransformerTest.php index ee89d92e4..8e9ee8179 100644 --- a/pkg/async-event-dispatcher/Tests/PhpSerializerEventTransformerTest.php +++ b/pkg/async-event-dispatcher/Tests/PhpSerializerEventTransformerTest.php @@ -6,8 +6,8 @@ use Enqueue\AsyncEventDispatcher\PhpSerializerEventTransformer; use Enqueue\Null\NullMessage; use Enqueue\Test\ClassExtensionTrait; -use Interop\Queue\PsrContext; -use Interop\Queue\PsrMessage; +use Interop\Queue\Context; +use Interop\Queue\Message; use PHPUnit\Framework\TestCase; use Symfony\Component\EventDispatcher\GenericEvent; @@ -34,7 +34,7 @@ public function testShouldReturnMessageWithPhpSerializedEventAsBodyOnToMessage() $message = $transformer->toMessage('fooEvent', $event); - $this->assertInstanceOf(PsrMessage::class, $message); + $this->assertInstanceOf(Message::class, $message); $this->assertEquals($expectedBody, $message->getBody()); } @@ -52,11 +52,11 @@ public function testShouldReturnEventUnserializedFromMessageBodyOnToEvent() } /** - * @return \PHPUnit_Framework_MockObject_MockObject|PsrContext + * @return \PHPUnit_Framework_MockObject_MockObject|Context */ private function createContextStub() { - $context = $this->createMock(PsrContext::class); + $context = $this->createMock(Context::class); $context ->expects($this->any()) ->method('createMessage') diff --git a/pkg/dbal/DbalConnectionFactory.php b/pkg/dbal/DbalConnectionFactory.php index 8c265ef0a..7e0f65c45 100644 --- a/pkg/dbal/DbalConnectionFactory.php +++ b/pkg/dbal/DbalConnectionFactory.php @@ -6,10 +6,10 @@ use Doctrine\DBAL\Connection; use Doctrine\DBAL\DriverManager; -use Interop\Queue\PsrConnectionFactory; -use Interop\Queue\PsrContext; +use Interop\Queue\ConnectionFactory; +use Interop\Queue\Context; -class DbalConnectionFactory implements PsrConnectionFactory +class DbalConnectionFactory implements ConnectionFactory { /** * @var array @@ -64,7 +64,7 @@ public function __construct($config = 'mysql:') /** * @return DbalContext */ - public function createContext(): PsrContext + public function createContext(): Context { if ($this->config['lazy']) { return new DbalContext(function () { diff --git a/pkg/dbal/DbalConsumer.php b/pkg/dbal/DbalConsumer.php index f0ad8dc5f..2f0976625 100644 --- a/pkg/dbal/DbalConsumer.php +++ b/pkg/dbal/DbalConsumer.php @@ -6,12 +6,12 @@ use Doctrine\DBAL\Connection; use Doctrine\DBAL\Types\Type; -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 DbalConsumer implements PsrConsumer +class DbalConsumer implements Consumer { /** * @var DbalContext @@ -61,12 +61,12 @@ public function getPollingInterval(): int /** * @return DbalDestination */ - public function getQueue(): PsrQueue + public function getQueue(): Queue { return $this->queue; } - public function receive(int $timeout = 0): ?PsrMessage + public function receive(int $timeout = 0): ?Message { $timeout /= 1000; $startAt = microtime(true); @@ -90,7 +90,7 @@ public function receive(int $timeout = 0): ?PsrMessage } } - public function receiveNoWait(): ?PsrMessage + public function receiveNoWait(): ?Message { return $this->receiveMessage(); } @@ -98,7 +98,7 @@ public function receiveNoWait(): ?PsrMessage /** * @param DbalMessage $message */ - public function acknowledge(PsrMessage $message): void + public function acknowledge(Message $message): void { // does nothing } @@ -106,7 +106,7 @@ public function acknowledge(PsrMessage $message): void /** * @param DbalMessage $message */ - public function reject(PsrMessage $message, bool $requeue = false): void + public function reject(Message $message, bool $requeue = false): void { InvalidMessageException::assertMessageInstanceOf($message, DbalMessage::class); diff --git a/pkg/dbal/DbalContext.php b/pkg/dbal/DbalContext.php index cf1477dea..91fa667ff 100644 --- a/pkg/dbal/DbalContext.php +++ b/pkg/dbal/DbalContext.php @@ -7,19 +7,19 @@ use Doctrine\DBAL\Connection; use Doctrine\DBAL\Schema\Table; use Doctrine\DBAL\Types\Type; -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\SubscriptionConsumerNotSupportedException; -use Interop\Queue\TemporaryQueueNotSupportedException; - -class DbalContext implements PsrContext +use Interop\Queue\Consumer; +use Interop\Queue\Context; +use Interop\Queue\Destination; +use Interop\Queue\Exception\InvalidDestinationException; +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 DbalContext implements Context { /** * @var Connection @@ -65,7 +65,7 @@ public function __construct($connection, array $config = []) /** * {@inheritdoc} */ - public function createMessage(string $body = '', array $properties = [], array $headers = []): PsrMessage + public function createMessage(string $body = '', array $properties = [], array $headers = []): Message { $message = new DbalMessage(); $message->setBody($body); @@ -78,7 +78,7 @@ public function createMessage(string $body = '', array $properties = [], array $ /** * @return DbalDestination */ - public function createQueue(string $name): PsrQueue + public function createQueue(string $name): Queue { return new DbalDestination($name); } @@ -86,12 +86,12 @@ public function createQueue(string $name): PsrQueue /** * @return DbalDestination */ - public function createTopic(string $name): PsrTopic + public function createTopic(string $name): Topic { return new DbalDestination($name); } - public function createTemporaryQueue(): PsrQueue + public function createTemporaryQueue(): Queue { throw TemporaryQueueNotSupportedException::providerDoestNotSupportIt(); } @@ -99,7 +99,7 @@ public function createTemporaryQueue(): PsrQueue /** * @return DbalProducer */ - public function createProducer(): PsrProducer + public function createProducer(): Producer { return new DbalProducer($this); } @@ -107,7 +107,7 @@ public function createProducer(): PsrProducer /** * @return DbalConsumer */ - public function createConsumer(PsrDestination $destination): PsrConsumer + public function createConsumer(Destination $destination): Consumer { InvalidDestinationException::assertDestinationInstanceOf($destination, DbalDestination::class); @@ -124,7 +124,7 @@ public function close(): void { } - public function createSubscriptionConsumer(): PsrSubscriptionConsumer + public function createSubscriptionConsumer(): SubscriptionConsumer { throw SubscriptionConsumerNotSupportedException::providerDoestNotSupportIt(); } @@ -132,7 +132,7 @@ public function createSubscriptionConsumer(): PsrSubscriptionConsumer /** * @param DbalDestination $queue */ - public function purgeQueue(PsrQueue $queue): void + public function purgeQueue(Queue $queue): void { $this->getDbalConnection()->delete( $this->getTableName(), diff --git a/pkg/dbal/DbalDestination.php b/pkg/dbal/DbalDestination.php index 33c1c0495..793bc40e7 100644 --- a/pkg/dbal/DbalDestination.php +++ b/pkg/dbal/DbalDestination.php @@ -4,10 +4,10 @@ namespace Enqueue\Dbal; -use Interop\Queue\PsrQueue; -use Interop\Queue\PsrTopic; +use Interop\Queue\Queue; +use Interop\Queue\Topic; -class DbalDestination implements PsrTopic, PsrQueue +class DbalDestination implements Topic, Queue { /** * @var string diff --git a/pkg/dbal/DbalMessage.php b/pkg/dbal/DbalMessage.php index 9183eca22..88b49c588 100644 --- a/pkg/dbal/DbalMessage.php +++ b/pkg/dbal/DbalMessage.php @@ -4,9 +4,9 @@ namespace Enqueue\Dbal; -use Interop\Queue\PsrMessage; +use Interop\Queue\Message; -class DbalMessage implements PsrMessage +class DbalMessage implements Message { /** * @var string diff --git a/pkg/dbal/DbalProducer.php b/pkg/dbal/DbalProducer.php index 9d2bfc09a..ddf567a8a 100644 --- a/pkg/dbal/DbalProducer.php +++ b/pkg/dbal/DbalProducer.php @@ -5,17 +5,17 @@ namespace Enqueue\Dbal; use Doctrine\DBAL\Types\Type; -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\Destination; +use Interop\Queue\Exception\Exception; +use Interop\Queue\Exception\InvalidDestinationException; +use Interop\Queue\Exception\InvalidMessageException; +use Interop\Queue\Message; +use Interop\Queue\Producer; use Ramsey\Uuid\Codec\OrderedTimeCodec; use Ramsey\Uuid\Uuid; use Ramsey\Uuid\UuidFactory; -class DbalProducer implements PsrProducer +class DbalProducer implements Producer { /** * @var int|null @@ -55,7 +55,7 @@ public function __construct(DbalContext $context) * @param DbalDestination $destination * @param DbalMessage $message */ - public function send(PsrDestination $destination, PsrMessage $message): void + public function send(Destination $destination, Message $message): void { InvalidDestinationException::assertDestinationInstanceOf($destination, DbalDestination::class); InvalidMessageException::assertMessageInstanceOf($message, DbalMessage::class); @@ -138,7 +138,7 @@ public function send(PsrDestination $destination, PsrMessage $message): void } } - public function setDeliveryDelay(int $deliveryDelay = null): PsrProducer + public function setDeliveryDelay(int $deliveryDelay = null): Producer { $this->deliveryDelay = $deliveryDelay; @@ -150,7 +150,7 @@ public function getDeliveryDelay(): ?int return $this->deliveryDelay; } - public function setPriority(int $priority = null): PsrProducer + public function setPriority(int $priority = null): Producer { $this->priority = $priority; @@ -162,7 +162,7 @@ public function getPriority(): ?int return $this->priority; } - public function setTimeToLive(int $timeToLive = null): PsrProducer + public function setTimeToLive(int $timeToLive = null): Producer { $this->timeToLive = $timeToLive; diff --git a/pkg/dbal/ManagerRegistryConnectionFactory.php b/pkg/dbal/ManagerRegistryConnectionFactory.php index f6dcdb587..bf2b7e885 100644 --- a/pkg/dbal/ManagerRegistryConnectionFactory.php +++ b/pkg/dbal/ManagerRegistryConnectionFactory.php @@ -6,10 +6,10 @@ use Doctrine\Common\Persistence\ManagerRegistry; use Doctrine\DBAL\Connection; -use Interop\Queue\PsrConnectionFactory; -use Interop\Queue\PsrContext; +use Interop\Queue\ConnectionFactory; +use Interop\Queue\Context; -class ManagerRegistryConnectionFactory implements PsrConnectionFactory +class ManagerRegistryConnectionFactory implements ConnectionFactory { /** * @var ManagerRegistry @@ -45,7 +45,7 @@ public function __construct(ManagerRegistry $registry, array $config = []) /** * @return DbalContext */ - public function createContext(): PsrContext + public function createContext(): Context { if ($this->config['lazy']) { return new DbalContext(function () { diff --git a/pkg/dbal/README.md b/pkg/dbal/README.md index 480bfc5cc..b53a60d75 100644 --- a/pkg/dbal/README.md +++ b/pkg/dbal/README.md @@ -5,7 +5,7 @@ [![Total Downloads](https://poser.pugx.org/enqueue/dbal/d/total.png)](https://packagist.org/packages/enqueue/dbal) [![Latest Stable Version](https://poser.pugx.org/enqueue/dbal/version.png)](https://packagist.org/packages/enqueue/dbal) -This is an implementation of PSR specification. It allows you to send and consume message through Doctrine DBAL library and SQL like database as broker. +This is an implementation of Queue Interop specification. It allows you to send and consume message through Doctrine DBAL library and SQL like database as broker. ## Resources diff --git a/pkg/dbal/Tests/DbalConnectionFactoryTest.php b/pkg/dbal/Tests/DbalConnectionFactoryTest.php index 3391e14c9..076402055 100644 --- a/pkg/dbal/Tests/DbalConnectionFactoryTest.php +++ b/pkg/dbal/Tests/DbalConnectionFactoryTest.php @@ -5,7 +5,7 @@ use Enqueue\Dbal\DbalConnectionFactory; use Enqueue\Dbal\DbalContext; use Enqueue\Test\ClassExtensionTrait; -use Interop\Queue\PsrConnectionFactory; +use Interop\Queue\ConnectionFactory; class DbalConnectionFactoryTest extends \PHPUnit_Framework_TestCase { @@ -13,7 +13,7 @@ class DbalConnectionFactoryTest extends \PHPUnit_Framework_TestCase public function testShouldImplementConnectionFactoryInterface() { - $this->assertClassImplements(PsrConnectionFactory::class, DbalConnectionFactory::class); + $this->assertClassImplements(ConnectionFactory::class, DbalConnectionFactory::class); } public function testShouldCreateLazyContext() diff --git a/pkg/dbal/Tests/DbalConsumerTest.php b/pkg/dbal/Tests/DbalConsumerTest.php index 8c6a826c2..40420214e 100644 --- a/pkg/dbal/Tests/DbalConsumerTest.php +++ b/pkg/dbal/Tests/DbalConsumerTest.php @@ -8,9 +8,9 @@ use Enqueue\Dbal\DbalMessage; use Enqueue\Dbal\DbalProducer; use Enqueue\Test\ClassExtensionTrait; -use Interop\Queue\InvalidMessageException; -use Interop\Queue\PsrConsumer; -use Interop\Queue\PsrMessage; +use Interop\Queue\Consumer; +use Interop\Queue\Exception\InvalidMessageException; +use Interop\Queue\Message; class DbalConsumerTest extends \PHPUnit_Framework_TestCase { @@ -18,7 +18,7 @@ class DbalConsumerTest extends \PHPUnit_Framework_TestCase public function testShouldImplementConsumerInterface() { - $this->assertClassImplements(PsrConsumer::class, DbalConsumer::class); + $this->assertClassImplements(Consumer::class, DbalConsumer::class); } public function testCouldBeConstructedWithRequiredArguments() @@ -125,7 +125,7 @@ private function createContextMock() } } -class InvalidMessage implements PsrMessage +class InvalidMessage implements Message { public function getBody(): string { diff --git a/pkg/dbal/Tests/DbalContextTest.php b/pkg/dbal/Tests/DbalContextTest.php index ee2178754..0cddfdf71 100644 --- a/pkg/dbal/Tests/DbalContextTest.php +++ b/pkg/dbal/Tests/DbalContextTest.php @@ -9,10 +9,10 @@ use Enqueue\Dbal\DbalMessage; use Enqueue\Dbal\DbalProducer; use Enqueue\Test\ClassExtensionTrait; -use Interop\Queue\InvalidDestinationException; -use Interop\Queue\PsrContext; -use Interop\Queue\PsrDestination; -use Interop\Queue\TemporaryQueueNotSupportedException; +use Interop\Queue\Context; +use Interop\Queue\Destination; +use Interop\Queue\Exception\InvalidDestinationException; +use Interop\Queue\Exception\TemporaryQueueNotSupportedException; class DbalContextTest extends \PHPUnit_Framework_TestCase { @@ -20,7 +20,7 @@ class DbalContextTest extends \PHPUnit_Framework_TestCase public function testShouldImplementContextInterface() { - $this->assertClassImplements(PsrContext::class, DbalContext::class); + $this->assertClassImplements(Context::class, DbalContext::class); } public function testCouldBeConstructedWithRequiredArguments() @@ -154,6 +154,6 @@ private function createConnectionMock() } } -class NotSupportedDestination2 implements PsrDestination +class NotSupportedDestination2 implements Destination { } diff --git a/pkg/dbal/Tests/DbalDestinationTest.php b/pkg/dbal/Tests/DbalDestinationTest.php index 2a7d931ce..28c03c7fb 100644 --- a/pkg/dbal/Tests/DbalDestinationTest.php +++ b/pkg/dbal/Tests/DbalDestinationTest.php @@ -4,9 +4,9 @@ use Enqueue\Dbal\DbalDestination; use Enqueue\Test\ClassExtensionTrait; -use Interop\Queue\PsrDestination; -use Interop\Queue\PsrQueue; -use Interop\Queue\PsrTopic; +use Interop\Queue\Destination; +use Interop\Queue\Queue; +use Interop\Queue\Topic; class DbalDestinationTest extends \PHPUnit_Framework_TestCase { @@ -14,17 +14,17 @@ class DbalDestinationTest extends \PHPUnit_Framework_TestCase public function testShouldImplementDestinationInterface() { - $this->assertClassImplements(PsrDestination::class, DbalDestination::class); + $this->assertClassImplements(Destination::class, DbalDestination::class); } public function testShouldImplementTopicInterface() { - $this->assertClassImplements(PsrTopic::class, DbalDestination::class); + $this->assertClassImplements(Topic::class, DbalDestination::class); } public function testShouldImplementQueueInterface() { - $this->assertClassImplements(PsrQueue::class, DbalDestination::class); + $this->assertClassImplements(Queue::class, DbalDestination::class); } public function testShouldReturnTopicAndQueuePreviouslySetInConstructor() diff --git a/pkg/dbal/Tests/DbalProducerTest.php b/pkg/dbal/Tests/DbalProducerTest.php index 428691b14..a3e54ffba 100644 --- a/pkg/dbal/Tests/DbalProducerTest.php +++ b/pkg/dbal/Tests/DbalProducerTest.php @@ -6,9 +6,9 @@ use Enqueue\Dbal\DbalMessage; use Enqueue\Dbal\DbalProducer; use Enqueue\Test\ClassExtensionTrait; -use Interop\Queue\InvalidDestinationException; -use Interop\Queue\PsrDestination; -use Interop\Queue\PsrProducer; +use Interop\Queue\Destination; +use Interop\Queue\Exception\InvalidDestinationException; +use Interop\Queue\Producer; class DbalProducerTest extends \PHPUnit_Framework_TestCase { @@ -16,7 +16,7 @@ class DbalProducerTest extends \PHPUnit_Framework_TestCase public function testShouldImplementProducerInterface() { - $this->assertClassImplements(PsrProducer::class, DbalProducer::class); + $this->assertClassImplements(Producer::class, DbalProducer::class); } public function testCouldBeConstructedWithRequiredArguments() @@ -47,6 +47,6 @@ private function createContextMock() } } -class NotSupportedDestination1 implements PsrDestination +class NotSupportedDestination1 implements Destination { } diff --git a/pkg/dbal/Tests/ManagerRegistryConnectionFactoryTest.php b/pkg/dbal/Tests/ManagerRegistryConnectionFactoryTest.php index f739a941c..91cbe2f3a 100644 --- a/pkg/dbal/Tests/ManagerRegistryConnectionFactoryTest.php +++ b/pkg/dbal/Tests/ManagerRegistryConnectionFactoryTest.php @@ -7,7 +7,7 @@ use Enqueue\Dbal\DbalContext; use Enqueue\Dbal\ManagerRegistryConnectionFactory; use Enqueue\Test\ClassExtensionTrait; -use Interop\Queue\PsrConnectionFactory; +use Interop\Queue\ConnectionFactory; class ManagerRegistryConnectionFactoryTest extends \PHPUnit_Framework_TestCase { @@ -15,7 +15,7 @@ class ManagerRegistryConnectionFactoryTest extends \PHPUnit_Framework_TestCase public function testShouldImplementConnectionFactoryInterface() { - $this->assertClassImplements(PsrConnectionFactory::class, ManagerRegistryConnectionFactory::class); + $this->assertClassImplements(ConnectionFactory::class, ManagerRegistryConnectionFactory::class); } public function testCouldBeConstructedWithEmptyConfiguration() diff --git a/pkg/dbal/Tests/Spec/DbalConnectionFactoryTest.php b/pkg/dbal/Tests/Spec/DbalConnectionFactoryTest.php index 2ed159787..d7fbfcde5 100644 --- a/pkg/dbal/Tests/Spec/DbalConnectionFactoryTest.php +++ b/pkg/dbal/Tests/Spec/DbalConnectionFactoryTest.php @@ -3,9 +3,9 @@ namespace Enqueue\Dbal\Tests\Spec; use Enqueue\Dbal\DbalConnectionFactory; -use Interop\Queue\Spec\PsrConnectionFactorySpec; +use Interop\Queue\Spec\ConnectionFactorySpec; -class DbalConnectionFactoryTest extends PsrConnectionFactorySpec +class DbalConnectionFactoryTest extends ConnectionFactorySpec { /** * {@inheritdoc} diff --git a/pkg/dbal/Tests/Spec/DbalContextTest.php b/pkg/dbal/Tests/Spec/DbalContextTest.php index eb5a5f74f..c45ece1c8 100644 --- a/pkg/dbal/Tests/Spec/DbalContextTest.php +++ b/pkg/dbal/Tests/Spec/DbalContextTest.php @@ -2,12 +2,12 @@ namespace Enqueue\Dbal\Tests\Spec; -use Interop\Queue\Spec\PsrContextSpec; +use Interop\Queue\Spec\ContextSpec; /** * @group functional */ -class DbalContextTest extends PsrContextSpec +class DbalContextTest extends ContextSpec { use CreateDbalContextTrait; diff --git a/pkg/dbal/Tests/Spec/DbalMessageTest.php b/pkg/dbal/Tests/Spec/DbalMessageTest.php index ca7d4dc69..c9ce855df 100644 --- a/pkg/dbal/Tests/Spec/DbalMessageTest.php +++ b/pkg/dbal/Tests/Spec/DbalMessageTest.php @@ -3,9 +3,9 @@ namespace Enqueue\Dbal\Tests\Spec; use Enqueue\Dbal\DbalMessage; -use Interop\Queue\Spec\PsrMessageSpec; +use Interop\Queue\Spec\MessageSpec; -class DbalMessageTest extends PsrMessageSpec +class DbalMessageTest extends MessageSpec { /** * {@inheritdoc} diff --git a/pkg/dbal/Tests/Spec/DbalProducerTest.php b/pkg/dbal/Tests/Spec/DbalProducerTest.php index 2580d3fd3..5ff6b7cb6 100644 --- a/pkg/dbal/Tests/Spec/DbalProducerTest.php +++ b/pkg/dbal/Tests/Spec/DbalProducerTest.php @@ -2,12 +2,12 @@ namespace Enqueue\Dbal\Tests\Spec; -use Interop\Queue\Spec\PsrProducerSpec; +use Interop\Queue\Spec\ProducerSpec; /** * @group functional */ -class DbalProducerTest extends PsrProducerSpec +class DbalProducerTest extends ProducerSpec { use CreateDbalContextTrait; diff --git a/pkg/dbal/Tests/Spec/DbalQueueTest.php b/pkg/dbal/Tests/Spec/DbalQueueTest.php index 091a48046..a9eebbb88 100644 --- a/pkg/dbal/Tests/Spec/DbalQueueTest.php +++ b/pkg/dbal/Tests/Spec/DbalQueueTest.php @@ -3,9 +3,9 @@ namespace Enqueue\Dbal\Tests\Spec; use Enqueue\Dbal\DbalDestination; -use Interop\Queue\Spec\PsrQueueSpec; +use Interop\Queue\Spec\QueueSpec; -class DbalQueueTest extends PsrQueueSpec +class DbalQueueTest extends QueueSpec { /** * {@inheritdoc} diff --git a/pkg/dbal/Tests/Spec/DbalSendAndReceivePriorityMessagesFromQueueTest.php b/pkg/dbal/Tests/Spec/DbalSendAndReceivePriorityMessagesFromQueueTest.php index 7f9441784..60dda3a25 100644 --- a/pkg/dbal/Tests/Spec/DbalSendAndReceivePriorityMessagesFromQueueTest.php +++ b/pkg/dbal/Tests/Spec/DbalSendAndReceivePriorityMessagesFromQueueTest.php @@ -4,7 +4,7 @@ use Enqueue\Dbal\DbalContext; use Enqueue\Dbal\DbalMessage; -use Interop\Queue\PsrContext; +use Interop\Queue\Context; use Interop\Queue\Spec\SendAndReceivePriorityMessagesFromQueueSpec; /** @@ -24,7 +24,7 @@ public function setUp() } /** - * @return PsrContext + * @return Context */ protected function createContext() { @@ -38,7 +38,7 @@ protected function createContext() * * @return DbalMessage */ - protected function createMessage(PsrContext $context, $body) + protected function createMessage(Context $context, $body) { /** @var DbalMessage $message */ $message = parent::createMessage($context, $body); diff --git a/pkg/dbal/Tests/Spec/DbalTopicTest.php b/pkg/dbal/Tests/Spec/DbalTopicTest.php index 91bd52fd0..bb9885ea8 100644 --- a/pkg/dbal/Tests/Spec/DbalTopicTest.php +++ b/pkg/dbal/Tests/Spec/DbalTopicTest.php @@ -3,9 +3,9 @@ namespace Enqueue\Dbal\Tests\Spec; use Enqueue\Dbal\DbalDestination; -use Interop\Queue\Spec\PsrTopicSpec; +use Interop\Queue\Spec\TopicSpec; -class DbalTopicTest extends PsrTopicSpec +class DbalTopicTest extends TopicSpec { /** * {@inheritdoc} diff --git a/pkg/enqueue-bundle/Resources/config/client.yml b/pkg/enqueue-bundle/Resources/config/client.yml index ac6c52b5d..0a6d3541b 100644 --- a/pkg/enqueue-bundle/Resources/config/client.yml +++ b/pkg/enqueue-bundle/Resources/config/client.yml @@ -1,6 +1,6 @@ services: enqueue.client.default.context: - class: 'Interop\Queue\PsrContext' + class: 'Interop\Queue\Context' factory: ['@enqueue.client.default.driver', 'getContext'] enqueue.client.default.driver_factory: diff --git a/pkg/enqueue-bundle/Tests/Functional/App/AsyncListener.php b/pkg/enqueue-bundle/Tests/Functional/App/AsyncListener.php index 2a73d3608..9e94c2c6f 100644 --- a/pkg/enqueue-bundle/Tests/Functional/App/AsyncListener.php +++ b/pkg/enqueue-bundle/Tests/Functional/App/AsyncListener.php @@ -39,8 +39,8 @@ public function onEvent(Event $event = null, $eventName) if (false == $this->isSyncMode($eventName)) { $transformerName = $this->registry->getTransformerNameForEvent($eventName); - $psrMessage = $this->registry->getTransformer($transformerName)->toMessage($eventName, $event); - $message = new Message($psrMessage->getBody()); + $interopMessage = $this->registry->getTransformer($transformerName)->toMessage($eventName, $event); + $message = new Message($interopMessage->getBody()); $message->setScope(Message::SCOPE_APP); $message->setProperty('event_name', $eventName); $message->setProperty('transformer_name', $transformerName); diff --git a/pkg/enqueue-bundle/Tests/Functional/App/SqsCustomConnectionFactoryFactory.php b/pkg/enqueue-bundle/Tests/Functional/App/SqsCustomConnectionFactoryFactory.php index 415058409..6ed70cd65 100644 --- a/pkg/enqueue-bundle/Tests/Functional/App/SqsCustomConnectionFactoryFactory.php +++ b/pkg/enqueue-bundle/Tests/Functional/App/SqsCustomConnectionFactoryFactory.php @@ -4,7 +4,7 @@ use Enqueue\ConnectionFactoryFactoryInterface; use Enqueue\Sqs\SqsConnectionFactory; -use Interop\Queue\PsrConnectionFactory; +use Interop\Queue\ConnectionFactory; use Symfony\Component\DependencyInjection\ContainerInterface; class SqsCustomConnectionFactoryFactory implements ConnectionFactoryFactoryInterface @@ -19,7 +19,7 @@ public function __construct(ContainerInterface $container) $this->container = $container; } - public function create($config): PsrConnectionFactory + public function create($config): ConnectionFactory { if (false == isset($config['service'])) { throw new \LogicException('The sqs client has to be set'); diff --git a/pkg/enqueue-bundle/Tests/Functional/App/TestAsyncEventTransformer.php b/pkg/enqueue-bundle/Tests/Functional/App/TestAsyncEventTransformer.php index 975cd4214..63d6df75a 100644 --- a/pkg/enqueue-bundle/Tests/Functional/App/TestAsyncEventTransformer.php +++ b/pkg/enqueue-bundle/Tests/Functional/App/TestAsyncEventTransformer.php @@ -4,22 +4,22 @@ use Enqueue\AsyncEventDispatcher\EventTransformer; use Enqueue\Util\JSON; -use Interop\Queue\PsrContext; -use Interop\Queue\PsrMessage; +use Interop\Queue\Context; +use Interop\Queue\Message; use Symfony\Component\EventDispatcher\Event; use Symfony\Component\EventDispatcher\GenericEvent; class TestAsyncEventTransformer implements EventTransformer { /** - * @var PsrContext + * @var Context */ private $context; /** - * @param PsrContext $context + * @param Context $context */ - public function __construct(PsrContext $context) + public function __construct(Context $context) { $this->context = $context; } @@ -41,7 +41,7 @@ public function toMessage($eventName, Event $event) ])); } - public function toEvent($eventName, PsrMessage $message) + public function toEvent($eventName, Message $message) { $data = JSON::decode($message->getBody()); diff --git a/pkg/enqueue-bundle/Tests/Functional/App/TestCommandSubscriberProcessor.php b/pkg/enqueue-bundle/Tests/Functional/App/TestCommandSubscriberProcessor.php index 2878ec762..480992ff1 100644 --- a/pkg/enqueue-bundle/Tests/Functional/App/TestCommandSubscriberProcessor.php +++ b/pkg/enqueue-bundle/Tests/Functional/App/TestCommandSubscriberProcessor.php @@ -4,15 +4,15 @@ use Enqueue\Client\CommandSubscriberInterface; use Enqueue\Consumption\Result; -use Interop\Queue\PsrContext; -use Interop\Queue\PsrMessage; -use Interop\Queue\PsrProcessor; +use Interop\Queue\Context; +use Interop\Queue\Message; +use Interop\Queue\Processor; -class TestCommandSubscriberProcessor implements PsrProcessor, CommandSubscriberInterface +class TestCommandSubscriberProcessor implements Processor, CommandSubscriberInterface { public $calls = []; - public function process(PsrMessage $message, PsrContext $context) + public function process(Message $message, Context $context) { $this->calls[] = $message; diff --git a/pkg/enqueue-bundle/Tests/Functional/App/TestExclusiveCommandSubscriberProcessor.php b/pkg/enqueue-bundle/Tests/Functional/App/TestExclusiveCommandSubscriberProcessor.php index df0a5719b..999ad1f24 100644 --- a/pkg/enqueue-bundle/Tests/Functional/App/TestExclusiveCommandSubscriberProcessor.php +++ b/pkg/enqueue-bundle/Tests/Functional/App/TestExclusiveCommandSubscriberProcessor.php @@ -4,15 +4,15 @@ use Enqueue\Client\CommandSubscriberInterface; use Enqueue\Consumption\Result; -use Interop\Queue\PsrContext; -use Interop\Queue\PsrMessage; -use Interop\Queue\PsrProcessor; +use Interop\Queue\Context; +use Interop\Queue\Message; +use Interop\Queue\Processor; -class TestExclusiveCommandSubscriberProcessor implements PsrProcessor, CommandSubscriberInterface +class TestExclusiveCommandSubscriberProcessor implements Processor, CommandSubscriberInterface { public $calls = []; - public function process(PsrMessage $message, PsrContext $context) + public function process(Message $message, Context $context) { $this->calls[] = $message; diff --git a/pkg/enqueue-bundle/Tests/Functional/App/TestTopicSubscriberProcessor.php b/pkg/enqueue-bundle/Tests/Functional/App/TestTopicSubscriberProcessor.php index 7130eda44..2b9f16ead 100644 --- a/pkg/enqueue-bundle/Tests/Functional/App/TestTopicSubscriberProcessor.php +++ b/pkg/enqueue-bundle/Tests/Functional/App/TestTopicSubscriberProcessor.php @@ -4,15 +4,15 @@ use Enqueue\Client\TopicSubscriberInterface; use Enqueue\Consumption\Result; -use Interop\Queue\PsrContext; -use Interop\Queue\PsrMessage; -use Interop\Queue\PsrProcessor; +use Interop\Queue\Context; +use Interop\Queue\Message; +use Interop\Queue\Processor; -class TestTopicSubscriberProcessor implements PsrProcessor, TopicSubscriberInterface +class TestTopicSubscriberProcessor implements Processor, TopicSubscriberInterface { public $calls = []; - public function process(PsrMessage $message, PsrContext $context) + public function process(Message $message, Context $context) { $this->calls[] = $message; diff --git a/pkg/enqueue-bundle/Tests/Functional/ContextTest.php b/pkg/enqueue-bundle/Tests/Functional/ContextTest.php index 6e7e7bd00..87e2d95a0 100644 --- a/pkg/enqueue-bundle/Tests/Functional/ContextTest.php +++ b/pkg/enqueue-bundle/Tests/Functional/ContextTest.php @@ -2,7 +2,7 @@ namespace Enqueue\Bundle\Tests\Functional; -use Interop\Queue\PsrContext; +use Interop\Queue\Context; /** * @group functional @@ -13,6 +13,6 @@ public function testCouldBeGetFromContainerAsService() { $connection = static::$container->get('test_enqueue.transport.default.context'); - $this->assertInstanceOf(PsrContext::class, $connection); + $this->assertInstanceOf(Context::class, $connection); } } diff --git a/pkg/enqueue-bundle/Tests/Functional/Events/AsyncProcessorTest.php b/pkg/enqueue-bundle/Tests/Functional/Events/AsyncProcessorTest.php index aabab9e0f..101e5ecec 100644 --- a/pkg/enqueue-bundle/Tests/Functional/Events/AsyncProcessorTest.php +++ b/pkg/enqueue-bundle/Tests/Functional/Events/AsyncProcessorTest.php @@ -10,7 +10,7 @@ use Enqueue\Null\NullContext; use Enqueue\Null\NullMessage; use Enqueue\Util\JSON; -use Interop\Queue\PsrProcessor; +use Interop\Queue\Processor; use Symfony\Component\EventDispatcher\GenericEvent; /** @@ -45,7 +45,7 @@ public function testShouldRejectIfMessageDoesNotContainEventNameProperty() $message = new NullMessage(); - $this->assertEquals(PsrProcessor::REJECT, $processor->process($message, new NullContext())); + $this->assertEquals(Processor::REJECT, $processor->process($message, new NullContext())); } public function testShouldRejectIfMessageDoesNotContainTransformerNameProperty() @@ -56,7 +56,7 @@ public function testShouldRejectIfMessageDoesNotContainTransformerNameProperty() $message = new NullMessage(); $message->setProperty('event_name', 'anEventName'); - $this->assertEquals(PsrProcessor::REJECT, $processor->process($message, new NullContext())); + $this->assertEquals(Processor::REJECT, $processor->process($message, new NullContext())); } public function testShouldCallRealListener() @@ -72,7 +72,7 @@ public function testShouldCallRealListener() 'arguments' => ['fooArg' => 'fooVal'], ])); - $this->assertEquals(PsrProcessor::ACK, $processor->process($message, new NullContext())); + $this->assertEquals(Processor::ACK, $processor->process($message, new NullContext())); /** @var TestAsyncListener $listener */ $listener = static::$container->get('test_async_listener'); @@ -103,7 +103,7 @@ public function testShouldCallRealSubscriber() 'arguments' => ['fooArg' => 'fooVal'], ])); - $this->assertEquals(PsrProcessor::ACK, $processor->process($message, new NullContext())); + $this->assertEquals(Processor::ACK, $processor->process($message, new NullContext())); /** @var TestAsyncSubscriber $subscriber */ $subscriber = static::$container->get('test_async_subscriber'); diff --git a/pkg/enqueue-bundle/Tests/Functional/TestCommandProcessor.php b/pkg/enqueue-bundle/Tests/Functional/TestCommandProcessor.php index be6438ae2..5875a865b 100644 --- a/pkg/enqueue-bundle/Tests/Functional/TestCommandProcessor.php +++ b/pkg/enqueue-bundle/Tests/Functional/TestCommandProcessor.php @@ -3,20 +3,20 @@ namespace Enqueue\Bundle\Tests\Functional; use Enqueue\Client\CommandSubscriberInterface; -use Interop\Queue\PsrContext; -use Interop\Queue\PsrMessage; -use Interop\Queue\PsrProcessor; +use Interop\Queue\Context; +use Interop\Queue\Message; +use Interop\Queue\Processor; -class TestCommandProcessor implements PsrProcessor, CommandSubscriberInterface +class TestCommandProcessor implements Processor, CommandSubscriberInterface { const COMMAND = 'test-command'; /** - * @var PsrMessage + * @var Message */ public $message; - public function process(PsrMessage $message, PsrContext $context) + public function process(Message $message, Context $context) { $this->message = $message; diff --git a/pkg/enqueue-bundle/Tests/Functional/TestProcessor.php b/pkg/enqueue-bundle/Tests/Functional/TestProcessor.php index a0086bed6..8d21cb7ac 100644 --- a/pkg/enqueue-bundle/Tests/Functional/TestProcessor.php +++ b/pkg/enqueue-bundle/Tests/Functional/TestProcessor.php @@ -3,20 +3,20 @@ namespace Enqueue\Bundle\Tests\Functional; use Enqueue\Client\TopicSubscriberInterface; -use Interop\Queue\PsrContext; -use Interop\Queue\PsrMessage; -use Interop\Queue\PsrProcessor; +use Interop\Queue\Context; +use Interop\Queue\Message; +use Interop\Queue\Processor; -class TestProcessor implements PsrProcessor, TopicSubscriberInterface +class TestProcessor implements Processor, TopicSubscriberInterface { const TOPIC = 'test-topic'; /** - * @var PsrMessage + * @var Message */ public $message; - public function process(PsrMessage $message, PsrContext $context) + public function process(Message $message, Context $context) { $this->message = $message; diff --git a/pkg/enqueue-bundle/Tests/Functional/UseCasesTest.php b/pkg/enqueue-bundle/Tests/Functional/UseCasesTest.php index 7014ba8f5..e9a576484 100644 --- a/pkg/enqueue-bundle/Tests/Functional/UseCasesTest.php +++ b/pkg/enqueue-bundle/Tests/Functional/UseCasesTest.php @@ -6,10 +6,10 @@ use Enqueue\Client\DriverInterface; use Enqueue\Client\ProducerInterface; use Enqueue\Stomp\StompDestination; -use Interop\Queue\PsrContext; -use Interop\Queue\PsrMessage; -use Interop\Queue\PsrQueue; -use Interop\Queue\PurgeQueueNotSupportedException; +use Interop\Queue\Context; +use Interop\Queue\Exception\PurgeQueueNotSupportedException; +use Interop\Queue\Message; +use Interop\Queue\Queue; use Symfony\Component\Console\Tester\CommandTester; use Symfony\Component\Filesystem\Filesystem; @@ -26,8 +26,8 @@ public function setUp() public function tearDown() { - if ($this->getPsrContext()) { - $this->getPsrContext()->close(); + if ($this->getContext()) { + $this->getContext()->close(); } if (static::$kernel) { @@ -133,10 +133,10 @@ public function testProducerSendsMessage(array $enqueueConfig) $this->getMessageProducer()->sendEvent(TestProcessor::TOPIC, $expectedBody); - $consumer = $this->getPsrContext()->createConsumer($this->getTestQueue()); + $consumer = $this->getContext()->createConsumer($this->getTestQueue()); $message = $consumer->receive(100); - $this->assertInstanceOf(PsrMessage::class, $message); + $this->assertInstanceOf(Message::class, $message); $consumer->acknowledge($message); $this->assertSame($expectedBody, $message->getBody()); @@ -153,13 +153,13 @@ public function testProducerSendsCommandMessage(array $enqueueConfig) $this->getMessageProducer()->sendCommand(TestCommandProcessor::COMMAND, $expectedBody); - $consumer = $this->getPsrContext()->createConsumer($this->getTestQueue()); + $consumer = $this->getContext()->createConsumer($this->getTestQueue()); $message = $consumer->receive(100); - $this->assertInstanceOf(PsrMessage::class, $message); + $this->assertInstanceOf(Message::class, $message); $consumer->acknowledge($message); - $this->assertInstanceOf(PsrMessage::class, $message); + $this->assertInstanceOf(Message::class, $message); $this->assertSame($expectedBody, $message->getBody()); } @@ -184,7 +184,7 @@ public function testClientConsumeCommandMessagesFromExplicitlySetQueue(array $en 'client-queue-names' => ['test'], ]); - $this->assertInstanceOf(PsrMessage::class, $processor->message); + $this->assertInstanceOf(Message::class, $processor->message); $this->assertEquals($expectedBody, $processor->message->getBody()); } @@ -209,7 +209,7 @@ public function testClientConsumeMessagesFromExplicitlySetQueue(array $enqueueCo 'client-queue-names' => ['test'], ]); - $this->assertInstanceOf(PsrMessage::class, $processor->message); + $this->assertInstanceOf(Message::class, $processor->message); $this->assertEquals($expectedBody, $processor->message->getBody()); } @@ -243,7 +243,7 @@ public function testClientConsumeMessagesFromExplicitlySetQueue(array $enqueueCo // 'processor-service' => 'test.message.processor', // ]); // -// $this->assertInstanceOf(PsrMessage::class, $processor->message); +// $this->assertInstanceOf(Message::class, $processor->message); // $this->assertEquals($expectedBody, $processor->message->getBody()); // } @@ -268,7 +268,7 @@ protected function customSetUp(array $enqueueConfig) /** @var DriverInterface $driver */ $driver = static::$container->get('test_enqueue.client.default.driver'); - $context = $this->getPsrContext(); + $context = $this->getContext(); $driver->setupBroker(); @@ -279,7 +279,7 @@ protected function customSetUp(array $enqueueConfig) } /** - * @return PsrQueue + * @return Queue */ protected function getTestQueue() { @@ -289,10 +289,7 @@ protected function getTestQueue() return $driver->createQueue('test'); } - /** - * {@inheritdoc} - */ - protected static function createKernel(array $options = []) + protected static function createKernel(array $options = []): CustomAppKernel { /** @var CustomAppKernel $kernel */ $kernel = parent::createKernel($options); @@ -302,18 +299,12 @@ protected static function createKernel(array $options = []) return $kernel; } - /** - * @return ProducerInterface|object - */ - private function getMessageProducer() + private function getMessageProducer(): ProducerInterface { return static::$container->get('enqueue.client.default.producer'); } - /** - * @return PsrContext|object - */ - private function getPsrContext() + private function getContext(): Context { return static::$container->get('test_enqueue.transport.default.context'); } diff --git a/pkg/enqueue-bundle/Tests/Unit/Consumption/Extension/DoctrineClearIdentityMapExtensionTest.php b/pkg/enqueue-bundle/Tests/Unit/Consumption/Extension/DoctrineClearIdentityMapExtensionTest.php index 08403bf16..b011abc35 100644 --- a/pkg/enqueue-bundle/Tests/Unit/Consumption/Extension/DoctrineClearIdentityMapExtensionTest.php +++ b/pkg/enqueue-bundle/Tests/Unit/Consumption/Extension/DoctrineClearIdentityMapExtensionTest.php @@ -5,9 +5,9 @@ use Doctrine\Common\Persistence\ObjectManager; use Enqueue\Bundle\Consumption\Extension\DoctrineClearIdentityMapExtension; use Enqueue\Consumption\Context; -use Interop\Queue\PsrConsumer; -use Interop\Queue\PsrContext; -use Interop\Queue\PsrProcessor; +use Interop\Queue\Consumer; +use Interop\Queue\Context as InteropContext; +use Interop\Queue\Processor; use PHPUnit\Framework\TestCase; use Psr\Log\LoggerInterface; use Symfony\Bridge\Doctrine\RegistryInterface; @@ -34,7 +34,7 @@ public function testShouldClearIdentityMap() ->will($this->returnValue(['manager-name' => $manager])) ; - $context = $this->createPsrContext(); + $context = $this->createContext(); $context->getLogger() ->expects($this->once()) ->method('debug') @@ -45,15 +45,12 @@ public function testShouldClearIdentityMap() $extension->onPreReceived($context); } - /** - * @return Context - */ - protected function createPsrContext() + protected function createContext(): Context { - $context = new Context($this->createMock(PsrContext::class)); + $context = new Context($this->createMock(InteropContext::class)); $context->setLogger($this->createMock(LoggerInterface::class)); - $context->setPsrConsumer($this->createMock(PsrConsumer::class)); - $context->setPsrProcessor($this->createMock(PsrProcessor::class)); + $context->setConsumer($this->createMock(Consumer::class)); + $context->setProcessor($this->createMock(Processor::class)); return $context; } @@ -61,7 +58,7 @@ protected function createPsrContext() /** * @return \PHPUnit_Framework_MockObject_MockObject|RegistryInterface */ - protected function createRegistryMock() + protected function createRegistryMock(): RegistryInterface { return $this->createMock(RegistryInterface::class); } @@ -69,7 +66,7 @@ protected function createRegistryMock() /** * @return \PHPUnit_Framework_MockObject_MockObject|ObjectManager */ - protected function createManagerMock() + protected function createManagerMock(): ObjectManager { return $this->createMock(ObjectManager::class); } diff --git a/pkg/enqueue-bundle/Tests/Unit/Consumption/Extension/DoctrinePingConnectionExtensionTest.php b/pkg/enqueue-bundle/Tests/Unit/Consumption/Extension/DoctrinePingConnectionExtensionTest.php index acc23bc4e..b93e507cb 100644 --- a/pkg/enqueue-bundle/Tests/Unit/Consumption/Extension/DoctrinePingConnectionExtensionTest.php +++ b/pkg/enqueue-bundle/Tests/Unit/Consumption/Extension/DoctrinePingConnectionExtensionTest.php @@ -5,9 +5,9 @@ use Doctrine\DBAL\Connection; use Enqueue\Bundle\Consumption\Extension\DoctrinePingConnectionExtension; use Enqueue\Consumption\Context; -use Interop\Queue\PsrConsumer; -use Interop\Queue\PsrContext; -use Interop\Queue\PsrProcessor; +use Interop\Queue\Consumer; +use Interop\Queue\Context as InteropContext; +use Interop\Queue\Processor; use PHPUnit\Framework\TestCase; use Psr\Log\LoggerInterface; use Symfony\Bridge\Doctrine\RegistryInterface; @@ -41,7 +41,7 @@ public function testShouldNotReconnectIfConnectionIsOK() ->method('connect') ; - $context = $this->createPsrContext(); + $context = $this->createContext(); $context->getLogger() ->expects($this->never()) ->method('debug') @@ -80,7 +80,7 @@ public function testShouldDoesReconnectIfConnectionFailed() ->method('connect') ; - $context = $this->createPsrContext(); + $context = $this->createContext(); $context->getLogger() ->expects($this->at(0)) ->method('debug') @@ -129,7 +129,7 @@ public function testShouldSkipIfConnectionWasNotOpened() ->will($this->returnValue(true)) ; - $context = $this->createPsrContext(); + $context = $this->createContext(); $context->getLogger() ->expects($this->never()) ->method('debug') @@ -146,15 +146,12 @@ public function testShouldSkipIfConnectionWasNotOpened() $extension->onPreReceived($context); } - /** - * @return Context - */ - protected function createPsrContext() + protected function createContext(): Context { - $context = new Context($this->createMock(PsrContext::class)); + $context = new Context($this->createMock(InteropContext::class)); $context->setLogger($this->createMock(LoggerInterface::class)); - $context->setPsrConsumer($this->createMock(PsrConsumer::class)); - $context->setPsrProcessor($this->createMock(PsrProcessor::class)); + $context->setConsumer($this->createMock(Consumer::class)); + $context->setProcessor($this->createMock(Processor::class)); return $context; } @@ -162,7 +159,7 @@ protected function createPsrContext() /** * @return \PHPUnit_Framework_MockObject_MockObject|RegistryInterface */ - protected function createRegistryMock() + protected function createRegistryMock(): RegistryInterface { return $this->createMock(RegistryInterface::class); } @@ -170,7 +167,7 @@ protected function createRegistryMock() /** * @return \PHPUnit_Framework_MockObject_MockObject|Connection */ - protected function createConnectionMock() + protected function createConnectionMock(): Connection { return $this->createMock(Connection::class); } diff --git a/pkg/enqueue/Client/ArrayProcessorRegistry.php b/pkg/enqueue/Client/ArrayProcessorRegistry.php index bbe1cfe84..5dede785c 100644 --- a/pkg/enqueue/Client/ArrayProcessorRegistry.php +++ b/pkg/enqueue/Client/ArrayProcessorRegistry.php @@ -2,29 +2,29 @@ namespace Enqueue\Client; -use Interop\Queue\PsrProcessor; +use Interop\Queue\Processor; class ArrayProcessorRegistry implements ProcessorRegistryInterface { /** - * @var PsrProcessor[] + * @var Processor[] */ private $processors; /** - * @param PsrProcessor[] $processors + * @param Processor[] $processors */ public function __construct(array $processors = []) { $this->processors = $processors; } - public function add(string $name, PsrProcessor $processor): void + public function add(string $name, Processor $processor): void { $this->processors[$name] = $processor; } - public function get(string $processorName): PsrProcessor + public function get(string $processorName): Processor { if (false == isset($this->processors[$processorName])) { throw new \LogicException(sprintf('Processor was not found. processorName: "%s"', $processorName)); diff --git a/pkg/enqueue/Client/ConsumptionExtension/DelayRedeliveredMessageExtension.php b/pkg/enqueue/Client/ConsumptionExtension/DelayRedeliveredMessageExtension.php index 98fa483fa..0977f95b4 100644 --- a/pkg/enqueue/Client/ConsumptionExtension/DelayRedeliveredMessageExtension.php +++ b/pkg/enqueue/Client/ConsumptionExtension/DelayRedeliveredMessageExtension.php @@ -41,7 +41,7 @@ public function __construct(DriverInterface $driver, $delay) */ public function onPreReceived(Context $context) { - $message = $context->getPsrMessage(); + $message = $context->getInteropMessage(); if (false == $message->isRedelivered()) { return; } diff --git a/pkg/enqueue/Client/ConsumptionExtension/ExclusiveCommandExtension.php b/pkg/enqueue/Client/ConsumptionExtension/ExclusiveCommandExtension.php index 261ac0231..64a2d45e4 100644 --- a/pkg/enqueue/Client/ConsumptionExtension/ExclusiveCommandExtension.php +++ b/pkg/enqueue/Client/ConsumptionExtension/ExclusiveCommandExtension.php @@ -30,8 +30,8 @@ public function __construct(DriverInterface $driver) public function onPreReceived(Context $context) { - $message = $context->getPsrMessage(); - $queue = $context->getPsrQueue(); + $message = $context->getInteropMessage(); + $queue = $context->getInteropQueue(); if ($message->getProperty(Config::PARAMETER_TOPIC_NAME)) { return; diff --git a/pkg/enqueue/Client/ConsumptionExtension/SetRouterPropertiesExtension.php b/pkg/enqueue/Client/ConsumptionExtension/SetRouterPropertiesExtension.php index a87a098f5..0b91834b5 100644 --- a/pkg/enqueue/Client/ConsumptionExtension/SetRouterPropertiesExtension.php +++ b/pkg/enqueue/Client/ConsumptionExtension/SetRouterPropertiesExtension.php @@ -27,14 +27,14 @@ public function __construct(DriverInterface $driver) public function onPreReceived(Context $context) { - $message = $context->getPsrMessage(); + $message = $context->getInteropMessage(); if ($message->getProperty(Config::PARAMETER_PROCESSOR_NAME)) { return; } $config = $this->driver->getConfig(); $queue = $this->driver->createQueue($config->getRouterQueueName()); - if ($context->getPsrQueue()->getQueueName() != $queue->getQueueName()) { + if ($context->getInteropQueue()->getQueueName() != $queue->getQueueName()) { return; } diff --git a/pkg/enqueue/Client/DelegateProcessor.php b/pkg/enqueue/Client/DelegateProcessor.php index 6cb8f9866..299668443 100644 --- a/pkg/enqueue/Client/DelegateProcessor.php +++ b/pkg/enqueue/Client/DelegateProcessor.php @@ -2,11 +2,11 @@ namespace Enqueue\Client; -use Interop\Queue\PsrContext; -use Interop\Queue\PsrMessage; -use Interop\Queue\PsrProcessor; +use Interop\Queue\Context; +use Interop\Queue\Message as InteropMessage; +use Interop\Queue\Processor; -class DelegateProcessor implements PsrProcessor +class DelegateProcessor implements Processor { /** * @var ProcessorRegistryInterface @@ -24,7 +24,7 @@ public function __construct(ProcessorRegistryInterface $registry) /** * {@inheritdoc} */ - public function process(PsrMessage $message, PsrContext $context) + public function process(InteropMessage $message, Context $context) { $processorName = $message->getProperty(Config::PARAMETER_PROCESSOR_NAME); if (false == $processorName) { diff --git a/pkg/enqueue/Client/Driver/AmqpDriver.php b/pkg/enqueue/Client/Driver/AmqpDriver.php index 0d77d1194..6d36fc4c1 100644 --- a/pkg/enqueue/Client/Driver/AmqpDriver.php +++ b/pkg/enqueue/Client/Driver/AmqpDriver.php @@ -11,10 +11,10 @@ use Interop\Amqp\AmqpQueue; use Interop\Amqp\AmqpTopic; use Interop\Amqp\Impl\AmqpBind; -use Interop\Queue\PsrDestination; -use Interop\Queue\PsrMessage; -use Interop\Queue\PsrProducer; -use Interop\Queue\PsrQueue; +use Interop\Queue\Destination; +use Interop\Queue\Message as InteropMessage; +use Interop\Queue\Producer as InteropProducer; +use Interop\Queue\Queue as InteropQueue; use Psr\Log\LoggerInterface; use Psr\Log\NullLogger; @@ -31,7 +31,7 @@ public function __construct(AmqpContext $context, ...$args) /** * @return AmqpMessage */ - public function createTransportMessage(Message $clientMessage): PsrMessage + public function createTransportMessage(Message $clientMessage): InteropMessage { /** @var AmqpMessage $transportMessage */ $transportMessage = parent::createTransportMessage($clientMessage); @@ -96,7 +96,7 @@ public function setupBroker(LoggerInterface $logger = null): void /** * @return AmqpTopic */ - protected function createRouterTopic(): PsrDestination + protected function createRouterTopic(): Destination { $topic = $this->doCreateTopic( $this->createTransportRouterTopicName($this->getConfig()->getRouterTopicName(), true) @@ -110,7 +110,7 @@ protected function createRouterTopic(): PsrDestination /** * @return AmqpQueue */ - protected function doCreateQueue(string $transportQueueName): PsrQueue + protected function doCreateQueue(string $transportQueueName): InteropQueue { /** @var AmqpQueue $queue */ $queue = parent::doCreateQueue($transportQueueName); @@ -124,7 +124,7 @@ protected function doCreateQueue(string $transportQueueName): PsrQueue * @param AmqpTopic $topic * @param AmqpMessage $transportMessage */ - protected function doSendToRouter(PsrProducer $producer, PsrDestination $topic, PsrMessage $transportMessage): void + protected function doSendToRouter(InteropProducer $producer, Destination $topic, InteropMessage $transportMessage): void { // We should not handle priority, expiration, and delay at this stage. // The router will take care of it while re-sending the message to the final destinations. diff --git a/pkg/enqueue/Client/Driver/GenericDriver.php b/pkg/enqueue/Client/Driver/GenericDriver.php index e7b2e9343..639146654 100644 --- a/pkg/enqueue/Client/Driver/GenericDriver.php +++ b/pkg/enqueue/Client/Driver/GenericDriver.php @@ -10,18 +10,18 @@ use Enqueue\Client\MessagePriority; use Enqueue\Client\Route; use Enqueue\Client\RouteCollection; -use Interop\Queue\PsrContext; -use Interop\Queue\PsrDestination; -use Interop\Queue\PsrMessage; -use Interop\Queue\PsrProducer; -use Interop\Queue\PsrQueue; -use Interop\Queue\PsrTopic; +use Interop\Queue\Context; +use Interop\Queue\Destination; +use Interop\Queue\Message as InteropMessage; +use Interop\Queue\Producer as InteropProducer; +use Interop\Queue\Queue as InteropQueue; +use Interop\Queue\Topic as InteropTopic; use Psr\Log\LoggerInterface; class GenericDriver implements DriverInterface { /** - * @var PsrContext + * @var Context */ private $context; @@ -36,7 +36,7 @@ class GenericDriver implements DriverInterface private $routeCollection; public function __construct( - PsrContext $context, + Context $context, Config $config, RouteCollection $routeCollection ) { @@ -66,7 +66,7 @@ public function sendToProcessor(Message $message): void $topic = $message->getProperty(Config::PARAMETER_TOPIC_NAME); $command = $message->getProperty(Config::PARAMETER_COMMAND_NAME); - /** @var PsrQueue $queue */ + /** @var InteropQueue $queue */ $queue = null; if ($topic && $processor = $message->getProperty(Config::PARAMETER_PROCESSOR_NAME)) { $route = $this->routeCollection->topicAndProcessor($topic, $processor); @@ -117,14 +117,14 @@ public function setupBroker(LoggerInterface $logger = null): void { } - public function createQueue(string $clientQueueName, bool $prefix = true): PsrQueue + public function createQueue(string $clientQueueName, bool $prefix = true): InteropQueue { $transportName = $this->createTransportQueueName($clientQueueName, $prefix); return $this->doCreateQueue($transportName); } - public function createRouteQueue(Route $route): PsrQueue + public function createRouteQueue(Route $route): InteropQueue { $transportName = $this->createTransportQueueName( $route->getQueue() ?: $this->config->getDefaultProcessorQueueName(), @@ -134,7 +134,7 @@ public function createRouteQueue(Route $route): PsrQueue return $this->doCreateQueue($transportName); } - public function createTransportMessage(Message $clientMessage): PsrMessage + public function createTransportMessage(Message $clientMessage): InteropMessage { $headers = $clientMessage->getHeaders(); $properties = $clientMessage->getProperties(); @@ -167,7 +167,7 @@ public function createTransportMessage(Message $clientMessage): PsrMessage return $transportMessage; } - public function createClientMessage(PsrMessage $transportMessage): Message + public function createClientMessage(InteropMessage $transportMessage): Message { $clientMessage = new Message(); @@ -203,7 +203,7 @@ public function getConfig(): Config return $this->config; } - public function getContext(): PsrContext + public function getContext(): Context { return $this->context; } @@ -213,17 +213,17 @@ public function getRouteCollection(): RouteCollection return $this->routeCollection; } - protected function doSendToRouter(PsrProducer $producer, PsrDestination $topic, PsrMessage $transportMessage): void + protected function doSendToRouter(InteropProducer $producer, Destination $topic, InteropMessage $transportMessage): void { $producer->send($topic, $transportMessage); } - protected function doSendToProcessor(PsrProducer $producer, PsrQueue $queue, PsrMessage $transportMessage): void + protected function doSendToProcessor(InteropProducer $producer, InteropQueue $queue, InteropMessage $transportMessage): void { $producer->send($queue, $transportMessage); } - protected function createRouterTopic(): PsrDestination + protected function createRouterTopic(): Destination { return $this->createQueue($this->getConfig()->getRouterQueueName()); } @@ -243,12 +243,12 @@ protected function createTransportQueueName(string $name, bool $prefix): string return strtolower(implode($this->config->getSeparator(), array_filter([$clientPrefix, $clientAppName, $name]))); } - protected function doCreateQueue(string $transportQueueName): PsrQueue + protected function doCreateQueue(string $transportQueueName): InteropQueue { return $this->context->createQueue($transportQueueName); } - protected function doCreateTopic(string $transportTopicName): PsrTopic + protected function doCreateTopic(string $transportTopicName): InteropTopic { return $this->context->createTopic($transportTopicName); } diff --git a/pkg/enqueue/Client/Driver/GpsDriver.php b/pkg/enqueue/Client/Driver/GpsDriver.php index 572faacb5..2a37b7244 100644 --- a/pkg/enqueue/Client/Driver/GpsDriver.php +++ b/pkg/enqueue/Client/Driver/GpsDriver.php @@ -5,7 +5,7 @@ use Enqueue\Gps\GpsContext; use Enqueue\Gps\GpsQueue; use Enqueue\Gps\GpsTopic; -use Interop\Queue\PsrDestination; +use Interop\Queue\Destination; use Psr\Log\LoggerInterface; use Psr\Log\NullLogger; @@ -55,7 +55,7 @@ public function setupBroker(LoggerInterface $logger = null): void /** * @return GpsTopic */ - protected function createRouterTopic(): PsrDestination + protected function createRouterTopic(): Destination { return $this->doCreateTopic( $this->createTransportRouterTopicName($this->getConfig()->getRouterTopicName(), true) diff --git a/pkg/enqueue/Client/Driver/RabbitMqDriver.php b/pkg/enqueue/Client/Driver/RabbitMqDriver.php index 5e94b165f..096de6d26 100644 --- a/pkg/enqueue/Client/Driver/RabbitMqDriver.php +++ b/pkg/enqueue/Client/Driver/RabbitMqDriver.php @@ -3,14 +3,14 @@ namespace Enqueue\Client\Driver; use Interop\Amqp\AmqpQueue; -use Interop\Queue\PsrQueue; +use Interop\Queue\Queue as InteropQueue; class RabbitMqDriver extends AmqpDriver { /** * @return AmqpQueue */ - protected function doCreateQueue(string $transportQueueName): PsrQueue + protected function doCreateQueue(string $transportQueueName): InteropQueue { $queue = parent::doCreateQueue($transportQueueName); $queue->setArguments(['x-max-priority' => 4]); diff --git a/pkg/enqueue/Client/Driver/RabbitMqStompDriver.php b/pkg/enqueue/Client/Driver/RabbitMqStompDriver.php index ace520929..fc15953c8 100644 --- a/pkg/enqueue/Client/Driver/RabbitMqStompDriver.php +++ b/pkg/enqueue/Client/Driver/RabbitMqStompDriver.php @@ -9,10 +9,10 @@ use Enqueue\Stomp\StompDestination; use Enqueue\Stomp\StompMessage; use Enqueue\Stomp\StompProducer; -use Interop\Queue\PsrDestination; -use Interop\Queue\PsrMessage; -use Interop\Queue\PsrProducer; -use Interop\Queue\PsrQueue; +use Interop\Queue\Destination; +use Interop\Queue\Message as InteropMessage; +use Interop\Queue\Producer as InteropProducer; +use Interop\Queue\Queue as InteropQueue; use Psr\Log\LoggerInterface; use Psr\Log\NullLogger; @@ -33,7 +33,7 @@ public function __construct(StompContext $context, Config $config, RouteCollecti /** * @return StompMessage */ - public function createTransportMessage(Message $message): PsrMessage + public function createTransportMessage(Message $message): InteropMessage { $transportMessage = parent::createTransportMessage($message); @@ -138,7 +138,7 @@ public function setupBroker(LoggerInterface $logger = null): void /** * @return StompDestination */ - protected function doCreateQueue(string $transportQueueName): PsrQueue + protected function doCreateQueue(string $transportQueueName): InteropQueue { $queue = parent::doCreateQueue($transportQueueName); $queue->setHeader('x-max-priority', 4); @@ -151,7 +151,7 @@ protected function doCreateQueue(string $transportQueueName): PsrQueue * @param StompDestination $topic * @param StompMessage $transportMessage */ - protected function doSendToRouter(PsrProducer $producer, PsrDestination $topic, PsrMessage $transportMessage): void + protected function doSendToRouter(InteropProducer $producer, Destination $topic, InteropMessage $transportMessage): void { // We should not handle priority, expiration, and delay at this stage. // The router will take care of it while re-sending the message to the final destinations. @@ -167,7 +167,7 @@ protected function doSendToRouter(PsrProducer $producer, PsrDestination $topic, * @param StompDestination $destination * @param StompMessage $transportMessage */ - protected function doSendToProcessor(PsrProducer $producer, PsrQueue $destination, PsrMessage $transportMessage): void + protected function doSendToProcessor(InteropProducer $producer, InteropQueue $destination, InteropMessage $transportMessage): void { if ($delay = $transportMessage->getProperty('X-Enqueue-Delay')) { $producer->setDeliveryDelay(null); diff --git a/pkg/enqueue/Client/Driver/RdKafkaDriver.php b/pkg/enqueue/Client/Driver/RdKafkaDriver.php index f83677deb..1a10b228e 100644 --- a/pkg/enqueue/Client/Driver/RdKafkaDriver.php +++ b/pkg/enqueue/Client/Driver/RdKafkaDriver.php @@ -4,7 +4,7 @@ use Enqueue\RdKafka\RdKafkaContext; use Enqueue\RdKafka\RdKafkaTopic; -use Interop\Queue\PsrDestination; +use Interop\Queue\Destination; use Psr\Log\LoggerInterface; use Psr\Log\NullLogger; @@ -48,7 +48,7 @@ public function setupBroker(LoggerInterface $logger = null): void /** * @return RdKafkaTopic */ - protected function createRouterTopic(): PsrDestination + protected function createRouterTopic(): Destination { return $this->doCreateTopic( $this->createTransportRouterTopicName($this->getConfig()->getRouterTopicName(), true) diff --git a/pkg/enqueue/Client/Driver/SqsDriver.php b/pkg/enqueue/Client/Driver/SqsDriver.php index 622c6f7cf..9672d3955 100644 --- a/pkg/enqueue/Client/Driver/SqsDriver.php +++ b/pkg/enqueue/Client/Driver/SqsDriver.php @@ -9,7 +9,7 @@ /** * @method SqsContext getContext - * @method SqsDestination createQueue(string $clientQueueName): PsrQueue + * @method SqsDestination createQueue(string $clientQueueName): InteropQueue */ class SqsDriver extends GenericDriver { diff --git a/pkg/enqueue/Client/Driver/StompDriver.php b/pkg/enqueue/Client/Driver/StompDriver.php index 95cc8b761..7236505e2 100644 --- a/pkg/enqueue/Client/Driver/StompDriver.php +++ b/pkg/enqueue/Client/Driver/StompDriver.php @@ -6,9 +6,9 @@ use Enqueue\Stomp\StompContext; use Enqueue\Stomp\StompDestination; use Enqueue\Stomp\StompMessage; -use Interop\Queue\PsrDestination; -use Interop\Queue\PsrMessage; -use Interop\Queue\PsrQueue; +use Interop\Queue\Destination; +use Interop\Queue\Message as InteropMessage; +use Interop\Queue\Queue as InteropQueue; use Psr\Log\LoggerInterface; use Psr\Log\NullLogger; @@ -31,7 +31,7 @@ public function setupBroker(LoggerInterface $logger = null): void /** * @return StompMessage */ - public function createTransportMessage(Message $message): PsrMessage + public function createTransportMessage(Message $message): InteropMessage { /** @var StompMessage $transportMessage */ $transportMessage = parent::createTransportMessage($message); @@ -43,7 +43,7 @@ public function createTransportMessage(Message $message): PsrMessage /** * @return StompDestination */ - protected function doCreateQueue(string $transportQueueName): PsrQueue + protected function doCreateQueue(string $transportQueueName): InteropQueue { /** @var StompDestination $queue */ $queue = parent::doCreateQueue($transportQueueName); @@ -57,7 +57,7 @@ protected function doCreateQueue(string $transportQueueName): PsrQueue /** * @return StompDestination */ - protected function createRouterTopic(): PsrDestination + protected function createRouterTopic(): Destination { /** @var StompDestination $topic */ $topic = $this->doCreateTopic( diff --git a/pkg/enqueue/Client/DriverFactory.php b/pkg/enqueue/Client/DriverFactory.php index 67d3607c0..071ec0c62 100644 --- a/pkg/enqueue/Client/DriverFactory.php +++ b/pkg/enqueue/Client/DriverFactory.php @@ -8,7 +8,7 @@ use Enqueue\Dsn\Dsn; use Enqueue\Stomp\StompConnectionFactory; use Interop\Amqp\AmqpConnectionFactory; -use Interop\Queue\PsrConnectionFactory; +use Interop\Queue\ConnectionFactory; final class DriverFactory implements DriverFactoryInterface { @@ -28,7 +28,7 @@ public function __construct(Config $config, RouteCollection $routeCollection) $this->routeCollection = $routeCollection; } - public function create(PsrConnectionFactory $factory, string $dsn, array $config): DriverInterface + public function create(ConnectionFactory $factory, string $dsn, array $config): DriverInterface { $dsn = new Dsn($dsn); diff --git a/pkg/enqueue/Client/DriverFactoryInterface.php b/pkg/enqueue/Client/DriverFactoryInterface.php index ffc96ee82..6a558b7e2 100644 --- a/pkg/enqueue/Client/DriverFactoryInterface.php +++ b/pkg/enqueue/Client/DriverFactoryInterface.php @@ -2,9 +2,9 @@ namespace Enqueue\Client; -use Interop\Queue\PsrConnectionFactory; +use Interop\Queue\ConnectionFactory; interface DriverFactoryInterface { - public function create(PsrConnectionFactory $factory, string $dsn, array $config): DriverInterface; + public function create(ConnectionFactory $factory, string $dsn, array $config): DriverInterface; } diff --git a/pkg/enqueue/Client/DriverInterface.php b/pkg/enqueue/Client/DriverInterface.php index 23d06613c..f8b13d06a 100644 --- a/pkg/enqueue/Client/DriverInterface.php +++ b/pkg/enqueue/Client/DriverInterface.php @@ -4,24 +4,24 @@ namespace Enqueue\Client; -use Interop\Queue\PsrContext; -use Interop\Queue\PsrMessage; -use Interop\Queue\PsrQueue; +use Interop\Queue\Context; +use Interop\Queue\Message as InteropMessage; +use Interop\Queue\Queue as InteropQueue; use Psr\Log\LoggerInterface; interface DriverInterface { - public function createTransportMessage(Message $message): PsrMessage; + public function createTransportMessage(Message $message): InteropMessage; - public function createClientMessage(PsrMessage $message): Message; + public function createClientMessage(InteropMessage $message): Message; public function sendToRouter(Message $message): void; public function sendToProcessor(Message $message): void; - public function createQueue(string $queueName, bool $prefix = true): PsrQueue; + public function createQueue(string $queueName, bool $prefix = true): InteropQueue; - public function createRouteQueue(Route $route): PsrQueue; + public function createRouteQueue(Route $route): InteropQueue; /** * Prepare broker for work. @@ -31,7 +31,7 @@ public function setupBroker(LoggerInterface $logger = null): void; public function getConfig(): Config; - public function getContext(): PsrContext; + public function getContext(): Context; public function getRouteCollection(): RouteCollection; } diff --git a/pkg/enqueue/Client/ProcessorRegistryInterface.php b/pkg/enqueue/Client/ProcessorRegistryInterface.php index f8894a9b8..2639e5e84 100644 --- a/pkg/enqueue/Client/ProcessorRegistryInterface.php +++ b/pkg/enqueue/Client/ProcessorRegistryInterface.php @@ -2,9 +2,9 @@ namespace Enqueue\Client; -use Interop\Queue\PsrProcessor; +use Interop\Queue\Processor; interface ProcessorRegistryInterface { - public function get(string $processorName): PsrProcessor; + public function get(string $processorName): Processor; } diff --git a/pkg/enqueue/Client/RouterProcessor.php b/pkg/enqueue/Client/RouterProcessor.php index 791831685..d106e29ec 100644 --- a/pkg/enqueue/Client/RouterProcessor.php +++ b/pkg/enqueue/Client/RouterProcessor.php @@ -3,11 +3,11 @@ namespace Enqueue\Client; use Enqueue\Consumption\Result; -use Interop\Queue\PsrContext; -use Interop\Queue\PsrMessage; -use Interop\Queue\PsrProcessor; +use Interop\Queue\Context; +use Interop\Queue\Message as InteropMessage; +use Interop\Queue\Processor; -final class RouterProcessor implements PsrProcessor +final class RouterProcessor implements Processor { /** * @var DriverInterface @@ -19,7 +19,7 @@ public function __construct(DriverInterface $driver) $this->driver = $driver; } - public function process(PsrMessage $message, PsrContext $context): Result + public function process(InteropMessage $message, Context $context): Result { if ($message->getProperty(Config::PARAMETER_COMMAND_NAME)) { return Result::reject(sprintf( diff --git a/pkg/enqueue/ConnectionFactoryFactory.php b/pkg/enqueue/ConnectionFactoryFactory.php index 3aabfcefa..48c7f3d7f 100644 --- a/pkg/enqueue/ConnectionFactoryFactory.php +++ b/pkg/enqueue/ConnectionFactoryFactory.php @@ -3,11 +3,11 @@ namespace Enqueue; use Enqueue\Dsn\Dsn; -use Interop\Queue\PsrConnectionFactory; +use Interop\Queue\ConnectionFactory; final class ConnectionFactoryFactory implements ConnectionFactoryFactoryInterface { - public function create($config): PsrConnectionFactory + public function create($config): ConnectionFactory { if (is_string($config)) { $config = ['dsn' => $config]; diff --git a/pkg/enqueue/ConnectionFactoryFactoryInterface.php b/pkg/enqueue/ConnectionFactoryFactoryInterface.php index 22ee4cff2..d55808cdb 100644 --- a/pkg/enqueue/ConnectionFactoryFactoryInterface.php +++ b/pkg/enqueue/ConnectionFactoryFactoryInterface.php @@ -2,7 +2,7 @@ namespace Enqueue; -use Interop\Queue\PsrConnectionFactory; +use Interop\Queue\ConnectionFactory; interface ConnectionFactoryFactoryInterface { @@ -18,5 +18,5 @@ interface ConnectionFactoryFactoryInterface * * @throws \InvalidArgumentException if invalid config provided */ - public function create($config): PsrConnectionFactory; + public function create($config): ConnectionFactory; } diff --git a/pkg/enqueue/Consumption/CallbackProcessor.php b/pkg/enqueue/Consumption/CallbackProcessor.php index b002235ba..988b76529 100644 --- a/pkg/enqueue/Consumption/CallbackProcessor.php +++ b/pkg/enqueue/Consumption/CallbackProcessor.php @@ -2,11 +2,11 @@ namespace Enqueue\Consumption; -use Interop\Queue\PsrContext; -use Interop\Queue\PsrMessage; -use Interop\Queue\PsrProcessor; +use Interop\Queue\Context; +use Interop\Queue\Message as InteropMessage; +use Interop\Queue\Processor; -class CallbackProcessor implements PsrProcessor +class CallbackProcessor implements Processor { /** * @var callable @@ -24,7 +24,7 @@ public function __construct(callable $callback) /** * {@inheritdoc} */ - public function process(PsrMessage $message, PsrContext $context) + public function process(InteropMessage $message, Context $context) { return call_user_func($this->callback, $message, $context); } diff --git a/pkg/enqueue/Consumption/Context.php b/pkg/enqueue/Consumption/Context.php index 0625e60f1..76935c1fd 100644 --- a/pkg/enqueue/Consumption/Context.php +++ b/pkg/enqueue/Consumption/Context.php @@ -3,29 +3,29 @@ namespace Enqueue\Consumption; use Enqueue\Consumption\Exception\IllegalContextModificationException; -use Interop\Queue\PsrConsumer; -use Interop\Queue\PsrContext; -use Interop\Queue\PsrMessage; -use Interop\Queue\PsrProcessor; -use Interop\Queue\PsrQueue; +use Interop\Queue\Consumer; +use Interop\Queue\Context as InteropContext; +use Interop\Queue\Message as InteropMessage; +use Interop\Queue\Processor; +use Interop\Queue\Queue as InteropQueue; use Psr\Log\LoggerInterface; class Context { /** - * @var PsrContext + * @var InteropContext */ - private $psrContext; + private $context; /** - * @var PsrConsumer + * @var Consumer */ - private $psrConsumer; + private $consumer; /** - * @var PsrProcessor + * @var Processor */ - private $psrProcessor; + private $processor; /** * @var LoggerInterface @@ -33,9 +33,9 @@ class Context private $logger; /** - * @var PsrMessage + * @var InteropMessage */ - private $psrMessage; + private $interopMessage; /** * @var \Exception @@ -48,9 +48,9 @@ class Context private $result; /** - * @var PsrQueue + * @var InteropQueue */ - private $psrQueue; + private $InteropQueue; /** * @var bool @@ -58,81 +58,81 @@ class Context private $executionInterrupted; /** - * @param PsrContext $psrContext + * @param InteropContext $interopContext */ - public function __construct(PsrContext $psrContext) + public function __construct(InteropContext $interopContext) { - $this->psrContext = $psrContext; + $this->context = $interopContext; $this->executionInterrupted = false; } /** - * @return PsrMessage + * @return InteropMessage */ - public function getPsrMessage() + public function getInteropMessage() { - return $this->psrMessage; + return $this->interopMessage; } /** - * @param PsrMessage $psrMessage + * @param InteropMessage $interopMessage */ - public function setPsrMessage(PsrMessage $psrMessage) + public function setInteropMessage(InteropMessage $interopMessage) { - if ($this->psrMessage) { + if ($this->interopMessage) { throw new IllegalContextModificationException('The message could be set once'); } - $this->psrMessage = $psrMessage; + $this->interopMessage = $interopMessage; } /** - * @return PsrContext + * @return InteropContext */ - public function getPsrContext() + public function getInteropContext() { - return $this->psrContext; + return $this->context; } /** - * @return PsrConsumer + * @return Consumer */ - public function getPsrConsumer() + public function getConsumer() { - return $this->psrConsumer; + return $this->consumer; } /** - * @param PsrConsumer $psrConsumer + * @param Consumer $consumer */ - public function setPsrConsumer(PsrConsumer $psrConsumer) + public function setConsumer(Consumer $consumer) { - if ($this->psrConsumer) { + if ($this->consumer) { throw new IllegalContextModificationException('The message consumer could be set once'); } - $this->psrConsumer = $psrConsumer; + $this->consumer = $consumer; } /** - * @return PsrProcessor + * @return Processor */ - public function getPsrProcessor() + public function getProcessor() { - return $this->psrProcessor; + return $this->processor; } /** - * @param PsrProcessor $psrProcessor + * @param Processor $processor */ - public function setPsrProcessor(PsrProcessor $psrProcessor) + public function setProcessor(Processor $processor) { - if ($this->psrProcessor) { + if ($this->processor) { throw new IllegalContextModificationException('The message processor could be set once'); } - $this->psrProcessor = $psrProcessor; + $this->processor = $processor; } /** @@ -212,22 +212,22 @@ public function setLogger(LoggerInterface $logger) } /** - * @return PsrQueue + * @return InteropQueue */ - public function getPsrQueue() + public function getInteropQueue() { - return $this->psrQueue; + return $this->InteropQueue; } /** - * @param PsrQueue $psrQueue + * @param InteropQueue $InteropQueue */ - public function setPsrQueue(PsrQueue $psrQueue) + public function setInteropQueue(InteropQueue $InteropQueue) { - if ($this->psrQueue) { + if ($this->InteropQueue) { throw new IllegalContextModificationException('The queue modification is not allowed'); } - $this->psrQueue = $psrQueue; + $this->InteropQueue = $InteropQueue; } } diff --git a/pkg/enqueue/Consumption/Extension/LoggerExtension.php b/pkg/enqueue/Consumption/Extension/LoggerExtension.php index 0779c9033..b498e213d 100644 --- a/pkg/enqueue/Consumption/Extension/LoggerExtension.php +++ b/pkg/enqueue/Consumption/Extension/LoggerExtension.php @@ -6,7 +6,7 @@ use Enqueue\Consumption\EmptyExtensionTrait; use Enqueue\Consumption\ExtensionInterface; use Enqueue\Consumption\Result; -use Interop\Queue\PsrMessage; +use Interop\Queue\Message as InteropMessage; use Psr\Log\LoggerInterface; class LoggerExtension implements ExtensionInterface @@ -59,13 +59,13 @@ public function onPostReceived(Context $context) case Result::REJECT: case Result::REQUEUE: if ($result->getReason()) { - $this->logger->error($result->getReason(), $this->messageToLogContext($context->getPsrMessage())); + $this->logger->error($result->getReason(), $this->messageToLogContext($context->getInteropMessage())); } break; case Result::ACK: if ($result->getReason()) { - $this->logger->info($result->getReason(), $this->messageToLogContext($context->getPsrMessage())); + $this->logger->info($result->getReason(), $this->messageToLogContext($context->getInteropMessage())); } break; @@ -75,11 +75,11 @@ public function onPostReceived(Context $context) } /** - * @param PsrMessage $message + * @param InteropMessage $message * * @return array */ - private function messageToLogContext(PsrMessage $message) + private function messageToLogContext(InteropMessage $message) { return [ 'body' => $message->getBody(), diff --git a/pkg/enqueue/Consumption/Extension/ReplyExtension.php b/pkg/enqueue/Consumption/Extension/ReplyExtension.php index 0d7a76eeb..4435e5573 100644 --- a/pkg/enqueue/Consumption/Extension/ReplyExtension.php +++ b/pkg/enqueue/Consumption/Extension/ReplyExtension.php @@ -16,7 +16,7 @@ class ReplyExtension implements ExtensionInterface */ public function onPostReceived(Context $context) { - $replyTo = $context->getPsrMessage()->getReplyTo(); + $replyTo = $context->getInteropMessage()->getReplyTo(); if (false == $replyTo) { return; } @@ -31,13 +31,13 @@ public function onPostReceived(Context $context) return; } - $correlationId = $context->getPsrMessage()->getCorrelationId(); + $correlationId = $context->getInteropMessage()->getCorrelationId(); $replyMessage = clone $result->getReply(); $replyMessage->setCorrelationId($correlationId); - $replyQueue = $context->getPsrContext()->createQueue($replyTo); + $replyQueue = $context->getInteropContext()->createQueue($replyTo); $context->getLogger()->debug(sprintf('[ReplyExtension] Send reply to "%s"', $replyTo)); - $context->getPsrContext()->createProducer()->send($replyQueue, $replyMessage); + $context->getInteropContext()->createProducer()->send($replyQueue, $replyMessage); } } diff --git a/pkg/enqueue/Consumption/FallbackSubscriptionConsumer.php b/pkg/enqueue/Consumption/FallbackSubscriptionConsumer.php index e40d8bfa8..cdd6fb13a 100644 --- a/pkg/enqueue/Consumption/FallbackSubscriptionConsumer.php +++ b/pkg/enqueue/Consumption/FallbackSubscriptionConsumer.php @@ -2,13 +2,13 @@ namespace Enqueue\Consumption; -use Interop\Queue\PsrConsumer; -use Interop\Queue\PsrSubscriptionConsumer; +use Interop\Queue\Consumer; +use Interop\Queue\SubscriptionConsumer; -final class FallbackSubscriptionConsumer implements PsrSubscriptionConsumer +final class FallbackSubscriptionConsumer implements SubscriptionConsumer { /** - * an item contains an array: [PsrConsumer $consumer, callable $callback];. + * an item contains an array: [Consumer $consumer, callable $callback];. * an item key is a queue name. * * @var array @@ -37,8 +37,8 @@ public function consume(int $timeout = 0): void while (true) { /** * @var string - * @var PsrConsumer $consumer - * @var callable $processor + * @var Consumer $consumer + * @var callable $processor */ foreach ($this->subscribers as $queueName => list($consumer, $callback)) { $message = $consumer->receiveNoWait(); @@ -62,7 +62,7 @@ public function consume(int $timeout = 0): void } } - public function subscribe(PsrConsumer $consumer, callable $callback): void + public function subscribe(Consumer $consumer, callable $callback): void { $queueName = $consumer->getQueue()->getQueueName(); if (array_key_exists($queueName, $this->subscribers)) { @@ -76,7 +76,7 @@ public function subscribe(PsrConsumer $consumer, callable $callback): void $this->subscribers[$queueName] = [$consumer, $callback]; } - public function unsubscribe(PsrConsumer $consumer): void + public function unsubscribe(Consumer $consumer): void { if (false == array_key_exists($consumer->getQueue()->getQueueName(), $this->subscribers)) { return; diff --git a/pkg/enqueue/Consumption/QueueConsumer.php b/pkg/enqueue/Consumption/QueueConsumer.php index 5277be51e..12d4bbfac 100644 --- a/pkg/enqueue/Consumption/QueueConsumer.php +++ b/pkg/enqueue/Consumption/QueueConsumer.php @@ -6,22 +6,22 @@ use Enqueue\Consumption\Exception\InvalidArgumentException; use Enqueue\Consumption\Exception\LogicException; use Enqueue\Util\VarExport; -use Interop\Queue\PsrConsumer; -use Interop\Queue\PsrContext; -use Interop\Queue\PsrMessage; -use Interop\Queue\PsrProcessor; -use Interop\Queue\PsrQueue; -use Interop\Queue\PsrSubscriptionConsumer; -use Interop\Queue\SubscriptionConsumerNotSupportedException; +use Interop\Queue\Consumer; +use Interop\Queue\Context as InteropContext; +use Interop\Queue\Exception\SubscriptionConsumerNotSupportedException; +use Interop\Queue\Message as InteropMessage; +use Interop\Queue\Processor; +use Interop\Queue\Queue as InteropQueue; +use Interop\Queue\SubscriptionConsumer; use Psr\Log\LoggerInterface; use Psr\Log\NullLogger; final class QueueConsumer implements QueueConsumerInterface { /** - * @var PsrContext + * @var InteropContext */ - private $psrContext; + private $interopContext; /** * @var ExtensionInterface|ChainExtension @@ -30,7 +30,7 @@ final class QueueConsumer implements QueueConsumerInterface /** * [ - * [PsrQueue, PsrProcessor], + * [InteropQueue, Processor], * ]. * * @var array @@ -58,23 +58,23 @@ final class QueueConsumer implements QueueConsumerInterface private $logger; /** - * @var PsrSubscriptionConsumer + * @var SubscriptionConsumer */ private $fallbackSubscriptionConsumer; /** - * @param PsrContext $psrContext + * @param InteropContext $interopContext * @param ExtensionInterface|ChainExtension|null $extension * @param int|float $idleTimeout the time in milliseconds queue consumer waits if no message received * @param int|float $receiveTimeout the time in milliseconds queue consumer waits for a message (10 ms by default) */ public function __construct( - PsrContext $psrContext, + InteropContext $interopContext, ExtensionInterface $extension = null, float $idleTimeout = 0., float $receiveTimeout = 10000. ) { - $this->psrContext = $psrContext; + $this->interopContext = $interopContext; $this->staticExtension = $extension ?: new ChainExtension([]); $this->idleTimeout = $idleTimeout; $this->receiveTimeout = $receiveTimeout; @@ -100,40 +100,28 @@ public function getIdleTimeout(): float return $this->idleTimeout; } - /** - * {@inheritdoc} - */ public function setReceiveTimeout(float $timeout): void { $this->receiveTimeout = $timeout; } - /** - * {@inheritdoc} - */ public function getReceiveTimeout(): float { return $this->receiveTimeout; } - /** - * {@inheritdoc} - */ - public function getPsrContext(): PsrContext + public function getContext(): InteropContext { - return $this->psrContext; + return $this->interopContext; } - /** - * {@inheritdoc} - */ - public function bind($queue, PsrProcessor $processor): QueueConsumerInterface + public function bind($queue, Processor $processor): QueueConsumerInterface { if (is_string($queue)) { - $queue = $this->psrContext->createQueue($queue); + $queue = $this->interopContext->createQueue($queue); } - InvalidArgumentException::assertInstanceOf($queue, PsrQueue::class); + InvalidArgumentException::assertInstanceOf($queue, InteropQueue::class); if (empty($queue->getQueueName())) { throw new LogicException('The queue name must be not empty.'); @@ -164,11 +152,11 @@ public function consume(ExtensionInterface $runtimeExtension = null): void throw new \LogicException('There is nothing to consume. It is required to bind something before calling consume method.'); } - /** @var PsrConsumer[] $consumers */ + /** @var Consumer[] $consumers */ $consumers = []; - /** @var PsrQueue $queue */ + /** @var InteropQueue $queue */ foreach ($this->boundProcessors as list($queue, $processor)) { - $consumers[$queue->getQueueName()] = $this->psrContext->createConsumer($queue); + $consumers[$queue->getQueueName()] = $this->interopContext->createConsumer($queue); } $this->extension = $runtimeExtension ? @@ -176,7 +164,7 @@ public function consume(ExtensionInterface $runtimeExtension = null): void $this->staticExtension ; - $context = new Context($this->psrContext); + $context = new Context($this->interopContext); $this->extension->onStart($context); if ($context->getLogger()) { @@ -189,15 +177,15 @@ public function consume(ExtensionInterface $runtimeExtension = null): void $this->logger->info('Start consuming'); try { - $subscriptionConsumer = $this->psrContext->createSubscriptionConsumer(); + $subscriptionConsumer = $this->interopContext->createSubscriptionConsumer(); } catch (SubscriptionConsumerNotSupportedException $e) { $subscriptionConsumer = $this->fallbackSubscriptionConsumer; } - $callback = function (PsrMessage $message, PsrConsumer $consumer) use (&$context) { + $callback = function (InteropMessage $message, Consumer $consumer) use (&$context) { $currentProcessor = null; - /** @var PsrQueue $queue */ + /** @var InteropQueue $queue */ foreach ($this->boundProcessors as list($queue, $processor)) { if ($queue->getQueueName() === $consumer->getQueue()->getQueueName()) { $currentProcessor = $processor; @@ -208,12 +196,12 @@ public function consume(ExtensionInterface $runtimeExtension = null): void throw new \LogicException(sprintf('The processor for the queue "%s" could not be found.', $consumer->getQueue()->getQueueName())); } - $context = new Context($this->psrContext); + $context = new Context($this->interopContext); $context->setLogger($this->logger); - $context->setPsrQueue($consumer->getQueue()); - $context->setPsrConsumer($consumer); - $context->setPsrProcessor($currentProcessor); - $context->setPsrMessage($message); + $context->setInteropQueue($consumer->getQueue()); + $context->setConsumer($consumer); + $context->setProcessor($currentProcessor); + $context->setInteropMessage($message); $this->processMessage($consumer, $currentProcessor, $message, $context); @@ -225,7 +213,7 @@ public function consume(ExtensionInterface $runtimeExtension = null): void }; foreach ($consumers as $consumer) { - /* @var PsrConsumer $consumer */ + /* @var Consumer $consumer */ $subscriptionConsumer->subscribe($consumer, $callback); } @@ -250,7 +238,7 @@ public function consume(ExtensionInterface $runtimeExtension = null): void $this->logger->info(sprintf('Consuming interrupted')); foreach ($consumers as $consumer) { - /* @var PsrConsumer $consumer */ + /* @var Consumer $consumer */ $subscriptionConsumer->unsubscribe($consumer); } @@ -274,9 +262,9 @@ public function consume(ExtensionInterface $runtimeExtension = null): void /** * @internal * - * @param PsrSubscriptionConsumer $fallbackSubscriptionConsumer + * @param SubscriptionConsumer $fallbackSubscriptionConsumer */ - public function setFallbackSubscriptionConsumer(PsrSubscriptionConsumer $fallbackSubscriptionConsumer): void + public function setFallbackSubscriptionConsumer(SubscriptionConsumer $fallbackSubscriptionConsumer): void { $this->fallbackSubscriptionConsumer = $fallbackSubscriptionConsumer; } @@ -323,16 +311,16 @@ private function onInterruptionByException(ExtensionInterface $extension, Contex throw $exception; } - private function processMessage(PsrConsumer $consumer, PsrProcessor $processor, PsrMessage $message, Context $context) + private function processMessage(Consumer $consumer, Processor $processor, InteropMessage $message, Context $context) { - $this->logger->info('Message received from the queue: '.$context->getPsrQueue()->getQueueName()); + $this->logger->info('Message received from the queue: '.$context->getInteropQueue()->getQueueName()); $this->logger->debug('Headers: {headers}', ['headers' => new VarExport($message->getHeaders())]); $this->logger->debug('Properties: {properties}', ['properties' => new VarExport($message->getProperties())]); $this->logger->debug('Payload: {payload}', ['payload' => new VarExport($message->getBody())]); $this->extension->onPreReceived($context); if (!$context->getResult()) { - $result = $processor->process($message, $context->getPsrContext()); + $result = $processor->process($message, $context->getInteropContext()); $context->setResult($result); } diff --git a/pkg/enqueue/Consumption/QueueConsumerInterface.php b/pkg/enqueue/Consumption/QueueConsumerInterface.php index 0add8ab60..8358ba380 100644 --- a/pkg/enqueue/Consumption/QueueConsumerInterface.php +++ b/pkg/enqueue/Consumption/QueueConsumerInterface.php @@ -2,9 +2,9 @@ namespace Enqueue\Consumption; -use Interop\Queue\PsrContext; -use Interop\Queue\PsrProcessor; -use Interop\Queue\PsrQueue; +use Interop\Queue\Context; +use Interop\Queue\Processor; +use Interop\Queue\Queue as InteropQueue; interface QueueConsumerInterface { @@ -22,16 +22,16 @@ public function setReceiveTimeout(float $timeout): void; public function getReceiveTimeout(): float; - public function getPsrContext(): PsrContext; + public function getContext(): Context; /** - * @param string|PsrQueue $queueName + * @param string|InteropQueue $queueName */ - public function bind($queueName, PsrProcessor $processor): self; + public function bind($queueName, Processor $processor): self; /** - * @param string|PsrQueue $queueName - * @param mixed $queue + * @param string|InteropQueue $queueName + * @param mixed $queue */ public function bindCallback($queue, callable $processor): self; diff --git a/pkg/enqueue/Consumption/Result.php b/pkg/enqueue/Consumption/Result.php index b78f997f4..926f2567d 100644 --- a/pkg/enqueue/Consumption/Result.php +++ b/pkg/enqueue/Consumption/Result.php @@ -2,25 +2,25 @@ namespace Enqueue\Consumption; -use Interop\Queue\PsrMessage; -use Interop\Queue\PsrProcessor; +use Interop\Queue\Message as InteropMessage; +use Interop\Queue\Processor; class Result { /** - * @see PsrProcessor::ACK for more details + * @see Processor::ACK for more details */ - const ACK = PsrProcessor::ACK; + const ACK = Processor::ACK; /** - * @see PsrProcessor::ACK for more details + * @see Processor::ACK for more details */ - const REJECT = PsrProcessor::REJECT; + const REJECT = Processor::REJECT; /** - * @see PsrProcessor::ACK for more details + * @see Processor::ACK for more details */ - const REQUEUE = PsrProcessor::REQUEUE; + const REQUEUE = Processor::REQUEUE; /** * @var string @@ -33,7 +33,7 @@ class Result private $reason; /** - * @var PsrMessage|null + * @var InteropMessage|null */ private $reply; @@ -72,7 +72,7 @@ public function getReason() } /** - * @return PsrMessage|null + * @return InteropMessage|null */ public function getReply() { @@ -80,9 +80,9 @@ public function getReply() } /** - * @param PsrMessage|null $reply + * @param InteropMessage|null $reply */ - public function setReply(PsrMessage $reply = null) + public function setReply(InteropMessage $reply = null) { $this->reply = $reply; } @@ -118,13 +118,13 @@ public static function requeue($reason = '') } /** - * @param PsrMessage $replyMessage - * @param string $status - * @param string|null $reason + * @param InteropMessage $replyMessage + * @param string $status + * @param string|null $reason * * @return static */ - public static function reply(PsrMessage $replyMessage, $status = self::ACK, $reason = null) + public static function reply(InteropMessage $replyMessage, $status = self::ACK, $reason = null) { $status = null === $status ? self::ACK : $status; diff --git a/pkg/enqueue/Resources.php b/pkg/enqueue/Resources.php index d58ba92be..21172c636 100644 --- a/pkg/enqueue/Resources.php +++ b/pkg/enqueue/Resources.php @@ -16,12 +16,12 @@ use Enqueue\Redis\RedisConnectionFactory; use Enqueue\Sqs\SqsConnectionFactory; use Enqueue\Stomp\StompConnectionFactory; -use Interop\Queue\PsrConnectionFactory; +use Interop\Queue\ConnectionFactory; final class Resources { /** - * [psr connection factory class => [ + * [connection factory class => [ * schemes => [schemes strings], * package => package name, * ]. @@ -173,8 +173,8 @@ public static function getKnownConnections(): array public static function addConnection(string $connectionFactoryClass, array $schemes, array $extensions, string $package): void { if (class_exists($connectionFactoryClass)) { - if (false == (new \ReflectionClass($connectionFactoryClass))->implementsInterface(PsrConnectionFactory::class)) { - throw new \InvalidArgumentException(sprintf('The connection factory class "%s" must implement "%s" interface.', $connectionFactoryClass, PsrConnectionFactory::class)); + if (false == (new \ReflectionClass($connectionFactoryClass))->implementsInterface(ConnectionFactory::class)) { + throw new \InvalidArgumentException(sprintf('The connection factory class "%s" must implement "%s" interface.', $connectionFactoryClass, ConnectionFactory::class)); } } diff --git a/pkg/enqueue/Router/Recipient.php b/pkg/enqueue/Router/Recipient.php index dc0ab4260..c7eac6af6 100644 --- a/pkg/enqueue/Router/Recipient.php +++ b/pkg/enqueue/Router/Recipient.php @@ -2,33 +2,33 @@ namespace Enqueue\Router; -use Interop\Queue\PsrDestination; -use Interop\Queue\PsrMessage; +use Interop\Queue\Destination; +use Interop\Queue\Message as InteropMessage; class Recipient { /** - * @var PsrDestination + * @var Destination */ private $destination; /** - * @var PsrMessage + * @var InteropMessage */ private $message; /** - * @param PsrDestination $destination - * @param PsrMessage $message + * @param Destination $destination + * @param InteropMessage $message */ - public function __construct(PsrDestination $destination, PsrMessage $message) + public function __construct(Destination $destination, InteropMessage $message) { $this->destination = $destination; $this->message = $message; } /** - * @return PsrDestination + * @return Destination */ public function getDestination() { @@ -36,7 +36,7 @@ public function getDestination() } /** - * @return PsrMessage + * @return InteropMessage */ public function getMessage() { diff --git a/pkg/enqueue/Router/RecipientListRouterInterface.php b/pkg/enqueue/Router/RecipientListRouterInterface.php index 78a354c6a..d00dd2abb 100644 --- a/pkg/enqueue/Router/RecipientListRouterInterface.php +++ b/pkg/enqueue/Router/RecipientListRouterInterface.php @@ -2,14 +2,14 @@ namespace Enqueue\Router; -use Interop\Queue\PsrMessage; +use Interop\Queue\Message as InteropMessage; interface RecipientListRouterInterface { /** - * @param PsrMessage $message + * @param InteropMessage $message * * @return \Traversable|Recipient[] */ - public function route(PsrMessage $message); + public function route(InteropMessage $message); } diff --git a/pkg/enqueue/Router/RouteRecipientListProcessor.php b/pkg/enqueue/Router/RouteRecipientListProcessor.php index 59df35510..22e32e2ca 100644 --- a/pkg/enqueue/Router/RouteRecipientListProcessor.php +++ b/pkg/enqueue/Router/RouteRecipientListProcessor.php @@ -2,11 +2,11 @@ namespace Enqueue\Router; -use Interop\Queue\PsrContext; -use Interop\Queue\PsrMessage; -use Interop\Queue\PsrProcessor; +use Interop\Queue\Context; +use Interop\Queue\Message as InteropMessage; +use Interop\Queue\Processor; -class RouteRecipientListProcessor implements PsrProcessor +class RouteRecipientListProcessor implements Processor { /** * @var RecipientListRouterInterface @@ -24,7 +24,7 @@ public function __construct(RecipientListRouterInterface $router) /** * {@inheritdoc} */ - public function process(PsrMessage $message, PsrContext $context) + public function process(InteropMessage $message, Context $context) { $producer = $context->createProducer(); foreach ($this->router->route($message) as $recipient) { diff --git a/pkg/enqueue/Rpc/Promise.php b/pkg/enqueue/Rpc/Promise.php index 91e0aaa22..0a5d28f0c 100644 --- a/pkg/enqueue/Rpc/Promise.php +++ b/pkg/enqueue/Rpc/Promise.php @@ -2,7 +2,7 @@ namespace Enqueue\Rpc; -use Interop\Queue\PsrMessage; +use Interop\Queue\Message as InteropMessage; class Promise { @@ -27,7 +27,7 @@ class Promise private $deleteReplyQueue; /** - * @var PsrMessage + * @var InteropMessage */ private $message; @@ -52,7 +52,7 @@ public function __construct(\Closure $receiveCallback, \Closure $receiveNoWaitCa * * @throws TimeoutException if the wait timeout is reached * - * @return PsrMessage + * @return InteropMessage */ public function receive($timeout = null) { @@ -72,7 +72,7 @@ public function receive($timeout = null) /** * Non blocking function. Returns message or null. * - * @return PsrMessage|null + * @return InteropMessage|null */ public function receiveNoWait() { @@ -109,15 +109,15 @@ public function isDeleteReplyQueue() * @param \Closure $cb * @param array $args * - * @return PsrMessage + * @return InteropMessage */ private function doReceive(\Closure $cb, ...$args) { $message = call_user_func_array($cb, $args); - if (null !== $message && false == $message instanceof PsrMessage) { + if (null !== $message && false == $message instanceof InteropMessage) { throw new \RuntimeException(sprintf( - 'Expected "%s" but got: "%s"', PsrMessage::class, is_object($message) ? get_class($message) : gettype($message))); + 'Expected "%s" but got: "%s"', InteropMessage::class, is_object($message) ? get_class($message) : gettype($message))); } return $message; diff --git a/pkg/enqueue/Rpc/RpcClient.php b/pkg/enqueue/Rpc/RpcClient.php index d429ac9af..591a4cc19 100644 --- a/pkg/enqueue/Rpc/RpcClient.php +++ b/pkg/enqueue/Rpc/RpcClient.php @@ -3,14 +3,14 @@ namespace Enqueue\Rpc; use Enqueue\Util\UUID; -use Interop\Queue\PsrContext; -use Interop\Queue\PsrDestination; -use Interop\Queue\PsrMessage; +use Interop\Queue\Context; +use Interop\Queue\Destination; +use Interop\Queue\Message as InteropMessage; class RpcClient { /** - * @var PsrContext + * @var Context */ private $context; @@ -20,37 +20,37 @@ class RpcClient private $rpcFactory; /** - * @param PsrContext $context + * @param Context $context * @param RpcFactory $promiseFactory */ - public function __construct(PsrContext $context, RpcFactory $promiseFactory = null) + public function __construct(Context $context, RpcFactory $promiseFactory = null) { $this->context = $context; $this->rpcFactory = $promiseFactory ?: new RpcFactory($context); } /** - * @param PsrDestination $destination - * @param PsrMessage $message + * @param Destination $destination + * @param InteropMessage $message * @param int $timeout * * @throws TimeoutException if the wait timeout is reached * - * @return PsrMessage + * @return InteropMessage */ - public function call(PsrDestination $destination, PsrMessage $message, $timeout) + public function call(Destination $destination, InteropMessage $message, $timeout) { return $this->callAsync($destination, $message, $timeout)->receive(); } /** - * @param PsrDestination $destination - * @param PsrMessage $message + * @param Destination $destination + * @param InteropMessage $message * @param int $timeout * * @return Promise */ - public function callAsync(PsrDestination $destination, PsrMessage $message, $timeout) + public function callAsync(Destination $destination, InteropMessage $message, $timeout) { if ($timeout < 1) { throw new \InvalidArgumentException(sprintf('Timeout must be positive not zero integer. Got %s', $timeout)); diff --git a/pkg/enqueue/Rpc/RpcFactory.php b/pkg/enqueue/Rpc/RpcFactory.php index 195fd959a..bd054b186 100644 --- a/pkg/enqueue/Rpc/RpcFactory.php +++ b/pkg/enqueue/Rpc/RpcFactory.php @@ -2,19 +2,19 @@ namespace Enqueue\Rpc; -use Interop\Queue\PsrContext; +use Interop\Queue\Context; class RpcFactory { /** - * @var PsrContext + * @var Context */ private $context; /** - * @param PsrContext $context + * @param Context $context */ - public function __construct(PsrContext $context) + public function __construct(Context $context) { $this->context = $context; } diff --git a/pkg/enqueue/Symfony/Client/ContainerProcessorRegistry.php b/pkg/enqueue/Symfony/Client/ContainerProcessorRegistry.php index c2d06c8c1..4031e423e 100644 --- a/pkg/enqueue/Symfony/Client/ContainerProcessorRegistry.php +++ b/pkg/enqueue/Symfony/Client/ContainerProcessorRegistry.php @@ -3,7 +3,7 @@ namespace Enqueue\Symfony\Client; use Enqueue\Client\ProcessorRegistryInterface; -use Interop\Queue\PsrProcessor; +use Interop\Queue\Processor; use Psr\Container\ContainerInterface; final class ContainerProcessorRegistry implements ProcessorRegistryInterface @@ -18,7 +18,7 @@ public function __construct(ContainerInterface $locator) $this->locator = $locator; } - public function get(string $processorName): PsrProcessor + public function get(string $processorName): Processor { if (false == $this->locator->has($processorName)) { throw new \LogicException(sprintf('Service locator does not have a processor with name "%s".', $processorName)); diff --git a/pkg/enqueue/Symfony/Consumption/ContainerAwareConsumeMessagesCommand.php b/pkg/enqueue/Symfony/Consumption/ContainerAwareConsumeMessagesCommand.php index 8f2695d31..e7607f6d6 100644 --- a/pkg/enqueue/Symfony/Consumption/ContainerAwareConsumeMessagesCommand.php +++ b/pkg/enqueue/Symfony/Consumption/ContainerAwareConsumeMessagesCommand.php @@ -6,7 +6,7 @@ use Enqueue\Consumption\Extension\LoggerExtension; use Enqueue\Consumption\QueueConsumerInterface; use Enqueue\Consumption\QueueSubscriberInterface; -use Interop\Queue\PsrProcessor; +use Interop\Queue\Processor; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; @@ -65,12 +65,12 @@ protected function execute(InputInterface $input, OutputInterface $output) { $this->setQueueConsumerOptions($this->consumer, $input); - /** @var PsrProcessor $processor */ + /** @var Processor $processor */ $processor = $this->container->get($input->getArgument('processor-service')); - if (false == $processor instanceof PsrProcessor) { + if (false == $processor instanceof Processor) { throw new \LogicException(sprintf( 'Invalid message processor service given. It must be an instance of %s but %s', - PsrProcessor::class, + Processor::class, get_class($processor) )); } diff --git a/pkg/enqueue/Symfony/DefaultTransportFactory.php b/pkg/enqueue/Symfony/DefaultTransportFactory.php index 307669786..eda667eb6 100644 --- a/pkg/enqueue/Symfony/DefaultTransportFactory.php +++ b/pkg/enqueue/Symfony/DefaultTransportFactory.php @@ -3,8 +3,8 @@ namespace Enqueue\Symfony; use Enqueue\Client\DriverInterface; -use Interop\Queue\PsrConnectionFactory; -use Interop\Queue\PsrContext; +use Interop\Queue\ConnectionFactory; +use Interop\Queue\Context; use Symfony\Component\Config\Definition\Builder\VariableNodeDefinition; use Symfony\Component\DependencyInjection\Alias; use Symfony\Component\DependencyInjection\ContainerBuilder; @@ -45,7 +45,7 @@ public function createConnectionFactory(ContainerBuilder $container, array $conf { $factoryId = sprintf('enqueue.transport.%s.connection_factory', $this->getName()); - $container->register($factoryId, PsrConnectionFactory::class) + $container->register($factoryId, ConnectionFactory::class) ->setFactory([new Reference('enqueue.connection_factory_factory'), 'create']) ->addArgument($config['dsn']) ; @@ -60,7 +60,7 @@ public function createContext(ContainerBuilder $container, array $config): strin $contextId = sprintf('enqueue.transport.%s.context', $this->getName()); $factoryId = sprintf('enqueue.transport.%s.connection_factory', $this->getName()); - $container->register($contextId, PsrContext::class) + $container->register($contextId, Context::class) ->setFactory([new Reference($factoryId), 'createContext']) ; diff --git a/pkg/enqueue/Symfony/DependencyInjection/TransportFactory.php b/pkg/enqueue/Symfony/DependencyInjection/TransportFactory.php index f54a34fba..7a80eea41 100644 --- a/pkg/enqueue/Symfony/DependencyInjection/TransportFactory.php +++ b/pkg/enqueue/Symfony/DependencyInjection/TransportFactory.php @@ -5,8 +5,8 @@ use Enqueue\ConnectionFactoryFactory; use Enqueue\ConnectionFactoryFactoryInterface; use Enqueue\Resources; -use Interop\Queue\PsrConnectionFactory; -use Interop\Queue\PsrContext; +use Interop\Queue\ConnectionFactory; +use Interop\Queue\Context; use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Reference; @@ -74,7 +74,7 @@ public function addConfiguration(ArrayNodeDefinition $builder): void )) ->end() ->scalarNode('connection_factory_class') - ->info(sprintf('The connection factory class should implement "%s" interface', PsrConnectionFactory::class)) + ->info(sprintf('The connection factory class should implement "%s" interface', ConnectionFactory::class)) ->end() ->scalarNode('factory_service') ->info(sprintf('The factory class should implement "%s" interface', ConnectionFactoryFactoryInterface::class)) @@ -107,7 +107,7 @@ public function createConnectionFactory(ContainerBuilder $container, array $conf ->addArgument($config) ; } else { - $container->register($factoryId, PsrConnectionFactory::class) + $container->register($factoryId, ConnectionFactory::class) ->setFactory([$factoryFactoryService, 'create']) ->addArgument($config) ; @@ -121,7 +121,7 @@ public function createContext(ContainerBuilder $container, array $config): strin $contextId = sprintf('enqueue.transport.%s.context', $this->getName()); $factoryId = sprintf('enqueue.transport.%s.connection_factory', $this->getName()); - $container->register($contextId, PsrContext::class) + $container->register($contextId, Context::class) ->setFactory([new Reference($factoryId), 'createContext']) ; diff --git a/pkg/enqueue/Tests/Client/ArrayProcessorRegistryTest.php b/pkg/enqueue/Tests/Client/ArrayProcessorRegistryTest.php index eb5d6848b..f49ec8ff8 100644 --- a/pkg/enqueue/Tests/Client/ArrayProcessorRegistryTest.php +++ b/pkg/enqueue/Tests/Client/ArrayProcessorRegistryTest.php @@ -5,7 +5,7 @@ use Enqueue\Client\ArrayProcessorRegistry; use Enqueue\Client\ProcessorRegistryInterface; use Enqueue\Test\ClassExtensionTrait; -use Interop\Queue\PsrProcessor; +use Interop\Queue\Processor; use PHPUnit\Framework\TestCase; class ArrayProcessorRegistryTest extends TestCase @@ -51,10 +51,10 @@ public function testShouldAllowGetProcessorAddedViaAddMethod() } /** - * @return \PHPUnit_Framework_MockObject_MockObject|PsrProcessor + * @return \PHPUnit_Framework_MockObject_MockObject|Processor */ protected function createProcessorMock() { - return $this->createMock(PsrProcessor::class); + return $this->createMock(Processor::class); } } diff --git a/pkg/enqueue/Tests/Client/ConsumptionExtension/DelayRedeliveredMessageExtensionTest.php b/pkg/enqueue/Tests/Client/ConsumptionExtension/DelayRedeliveredMessageExtensionTest.php index b61a3416c..5d4b7503d 100644 --- a/pkg/enqueue/Tests/Client/ConsumptionExtension/DelayRedeliveredMessageExtensionTest.php +++ b/pkg/enqueue/Tests/Client/ConsumptionExtension/DelayRedeliveredMessageExtensionTest.php @@ -9,7 +9,7 @@ use Enqueue\Consumption\Result; use Enqueue\Null\NullMessage; use Enqueue\Null\NullQueue; -use Interop\Queue\PsrContext; +use Interop\Queue\Context as InteropContext; use PHPUnit\Framework\TestCase; use Psr\Log\LoggerInterface; @@ -61,9 +61,9 @@ public function testShouldSendDelayedMessageAndRejectOriginalMessage() ) ; - $context = new Context($this->createPsrContextMock()); - $context->setPsrQueue($queue); - $context->setPsrMessage($originMessage); + $context = new Context($this->createContextMock()); + $context->setInteropQueue($queue); + $context->setInteropMessage($originMessage); $context->setLogger($logger); $this->assertNull($context->getResult()); @@ -92,8 +92,8 @@ public function testShouldDoNothingIfMessageIsNotRedelivered() ->method('sendToProcessor') ; - $context = new Context($this->createPsrContextMock()); - $context->setPsrMessage($message); + $context = new Context($this->createContextMock()); + $context->setInteropMessage($message); $extension = new DelayRedeliveredMessageExtension($driver, 12345); $extension->onPreReceived($context); @@ -112,8 +112,8 @@ public function testShouldDoNothingIfMessageIsRedeliveredButResultWasAlreadySetO ->method('sendToProcessor') ; - $context = new Context($this->createPsrContextMock()); - $context->setPsrMessage($message); + $context = new Context($this->createContextMock()); + $context->setInteropMessage($message); $context->setResult('aStatus'); $extension = new DelayRedeliveredMessageExtension($driver, 12345); @@ -129,11 +129,11 @@ private function createDriverMock() } /** - * @return \PHPUnit_Framework_MockObject_MockObject|PsrContext + * @return \PHPUnit_Framework_MockObject_MockObject|InteropContext */ - private function createPsrContextMock() + private function createContextMock(): InteropContext { - return $this->createMock(PsrContext::class); + return $this->createMock(InteropContext::class); } /** diff --git a/pkg/enqueue/Tests/Client/ConsumptionExtension/ExclusiveCommandExtensionTest.php b/pkg/enqueue/Tests/Client/ConsumptionExtension/ExclusiveCommandExtensionTest.php index d858c9197..ff10c803c 100644 --- a/pkg/enqueue/Tests/Client/ConsumptionExtension/ExclusiveCommandExtensionTest.php +++ b/pkg/enqueue/Tests/Client/ConsumptionExtension/ExclusiveCommandExtensionTest.php @@ -41,7 +41,7 @@ public function testShouldDoNothingIfMessageHasTopicPropertySetOnPreReceive() $message->setProperty(Config::PARAMETER_TOPIC_NAME, 'aTopic'); $context = new Context(new NullContext()); - $context->setPsrMessage($message); + $context->setInteropMessage($message); $driver = $this->createDriverStub(); $driver @@ -66,7 +66,7 @@ public function testShouldDoNothingIfMessageHasCommandPropertySetOnPreReceive() $message->setProperty(Config::PARAMETER_COMMAND_NAME, 'aCommand'); $context = new Context(new NullContext()); - $context->setPsrMessage($message); + $context->setInteropMessage($message); $driver = $this->createDriverStub(); $driver @@ -91,7 +91,7 @@ public function testShouldDoNothingIfMessageHasProcessorPropertySetOnPreReceive( $message->setProperty(Config::PARAMETER_PROCESSOR_NAME, 'aProcessor'); $context = new Context(new NullContext()); - $context->setPsrMessage($message); + $context->setInteropMessage($message); $driver = $this->createDriverStub(); $driver @@ -116,8 +116,8 @@ public function testShouldDoNothingIfCurrentQueueHasNoExclusiveProcessor() $queue = new NullQueue('aBarQueueName'); $context = new Context(new NullContext()); - $context->setPsrMessage($message); - $context->setPsrQueue($queue); + $context->setInteropMessage($message); + $context->setInteropQueue($queue); $extension = new ExclusiveCommandExtension($this->createDriverStub(new RouteCollection([]))); @@ -134,8 +134,8 @@ public function testShouldSetCommandPropertiesIfCurrentQueueHasExclusiveCommandP $queue = new NullQueue('fooQueue'); $context = new Context(new NullContext()); - $context->setPsrMessage($message); - $context->setPsrQueue($queue); + $context->setInteropMessage($message); + $context->setInteropQueue($queue); $context->setLogger(new NullLogger()); $routeCollection = new RouteCollection([ @@ -175,8 +175,8 @@ public function testShouldDoNothingIfAnotherQueue() $queue = new NullQueue('barQueue'); $context = new Context(new NullContext()); - $context->setPsrMessage($message); - $context->setPsrQueue($queue); + $context->setInteropMessage($message); + $context->setInteropQueue($queue); $context->setLogger(new NullLogger()); $routeCollection = new RouteCollection([ diff --git a/pkg/enqueue/Tests/Client/ConsumptionExtension/SetRouterPropertiesExtensionTest.php b/pkg/enqueue/Tests/Client/ConsumptionExtension/SetRouterPropertiesExtensionTest.php index 686ece9c5..395042a3d 100644 --- a/pkg/enqueue/Tests/Client/ConsumptionExtension/SetRouterPropertiesExtensionTest.php +++ b/pkg/enqueue/Tests/Client/ConsumptionExtension/SetRouterPropertiesExtensionTest.php @@ -10,7 +10,7 @@ use Enqueue\Null\NullMessage; use Enqueue\Null\NullQueue; use Enqueue\Test\ClassExtensionTrait; -use Interop\Queue\PsrContext; +use Interop\Queue\Context as InteropContext; use PHPUnit\Framework\TestCase; use Psr\Log\NullLogger; @@ -48,10 +48,10 @@ public function testShouldSetRouterProcessorPropertyIfNotSetAndOnRouterQueue() $message = new NullMessage(); - $context = new Context($this->createPsrContextMock()); + $context = new Context($this->createContextMock()); $context->setLogger(new NullLogger()); - $context->setPsrMessage($message); - $context->setPsrQueue(new NullQueue('test.router-queue')); + $context->setInteropMessage($message); + $context->setInteropQueue(new NullQueue('test.router-queue')); $extension = new SetRouterPropertiesExtension($driver); $extension->onPreReceived($context); @@ -81,9 +81,9 @@ public function testShouldNotSetRouterProcessorPropertyIfNotSetAndNotOnRouterQue $message = new NullMessage(); - $context = new Context($this->createPsrContextMock()); - $context->setPsrMessage($message); - $context->setPsrQueue(new NullQueue('test.another-queue')); + $context = new Context($this->createContextMock()); + $context->setInteropMessage($message); + $context->setInteropQueue(new NullQueue('test.another-queue')); $extension = new SetRouterPropertiesExtension($driver); $extension->onPreReceived($context); @@ -102,8 +102,8 @@ public function testShouldNotSetAnyPropertyIfProcessorNamePropertyAlreadySet() $message = new NullMessage(); $message->setProperty(Config::PARAMETER_PROCESSOR_NAME, 'non-router-processor'); - $context = new Context($this->createPsrContextMock()); - $context->setPsrMessage($message); + $context = new Context($this->createContextMock()); + $context->setInteropMessage($message); $extension = new SetRouterPropertiesExtension($driver); $extension->onPreReceived($context); @@ -114,11 +114,11 @@ public function testShouldNotSetAnyPropertyIfProcessorNamePropertyAlreadySet() } /** - * @return \PHPUnit_Framework_MockObject_MockObject|PsrContext + * @return \PHPUnit_Framework_MockObject_MockObject|InteropContext */ - protected function createPsrContextMock() + protected function createContextMock(): InteropContext { - return $this->createMock(PsrContext::class); + return $this->createMock(InteropContext::class); } /** diff --git a/pkg/enqueue/Tests/Client/ConsumptionExtension/SetupBrokerExtensionTest.php b/pkg/enqueue/Tests/Client/ConsumptionExtension/SetupBrokerExtensionTest.php index 21b011fe2..1339dd4c2 100644 --- a/pkg/enqueue/Tests/Client/ConsumptionExtension/SetupBrokerExtensionTest.php +++ b/pkg/enqueue/Tests/Client/ConsumptionExtension/SetupBrokerExtensionTest.php @@ -7,7 +7,7 @@ use Enqueue\Consumption\Context; use Enqueue\Consumption\ExtensionInterface; use Enqueue\Test\ClassExtensionTrait; -use Interop\Queue\PsrContext; +use Interop\Queue\Context as InteropContext; use PHPUnit\Framework\TestCase; use Psr\Log\NullLogger; @@ -36,7 +36,7 @@ public function testShouldSetupBroker() ->with($this->identicalTo($logger)) ; - $context = new Context($this->createMock(PsrContext::class)); + $context = new Context($this->createMock(InteropContext::class)); $context->setLogger($logger); $extension = new SetupBrokerExtension($driver); @@ -54,7 +54,7 @@ public function testShouldSetupBrokerOnlyOnce() ->with($this->identicalTo($logger)) ; - $context = new Context($this->createMock(PsrContext::class)); + $context = new Context($this->createMock(InteropContext::class)); $context->setLogger($logger); $extension = new SetupBrokerExtension($driver); diff --git a/pkg/enqueue/Tests/Client/DelegateProcessorTest.php b/pkg/enqueue/Tests/Client/DelegateProcessorTest.php index f107dde6f..4bf688f7b 100644 --- a/pkg/enqueue/Tests/Client/DelegateProcessorTest.php +++ b/pkg/enqueue/Tests/Client/DelegateProcessorTest.php @@ -6,8 +6,8 @@ use Enqueue\Client\DelegateProcessor; use Enqueue\Client\ProcessorRegistryInterface; use Enqueue\Null\NullMessage; -use Interop\Queue\PsrContext; -use Interop\Queue\PsrProcessor; +use Interop\Queue\Context; +use Interop\Queue\Processor; use PHPUnit\Framework\TestCase; class DelegateProcessorTest extends TestCase @@ -25,12 +25,12 @@ public function testShouldThrowExceptionIfProcessorNameIsNotSet() ); $processor = new DelegateProcessor($this->createProcessorRegistryMock()); - $processor->process(new NullMessage(), $this->createPsrContextMock()); + $processor->process(new NullMessage(), $this->createContextMock()); } public function testShouldProcessMessage() { - $session = $this->createPsrContextMock(); + $session = $this->createContextMock(); $message = new NullMessage(); $message->setProperties([ Config::PARAMETER_PROCESSOR_NAME => 'processor-name', @@ -67,18 +67,18 @@ protected function createProcessorRegistryMock() } /** - * @return \PHPUnit_Framework_MockObject_MockObject|PsrContext + * @return \PHPUnit_Framework_MockObject_MockObject|Context */ - protected function createPsrContextMock() + protected function createContextMock() { - return $this->createMock(PsrContext::class); + return $this->createMock(Context::class); } /** - * @return \PHPUnit_Framework_MockObject_MockObject|PsrProcessor + * @return \PHPUnit_Framework_MockObject_MockObject|Processor */ protected function createProcessorMock() { - return $this->createMock(PsrProcessor::class); + return $this->createMock(Processor::class); } } diff --git a/pkg/enqueue/Tests/Client/Driver/AmqpDriverTest.php b/pkg/enqueue/Tests/Client/Driver/AmqpDriverTest.php index e9c1d7709..11539cb06 100644 --- a/pkg/enqueue/Tests/Client/Driver/AmqpDriverTest.php +++ b/pkg/enqueue/Tests/Client/Driver/AmqpDriverTest.php @@ -17,10 +17,10 @@ use Interop\Amqp\Impl\AmqpMessage; use Interop\Amqp\Impl\AmqpQueue; use Interop\Amqp\Impl\AmqpTopic; -use Interop\Queue\PsrContext; -use Interop\Queue\PsrMessage; -use Interop\Queue\PsrProducer; -use Interop\Queue\PsrQueue; +use Interop\Queue\Context; +use Interop\Queue\Message as InteropMessage; +use Interop\Queue\Producer as InteropProducer; +use Interop\Queue\Queue as InteropQueue; use PHPUnit\Framework\TestCase; class AmqpDriverTest extends TestCase @@ -291,7 +291,7 @@ protected function createDriver(...$args): DriverInterface /** * @return AmqpContext */ - protected function createContextMock(): PsrContext + protected function createContextMock(): Context { return $this->createMock(AmqpContext::class); } @@ -299,7 +299,7 @@ protected function createContextMock(): PsrContext /** * @return AmqpProducer */ - protected function createProducerMock(): PsrProducer + protected function createProducerMock(): InteropProducer { return $this->createMock(AmqpProducer::class); } @@ -307,7 +307,7 @@ protected function createProducerMock(): PsrProducer /** * @return AmqpQueue */ - protected function createQueue(string $name): PsrQueue + protected function createQueue(string $name): InteropQueue { return new AmqpQueue($name); } @@ -323,7 +323,7 @@ protected function createTopic(string $name): AmqpTopic /** * @return AmqpMessage */ - protected function createMessage(): PsrMessage + protected function createMessage(): InteropMessage { return new AmqpMessage(); } @@ -333,7 +333,7 @@ protected function getRouterTransportName(): string return 'aprefix.router'; } - protected function assertTransportMessage(PsrMessage $transportMessage): void + protected function assertTransportMessage(InteropMessage $transportMessage): void { $this->assertSame('body', $transportMessage->getBody()); $this->assertArraySubset([ diff --git a/pkg/enqueue/Tests/Client/Driver/DbalDriverTest.php b/pkg/enqueue/Tests/Client/Driver/DbalDriverTest.php index c6fd10d95..c9fbc6e1d 100644 --- a/pkg/enqueue/Tests/Client/Driver/DbalDriverTest.php +++ b/pkg/enqueue/Tests/Client/Driver/DbalDriverTest.php @@ -11,11 +11,11 @@ use Enqueue\Dbal\DbalMessage; use Enqueue\Dbal\DbalProducer; use Enqueue\Test\ClassExtensionTrait; -use Interop\Queue\PsrContext; -use Interop\Queue\PsrMessage; -use Interop\Queue\PsrProducer; -use Interop\Queue\PsrQueue; -use Interop\Queue\PsrTopic; +use Interop\Queue\Context; +use Interop\Queue\Message as InteropMessage; +use Interop\Queue\Producer as InteropProducer; +use Interop\Queue\Queue as InteropQueue; +use Interop\Queue\Topic as InteropTopic; class DbalDriverTest extends \PHPUnit_Framework_TestCase { @@ -61,7 +61,7 @@ protected function createDriver(...$args): DriverInterface /** * @return DbalContext */ - protected function createContextMock(): PsrContext + protected function createContextMock(): Context { return $this->createMock(DbalContext::class); } @@ -69,7 +69,7 @@ protected function createContextMock(): PsrContext /** * @return DbalProducer */ - protected function createProducerMock(): PsrProducer + protected function createProducerMock(): InteropProducer { return $this->createMock(DbalProducer::class); } @@ -77,7 +77,7 @@ protected function createProducerMock(): PsrProducer /** * @return DbalDestination */ - protected function createQueue(string $name): PsrQueue + protected function createQueue(string $name): InteropQueue { return new DbalDestination($name); } @@ -85,7 +85,7 @@ protected function createQueue(string $name): PsrQueue /** * @return DbalDestination */ - protected function createTopic(string $name): PsrTopic + protected function createTopic(string $name): InteropTopic { return new DbalDestination($name); } @@ -93,7 +93,7 @@ protected function createTopic(string $name): PsrTopic /** * @return DbalMessage */ - protected function createMessage(): PsrMessage + protected function createMessage(): InteropMessage { return new DbalMessage(); } diff --git a/pkg/enqueue/Tests/Client/Driver/FsDriverTest.php b/pkg/enqueue/Tests/Client/Driver/FsDriverTest.php index bbc083be2..f1cd02f9b 100644 --- a/pkg/enqueue/Tests/Client/Driver/FsDriverTest.php +++ b/pkg/enqueue/Tests/Client/Driver/FsDriverTest.php @@ -12,11 +12,11 @@ use Enqueue\Fs\FsMessage; use Enqueue\Fs\FsProducer; use Enqueue\Test\ClassExtensionTrait; -use Interop\Queue\PsrContext; -use Interop\Queue\PsrMessage; -use Interop\Queue\PsrProducer; -use Interop\Queue\PsrQueue; -use Interop\Queue\PsrTopic; +use Interop\Queue\Context; +use Interop\Queue\Message as InteropMessage; +use Interop\Queue\Producer as InteropProducer; +use Interop\Queue\Queue as InteropQueue; +use Interop\Queue\Topic as InteropTopic; use Makasim\File\TempFile; use PHPUnit\Framework\TestCase; @@ -86,7 +86,7 @@ protected function createDriver(...$args): DriverInterface /** * @return FsContext */ - protected function createContextMock(): PsrContext + protected function createContextMock(): Context { return $this->createMock(FsContext::class); } @@ -94,7 +94,7 @@ protected function createContextMock(): PsrContext /** * @return FsProducer */ - protected function createProducerMock(): PsrProducer + protected function createProducerMock(): InteropProducer { return $this->createMock(FsProducer::class); } @@ -102,7 +102,7 @@ protected function createProducerMock(): PsrProducer /** * @return FsDestination */ - protected function createQueue(string $name): PsrQueue + protected function createQueue(string $name): InteropQueue { return new FsDestination(new \SplFileInfo($name)); } @@ -110,7 +110,7 @@ protected function createQueue(string $name): PsrQueue /** * @return FsDestination */ - protected function createTopic(string $name): PsrTopic + protected function createTopic(string $name): InteropTopic { return new FsDestination(new \SplFileInfo($name)); } @@ -118,7 +118,7 @@ protected function createTopic(string $name): PsrTopic /** * @return FsMessage */ - protected function createMessage(): PsrMessage + protected function createMessage(): InteropMessage { return new FsMessage(); } diff --git a/pkg/enqueue/Tests/Client/Driver/GenericDriverTest.php b/pkg/enqueue/Tests/Client/Driver/GenericDriverTest.php index 31f92a548..733e9ac20 100644 --- a/pkg/enqueue/Tests/Client/Driver/GenericDriverTest.php +++ b/pkg/enqueue/Tests/Client/Driver/GenericDriverTest.php @@ -9,11 +9,11 @@ use Enqueue\Null\NullQueue; use Enqueue\Null\NullTopic; use Enqueue\Test\ClassExtensionTrait; -use Interop\Queue\PsrContext; -use Interop\Queue\PsrMessage; -use Interop\Queue\PsrProducer; -use Interop\Queue\PsrQueue; -use Interop\Queue\PsrTopic; +use Interop\Queue\Context; +use Interop\Queue\Message as InteropMessage; +use Interop\Queue\Producer as InteropProducer; +use Interop\Queue\Queue as InteropQueue; +use Interop\Queue\Topic as InteropTopic; use PHPUnit\Framework\TestCase; class GenericDriverTest extends TestCase @@ -31,32 +31,32 @@ protected function createDriver(...$args): DriverInterface return new GenericDriver(...$args); } - protected function createContextMock(): PsrContext + protected function createContextMock(): Context { - return $this->createMock(PsrContext::class); + return $this->createMock(Context::class); } - protected function createProducerMock(): PsrProducer + protected function createProducerMock(): InteropProducer { - return $this->createMock(PsrProducer::class); + return $this->createMock(InteropProducer::class); } - protected function createQueue(string $name): PsrQueue + protected function createQueue(string $name): InteropQueue { return new NullQueue($name); } - protected function createTopic(string $name): PsrTopic + protected function createTopic(string $name): InteropTopic { return new NullTopic($name); } - protected function createMessage(): PsrMessage + protected function createMessage(): InteropMessage { return new NullMessage(); } - protected function assertTransportMessage(PsrMessage $transportMessage): void + protected function assertTransportMessage(InteropMessage $transportMessage): void { $this->assertSame('body', $transportMessage->getBody()); $this->assertArraySubset([ diff --git a/pkg/enqueue/Tests/Client/Driver/GenericDriverTestsTrait.php b/pkg/enqueue/Tests/Client/Driver/GenericDriverTestsTrait.php index 5d5d4c823..46c308b26 100644 --- a/pkg/enqueue/Tests/Client/Driver/GenericDriverTestsTrait.php +++ b/pkg/enqueue/Tests/Client/Driver/GenericDriverTestsTrait.php @@ -8,12 +8,12 @@ use Enqueue\Client\MessagePriority; use Enqueue\Client\Route; use Enqueue\Client\RouteCollection; -use Interop\Queue\PsrContext; -use Interop\Queue\PsrDestination; -use Interop\Queue\PsrMessage; -use Interop\Queue\PsrProducer; -use Interop\Queue\PsrQueue; -use Interop\Queue\PsrTopic; +use Interop\Queue\Context; +use Interop\Queue\Destination; +use Interop\Queue\Message as InteropMessage; +use Interop\Queue\Producer as InteropProducer; +use Interop\Queue\Queue as InteropQueue; +use Interop\Queue\Topic as InteropTopic; trait GenericDriverTestsTrait { @@ -28,7 +28,7 @@ public function testCouldBeConstructedWithRequiredArguments() $this->assertInstanceOf(DriverInterface::class, $driver); } - public function testShouldReturnPsrContextSetInConstructor() + public function testShouldReturnContextSetInConstructor() { $context = $this->createContextMock(); @@ -258,10 +258,10 @@ public function testShouldSendMessageToRouter() $producer ->expects($this->once()) ->method('send') - ->willReturnCallback(function (PsrDestination $topic, PsrMessage $message) use ($transportMessage) { + ->willReturnCallback(function (Destination $topic, InteropMessage $message) use ($transportMessage) { $this->assertSame( $this->getRouterTransportName(), - $topic instanceof PsrTopic ? $topic->getTopicName() : $topic->getQueueName()); + $topic instanceof InteropTopic ? $topic->getTopicName() : $topic->getQueueName()); $this->assertSame($transportMessage, $message); }) ; @@ -1070,23 +1070,23 @@ abstract protected function createDriver(...$args): DriverInterface; /** * @return \PHPUnit_Framework_MockObject_MockObject */ - abstract protected function createContextMock(): PsrContext; + abstract protected function createContextMock(): Context; /** * @return \PHPUnit_Framework_MockObject_MockObject */ - abstract protected function createProducerMock(): PsrProducer; + abstract protected function createProducerMock(): InteropProducer; - abstract protected function createQueue(string $name): PsrQueue; + abstract protected function createQueue(string $name): InteropQueue; - abstract protected function createTopic(string $name): PsrTopic; + abstract protected function createTopic(string $name): InteropTopic; - abstract protected function createMessage(): PsrMessage; + abstract protected function createMessage(): InteropMessage; /** * @return \PHPUnit_Framework_MockObject_MockObject */ - protected function createContextStub(): PsrContext + protected function createContextStub(): Context { $context = $this->createContextMock(); @@ -1109,7 +1109,7 @@ protected function createContextStub(): PsrContext return $context; } - protected function assertTransportMessage(PsrMessage $transportMessage): void + protected function assertTransportMessage(InteropMessage $transportMessage): void { $this->assertSame('body', $transportMessage->getBody()); $this->assertEquals([ diff --git a/pkg/enqueue/Tests/Client/Driver/GpsDriverTest.php b/pkg/enqueue/Tests/Client/Driver/GpsDriverTest.php index 8b48a3683..c0cac0458 100644 --- a/pkg/enqueue/Tests/Client/Driver/GpsDriverTest.php +++ b/pkg/enqueue/Tests/Client/Driver/GpsDriverTest.php @@ -13,11 +13,11 @@ use Enqueue\Gps\GpsQueue; use Enqueue\Gps\GpsTopic; use Enqueue\Test\ClassExtensionTrait; -use Interop\Queue\PsrContext; -use Interop\Queue\PsrMessage; -use Interop\Queue\PsrProducer; -use Interop\Queue\PsrQueue; -use Interop\Queue\PsrTopic; +use Interop\Queue\Context; +use Interop\Queue\Message as InteropMessage; +use Interop\Queue\Producer as InteropProducer; +use Interop\Queue\Queue as InteropQueue; +use Interop\Queue\Topic as InteropTopic; use PHPUnit\Framework\TestCase; class GpsDriverTest extends TestCase @@ -98,7 +98,7 @@ protected function createDriver(...$args): DriverInterface /** * @return GpsContext */ - protected function createContextMock(): PsrContext + protected function createContextMock(): Context { return $this->createMock(GpsContext::class); } @@ -106,7 +106,7 @@ protected function createContextMock(): PsrContext /** * @return GpsProducer */ - protected function createProducerMock(): PsrProducer + protected function createProducerMock(): InteropProducer { return $this->createMock(GpsProducer::class); } @@ -114,7 +114,7 @@ protected function createProducerMock(): PsrProducer /** * @return GpsQueue */ - protected function createQueue(string $name): PsrQueue + protected function createQueue(string $name): InteropQueue { return new GpsQueue($name); } @@ -122,7 +122,7 @@ protected function createQueue(string $name): PsrQueue /** * @return GpsTopic */ - protected function createTopic(string $name): PsrTopic + protected function createTopic(string $name): InteropTopic { return new GpsTopic($name); } @@ -130,7 +130,7 @@ protected function createTopic(string $name): PsrTopic /** * @return GpsMessage */ - protected function createMessage(): PsrMessage + protected function createMessage(): InteropMessage { return new GpsMessage(); } diff --git a/pkg/enqueue/Tests/Client/Driver/MongodbDriverTest.php b/pkg/enqueue/Tests/Client/Driver/MongodbDriverTest.php index da9c7e6eb..e74f7bd3b 100644 --- a/pkg/enqueue/Tests/Client/Driver/MongodbDriverTest.php +++ b/pkg/enqueue/Tests/Client/Driver/MongodbDriverTest.php @@ -11,11 +11,11 @@ use Enqueue\Mongodb\MongodbMessage; use Enqueue\Mongodb\MongodbProducer; use Enqueue\Test\ClassExtensionTrait; -use Interop\Queue\PsrContext; -use Interop\Queue\PsrMessage; -use Interop\Queue\PsrProducer; -use Interop\Queue\PsrQueue; -use Interop\Queue\PsrTopic; +use Interop\Queue\Context; +use Interop\Queue\Message as InteropMessage; +use Interop\Queue\Producer as InteropProducer; +use Interop\Queue\Queue as InteropQueue; +use Interop\Queue\Topic as InteropTopic; class MongodbDriverTest extends \PHPUnit_Framework_TestCase { @@ -65,7 +65,7 @@ protected function createDriver(...$args): DriverInterface /** * @return MongodbContext */ - protected function createContextMock(): PsrContext + protected function createContextMock(): Context { return $this->createMock(MongodbContext::class); } @@ -73,7 +73,7 @@ protected function createContextMock(): PsrContext /** * @return MongodbProducer */ - protected function createProducerMock(): PsrProducer + protected function createProducerMock(): InteropProducer { return $this->createMock(MongodbProducer::class); } @@ -81,7 +81,7 @@ protected function createProducerMock(): PsrProducer /** * @return MongodbDestination */ - protected function createQueue(string $name): PsrQueue + protected function createQueue(string $name): InteropQueue { return new MongodbDestination($name); } @@ -89,7 +89,7 @@ protected function createQueue(string $name): PsrQueue /** * @return MongodbDestination */ - protected function createTopic(string $name): PsrTopic + protected function createTopic(string $name): InteropTopic { return new MongodbDestination($name); } @@ -97,7 +97,7 @@ protected function createTopic(string $name): PsrTopic /** * @return MongodbMessage */ - protected function createMessage(): PsrMessage + protected function createMessage(): InteropMessage { return new MongodbMessage(); } diff --git a/pkg/enqueue/Tests/Client/Driver/RabbitMqDriverTest.php b/pkg/enqueue/Tests/Client/Driver/RabbitMqDriverTest.php index 295ac7267..d6604ed73 100644 --- a/pkg/enqueue/Tests/Client/Driver/RabbitMqDriverTest.php +++ b/pkg/enqueue/Tests/Client/Driver/RabbitMqDriverTest.php @@ -14,10 +14,10 @@ use Interop\Amqp\Impl\AmqpMessage; use Interop\Amqp\Impl\AmqpQueue; use Interop\Amqp\Impl\AmqpTopic; -use Interop\Queue\PsrContext; -use Interop\Queue\PsrMessage; -use Interop\Queue\PsrProducer; -use Interop\Queue\PsrQueue; +use Interop\Queue\Context; +use Interop\Queue\Message as InteropMessage; +use Interop\Queue\Producer as InteropProducer; +use Interop\Queue\Queue as InteropQueue; use PHPUnit\Framework\TestCase; class RabbitMqDriverTest extends TestCase @@ -69,7 +69,7 @@ protected function createDriver(...$args): DriverInterface /** * @return AmqpContext */ - protected function createContextMock(): PsrContext + protected function createContextMock(): Context { return $this->createMock(AmqpContext::class); } @@ -77,7 +77,7 @@ protected function createContextMock(): PsrContext /** * @return AmqpProducer */ - protected function createProducerMock(): PsrProducer + protected function createProducerMock(): InteropProducer { return $this->createMock(AmqpProducer::class); } @@ -85,7 +85,7 @@ protected function createProducerMock(): PsrProducer /** * @return AmqpQueue */ - protected function createQueue(string $name): PsrQueue + protected function createQueue(string $name): InteropQueue { return new AmqpQueue($name); } @@ -101,7 +101,7 @@ protected function createTopic(string $name): AmqpTopic /** * @return AmqpMessage */ - protected function createMessage(): PsrMessage + protected function createMessage(): InteropMessage { return new AmqpMessage(); } @@ -111,7 +111,7 @@ protected function getRouterTransportName(): string return 'aprefix.router'; } - protected function assertTransportMessage(PsrMessage $transportMessage): void + protected function assertTransportMessage(InteropMessage $transportMessage): void { $this->assertSame('body', $transportMessage->getBody()); $this->assertArraySubset([ diff --git a/pkg/enqueue/Tests/Client/Driver/RabbitMqStompDriverTest.php b/pkg/enqueue/Tests/Client/Driver/RabbitMqStompDriverTest.php index c055d8baa..9011f64fb 100644 --- a/pkg/enqueue/Tests/Client/Driver/RabbitMqStompDriverTest.php +++ b/pkg/enqueue/Tests/Client/Driver/RabbitMqStompDriverTest.php @@ -17,11 +17,11 @@ use Enqueue\Stomp\StompMessage; use Enqueue\Stomp\StompProducer; use Enqueue\Test\ClassExtensionTrait; -use Interop\Queue\PsrContext; -use Interop\Queue\PsrMessage; -use Interop\Queue\PsrProducer; -use Interop\Queue\PsrQueue; -use Interop\Queue\PsrTopic; +use Interop\Queue\Context; +use Interop\Queue\Message as InteropMessage; +use Interop\Queue\Producer as InteropProducer; +use Interop\Queue\Queue as InteropQueue; +use Interop\Queue\Topic as InteropTopic; use PHPUnit\Framework\TestCase; use Psr\Log\LoggerInterface; @@ -479,7 +479,7 @@ protected function createDriver(...$args): DriverInterface /** * @return StompContext */ - protected function createContextMock(): PsrContext + protected function createContextMock(): Context { return $this->createMock(StompContext::class); } @@ -487,7 +487,7 @@ protected function createContextMock(): PsrContext /** * @return StompProducer */ - protected function createProducerMock(): PsrProducer + protected function createProducerMock(): InteropProducer { return $this->createMock(StompProducer::class); } @@ -495,7 +495,7 @@ protected function createProducerMock(): PsrProducer /** * @return StompDestination */ - protected function createQueue(string $name): PsrQueue + protected function createQueue(string $name): InteropQueue { $destination = new StompDestination(); $destination->setType(StompDestination::TYPE_QUEUE); @@ -507,7 +507,7 @@ protected function createQueue(string $name): PsrQueue /** * @return StompDestination */ - protected function createTopic(string $name): PsrTopic + protected function createTopic(string $name): InteropTopic { $destination = new StompDestination(); $destination->setType(StompDestination::TYPE_TOPIC); @@ -519,12 +519,12 @@ protected function createTopic(string $name): PsrTopic /** * @return StompMessage */ - protected function createMessage(): PsrMessage + protected function createMessage(): InteropMessage { return new StompMessage(); } - protected function assertTransportMessage(PsrMessage $transportMessage): void + protected function assertTransportMessage(InteropMessage $transportMessage): void { $this->assertSame('body', $transportMessage->getBody()); $this->assertEquals([ diff --git a/pkg/enqueue/Tests/Client/Driver/RdKafkaDriverTest.php b/pkg/enqueue/Tests/Client/Driver/RdKafkaDriverTest.php index 899830e5c..f3474e78c 100644 --- a/pkg/enqueue/Tests/Client/Driver/RdKafkaDriverTest.php +++ b/pkg/enqueue/Tests/Client/Driver/RdKafkaDriverTest.php @@ -13,10 +13,10 @@ use Enqueue\RdKafka\RdKafkaProducer; use Enqueue\RdKafka\RdKafkaTopic; use Enqueue\Test\ClassExtensionTrait; -use Interop\Queue\PsrContext; -use Interop\Queue\PsrMessage; -use Interop\Queue\PsrProducer; -use Interop\Queue\PsrQueue; +use Interop\Queue\Context; +use Interop\Queue\Message as InteropMessage; +use Interop\Queue\Producer as InteropProducer; +use Interop\Queue\Queue as InteropQueue; use PHPUnit\Framework\TestCase; /** @@ -81,7 +81,7 @@ protected function createDriver(...$args): DriverInterface /** * @return RdKafkaContext */ - protected function createContextMock(): PsrContext + protected function createContextMock(): Context { return $this->createMock(RdKafkaContext::class); } @@ -89,7 +89,7 @@ protected function createContextMock(): PsrContext /** * @return RdKafkaProducer */ - protected function createProducerMock(): PsrProducer + protected function createProducerMock(): InteropProducer { return $this->createMock(RdKafkaProducer::class); } @@ -97,7 +97,7 @@ protected function createProducerMock(): PsrProducer /** * @return RdKafkaTopic */ - protected function createQueue(string $name): PsrQueue + protected function createQueue(string $name): InteropQueue { return new RdKafkaTopic($name); } @@ -113,7 +113,7 @@ protected function createTopic(string $name): RdKafkaTopic /** * @return RdKafkaMessage */ - protected function createMessage(): PsrMessage + protected function createMessage(): InteropMessage { return new RdKafkaMessage(); } diff --git a/pkg/enqueue/Tests/Client/Driver/SqsDriverTest.php b/pkg/enqueue/Tests/Client/Driver/SqsDriverTest.php index bf8bef1c9..2e3005e6a 100644 --- a/pkg/enqueue/Tests/Client/Driver/SqsDriverTest.php +++ b/pkg/enqueue/Tests/Client/Driver/SqsDriverTest.php @@ -12,11 +12,11 @@ use Enqueue\Sqs\SqsMessage; use Enqueue\Sqs\SqsProducer; use Enqueue\Test\ClassExtensionTrait; -use Interop\Queue\PsrContext; -use Interop\Queue\PsrMessage; -use Interop\Queue\PsrProducer; -use Interop\Queue\PsrQueue; -use Interop\Queue\PsrTopic; +use Interop\Queue\Context; +use Interop\Queue\Message as InteropMessage; +use Interop\Queue\Producer as InteropProducer; +use Interop\Queue\Queue as InteropQueue; +use Interop\Queue\Topic as InteropTopic; use PHPUnit\Framework\TestCase; class SqsDriverTest extends TestCase @@ -84,7 +84,7 @@ protected function createDriver(...$args): DriverInterface /** * @return SqsContext */ - protected function createContextMock(): PsrContext + protected function createContextMock(): Context { return $this->createMock(SqsContext::class); } @@ -92,7 +92,7 @@ protected function createContextMock(): PsrContext /** * @return SqsProducer */ - protected function createProducerMock(): PsrProducer + protected function createProducerMock(): InteropProducer { return $this->createMock(SqsProducer::class); } @@ -100,7 +100,7 @@ protected function createProducerMock(): PsrProducer /** * @return SqsDestination */ - protected function createQueue(string $name): PsrQueue + protected function createQueue(string $name): InteropQueue { return new SqsDestination($name); } @@ -108,7 +108,7 @@ protected function createQueue(string $name): PsrQueue /** * @return SqsDestination */ - protected function createTopic(string $name): PsrTopic + protected function createTopic(string $name): InteropTopic { return new SqsDestination($name); } @@ -116,7 +116,7 @@ protected function createTopic(string $name): PsrTopic /** * @return SqsMessage */ - protected function createMessage(): PsrMessage + protected function createMessage(): InteropMessage { return new SqsMessage(); } diff --git a/pkg/enqueue/Tests/Client/Driver/StompDriverTest.php b/pkg/enqueue/Tests/Client/Driver/StompDriverTest.php index b68e63e08..26199d346 100644 --- a/pkg/enqueue/Tests/Client/Driver/StompDriverTest.php +++ b/pkg/enqueue/Tests/Client/Driver/StompDriverTest.php @@ -13,11 +13,11 @@ use Enqueue\Stomp\StompMessage; use Enqueue\Stomp\StompProducer; use Enqueue\Test\ClassExtensionTrait; -use Interop\Queue\PsrContext; -use Interop\Queue\PsrMessage; -use Interop\Queue\PsrProducer; -use Interop\Queue\PsrQueue; -use Interop\Queue\PsrTopic; +use Interop\Queue\Context; +use Interop\Queue\Message as InteropMessage; +use Interop\Queue\Producer as InteropProducer; +use Interop\Queue\Queue as InteropQueue; +use Interop\Queue\Topic as InteropTopic; use PHPUnit\Framework\TestCase; use Psr\Log\LoggerInterface; @@ -108,7 +108,7 @@ protected function createDriver(...$args): DriverInterface /** * @return StompContext */ - protected function createContextMock(): PsrContext + protected function createContextMock(): Context { return $this->createMock(StompContext::class); } @@ -116,7 +116,7 @@ protected function createContextMock(): PsrContext /** * @return StompProducer */ - protected function createProducerMock(): PsrProducer + protected function createProducerMock(): InteropProducer { return $this->createMock(StompProducer::class); } @@ -124,7 +124,7 @@ protected function createProducerMock(): PsrProducer /** * @return StompDestination */ - protected function createQueue(string $name): PsrQueue + protected function createQueue(string $name): InteropQueue { $destination = new StompDestination(); $destination->setType(StompDestination::TYPE_QUEUE); @@ -136,7 +136,7 @@ protected function createQueue(string $name): PsrQueue /** * @return StompDestination */ - protected function createTopic(string $name): PsrTopic + protected function createTopic(string $name): InteropTopic { $destination = new StompDestination(); $destination->setType(StompDestination::TYPE_TOPIC); @@ -148,12 +148,12 @@ protected function createTopic(string $name): PsrTopic /** * @return StompMessage */ - protected function createMessage(): PsrMessage + protected function createMessage(): InteropMessage { return new StompMessage(); } - protected function assertTransportMessage(PsrMessage $transportMessage): void + protected function assertTransportMessage(InteropMessage $transportMessage): void { $this->assertSame('body', $transportMessage->getBody()); $this->assertEquals([ diff --git a/pkg/enqueue/Tests/Client/DriverFactoryTest.php b/pkg/enqueue/Tests/Client/DriverFactoryTest.php index f17ce38a0..c4f1ffb46 100644 --- a/pkg/enqueue/Tests/Client/DriverFactoryTest.php +++ b/pkg/enqueue/Tests/Client/DriverFactoryTest.php @@ -42,7 +42,7 @@ use Enqueue\Stomp\StompContext; use Interop\Amqp\AmqpConnectionFactory; use Interop\Amqp\AmqpContext; -use Interop\Queue\PsrConnectionFactory; +use Interop\Queue\ConnectionFactory; use PHPUnit\Framework\TestCase; class DriverFactoryTest extends TestCase @@ -164,9 +164,9 @@ public static function provideDSN() yield ['beanstalk:', PheanstalkConnectionFactory::class, PheanstalkContext::class, [], GenericDriver::class]; } - private function createConnectionFactoryMock(): PsrConnectionFactory + private function createConnectionFactoryMock(): ConnectionFactory { - return $this->createMock(PsrConnectionFactory::class); + return $this->createMock(ConnectionFactory::class); } private function createConfigMock(): Config diff --git a/pkg/enqueue/Tests/Client/RouterProcessorTest.php b/pkg/enqueue/Tests/Client/RouterProcessorTest.php index f69bb07d7..f38d4481d 100644 --- a/pkg/enqueue/Tests/Client/RouterProcessorTest.php +++ b/pkg/enqueue/Tests/Client/RouterProcessorTest.php @@ -12,7 +12,7 @@ use Enqueue\Null\NullContext; use Enqueue\Null\NullMessage; use Enqueue\Test\ClassExtensionTrait; -use Interop\Queue\PsrProcessor; +use Interop\Queue\Processor; use PHPUnit\Framework\TestCase; class RouterProcessorTest extends TestCase @@ -21,7 +21,7 @@ class RouterProcessorTest extends TestCase public function testShouldImplementProcessorInterface() { - $this->assertClassImplements(PsrProcessor::class, RouterProcessor::class); + $this->assertClassImplements(Processor::class, RouterProcessor::class); } public function testShouldBeFinal() diff --git a/pkg/enqueue/Tests/Consumption/CallbackProcessorTest.php b/pkg/enqueue/Tests/Consumption/CallbackProcessorTest.php index 1b034d908..f134cfe9f 100644 --- a/pkg/enqueue/Tests/Consumption/CallbackProcessorTest.php +++ b/pkg/enqueue/Tests/Consumption/CallbackProcessorTest.php @@ -6,7 +6,7 @@ use Enqueue\Null\NullContext; use Enqueue\Null\NullMessage; use Enqueue\Test\ClassExtensionTrait; -use Interop\Queue\PsrProcessor; +use Interop\Queue\Processor; use PHPUnit\Framework\TestCase; class CallbackProcessorTest extends TestCase @@ -15,7 +15,7 @@ class CallbackProcessorTest extends TestCase public function testShouldImplementProcessorInterface() { - $this->assertClassImplements(PsrProcessor::class, CallbackProcessor::class); + $this->assertClassImplements(Processor::class, CallbackProcessor::class); } public function testCouldBeConstructedWithCallableAsArgument() diff --git a/pkg/enqueue/Tests/Consumption/ContextTest.php b/pkg/enqueue/Tests/Consumption/ContextTest.php index a0f6b266a..f110597ae 100644 --- a/pkg/enqueue/Tests/Consumption/ContextTest.php +++ b/pkg/enqueue/Tests/Consumption/ContextTest.php @@ -6,10 +6,10 @@ use Enqueue\Consumption\Exception\IllegalContextModificationException; use Enqueue\Null\NullQueue; use Enqueue\Test\ClassExtensionTrait; -use Interop\Queue\PsrConsumer; -use Interop\Queue\PsrContext; -use Interop\Queue\PsrMessage; -use Interop\Queue\PsrProcessor; +use Interop\Queue\Consumer; +use Interop\Queue\Context as InteropContext; +use Interop\Queue\Message as InteropMessage; +use Interop\Queue\Processor; use PHPUnit\Framework\TestCase; use Psr\Log\NullLogger; @@ -19,50 +19,50 @@ class ContextTest extends TestCase public function testCouldBeConstructedWithSessionAsFirstArgument() { - new Context($this->createPsrContext()); + new Context($this->createContext()); } public function testShouldAllowGetSessionSetInConstructor() { - $psrContext = $this->createPsrContext(); + $interopContext = $this->createContext(); - $context = new Context($psrContext); + $context = new Context($interopContext); - $this->assertSame($psrContext, $context->getPsrContext()); + $this->assertSame($interopContext, $context->getInteropContext()); } public function testShouldAllowGetMessageConsumerPreviouslySet() { - $messageConsumer = $this->createPsrConsumer(); + $messageConsumer = $this->createConsumer(); - $context = new Context($this->createPsrContext()); - $context->setPsrConsumer($messageConsumer); + $context = new Context($this->createContext()); + $context->setConsumer($messageConsumer); - $this->assertSame($messageConsumer, $context->getPsrConsumer()); + $this->assertSame($messageConsumer, $context->getConsumer()); } public function testThrowOnTryToChangeMessageConsumerIfAlreadySet() { - $messageConsumer = $this->createPsrConsumer(); - $anotherMessageConsumer = $this->createPsrConsumer(); + $messageConsumer = $this->createConsumer(); + $anotherMessageConsumer = $this->createConsumer(); - $context = new Context($this->createPsrContext()); + $context = new Context($this->createContext()); - $context->setPsrConsumer($messageConsumer); + $context->setConsumer($messageConsumer); $this->expectException(IllegalContextModificationException::class); - $context->setPsrConsumer($anotherMessageConsumer); + $context->setConsumer($anotherMessageConsumer); } public function testShouldAllowGetMessageProducerPreviouslySet() { $processorMock = $this->createProcessorMock(); - $context = new Context($this->createPsrContext()); - $context->setPsrProcessor($processorMock); + $context = new Context($this->createContext()); + $context->setProcessor($processorMock); - $this->assertSame($processorMock, $context->getPsrProcessor()); + $this->assertSame($processorMock, $context->getProcessor()); } public function testThrowOnTryToChangeProcessorIfAlreadySet() @@ -70,20 +70,20 @@ public function testThrowOnTryToChangeProcessorIfAlreadySet() $processor = $this->createProcessorMock(); $anotherProcessor = $this->createProcessorMock(); - $context = new Context($this->createPsrContext()); + $context = new Context($this->createContext()); - $context->setPsrProcessor($processor); + $context->setProcessor($processor); $this->expectException(IllegalContextModificationException::class); - $context->setPsrProcessor($anotherProcessor); + $context->setProcessor($anotherProcessor); } public function testShouldAllowGetLoggerPreviouslySet() { $logger = new NullLogger(); - $context = new Context($this->createPsrContext()); + $context = new Context($this->createContext()); $context->setLogger($logger); $this->assertSame($logger, $context->getLogger()); @@ -91,42 +91,42 @@ public function testShouldAllowGetLoggerPreviouslySet() public function testShouldSetExecutionInterruptedToFalseInConstructor() { - $context = new Context($this->createPsrContext()); + $context = new Context($this->createContext()); $this->assertFalse($context->isExecutionInterrupted()); } public function testShouldAllowGetPreviouslySetMessage() { - /** @var PsrMessage $message */ - $message = $this->createMock(PsrMessage::class); + /** @var InteropMessage $message */ + $message = $this->createMock(InteropMessage::class); - $context = new Context($this->createPsrContext()); + $context = new Context($this->createContext()); - $context->setPsrMessage($message); + $context->setInteropMessage($message); - $this->assertSame($message, $context->getPsrMessage()); + $this->assertSame($message, $context->getInteropMessage()); } public function testThrowOnTryToChangeMessageIfAlreadySet() { - /** @var PsrMessage $message */ - $message = $this->createMock(PsrMessage::class); + /** @var InteropMessage $message */ + $message = $this->createMock(InteropMessage::class); - $context = new Context($this->createPsrContext()); + $context = new Context($this->createContext()); $this->expectException(IllegalContextModificationException::class); $this->expectExceptionMessage('The message could be set once'); - $context->setPsrMessage($message); - $context->setPsrMessage($message); + $context->setInteropMessage($message); + $context->setInteropMessage($message); } public function testShouldAllowGetPreviouslySetException() { $exception = new \Exception(); - $context = new Context($this->createPsrContext()); + $context = new Context($this->createContext()); $context->setException($exception); @@ -137,7 +137,7 @@ public function testShouldAllowGetPreviouslySetResult() { $result = 'aResult'; - $context = new Context($this->createPsrContext()); + $context = new Context($this->createContext()); $context->setResult($result); @@ -148,7 +148,7 @@ public function testThrowOnTryToChangeResultIfAlreadySet() { $result = 'aResult'; - $context = new Context($this->createPsrContext()); + $context = new Context($this->createContext()); $this->expectException(IllegalContextModificationException::class); $this->expectExceptionMessage('The result modification is not allowed'); @@ -159,7 +159,7 @@ public function testThrowOnTryToChangeResultIfAlreadySet() public function testShouldAllowGetPreviouslySetExecutionInterrupted() { - $context = new Context($this->createPsrContext()); + $context = new Context($this->createContext()); // guard $this->assertFalse($context->isExecutionInterrupted()); @@ -171,7 +171,7 @@ public function testShouldAllowGetPreviouslySetExecutionInterrupted() public function testThrowOnTryToRollbackExecutionInterruptedIfAlreadySetToTrue() { - $context = new Context($this->createPsrContext()); + $context = new Context($this->createContext()); $this->expectException(IllegalContextModificationException::class); $this->expectExceptionMessage('The execution once interrupted could not be roll backed'); @@ -182,7 +182,7 @@ public function testThrowOnTryToRollbackExecutionInterruptedIfAlreadySetToTrue() public function testNotThrowOnSettingExecutionInterruptedToTrueIfAlreadySetToTrue() { - $context = new Context($this->createPsrContext()); + $context = new Context($this->createContext()); $context->setExecutionInterrupted(true); $context->setExecutionInterrupted(true); @@ -192,7 +192,7 @@ public function testShouldAllowGetPreviouslySetLogger() { $expectedLogger = new NullLogger(); - $context = new Context($this->createPsrContext()); + $context = new Context($this->createContext()); $context->setLogger($expectedLogger); @@ -201,7 +201,7 @@ public function testShouldAllowGetPreviouslySetLogger() public function testThrowOnSettingLoggerIfAlreadySet() { - $context = new Context($this->createPsrContext()); + $context = new Context($this->createContext()); $context->setLogger(new NullLogger()); @@ -213,46 +213,46 @@ public function testThrowOnSettingLoggerIfAlreadySet() public function testShouldAllowGetPreviouslySetQueue() { - $context = new Context($this->createPsrContext()); + $context = new Context($this->createContext()); - $context->setPsrQueue($queue = new NullQueue('')); + $context->setInteropQueue($queue = new NullQueue('')); - $this->assertSame($queue, $context->getPsrQueue()); + $this->assertSame($queue, $context->getInteropQueue()); } public function testThrowOnSettingQueueNameIfAlreadySet() { - $context = new Context($this->createPsrContext()); + $context = new Context($this->createContext()); - $context->setPsrQueue(new NullQueue('')); + $context->setInteropQueue(new NullQueue('')); $this->expectException(IllegalContextModificationException::class); $this->expectExceptionMessage('The queue modification is not allowed'); - $context->setPsrQueue(new NullQueue('')); + $context->setInteropQueue(new NullQueue('')); } /** - * @return \PHPUnit_Framework_MockObject_MockObject|PsrContext + * @return \PHPUnit_Framework_MockObject_MockObject|InteropContext */ - protected function createPsrContext() + protected function createContext(): InteropContext { - return $this->createMock(PsrContext::class); + return $this->createMock(InteropContext::class); } /** - * @return \PHPUnit_Framework_MockObject_MockObject|PsrConsumer + * @return \PHPUnit_Framework_MockObject_MockObject|Consumer */ - protected function createPsrConsumer() + protected function createConsumer() { - return $this->createMock(PsrConsumer::class); + return $this->createMock(Consumer::class); } /** - * @return \PHPUnit_Framework_MockObject_MockObject|PsrProcessor + * @return \PHPUnit_Framework_MockObject_MockObject|Processor */ protected function createProcessorMock() { - return $this->createMock(PsrProcessor::class); + return $this->createMock(Processor::class); } } diff --git a/pkg/enqueue/Tests/Consumption/Extension/LimitConsumedMessagesExtensionTest.php b/pkg/enqueue/Tests/Consumption/Extension/LimitConsumedMessagesExtensionTest.php index 250c5778d..4c3d7557f 100644 --- a/pkg/enqueue/Tests/Consumption/Extension/LimitConsumedMessagesExtensionTest.php +++ b/pkg/enqueue/Tests/Consumption/Extension/LimitConsumedMessagesExtensionTest.php @@ -4,9 +4,9 @@ use Enqueue\Consumption\Context; use Enqueue\Consumption\Extension\LimitConsumedMessagesExtension; -use Interop\Queue\PsrConsumer; -use Interop\Queue\PsrContext; -use Interop\Queue\PsrProcessor; +use Interop\Queue\Consumer; +use Interop\Queue\Context as InteropContext; +use Interop\Queue\Processor; use PHPUnit\Framework\TestCase; use Psr\Log\LoggerInterface; @@ -97,12 +97,12 @@ public function testOnPostReceivedShouldInterruptExecutionIfMessageLimitExceeded /** * @return Context */ - protected function createContext() + protected function createContext(): Context { - $context = new Context($this->createMock(PsrContext::class)); + $context = new Context($this->createMock(InteropContext::class)); $context->setLogger($this->createMock(LoggerInterface::class)); - $context->setPsrConsumer($this->createMock(PsrConsumer::class)); - $context->setPsrProcessor($this->createMock(PsrProcessor::class)); + $context->setConsumer($this->createMock(Consumer::class)); + $context->setProcessor($this->createMock(Processor::class)); return $context; } diff --git a/pkg/enqueue/Tests/Consumption/Extension/LimitConsumerMemoryExtensionTest.php b/pkg/enqueue/Tests/Consumption/Extension/LimitConsumerMemoryExtensionTest.php index 74514e58c..e42e55972 100644 --- a/pkg/enqueue/Tests/Consumption/Extension/LimitConsumerMemoryExtensionTest.php +++ b/pkg/enqueue/Tests/Consumption/Extension/LimitConsumerMemoryExtensionTest.php @@ -4,9 +4,9 @@ use Enqueue\Consumption\Context; use Enqueue\Consumption\Extension\LimitConsumerMemoryExtension; -use Interop\Queue\PsrConsumer; -use Interop\Queue\PsrContext; -use Interop\Queue\PsrProcessor; +use Interop\Queue\Consumer; +use Interop\Queue\Context as InteropContext; +use Interop\Queue\Processor; use PHPUnit\Framework\TestCase; use Psr\Log\LoggerInterface; @@ -26,7 +26,7 @@ public function testShouldThrowExceptionIfMemoryLimitIsNotInt() public function testOnIdleShouldInterruptExecutionIfMemoryLimitReached() { - $context = $this->createPsrContext(); + $context = $this->createContext(); $context->getLogger() ->expects($this->once()) ->method('debug') @@ -45,7 +45,7 @@ public function testOnIdleShouldInterruptExecutionIfMemoryLimitReached() public function testOnPostReceivedShouldInterruptExecutionIfMemoryLimitReached() { - $context = $this->createPsrContext(); + $context = $this->createContext(); $context->getLogger() ->expects($this->once()) ->method('debug') @@ -64,7 +64,7 @@ public function testOnPostReceivedShouldInterruptExecutionIfMemoryLimitReached() public function testOnBeforeReceivedShouldInterruptExecutionIfMemoryLimitReached() { - $context = $this->createPsrContext(); + $context = $this->createContext(); $context->getLogger() ->expects($this->once()) ->method('debug') @@ -83,7 +83,7 @@ public function testOnBeforeReceivedShouldInterruptExecutionIfMemoryLimitReached public function testOnBeforeReceiveShouldNotInterruptExecutionIfMemoryLimitIsNotReached() { - $context = $this->createPsrContext(); + $context = $this->createContext(); // guard $this->assertFalse($context->isExecutionInterrupted()); @@ -97,7 +97,7 @@ public function testOnBeforeReceiveShouldNotInterruptExecutionIfMemoryLimitIsNot public function testOnIdleShouldNotInterruptExecutionIfMemoryLimitIsNotReached() { - $context = $this->createPsrContext(); + $context = $this->createContext(); // guard $this->assertFalse($context->isExecutionInterrupted()); @@ -111,7 +111,7 @@ public function testOnIdleShouldNotInterruptExecutionIfMemoryLimitIsNotReached() public function testOnPostReceivedShouldNotInterruptExecutionIfMemoryLimitIsNotReached() { - $context = $this->createPsrContext(); + $context = $this->createContext(); // guard $this->assertFalse($context->isExecutionInterrupted()); @@ -126,12 +126,12 @@ public function testOnPostReceivedShouldNotInterruptExecutionIfMemoryLimitIsNotR /** * @return Context */ - protected function createPsrContext() + protected function createContext(): Context { - $context = new Context($this->createMock(PsrContext::class)); + $context = new Context($this->createMock(InteropContext::class)); $context->setLogger($this->createMock(LoggerInterface::class)); - $context->setPsrConsumer($this->createMock(PsrConsumer::class)); - $context->setPsrProcessor($this->createMock(PsrProcessor::class)); + $context->setConsumer($this->createMock(Consumer::class)); + $context->setProcessor($this->createMock(Processor::class)); return $context; } diff --git a/pkg/enqueue/Tests/Consumption/Extension/LimitConsumptionTimeExtensionTest.php b/pkg/enqueue/Tests/Consumption/Extension/LimitConsumptionTimeExtensionTest.php index fffeb9439..66485dc7a 100644 --- a/pkg/enqueue/Tests/Consumption/Extension/LimitConsumptionTimeExtensionTest.php +++ b/pkg/enqueue/Tests/Consumption/Extension/LimitConsumptionTimeExtensionTest.php @@ -4,9 +4,9 @@ use Enqueue\Consumption\Context; use Enqueue\Consumption\Extension\LimitConsumptionTimeExtension; -use Interop\Queue\PsrConsumer; -use Interop\Queue\PsrContext; -use Interop\Queue\PsrProcessor; +use Interop\Queue\Consumer; +use Interop\Queue\Context as InteropContext; +use Interop\Queue\Processor; use PHPUnit\Framework\TestCase; use Psr\Log\LoggerInterface; @@ -110,12 +110,12 @@ public function testOnPostReceivedShouldNotInterruptExecutionIfConsumptionTimeIs /** * @return Context */ - protected function createContext() + protected function createContext(): Context { - $context = new Context($this->createMock(PsrContext::class)); + $context = new Context($this->createMock(InteropContext::class)); $context->setLogger($this->createMock(LoggerInterface::class)); - $context->setPsrConsumer($this->createMock(PsrConsumer::class)); - $context->setPsrProcessor($this->createMock(PsrProcessor::class)); + $context->setConsumer($this->createMock(Consumer::class)); + $context->setProcessor($this->createMock(Processor::class)); return $context; } diff --git a/pkg/enqueue/Tests/Consumption/Extension/LoggerExtensionTest.php b/pkg/enqueue/Tests/Consumption/Extension/LoggerExtensionTest.php index 68bc7003f..6bd05ef8c 100644 --- a/pkg/enqueue/Tests/Consumption/Extension/LoggerExtensionTest.php +++ b/pkg/enqueue/Tests/Consumption/Extension/LoggerExtensionTest.php @@ -8,8 +8,8 @@ use Enqueue\Consumption\Result; use Enqueue\Null\NullMessage; use Enqueue\Test\ClassExtensionTrait; -use Interop\Queue\PsrConsumer; -use Interop\Queue\PsrContext; +use Interop\Queue\Consumer; +use Interop\Queue\Context as InteropContext; use PHPUnit\Framework\TestCase; use Psr\Log\LoggerInterface; @@ -33,7 +33,7 @@ public function testShouldSetLoggerToContextOnStart() $extension = new LoggerExtension($logger); - $context = new Context($this->createPsrContextMock()); + $context = new Context($this->createContextMock()); $extension->onStart($context); @@ -51,7 +51,7 @@ public function testShouldAddInfoMessageOnStart() $extension = new LoggerExtension($logger); - $context = new Context($this->createPsrContextMock()); + $context = new Context($this->createContextMock()); $extension->onStart($context); } @@ -70,9 +70,9 @@ public function testShouldLogRejectMessageStatus() $message = new NullMessage(); $message->setBody('message body'); - $context = new Context($this->createPsrContextMock()); + $context = new Context($this->createContextMock()); $context->setResult(Result::reject('reason')); - $context->setPsrMessage($message); + $context->setInteropMessage($message); $extension->onPostReceived($context); } @@ -91,9 +91,9 @@ public function testShouldLogRequeueMessageStatus() $message = new NullMessage(); $message->setBody('message body'); - $context = new Context($this->createPsrContextMock()); + $context = new Context($this->createContextMock()); $context->setResult(Result::requeue('reason')); - $context->setPsrMessage($message); + $context->setInteropMessage($message); $extension->onPostReceived($context); } @@ -108,7 +108,7 @@ public function testShouldNotLogRequeueMessageStatusIfReasonIsEmpty() $extension = new LoggerExtension($logger); - $context = new Context($this->createPsrContextMock()); + $context = new Context($this->createContextMock()); $context->setResult(Result::requeue()); $extension->onPostReceived($context); @@ -128,9 +128,9 @@ public function testShouldLogAckMessageStatus() $message = new NullMessage(); $message->setBody('message body'); - $context = new Context($this->createPsrContextMock()); + $context = new Context($this->createContextMock()); $context->setResult(Result::ack('reason')); - $context->setPsrMessage($message); + $context->setInteropMessage($message); $extension->onPostReceived($context); } @@ -145,7 +145,7 @@ public function testShouldNotLogAckMessageStatusIfReasonIsEmpty() $extension = new LoggerExtension($logger); - $context = new Context($this->createPsrContextMock()); + $context = new Context($this->createContextMock()); $context->setResult(Result::ack()); $extension->onPostReceived($context); @@ -168,18 +168,18 @@ public function testShouldNotSetLoggerIfOneHasBeenSetOnStart() $extension = new LoggerExtension($logger); - $context = new Context($this->createPsrContextMock()); + $context = new Context($this->createContextMock()); $context->setLogger($alreadySetLogger); $extension->onStart($context); } /** - * @return \PHPUnit_Framework_MockObject_MockObject|PsrContext + * @return \PHPUnit_Framework_MockObject_MockObject|InteropContext */ - protected function createPsrContextMock() + protected function createContextMock(): InteropContext { - return $this->createMock(PsrContext::class); + return $this->createMock(InteropContext::class); } /** @@ -191,10 +191,10 @@ protected function createLogger() } /** - * @return \PHPUnit_Framework_MockObject_MockObject|PsrConsumer + * @return \PHPUnit_Framework_MockObject_MockObject|Consumer */ protected function createConsumerMock() { - return $this->createMock(PsrConsumer::class); + return $this->createMock(Consumer::class); } } diff --git a/pkg/enqueue/Tests/Consumption/Extension/NicenessExtensionTest.php b/pkg/enqueue/Tests/Consumption/Extension/NicenessExtensionTest.php index 1cabdaff0..36a80d38b 100644 --- a/pkg/enqueue/Tests/Consumption/Extension/NicenessExtensionTest.php +++ b/pkg/enqueue/Tests/Consumption/Extension/NicenessExtensionTest.php @@ -4,9 +4,9 @@ use Enqueue\Consumption\Context; use Enqueue\Consumption\Extension\NicenessExtension; -use Interop\Queue\PsrConsumer; -use Interop\Queue\PsrContext; -use Interop\Queue\PsrProcessor; +use Interop\Queue\Consumer; +use Interop\Queue\Context as InteropContext; +use Interop\Queue\Processor; use PHPUnit\Framework\TestCase; use Psr\Log\LoggerInterface; @@ -35,12 +35,12 @@ public function testShouldThrowWarningOnInvalidArgument() /** * @return Context */ - protected function createContext() + protected function createContext(): Context { - $context = new Context($this->createMock(PsrContext::class)); + $context = new Context($this->createMock(InteropContext::class)); $context->setLogger($this->createMock(LoggerInterface::class)); - $context->setPsrConsumer($this->createMock(PsrConsumer::class)); - $context->setPsrProcessor($this->createMock(PsrProcessor::class)); + $context->setConsumer($this->createMock(Consumer::class)); + $context->setProcessor($this->createMock(Processor::class)); return $context; } diff --git a/pkg/enqueue/Tests/Consumption/Extension/ReplyExtensionTest.php b/pkg/enqueue/Tests/Consumption/Extension/ReplyExtensionTest.php index 49120559e..09802d3f1 100644 --- a/pkg/enqueue/Tests/Consumption/Extension/ReplyExtensionTest.php +++ b/pkg/enqueue/Tests/Consumption/Extension/ReplyExtensionTest.php @@ -9,8 +9,8 @@ use Enqueue\Null\NullMessage; use Enqueue\Null\NullQueue; use Enqueue\Test\ClassExtensionTrait; -use Interop\Queue\PsrContext; -use Interop\Queue\PsrProducer; +use Interop\Queue\Context as InteropContext; +use Interop\Queue\Producer as InteropProducer; use PHPUnit\Framework\TestCase; use Psr\Log\NullLogger; @@ -61,7 +61,7 @@ public function testShouldDoNothingIfReceivedMessageNotHaveReplyToSet() $extension = new ReplyExtension(); $context = new Context($this->createNeverUsedContextMock()); - $context->setPsrMessage(new NullMessage()); + $context->setInteropMessage(new NullMessage()); $extension->onPostReceived($context); } @@ -74,7 +74,7 @@ public function testShouldDoNothingIfContextResultIsNotInstanceOfResult() $message->setReplyTo('aReplyToQueue'); $context = new Context($this->createNeverUsedContextMock()); - $context->setPsrMessage($message); + $context->setInteropMessage($message); $context->setResult('notInstanceOfResult'); $extension->onPostReceived($context); @@ -88,7 +88,7 @@ public function testShouldDoNothingIfResultInstanceOfResultButReplyMessageNotSet $message->setReplyTo('aReplyToQueue'); $context = new Context($this->createNeverUsedContextMock()); - $context->setPsrMessage($message); + $context->setInteropMessage($message); $context->setResult(Result::ack()); $extension->onPostReceived($context); @@ -107,15 +107,15 @@ public function testShouldSendReplyMessageToReplyQueueOnPostReceived() $replyQueue = new NullQueue('aReplyName'); - $producerMock = $this->createMock(PsrProducer::class); + $producerMock = $this->createMock(InteropProducer::class); $producerMock ->expects($this->once()) ->method('send') ->with($replyQueue, $replyMessage) ; - /** @var \PHPUnit_Framework_MockObject_MockObject|PsrContext $contextMock */ - $contextMock = $this->createMock(PsrContext::class); + /** @var \PHPUnit_Framework_MockObject_MockObject|InteropContext $contextMock */ + $contextMock = $this->createMock(InteropContext::class); $contextMock ->expects($this->once()) ->method('createQueue') @@ -128,7 +128,7 @@ public function testShouldSendReplyMessageToReplyQueueOnPostReceived() ; $context = new Context($contextMock); - $context->setPsrMessage($message); + $context->setInteropMessage($message); $context->setResult(Result::reply($replyMessage)); $context->setLogger(new NullLogger()); @@ -136,11 +136,11 @@ public function testShouldSendReplyMessageToReplyQueueOnPostReceived() } /** - * @return \PHPUnit_Framework_MockObject_MockObject|PsrContext + * @return \PHPUnit_Framework_MockObject_MockObject|InteropContext */ - private function createNeverUsedContextMock() + private function createNeverUsedContextMock(): InteropContext { - $contextMock = $this->createMock(PsrContext::class); + $contextMock = $this->createMock(InteropContext::class); $contextMock ->expects($this->never()) ->method('createProducer') diff --git a/pkg/enqueue/Tests/Consumption/FallbackSubscriptionConsumerTest.php b/pkg/enqueue/Tests/Consumption/FallbackSubscriptionConsumerTest.php index b054180ed..ff67b1a58 100644 --- a/pkg/enqueue/Tests/Consumption/FallbackSubscriptionConsumerTest.php +++ b/pkg/enqueue/Tests/Consumption/FallbackSubscriptionConsumerTest.php @@ -3,18 +3,18 @@ namespace Enqueue\Tests\Consumption; use Enqueue\Consumption\FallbackSubscriptionConsumer; -use Interop\Queue\PsrConsumer; -use Interop\Queue\PsrMessage; -use Interop\Queue\PsrQueue; -use Interop\Queue\PsrSubscriptionConsumer; +use Interop\Queue\Consumer; +use Interop\Queue\Message as InteropMessage; +use Interop\Queue\Queue as InteropQueue; +use Interop\Queue\SubscriptionConsumer; class FallbackSubscriptionConsumerTest extends \PHPUnit_Framework_TestCase { - public function testShouldImplementPsrSubscriptionConsumerInterface() + public function testShouldImplementSubscriptionConsumerInterface() { $rc = new \ReflectionClass(FallbackSubscriptionConsumer::class); - $this->assertTrue($rc->implementsInterface(PsrSubscriptionConsumer::class)); + $this->assertTrue($rc->implementsInterface(SubscriptionConsumer::class)); } public function testCouldBeConstructedWithoutAnyArguments() @@ -176,7 +176,7 @@ public function testShouldConsumeMessagesFromTwoQueuesInExpectedOrder() ; $actualOrder = []; - $callback = function (PsrMessage $message, PsrConsumer $consumer) use (&$actualOrder) { + $callback = function (InteropMessage $message, Consumer $consumer) use (&$actualOrder) { $actualOrder[] = [$message->getBody(), $consumer->getQueue()->getQueueName()]; }; @@ -228,11 +228,11 @@ public function testShouldConsumeTillTimeoutIsReached() /** * @param null|mixed $body * - * @return PsrMessage|\PHPUnit_Framework_MockObject_MockObject + * @return InteropMessage|\PHPUnit_Framework_MockObject_MockObject */ private function createMessageStub($body = null) { - $messageMock = $this->createMock(PsrMessage::class); + $messageMock = $this->createMock(InteropMessage::class); $messageMock ->expects($this->any()) ->method('getBody') @@ -245,17 +245,17 @@ private function createMessageStub($body = null) /** * @param null|mixed $queueName * - * @return PsrConsumer|\PHPUnit_Framework_MockObject_MockObject + * @return Consumer|\PHPUnit_Framework_MockObject_MockObject */ private function createConsumerStub($queueName = null) { - $queueMock = $this->createMock(PsrQueue::class); + $queueMock = $this->createMock(InteropQueue::class); $queueMock ->expects($this->any()) ->method('getQueueName') ->willReturn($queueName); - $consumerMock = $this->createMock(PsrConsumer::class); + $consumerMock = $this->createMock(Consumer::class); $consumerMock ->expects($this->any()) ->method('getQueue') diff --git a/pkg/enqueue/Tests/Consumption/Mock/DummySubscriptionConsumer.php b/pkg/enqueue/Tests/Consumption/Mock/DummySubscriptionConsumer.php index f83228420..40351484d 100644 --- a/pkg/enqueue/Tests/Consumption/Mock/DummySubscriptionConsumer.php +++ b/pkg/enqueue/Tests/Consumption/Mock/DummySubscriptionConsumer.php @@ -2,11 +2,11 @@ namespace Enqueue\Tests\Consumption\Mock; -use Interop\Queue\PsrConsumer; -use Interop\Queue\PsrMessage; -use Interop\Queue\PsrSubscriptionConsumer; +use Interop\Queue\Consumer; +use Interop\Queue\Message as InteropMessage; +use Interop\Queue\SubscriptionConsumer; -class DummySubscriptionConsumer implements PsrSubscriptionConsumer +class DummySubscriptionConsumer implements SubscriptionConsumer { private $subscriptions = []; @@ -18,7 +18,7 @@ class DummySubscriptionConsumer implements PsrSubscriptionConsumer public function consume(int $timeout = 0): void { foreach ($this->messages as list($message, $queueName)) { - /** @var PsrMessage $message */ + /** @var InteropMessage $message */ /** @var string $queueName */ if (false == call_user_func($this->subscriptions[$queueName][1], $message, $this->subscriptions[$queueName][0])) { return; @@ -26,12 +26,12 @@ public function consume(int $timeout = 0): void } } - public function subscribe(PsrConsumer $consumer, callable $callback): void + public function subscribe(Consumer $consumer, callable $callback): void { $this->subscriptions[$consumer->getQueue()->getQueueName()] = [$consumer, $callback]; } - public function unsubscribe(PsrConsumer $consumer): void + public function unsubscribe(Consumer $consumer): void { unset($this->subscriptions[$consumer->getQueue()->getQueueName()]); } @@ -41,7 +41,7 @@ public function unsubscribeAll(): void $this->subscriptions = []; } - public function addMessage(PsrMessage $message, string $queueName): void + public function addMessage(InteropMessage $message, string $queueName): void { $this->messages[] = [$message, $queueName]; } diff --git a/pkg/enqueue/Tests/Consumption/QueueConsumerTest.php b/pkg/enqueue/Tests/Consumption/QueueConsumerTest.php index 9a9960649..5b655c13e 100644 --- a/pkg/enqueue/Tests/Consumption/QueueConsumerTest.php +++ b/pkg/enqueue/Tests/Consumption/QueueConsumerTest.php @@ -12,13 +12,13 @@ use Enqueue\Null\NullQueue; use Enqueue\Tests\Consumption\Mock\BreakCycleExtension; use Enqueue\Tests\Consumption\Mock\DummySubscriptionConsumer; -use Interop\Queue\PsrConsumer; -use Interop\Queue\PsrContext; -use Interop\Queue\PsrMessage; -use Interop\Queue\PsrProcessor; -use Interop\Queue\PsrQueue; -use Interop\Queue\PsrSubscriptionConsumer; -use Interop\Queue\SubscriptionConsumerNotSupportedException; +use Interop\Queue\Consumer; +use Interop\Queue\Context as InteropContext; +use Interop\Queue\Exception\SubscriptionConsumerNotSupportedException; +use Interop\Queue\Message; +use Interop\Queue\Processor; +use Interop\Queue\Queue; +use Interop\Queue\SubscriptionConsumer; use PHPUnit\Framework\TestCase; use Psr\Log\NullLogger; @@ -26,40 +26,40 @@ class QueueConsumerTest extends TestCase { public function testCouldBeConstructedWithConnectionAndExtensionsAsArguments() { - new QueueConsumer($this->createPsrContextStub(), null, 0); + new QueueConsumer($this->createContextStub(), null, 0); } public function testCouldBeConstructedWithConnectionOnly() { - new QueueConsumer($this->createPsrContextStub()); + new QueueConsumer($this->createContextStub()); } public function testCouldBeConstructedWithConnectionAndSingleExtension() { - new QueueConsumer($this->createPsrContextStub(), $this->createExtension()); + new QueueConsumer($this->createContextStub(), $this->createExtension()); } public function testShouldSetEmptyArrayToBoundProcessorsPropertyInConstructor() { - $consumer = new QueueConsumer($this->createPsrContextStub(), null, 0); + $consumer = new QueueConsumer($this->createContextStub(), null, 0); $this->assertAttributeSame([], 'boundProcessors', $consumer); } public function testShouldAllowGetConnectionSetInConstructor() { - $expectedConnection = $this->createPsrContextStub(); + $expectedConnection = $this->createContextStub(); $consumer = new QueueConsumer($expectedConnection, null, 0); - $this->assertSame($expectedConnection, $consumer->getPsrContext()); + $this->assertSame($expectedConnection, $consumer->getContext()); } public function testThrowIfQueueNameEmptyOnBind() { $processorMock = $this->createProcessorMock(); - $consumer = new QueueConsumer($this->createPsrContextStub(), null, 0); + $consumer = new QueueConsumer($this->createContextStub(), null, 0); $this->expectException(\LogicException::class); $this->expectExceptionMessage('The queue name must be not empty.'); @@ -70,7 +70,7 @@ public function testThrowIfQueueAlreadyBoundToProcessorOnBind() { $processorMock = $this->createProcessorMock(); - $consumer = new QueueConsumer($this->createPsrContextStub(), null, 0); + $consumer = new QueueConsumer($this->createContextStub(), null, 0); $consumer->bind(new NullQueue('theQueueName'), $processorMock); @@ -84,7 +84,7 @@ public function testShouldAllowBindProcessorToQueue() $queue = new NullQueue('theQueueName'); $processorMock = $this->createProcessorMock(); - $consumer = new QueueConsumer($this->createPsrContextStub(), null, 0); + $consumer = new QueueConsumer($this->createContextStub(), null, 0); $consumer->bind($queue, $processorMock); @@ -95,16 +95,16 @@ public function testThrowIfQueueNeitherInstanceOfQueueNorString() { $processorMock = $this->createProcessorMock(); - $consumer = new QueueConsumer($this->createPsrContextStub(), null, 0); + $consumer = new QueueConsumer($this->createContextStub(), null, 0); $this->expectException(InvalidArgumentException::class); - $this->expectExceptionMessage('The argument must be an instance of Interop\Queue\PsrQueue but got stdClass.'); + $this->expectExceptionMessage('The argument must be an instance of Interop\Queue\Queue but got stdClass.'); $consumer->bind(new \stdClass(), $processorMock); } public function testCouldSetGetIdleTimeout() { - $consumer = new QueueConsumer($this->createPsrContextStub(), null, 0); + $consumer = new QueueConsumer($this->createContextStub(), null, 0); $consumer->setIdleTimeout(123456.1); @@ -113,7 +113,7 @@ public function testCouldSetGetIdleTimeout() public function testCouldSetGetReceiveTimeout() { - $consumer = new QueueConsumer($this->createPsrContextStub(), null, 0); + $consumer = new QueueConsumer($this->createContextStub(), null, 0); $consumer->setReceiveTimeout(123456.1); @@ -156,7 +156,7 @@ public function testShouldReturnSelfOnBind() { $processorMock = $this->createProcessorMock(); - $consumer = new QueueConsumer($this->createPsrContextStub(), null, 0); + $consumer = new QueueConsumer($this->createContextStub(), null, 0); $this->assertSame($consumer, $consumer->bind(new NullQueue('foo_queue'), $processorMock)); } @@ -178,7 +178,7 @@ public function testShouldUseContextSubscriptionConsumerIfSupport() ->method('consume') ; - $contextMock = $this->createMock(PsrContext::class); + $contextMock = $this->createMock(InteropContext::class); $contextMock ->expects($this->once()) ->method('createConsumer') @@ -325,7 +325,7 @@ public function testShouldProcessFiveMessagesAndQuit() $subscriptionConsumerMock->addMessage($fourthMessageMock, 'foo_queue'); $subscriptionConsumerMock->addMessage($fifthMessageMock, 'foo_queue'); - $contextStub = $this->createPsrContextStub(); + $contextStub = $this->createContextStub(); $processorMock = $this->createProcessorMock(); $processorMock @@ -355,7 +355,7 @@ public function testShouldAckMessageIfProcessorReturnSuchStatus() ->with($this->identicalTo($messageMock)) ; - $contextStub = $this->createPsrContextStub($consumerStub); + $contextStub = $this->createContextStub($consumerStub); $processorMock = $this->createProcessorMock(); $processorMock @@ -381,7 +381,7 @@ public function testThrowIfProcessorReturnNull() $consumerStub = $this->createConsumerStub('foo_queue'); - $contextStub = $this->createPsrContextStub($consumerStub); + $contextStub = $this->createContextStub($consumerStub); $processorMock = $this->createProcessorMock(); $processorMock @@ -414,7 +414,7 @@ public function testShouldRejectMessageIfProcessorReturnSuchStatus() ->with($this->identicalTo($messageMock), false) ; - $contextStub = $this->createPsrContextStub($consumerStub); + $contextStub = $this->createContextStub($consumerStub); $processorMock = $this->createProcessorMock(); $processorMock @@ -445,7 +445,7 @@ public function testShouldRequeueMessageIfProcessorReturnSuchStatus() ->with($this->identicalTo($messageMock), true) ; - $contextStub = $this->createPsrContextStub($consumerStub); + $contextStub = $this->createContextStub($consumerStub); $processorMock = $this->createProcessorMock(); $processorMock @@ -471,7 +471,7 @@ public function testThrowIfProcessorReturnInvalidStatus() $consumerStub = $this->createConsumerStub('foo_queue'); - $contextStub = $this->createPsrContextStub($consumerStub); + $contextStub = $this->createContextStub($consumerStub); $processorMock = $this->createProcessorMock(); $processorMock @@ -509,7 +509,7 @@ public function testShouldNotPassMessageToProcessorIfItWasProcessedByExtension() $consumerStub = $this->createConsumerStub('foo_queue'); - $contextStub = $this->createPsrContextStub($consumerStub); + $contextStub = $this->createContextStub($consumerStub); $processorMock = $this->createProcessorMock(); $processorMock @@ -529,7 +529,7 @@ public function testShouldCallOnStartExtensionMethod() { $consumerStub = $this->createConsumerStub('foo_queue'); - $contextStub = $this->createPsrContextStub($consumerStub); + $contextStub = $this->createContextStub($consumerStub); $processorMock = $this->createProcessorMock(); @@ -539,14 +539,14 @@ public function testShouldCallOnStartExtensionMethod() ->method('onStart') ->with($this->isInstanceOf(Context::class)) ->willReturnCallback(function (Context $context) use ($contextStub) { - $this->assertSame($contextStub, $context->getPsrContext()); - $this->assertNull($context->getPsrConsumer()); - $this->assertNull($context->getPsrProcessor()); + $this->assertSame($contextStub, $context->getInteropContext()); + $this->assertNull($context->getConsumer()); + $this->assertNull($context->getProcessor()); $this->assertNull($context->getLogger()); - $this->assertNull($context->getPsrMessage()); + $this->assertNull($context->getInteropMessage()); $this->assertNull($context->getException()); $this->assertNull($context->getResult()); - $this->assertNull($context->getPsrQueue()); + $this->assertNull($context->getInteropQueue()); $this->assertFalse($context->isExecutionInterrupted()); }) ; @@ -563,7 +563,7 @@ public function testShouldCallOnIdleExtensionMethod() { $consumerStub = $this->createConsumerStub('foo_queue'); - $contextStub = $this->createPsrContextStub($consumerStub); + $contextStub = $this->createContextStub($consumerStub); $processorMock = $this->createProcessorMock(); @@ -573,11 +573,11 @@ public function testShouldCallOnIdleExtensionMethod() ->method('onIdle') ->with($this->isInstanceOf(Context::class)) ->willReturnCallback(function (Context $context) use ($contextStub) { - $this->assertSame($contextStub, $context->getPsrContext()); + $this->assertSame($contextStub, $context->getInteropContext()); $this->assertInstanceOf(NullLogger::class, $context->getLogger()); - $this->assertNull($context->getPsrProcessor()); - $this->assertNull($context->getPsrConsumer()); - $this->assertNull($context->getPsrMessage()); + $this->assertNull($context->getProcessor()); + $this->assertNull($context->getConsumer()); + $this->assertNull($context->getInteropMessage()); $this->assertNull($context->getException()); $this->assertNull($context->getResult()); $this->assertFalse($context->isExecutionInterrupted()); @@ -596,7 +596,7 @@ public function testShouldCallOnBeforeReceiveExtensionMethod() { $consumerStub = $this->createConsumerStub('foo_queue'); - $contextStub = $this->createPsrContextStub($consumerStub); + $contextStub = $this->createContextStub($consumerStub); $processorMock = $this->createProcessorStub(); @@ -608,14 +608,14 @@ public function testShouldCallOnBeforeReceiveExtensionMethod() ->method('onBeforeReceive') ->with($this->isInstanceOf(Context::class)) ->willReturnCallback(function (Context $context) use ($contextStub) { - $this->assertSame($contextStub, $context->getPsrContext()); + $this->assertSame($contextStub, $context->getInteropContext()); $this->assertInstanceOf(NullLogger::class, $context->getLogger()); - $this->assertNull($context->getPsrProcessor()); - $this->assertNull($context->getPsrConsumer()); - $this->assertNull($context->getPsrMessage()); + $this->assertNull($context->getProcessor()); + $this->assertNull($context->getConsumer()); + $this->assertNull($context->getInteropMessage()); $this->assertNull($context->getException()); $this->assertNull($context->getResult()); - $this->assertNull($context->getPsrQueue()); + $this->assertNull($context->getInteropQueue()); $this->assertFalse($context->isExecutionInterrupted()); }) ; @@ -637,7 +637,7 @@ public function testShouldCallOnPreReceivedExtensionMethodWithExpectedContext() $consumerStub = $this->createConsumerStub('foo_queue'); - $contextStub = $this->createPsrContextStub($consumerStub); + $contextStub = $this->createContextStub($consumerStub); $processorMock = $this->createProcessorStub(); @@ -652,10 +652,10 @@ public function testShouldCallOnPreReceivedExtensionMethodWithExpectedContext() $processorMock, $expectedMessage ) { - $this->assertSame($contextStub, $context->getPsrContext()); - $this->assertSame($consumerStub, $context->getPsrConsumer()); - $this->assertSame($processorMock, $context->getPsrProcessor()); - $this->assertSame($expectedMessage, $context->getPsrMessage()); + $this->assertSame($contextStub, $context->getInteropContext()); + $this->assertSame($consumerStub, $context->getConsumer()); + $this->assertSame($processorMock, $context->getProcessor()); + $this->assertSame($expectedMessage, $context->getInteropMessage()); $this->assertInstanceOf(NullLogger::class, $context->getLogger()); $this->assertNull($context->getException()); $this->assertNull($context->getResult()); @@ -680,7 +680,7 @@ public function testShouldCallOnResultExtensionMethodWithExpectedContext() $consumerStub = $this->createConsumerStub('foo_queue'); - $contextStub = $this->createPsrContextStub($consumerStub); + $contextStub = $this->createContextStub($consumerStub); $processorMock = $this->createProcessorStub(); @@ -695,10 +695,10 @@ public function testShouldCallOnResultExtensionMethodWithExpectedContext() $processorMock, $expectedMessage ) { - $this->assertSame($contextStub, $context->getPsrContext()); - $this->assertSame($consumerStub, $context->getPsrConsumer()); - $this->assertSame($processorMock, $context->getPsrProcessor()); - $this->assertSame($expectedMessage, $context->getPsrMessage()); + $this->assertSame($contextStub, $context->getInteropContext()); + $this->assertSame($consumerStub, $context->getConsumer()); + $this->assertSame($processorMock, $context->getProcessor()); + $this->assertSame($expectedMessage, $context->getInteropMessage()); $this->assertInstanceOf(NullLogger::class, $context->getLogger()); $this->assertNull($context->getException()); $this->assertSame(Result::ACK, $context->getResult()); @@ -723,7 +723,7 @@ public function testShouldCallOnPostReceivedExtensionMethodWithExpectedContext() $consumerStub = $this->createConsumerStub('foo_queue'); - $contextStub = $this->createPsrContextStub($consumerStub); + $contextStub = $this->createContextStub($consumerStub); $processorMock = $this->createProcessorStub(); @@ -738,10 +738,10 @@ public function testShouldCallOnPostReceivedExtensionMethodWithExpectedContext() $processorMock, $expectedMessage ) { - $this->assertSame($contextStub, $context->getPsrContext()); - $this->assertSame($consumerStub, $context->getPsrConsumer()); - $this->assertSame($processorMock, $context->getPsrProcessor()); - $this->assertSame($expectedMessage, $context->getPsrMessage()); + $this->assertSame($contextStub, $context->getInteropContext()); + $this->assertSame($consumerStub, $context->getConsumer()); + $this->assertSame($processorMock, $context->getProcessor()); + $this->assertSame($expectedMessage, $context->getInteropMessage()); $this->assertInstanceOf(NullLogger::class, $context->getLogger()); $this->assertNull($context->getException()); $this->assertSame(Result::ACK, $context->getResult()); @@ -761,7 +761,7 @@ public function testShouldAllowInterruptConsumingOnIdle() { $consumerStub = $this->createConsumerStub('foo_queue'); - $contextStub = $this->createPsrContextStub($consumerStub); + $contextStub = $this->createContextStub($consumerStub); $processorMock = $this->createProcessorMock(); @@ -779,11 +779,11 @@ public function testShouldAllowInterruptConsumingOnIdle() ->method('onInterrupted') ->with($this->isInstanceOf(Context::class)) ->willReturnCallback(function (Context $context) use ($contextStub) { - $this->assertSame($contextStub, $context->getPsrContext()); + $this->assertSame($contextStub, $context->getInteropContext()); $this->assertInstanceOf(NullLogger::class, $context->getLogger()); - $this->assertNull($context->getPsrConsumer()); - $this->assertNull($context->getPsrProcessor()); - $this->assertNull($context->getPsrMessage()); + $this->assertNull($context->getConsumer()); + $this->assertNull($context->getProcessor()); + $this->assertNull($context->getInteropMessage()); $this->assertNull($context->getException()); $this->assertNull($context->getResult()); $this->assertTrue($context->isExecutionInterrupted()); @@ -802,7 +802,7 @@ public function testShouldNotCloseContextWhenConsumptionInterrupted() { $consumerStub = $this->createConsumerStub('foo_queue'); - $contextStub = $this->createPsrContextStub($consumerStub); + $contextStub = $this->createContextStub($consumerStub); $contextStub ->expects($this->never()) ->method('close') @@ -837,7 +837,7 @@ public function testShouldNotCloseContextWhenConsumptionInterruptedByException() $consumerStub = $this->createConsumerStub('foo_queue'); - $contextStub = $this->createPsrContextStub($consumerStub); + $contextStub = $this->createContextStub($consumerStub); $contextStub ->expects($this->never()) ->method('close') @@ -876,7 +876,7 @@ public function testShouldSetMainExceptionAsPreviousToExceptionThrownOnInterrupt $consumerStub = $this->createConsumerStub('foo_queue'); - $contextStub = $this->createPsrContextStub($consumerStub); + $contextStub = $this->createContextStub($consumerStub); $processorMock = $this->createProcessorMock(); $processorMock @@ -918,7 +918,7 @@ public function testShouldAllowInterruptConsumingOnPreReceiveButProcessCurrentMe $consumerStub = $this->createConsumerStub('foo_queue'); - $contextStub = $this->createPsrContextStub($consumerStub); + $contextStub = $this->createContextStub($consumerStub); $processorMock = $this->createProcessorMock(); $processorMock @@ -946,10 +946,10 @@ public function testShouldAllowInterruptConsumingOnPreReceiveButProcessCurrentMe $processorMock, $expectedMessage ) { - $this->assertSame($contextStub, $context->getPsrContext()); - $this->assertSame($consumerStub, $context->getPsrConsumer()); - $this->assertSame($processorMock, $context->getPsrProcessor()); - $this->assertSame($expectedMessage, $context->getPsrMessage()); + $this->assertSame($contextStub, $context->getInteropContext()); + $this->assertSame($consumerStub, $context->getConsumer()); + $this->assertSame($processorMock, $context->getProcessor()); + $this->assertSame($expectedMessage, $context->getInteropMessage()); $this->assertInstanceOf(NullLogger::class, $context->getLogger()); $this->assertNull($context->getException()); $this->assertSame(Result::ACK, $context->getResult()); @@ -974,7 +974,7 @@ public function testShouldAllowInterruptConsumingOnResult() $consumerStub = $this->createConsumerStub('foo_queue'); - $contextStub = $this->createPsrContextStub($consumerStub); + $contextStub = $this->createContextStub($consumerStub); $processorMock = $this->createProcessorMock(); $processorMock @@ -1002,10 +1002,10 @@ public function testShouldAllowInterruptConsumingOnResult() $processorMock, $expectedMessage ) { - $this->assertSame($contextStub, $context->getPsrContext()); - $this->assertSame($consumerStub, $context->getPsrConsumer()); - $this->assertSame($processorMock, $context->getPsrProcessor()); - $this->assertSame($expectedMessage, $context->getPsrMessage()); + $this->assertSame($contextStub, $context->getInteropContext()); + $this->assertSame($consumerStub, $context->getConsumer()); + $this->assertSame($processorMock, $context->getProcessor()); + $this->assertSame($expectedMessage, $context->getInteropMessage()); $this->assertInstanceOf(NullLogger::class, $context->getLogger()); $this->assertNull($context->getException()); $this->assertSame(Result::ACK, $context->getResult()); @@ -1030,7 +1030,7 @@ public function testShouldAllowInterruptConsumingOnPostReceive() $consumerStub = $this->createConsumerStub('foo_queue'); - $contextStub = $this->createPsrContextStub($consumerStub); + $contextStub = $this->createContextStub($consumerStub); $processorMock = $this->createProcessorMock(); $processorMock @@ -1058,10 +1058,10 @@ public function testShouldAllowInterruptConsumingOnPostReceive() $processorMock, $expectedMessage ) { - $this->assertSame($contextStub, $context->getPsrContext()); - $this->assertSame($consumerStub, $context->getPsrConsumer()); - $this->assertSame($processorMock, $context->getPsrProcessor()); - $this->assertSame($expectedMessage, $context->getPsrMessage()); + $this->assertSame($contextStub, $context->getInteropContext()); + $this->assertSame($consumerStub, $context->getConsumer()); + $this->assertSame($processorMock, $context->getProcessor()); + $this->assertSame($expectedMessage, $context->getInteropMessage()); $this->assertInstanceOf(NullLogger::class, $context->getLogger()); $this->assertNull($context->getException()); $this->assertSame(Result::ACK, $context->getResult()); @@ -1087,7 +1087,7 @@ public function testShouldCallOnInterruptedIfExceptionThrow() $consumerStub = $this->createConsumerStub('foo_queue'); - $contextStub = $this->createPsrContextStub($consumerStub); + $contextStub = $this->createContextStub($consumerStub); $processorMock = $this->createProcessorMock(); $processorMock @@ -1108,10 +1108,10 @@ public function testShouldCallOnInterruptedIfExceptionThrow() $expectedMessage, $expectedException ) { - $this->assertSame($contextStub, $context->getPsrContext()); - $this->assertSame($consumerStub, $context->getPsrConsumer()); - $this->assertSame($processorMock, $context->getPsrProcessor()); - $this->assertSame($expectedMessage, $context->getPsrMessage()); + $this->assertSame($contextStub, $context->getInteropContext()); + $this->assertSame($consumerStub, $context->getConsumer()); + $this->assertSame($processorMock, $context->getProcessor()); + $this->assertSame($expectedMessage, $context->getInteropMessage()); $this->assertSame($expectedException, $context->getException()); $this->assertInstanceOf(NullLogger::class, $context->getLogger()); $this->assertNull($context->getResult()); @@ -1138,7 +1138,7 @@ public function testShouldCallExtensionPassedOnRuntime() $consumerStub = $this->createConsumerStub('foo_queue'); - $contextStub = $this->createPsrContextStub($consumerStub); + $contextStub = $this->createContextStub($consumerStub); $processorMock = $this->createProcessorMock(); $processorMock @@ -1190,7 +1190,7 @@ public function testShouldChangeLoggerOnStart() $consumerStub = $this->createConsumerStub('foo_queue'); - $contextStub = $this->createPsrContextStub($consumerStub); + $contextStub = $this->createContextStub($consumerStub); $processorMock = $this->createProcessorMock(); $processorMock @@ -1269,7 +1269,7 @@ public function testShouldCallProcessorAsMessageComeAlong() $contextStub ->expects($this->any()) ->method('createConsumer') - ->willReturnCallback(function (PsrQueue $queue) use ($consumers) { + ->willReturnCallback(function (Queue $queue) use ($consumers) { return $consumers[$queue->getQueueName()]; }) ; @@ -1301,21 +1301,21 @@ public function testShouldCallProcessorAsMessageComeAlong() $this->assertCount(3, $actualContexts); - $this->assertSame($firstMessage, $actualContexts[0]->getPsrMessage()); - $this->assertSame($secondMessage, $actualContexts[1]->getPsrMessage()); - $this->assertSame($thirdMessage, $actualContexts[2]->getPsrMessage()); + $this->assertSame($firstMessage, $actualContexts[0]->getInteropMessage()); + $this->assertSame($secondMessage, $actualContexts[1]->getInteropMessage()); + $this->assertSame($thirdMessage, $actualContexts[2]->getInteropMessage()); - $this->assertSame($fooConsumerStub, $actualContexts[0]->getPsrConsumer()); - $this->assertSame($barConsumerStub, $actualContexts[1]->getPsrConsumer()); - $this->assertSame($fooConsumerStub, $actualContexts[2]->getPsrConsumer()); + $this->assertSame($fooConsumerStub, $actualContexts[0]->getConsumer()); + $this->assertSame($barConsumerStub, $actualContexts[1]->getConsumer()); + $this->assertSame($fooConsumerStub, $actualContexts[2]->getConsumer()); } /** * @return \PHPUnit_Framework_MockObject_MockObject */ - private function createContextWithoutSubscriptionConsumerMock(): PsrContext + private function createContextWithoutSubscriptionConsumerMock(): InteropContext { - $contextMock = $this->createMock(PsrContext::class); + $contextMock = $this->createMock(InteropContext::class); $contextMock ->expects($this->any()) ->method('createSubscriptionConsumer') @@ -1326,9 +1326,9 @@ private function createContextWithoutSubscriptionConsumerMock(): PsrContext } /** - * @return \PHPUnit_Framework_MockObject_MockObject|PsrContext + * @return \PHPUnit_Framework_MockObject_MockObject|InteropContext */ - private function createPsrContextStub(PsrConsumer $consumer = null) + private function createContextStub(Consumer $consumer = null): InteropContext { $context = $this->createContextWithoutSubscriptionConsumerMock(); $context @@ -1341,7 +1341,7 @@ private function createPsrContextStub(PsrConsumer $consumer = null) $context ->expects($this->any()) ->method('createConsumer') - ->willReturnCallback(function (PsrQueue $queue) use ($consumer) { + ->willReturnCallback(function (Queue $queue) use ($consumer) { return $consumer ?: $this->createConsumerStub($queue); }) ; @@ -1355,15 +1355,15 @@ private function createPsrContextStub(PsrConsumer $consumer = null) } /** - * @return \PHPUnit_Framework_MockObject_MockObject|PsrProcessor + * @return \PHPUnit_Framework_MockObject_MockObject|Processor */ private function createProcessorMock() { - return $this->createMock(PsrProcessor::class); + return $this->createMock(Processor::class); } /** - * @return \PHPUnit_Framework_MockObject_MockObject|PsrProcessor + * @return \PHPUnit_Framework_MockObject_MockObject|Processor */ private function createProcessorStub() { @@ -1378,11 +1378,11 @@ private function createProcessorStub() } /** - * @return \PHPUnit_Framework_MockObject_MockObject|PsrMessage + * @return \PHPUnit_Framework_MockObject_MockObject|Message */ - private function createMessageMock() + private function createMessageMock(): Message { - return $this->createMock(PsrMessage::class); + return $this->createMock(Message::class); } /** @@ -1396,15 +1396,15 @@ private function createExtension() /** * @param null|mixed $queue * - * @return \PHPUnit_Framework_MockObject_MockObject|PsrConsumer + * @return \PHPUnit_Framework_MockObject_MockObject|Consumer */ - private function createConsumerStub($queue = null) + private function createConsumerStub($queue = null): Consumer { if (is_string($queue)) { $queue = new NullQueue($queue); } - $consumerMock = $this->createMock(PsrConsumer::class); + $consumerMock = $this->createMock(Consumer::class); $consumerMock ->expects($this->any()) ->method('getQueue') @@ -1415,10 +1415,10 @@ private function createConsumerStub($queue = null) } /** - * @return PsrSubscriptionConsumer|\PHPUnit_Framework_MockObject_MockObject + * @return SubscriptionConsumer|\PHPUnit_Framework_MockObject_MockObject */ - private function createSubscriptionConsumerMock() + private function createSubscriptionConsumerMock(): SubscriptionConsumer { - return $this->createMock(PsrSubscriptionConsumer::class); + return $this->createMock(SubscriptionConsumer::class); } } diff --git a/pkg/enqueue/Tests/ResourcesTest.php b/pkg/enqueue/Tests/ResourcesTest.php index 0131b4c49..52bd13f9f 100644 --- a/pkg/enqueue/Tests/ResourcesTest.php +++ b/pkg/enqueue/Tests/ResourcesTest.php @@ -4,7 +4,7 @@ use Enqueue\Redis\RedisConnectionFactory; use Enqueue\Resources; -use Interop\Queue\PsrConnectionFactory; +use Interop\Queue\ConnectionFactory; use PHPUnit\Framework\TestCase; class ResourcesTest extends TestCase @@ -62,14 +62,14 @@ public function testShouldGetKnownConnectionsInExpectedFormat() public function testThrowsIfConnectionClassNotImplementConnectionFactoryInterfaceOnAddConnection() { $this->expectException(\InvalidArgumentException::class); - $this->expectExceptionMessage('The connection factory class "stdClass" must implement "Interop\Queue\PsrConnectionFactory" interface.'); + $this->expectExceptionMessage('The connection factory class "stdClass" must implement "Interop\Queue\ConnectionFactory" interface.'); Resources::addConnection(\stdClass::class, [], [], 'foo'); } public function testThrowsIfNoSchemesProvidedOnAddConnection() { - $connectionClass = $this->getMockClass(PsrConnectionFactory::class); + $connectionClass = $this->getMockClass(ConnectionFactory::class); $this->expectException(\InvalidArgumentException::class); $this->expectExceptionMessage('Schemes could not be empty.'); @@ -79,7 +79,7 @@ public function testThrowsIfNoSchemesProvidedOnAddConnection() public function testThrowsIfNoPackageProvidedOnAddConnection() { - $connectionClass = $this->getMockClass(PsrConnectionFactory::class); + $connectionClass = $this->getMockClass(ConnectionFactory::class); $this->expectException(\InvalidArgumentException::class); $this->expectExceptionMessage('Package name could not be empty.'); @@ -103,7 +103,7 @@ public function testShouldAllowRegisterConnectionThatIsNotInstalled() public function testShouldAllowGetPreviouslyRegisteredConnection() { - $connectionClass = $this->getMockClass(PsrConnectionFactory::class); + $connectionClass = $this->getMockClass(ConnectionFactory::class); Resources::addConnection( $connectionClass, diff --git a/pkg/enqueue/Tests/Router/RecipientTest.php b/pkg/enqueue/Tests/Router/RecipientTest.php index 3f3737234..57cc83eed 100644 --- a/pkg/enqueue/Tests/Router/RecipientTest.php +++ b/pkg/enqueue/Tests/Router/RecipientTest.php @@ -3,26 +3,26 @@ namespace Enqueue\Tests\Router; use Enqueue\Router\Recipient; -use Interop\Queue\PsrDestination; -use Interop\Queue\PsrMessage; +use Interop\Queue\Destination; +use Interop\Queue\Message as InteropMessage; use PHPUnit\Framework\TestCase; class RecipientTest extends TestCase { public function testShouldAllowGetMessageSetInConstructor() { - $message = $this->createMock(PsrMessage::class); + $message = $this->createMock(InteropMessage::class); - $recipient = new Recipient($this->createMock(PsrDestination::class), $message); + $recipient = new Recipient($this->createMock(Destination::class), $message); $this->assertSame($message, $recipient->getMessage()); } public function testShouldAllowGetDestinationSetInConstructor() { - $destination = $this->createMock(PsrDestination::class); + $destination = $this->createMock(Destination::class); - $recipient = new Recipient($destination, $this->createMock(PsrMessage::class)); + $recipient = new Recipient($destination, $this->createMock(InteropMessage::class)); $this->assertSame($destination, $recipient->getDestination()); } diff --git a/pkg/enqueue/Tests/Router/RouteRecipientListProcessorTest.php b/pkg/enqueue/Tests/Router/RouteRecipientListProcessorTest.php index b7980430f..38e05806e 100644 --- a/pkg/enqueue/Tests/Router/RouteRecipientListProcessorTest.php +++ b/pkg/enqueue/Tests/Router/RouteRecipientListProcessorTest.php @@ -9,9 +9,9 @@ use Enqueue\Router\RecipientListRouterInterface; use Enqueue\Router\RouteRecipientListProcessor; use Enqueue\Test\ClassExtensionTrait; -use Interop\Queue\PsrContext; -use Interop\Queue\PsrProcessor; -use Interop\Queue\PsrProducer; +use Interop\Queue\Context; +use Interop\Queue\Processor; +use Interop\Queue\Producer as InteropProducer; use PHPUnit\Framework\TestCase; class RouteRecipientListProcessorTest extends TestCase @@ -20,7 +20,7 @@ class RouteRecipientListProcessorTest extends TestCase public function testShouldImplementProcessorInterface() { - $this->assertClassImplements(PsrProcessor::class, RouteRecipientListProcessor::class); + $this->assertClassImplements(Processor::class, RouteRecipientListProcessor::class); } public function testCouldBeConstructedWithRouterAsFirstArgument() @@ -55,7 +55,7 @@ public function testShouldProduceRecipientsMessagesAndAckOriginalMessage() ->with($this->identicalTo($barRecipient->getDestination()), $this->identicalTo($barRecipient->getMessage())) ; - $sessionMock = $this->createPsrContextMock(); + $sessionMock = $this->createContextMock(); $sessionMock ->expects($this->once()) ->method('createProducer') @@ -70,19 +70,19 @@ public function testShouldProduceRecipientsMessagesAndAckOriginalMessage() } /** - * @return \PHPUnit_Framework_MockObject_MockObject|PsrProducer + * @return \PHPUnit_Framework_MockObject_MockObject|InteropProducer */ protected function createProducerMock() { - return $this->createMock(PsrProducer::class); + return $this->createMock(InteropProducer::class); } /** - * @return \PHPUnit_Framework_MockObject_MockObject|PsrContext + * @return \PHPUnit_Framework_MockObject_MockObject|Context */ - protected function createPsrContextMock() + protected function createContextMock() { - return $this->createMock(PsrContext::class); + return $this->createMock(Context::class); } /** diff --git a/pkg/enqueue/Tests/Rpc/PromiseTest.php b/pkg/enqueue/Tests/Rpc/PromiseTest.php index 7202e67fc..2755ef469 100644 --- a/pkg/enqueue/Tests/Rpc/PromiseTest.php +++ b/pkg/enqueue/Tests/Rpc/PromiseTest.php @@ -122,7 +122,7 @@ public function testOnReceiveShouldThrowExceptionIfCallbackReturnNotMessageInsta $promise = new Promise($receivecb, function () {}, function () {}); $this->expectException(\RuntimeException::class); - $this->expectExceptionMessage('Expected "Interop\Queue\PsrMessage" but got: "stdClass"'); + $this->expectExceptionMessage('Expected "Interop\Queue\Message" but got: "stdClass"'); $promise->receive(); } @@ -136,7 +136,7 @@ public function testOnReceiveNoWaitShouldThrowExceptionIfCallbackReturnNotMessag $promise = new Promise(function () {}, $receivecb, function () {}); $this->expectException(\RuntimeException::class); - $this->expectExceptionMessage('Expected "Interop\Queue\PsrMessage" but got: "stdClass"'); + $this->expectExceptionMessage('Expected "Interop\Queue\Message" but got: "stdClass"'); $promise->receiveNoWait(); } diff --git a/pkg/enqueue/Tests/Rpc/RpcClientTest.php b/pkg/enqueue/Tests/Rpc/RpcClientTest.php index ce7aa2785..78f72bbe5 100644 --- a/pkg/enqueue/Tests/Rpc/RpcClientTest.php +++ b/pkg/enqueue/Tests/Rpc/RpcClientTest.php @@ -7,16 +7,16 @@ use Enqueue\Null\NullQueue; use Enqueue\Rpc\Promise; use Enqueue\Rpc\RpcClient; -use Interop\Queue\PsrConsumer; -use Interop\Queue\PsrContext; -use Interop\Queue\PsrProducer; +use Interop\Queue\Consumer; +use Interop\Queue\Context; +use Interop\Queue\Producer as InteropProducer; use PHPUnit\Framework\TestCase; class RpcClientTest extends TestCase { - public function testCouldBeConstructedWithPsrContextAsFirstArgument() + public function testCouldBeConstructedWithContextAsFirstArgument() { - new RpcClient($this->createPsrContextMock()); + new RpcClient($this->createContextMock()); } public function testShouldSetReplyToIfNotSet() @@ -80,14 +80,14 @@ public function testShouldProduceMessageToQueue() $message->setCorrelationId('theCorrelationId'); $message->setReplyTo('theReplyTo'); - $producer = $this->createPsrProducerMock(); + $producer = $this->createInteropProducerMock(); $producer ->expects($this->once()) ->method('send') ->with($this->identicalTo($queue), $this->identicalTo($message)) ; - $context = $this->createPsrContextMock(); + $context = $this->createContextMock(); $context ->expects($this->once()) ->method('createProducer') @@ -110,7 +110,7 @@ public function testShouldReceiveMessageAndAckMessageIfCorrelationEquals() $receivedMessage = new NullMessage(); $receivedMessage->setCorrelationId('theCorrelationId'); - $consumer = $this->createPsrConsumerMock(); + $consumer = $this->createConsumerMock(); $consumer ->expects($this->once()) ->method('receive') @@ -127,11 +127,11 @@ public function testShouldReceiveMessageAndAckMessageIfCorrelationEquals() ->method('reject') ; - $context = $this->createPsrContextMock(); + $context = $this->createContextMock(); $context ->expects($this->once()) ->method('createProducer') - ->willReturn($this->createPsrProducerMock()) + ->willReturn($this->createInteropProducerMock()) ; $context ->expects($this->atLeastOnce()) @@ -162,7 +162,7 @@ public function testShouldReceiveNoWaitMessageAndAckMessageIfCorrelationEquals() $receivedMessage = new NullMessage(); $receivedMessage->setCorrelationId('theCorrelationId'); - $consumer = $this->createPsrConsumerMock(); + $consumer = $this->createConsumerMock(); $consumer ->expects($this->once()) ->method('receiveNoWait') @@ -178,11 +178,11 @@ public function testShouldReceiveNoWaitMessageAndAckMessageIfCorrelationEquals() ->method('reject') ; - $context = $this->createPsrContextMock(); + $context = $this->createContextMock(); $context ->expects($this->once()) ->method('createProducer') - ->willReturn($this->createPsrProducerMock()) + ->willReturn($this->createInteropProducerMock()) ; $context ->expects($this->atLeastOnce()) @@ -213,14 +213,14 @@ public function testShouldDeleteQueueAfterReceiveIfDeleteReplyQueueIsTrue() $receivedMessage = new NullMessage(); $receivedMessage->setCorrelationId('theCorrelationId'); - $consumer = $this->createPsrConsumerMock(); + $consumer = $this->createConsumerMock(); $consumer ->expects($this->once()) ->method('receive') ->willReturn($receivedMessage) ; - $context = $this->getMockBuilder(PsrContext::class) + $context = $this->getMockBuilder(Context::class) ->disableOriginalConstructor() ->setMethods(['deleteQueue']) ->getMockForAbstractClass() @@ -229,7 +229,7 @@ public function testShouldDeleteQueueAfterReceiveIfDeleteReplyQueueIsTrue() $context ->expects($this->once()) ->method('createProducer') - ->willReturn($this->createPsrProducerMock()) + ->willReturn($this->createInteropProducerMock()) ; $context ->expects($this->atLeastOnce()) @@ -267,18 +267,18 @@ public function testShouldNotCallDeleteQueueIfDeleteReplyQueueIsTrueButContextHa $receivedMessage = new NullMessage(); $receivedMessage->setCorrelationId('theCorrelationId'); - $consumer = $this->createPsrConsumerMock(); + $consumer = $this->createConsumerMock(); $consumer ->expects($this->once()) ->method('receive') ->willReturn($receivedMessage) ; - $context = $this->createPsrContextMock(); + $context = $this->createContextMock(); $context ->expects($this->once()) ->method('createProducer') - ->willReturn($this->createPsrProducerMock()) + ->willReturn($this->createInteropProducerMock()) ; $context ->expects($this->once()) @@ -329,26 +329,26 @@ public function testShouldDoSyncCall() } /** - * @return PsrContext|\PHPUnit_Framework_MockObject_MockObject|PsrProducer + * @return Context|\PHPUnit_Framework_MockObject_MockObject|InteropProducer */ - private function createPsrProducerMock() + private function createInteropProducerMock() { - return $this->createMock(PsrProducer::class); + return $this->createMock(InteropProducer::class); } /** - * @return \PHPUnit_Framework_MockObject_MockObject|PsrConsumer + * @return \PHPUnit_Framework_MockObject_MockObject|Consumer */ - private function createPsrConsumerMock() + private function createConsumerMock() { - return $this->createMock(PsrConsumer::class); + return $this->createMock(Consumer::class); } /** - * @return \PHPUnit_Framework_MockObject_MockObject|PsrContext + * @return \PHPUnit_Framework_MockObject_MockObject|Context */ - private function createPsrContextMock() + private function createContextMock() { - return $this->createMock(PsrContext::class); + return $this->createMock(Context::class); } } diff --git a/pkg/enqueue/Tests/Symfony/Client/ConsumeMessagesCommandTest.php b/pkg/enqueue/Tests/Symfony/Client/ConsumeMessagesCommandTest.php index 69af29fdf..a33905a8e 100644 --- a/pkg/enqueue/Tests/Symfony/Client/ConsumeMessagesCommandTest.php +++ b/pkg/enqueue/Tests/Symfony/Client/ConsumeMessagesCommandTest.php @@ -11,7 +11,7 @@ use Enqueue\Consumption\QueueConsumerInterface; use Enqueue\Null\NullQueue; use Enqueue\Symfony\Client\ConsumeMessagesCommand; -use Interop\Queue\PsrContext; +use Interop\Queue\Context; use PHPUnit\Framework\TestCase; use Symfony\Component\Console\Tester\CommandTester; @@ -91,7 +91,7 @@ public function testShouldBindDefaultQueueOnly() $processor = $this->createDelegateProcessorMock(); - $context = $this->createPsrContextMock(); + $context = $this->createContextMock(); $context ->expects($this->never()) ->method('close') @@ -133,7 +133,7 @@ public function testShouldBindDefaultQueueIfRouteDoesNotDefineQueue() $processor = $this->createDelegateProcessorMock(); - $context = $this->createPsrContextMock(); + $context = $this->createContextMock(); $context ->expects($this->never()) ->method('close') @@ -309,7 +309,7 @@ public function testShouldSkipQueueConsumptionAndUseCustomClientDestinationName( $processor = $this->createDelegateProcessorMock(); - $context = $this->createPsrContextMock(); + $context = $this->createContextMock(); $context ->expects($this->never()) ->method('close') @@ -361,11 +361,11 @@ public function testShouldSkipQueueConsumptionAndUseCustomClientDestinationName( } /** - * @return \PHPUnit_Framework_MockObject_MockObject|PsrContext + * @return \PHPUnit_Framework_MockObject_MockObject|Context */ - private function createPsrContextMock() + private function createContextMock() { - return $this->createMock(PsrContext::class); + return $this->createMock(Context::class); } /** diff --git a/pkg/enqueue/Tests/Symfony/Client/DependencyInjection/BuildCommandSubscriberRoutesPassTest.php b/pkg/enqueue/Tests/Symfony/Client/DependencyInjection/BuildCommandSubscriberRoutesPassTest.php index a93efe3d0..9d375227c 100644 --- a/pkg/enqueue/Tests/Symfony/Client/DependencyInjection/BuildCommandSubscriberRoutesPassTest.php +++ b/pkg/enqueue/Tests/Symfony/Client/DependencyInjection/BuildCommandSubscriberRoutesPassTest.php @@ -7,9 +7,9 @@ use Enqueue\Client\RouteCollection; use Enqueue\Symfony\Client\DependencyInjection\BuildCommandSubscriberRoutesPass; use Enqueue\Test\ClassExtensionTrait; -use Interop\Queue\PsrContext; -use Interop\Queue\PsrMessage; -use Interop\Queue\PsrProcessor; +use Interop\Queue\Context; +use Interop\Queue\Message as InteropMessage; +use Interop\Queue\Processor; use PHPUnit\Framework\TestCase; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; use Symfony\Component\DependencyInjection\ContainerBuilder; @@ -55,7 +55,7 @@ public function testThrowIfTaggedProcessorIsBuiltByFactory() $container->register('enqueue.client.aName.route_collection', RouteCollection::class) ->addArgument([]) ; - $container->register('aProcessor', PsrProcessor::class) + $container->register('aProcessor', Processor::class) ->setFactory('foo') ->addTag('enqueue.command_subscriber') ; @@ -371,10 +371,10 @@ public function testShouldMergeExtractedRoutesWithAlreadySetInCollection() private function createCommandSubscriberProcessor($commandSubscriberReturns = ['aCommand']) { - $processor = new class() implements PsrProcessor, CommandSubscriberInterface { + $processor = new class() implements Processor, CommandSubscriberInterface { public static $return; - public function process(PsrMessage $message, PsrContext $context) + public function process(InteropMessage $message, Context $context) { } diff --git a/pkg/enqueue/Tests/Symfony/Client/DependencyInjection/BuildTopicSubscriberRoutesPassTest.php b/pkg/enqueue/Tests/Symfony/Client/DependencyInjection/BuildTopicSubscriberRoutesPassTest.php index 0ad70a21a..895cfb11d 100644 --- a/pkg/enqueue/Tests/Symfony/Client/DependencyInjection/BuildTopicSubscriberRoutesPassTest.php +++ b/pkg/enqueue/Tests/Symfony/Client/DependencyInjection/BuildTopicSubscriberRoutesPassTest.php @@ -7,9 +7,9 @@ use Enqueue\Client\TopicSubscriberInterface; use Enqueue\Symfony\Client\DependencyInjection\BuildTopicSubscriberRoutesPass; use Enqueue\Test\ClassExtensionTrait; -use Interop\Queue\PsrContext; -use Interop\Queue\PsrMessage; -use Interop\Queue\PsrProcessor; +use Interop\Queue\Context; +use Interop\Queue\Message as InteropMessage; +use Interop\Queue\Processor; use PHPUnit\Framework\TestCase; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; use Symfony\Component\DependencyInjection\ContainerBuilder; @@ -55,7 +55,7 @@ public function testThrowIfTaggedProcessorIsBuiltByFactory() $container->register('enqueue.client.aName.route_collection', RouteCollection::class) ->addArgument([]) ; - $container->register('aProcessor', PsrProcessor::class) + $container->register('aProcessor', Processor::class) ->setFactory('foo') ->addTag('enqueue.topic_subscriber') ; @@ -333,10 +333,10 @@ public function testShouldMergeExtractedRoutesWithAlreadySetInCollection() private function createTopicSubscriberProcessor($topicSubscriberReturns = ['aTopic']) { - $processor = new class() implements PsrProcessor, TopicSubscriberInterface { + $processor = new class() implements Processor, TopicSubscriberInterface { public static $return; - public function process(PsrMessage $message, PsrContext $context) + public function process(InteropMessage $message, Context $context) { } diff --git a/pkg/enqueue/Tests/Symfony/Consumption/ConsumeMessagesCommandTest.php b/pkg/enqueue/Tests/Symfony/Consumption/ConsumeMessagesCommandTest.php index a01fd8fee..2e47a05b5 100644 --- a/pkg/enqueue/Tests/Symfony/Consumption/ConsumeMessagesCommandTest.php +++ b/pkg/enqueue/Tests/Symfony/Consumption/ConsumeMessagesCommandTest.php @@ -5,7 +5,7 @@ use Enqueue\Consumption\ChainExtension; use Enqueue\Consumption\QueueConsumerInterface; use Enqueue\Symfony\Consumption\ConsumeMessagesCommand; -use Interop\Queue\PsrContext; +use Interop\Queue\Context; use PHPUnit\Framework\TestCase; use Symfony\Component\Console\Tester\CommandTester; @@ -69,11 +69,11 @@ public function testShouldExecuteConsumption() } /** - * @return \PHPUnit_Framework_MockObject_MockObject|PsrContext + * @return \PHPUnit_Framework_MockObject_MockObject|Context */ private function createContextMock() { - return $this->createMock(PsrContext::class); + return $this->createMock(Context::class); } /** diff --git a/pkg/enqueue/Tests/Symfony/Consumption/ContainerAwareConsumeMessagesCommandTest.php b/pkg/enqueue/Tests/Symfony/Consumption/ContainerAwareConsumeMessagesCommandTest.php index 6a587ab40..2c04b0761 100644 --- a/pkg/enqueue/Tests/Symfony/Consumption/ContainerAwareConsumeMessagesCommandTest.php +++ b/pkg/enqueue/Tests/Symfony/Consumption/ContainerAwareConsumeMessagesCommandTest.php @@ -6,9 +6,9 @@ use Enqueue\Consumption\QueueConsumerInterface; use Enqueue\Symfony\Consumption\ContainerAwareConsumeMessagesCommand; use Enqueue\Tests\Symfony\Consumption\Mock\QueueSubscriberProcessor; -use Interop\Queue\PsrContext; -use Interop\Queue\PsrProcessor; -use Interop\Queue\PsrQueue; +use Interop\Queue\Context; +use Interop\Queue\Processor; +use Interop\Queue\Queue as InteropQueue; use PHPUnit\Framework\TestCase; use Symfony\Component\Console\Tester\CommandTester; use Symfony\Component\DependencyInjection\Container; @@ -64,7 +64,7 @@ public function testShouldThrowExceptionIfProcessorInstanceHasWrongClass() $tester = new CommandTester($command); $this->expectException(\LogicException::class); - $this->expectExceptionMessage('Invalid message processor service given. It must be an instance of Interop\Queue\PsrProcessor but stdClass'); + $this->expectExceptionMessage('Invalid message processor service given. It must be an instance of Interop\Queue\Processor but stdClass'); $tester->execute([ 'processor-service' => 'processor-service', '--queue' => ['queue-name'], @@ -175,27 +175,27 @@ public function testShouldExecuteConsumptionWhenProcessorImplementsQueueSubscrib } /** - * @return \PHPUnit_Framework_MockObject_MockObject|PsrContext + * @return \PHPUnit_Framework_MockObject_MockObject|Context */ protected function createContextMock() { - return $this->createMock(PsrContext::class); + return $this->createMock(Context::class); } /** - * @return \PHPUnit_Framework_MockObject_MockObject|PsrQueue + * @return \PHPUnit_Framework_MockObject_MockObject|InteropQueue */ protected function createQueueMock() { - return $this->createMock(PsrQueue::class); + return $this->createMock(InteropQueue::class); } /** - * @return \PHPUnit_Framework_MockObject_MockObject|PsrProcessor + * @return \PHPUnit_Framework_MockObject_MockObject|Processor */ protected function createProcessor() { - return $this->createMock(PsrProcessor::class); + return $this->createMock(Processor::class); } /** diff --git a/pkg/enqueue/Tests/Symfony/Consumption/Mock/QueueSubscriberProcessor.php b/pkg/enqueue/Tests/Symfony/Consumption/Mock/QueueSubscriberProcessor.php index e71ad1634..56b3c9319 100644 --- a/pkg/enqueue/Tests/Symfony/Consumption/Mock/QueueSubscriberProcessor.php +++ b/pkg/enqueue/Tests/Symfony/Consumption/Mock/QueueSubscriberProcessor.php @@ -3,13 +3,13 @@ namespace Enqueue\Tests\Symfony\Consumption\Mock; use Enqueue\Consumption\QueueSubscriberInterface; -use Interop\Queue\PsrContext; -use Interop\Queue\PsrMessage; -use Interop\Queue\PsrProcessor; +use Interop\Queue\Context; +use Interop\Queue\Message as InteropMessage; +use Interop\Queue\Processor; -class QueueSubscriberProcessor implements PsrProcessor, QueueSubscriberInterface +class QueueSubscriberProcessor implements Processor, QueueSubscriberInterface { - public function process(PsrMessage $message, PsrContext $context) + public function process(InteropMessage $message, Context $context) { } diff --git a/pkg/fs/CannotObtainLockException.php b/pkg/fs/CannotObtainLockException.php index d1f842c60..2788dede8 100644 --- a/pkg/fs/CannotObtainLockException.php +++ b/pkg/fs/CannotObtainLockException.php @@ -4,7 +4,7 @@ namespace Enqueue\Fs; -use Interop\Queue\Exception; +use Interop\Queue\Exception\Exception; class CannotObtainLockException extends Exception { diff --git a/pkg/fs/FsConnectionFactory.php b/pkg/fs/FsConnectionFactory.php index a4c3a0d60..c35c52e5a 100644 --- a/pkg/fs/FsConnectionFactory.php +++ b/pkg/fs/FsConnectionFactory.php @@ -4,10 +4,10 @@ namespace Enqueue\Fs; -use Interop\Queue\PsrConnectionFactory; -use Interop\Queue\PsrContext; +use Interop\Queue\ConnectionFactory; +use Interop\Queue\Context; -class FsConnectionFactory implements PsrConnectionFactory +class FsConnectionFactory implements ConnectionFactory { /** * @var string @@ -49,7 +49,7 @@ public function __construct($config = 'file:') /** * @return FsContext */ - public function createContext(): PsrContext + public function createContext(): Context { return new FsContext( $this->config['path'], diff --git a/pkg/fs/FsConsumer.php b/pkg/fs/FsConsumer.php index af96513dc..d9092aaf4 100644 --- a/pkg/fs/FsConsumer.php +++ b/pkg/fs/FsConsumer.php @@ -4,12 +4,12 @@ namespace Enqueue\Fs; -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 FsConsumer implements PsrConsumer +class FsConsumer implements Consumer { /** * @var FsDestination @@ -66,7 +66,7 @@ public function getPollingInterval(): int /** * @return FsDestination */ - public function getQueue(): PsrQueue + public function getQueue(): Queue { return $this->destination; } @@ -74,7 +74,7 @@ public function getQueue(): PsrQueue /** * @return FsMessage */ - public function receive(int $timeout = 0): ?PsrMessage + public function receive(int $timeout = 0): ?Message { $timeout /= 1000; $startAt = microtime(true); @@ -101,7 +101,7 @@ public function receive(int $timeout = 0): ?PsrMessage /** * @return FsMessage */ - public function receiveNoWait(): ?PsrMessage + public function receiveNoWait(): ?Message { if ($this->preFetchedMessages) { return array_shift($this->preFetchedMessages); @@ -154,12 +154,12 @@ public function receiveNoWait(): ?PsrMessage return null; } - public function acknowledge(PsrMessage $message): void + public function acknowledge(Message $message): void { // do nothing. fs transport always works in auto ack mode } - public function reject(PsrMessage $message, bool $requeue = false): void + public function reject(Message $message, bool $requeue = false): void { InvalidMessageException::assertMessageInstanceOf($message, FsMessage::class); diff --git a/pkg/fs/FsContext.php b/pkg/fs/FsContext.php index 03ac25c27..0d499526c 100644 --- a/pkg/fs/FsContext.php +++ b/pkg/fs/FsContext.php @@ -4,20 +4,20 @@ namespace Enqueue\Fs; -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\SubscriptionConsumerNotSupportedException; +use Interop\Queue\Consumer; +use Interop\Queue\Context; +use Interop\Queue\Destination; +use Interop\Queue\Exception\InvalidDestinationException; +use Interop\Queue\Exception\SubscriptionConsumerNotSupportedException; +use Interop\Queue\Message; +use Interop\Queue\Producer; +use Interop\Queue\Queue; +use Interop\Queue\SubscriptionConsumer; +use Interop\Queue\Topic; use Makasim\File\TempFile; use Symfony\Component\Filesystem\Filesystem; -class FsContext implements PsrContext +class FsContext implements Context { /** * @var string @@ -60,7 +60,7 @@ public function __construct(string $storeDir, int $preFetchCount, int $chmod, in /** * @return FsMessage */ - public function createMessage(string $body = '', array $properties = [], array $headers = []): PsrMessage + public function createMessage(string $body = '', array $properties = [], array $headers = []): Message { return new FsMessage($body, $properties, $headers); } @@ -68,7 +68,7 @@ public function createMessage(string $body = '', array $properties = [], array $ /** * @return FsDestination */ - public function createTopic(string $topicName): PsrTopic + public function createTopic(string $topicName): Topic { return $this->createQueue($topicName); } @@ -76,7 +76,7 @@ public function createTopic(string $topicName): PsrTopic /** * @return FsDestination */ - public function createQueue(string $queueName): PsrQueue + public function createQueue(string $queueName): Queue { return new FsDestination(new \SplFileInfo($this->getStoreDir().'/'.$queueName)); } @@ -125,7 +125,7 @@ public function workWithFile(FsDestination $destination, string $mode, callable /** * @return FsDestination */ - public function createTemporaryQueue(): PsrQueue + public function createTemporaryQueue(): Queue { return new FsDestination( new TempFile($this->getStoreDir().'/'.uniqid('tmp-q-', true)) @@ -135,7 +135,7 @@ public function createTemporaryQueue(): PsrQueue /** * @return FsProducer */ - public function createProducer(): PsrProducer + public function createProducer(): Producer { return new FsProducer($this); } @@ -145,7 +145,7 @@ public function createProducer(): PsrProducer * * @return FsConsumer */ - public function createConsumer(PsrDestination $destination): PsrConsumer + public function createConsumer(Destination $destination): Consumer { InvalidDestinationException::assertDestinationInstanceOf($destination, FsDestination::class); @@ -163,7 +163,7 @@ public function close(): void $this->lock->releaseAll(); } - public function createSubscriptionConsumer(): PsrSubscriptionConsumer + public function createSubscriptionConsumer(): SubscriptionConsumer { throw SubscriptionConsumerNotSupportedException::providerDoestNotSupportIt(); } @@ -171,7 +171,7 @@ public function createSubscriptionConsumer(): PsrSubscriptionConsumer /** * @param FsDestination $queue */ - public function purgeQueue(PsrQueue $queue): void + public function purgeQueue(Queue $queue): void { InvalidDestinationException::assertDestinationInstanceOf($queue, FsDestination::class); diff --git a/pkg/fs/FsDestination.php b/pkg/fs/FsDestination.php index 065442543..559391785 100644 --- a/pkg/fs/FsDestination.php +++ b/pkg/fs/FsDestination.php @@ -4,10 +4,10 @@ namespace Enqueue\Fs; -use Interop\Queue\PsrQueue; -use Interop\Queue\PsrTopic; +use Interop\Queue\Queue; +use Interop\Queue\Topic; -class FsDestination implements PsrQueue, PsrTopic +class FsDestination implements Queue, Topic { /** * @var \SplFileInfo diff --git a/pkg/fs/FsMessage.php b/pkg/fs/FsMessage.php index fdacc7321..d66ee52cd 100644 --- a/pkg/fs/FsMessage.php +++ b/pkg/fs/FsMessage.php @@ -4,9 +4,9 @@ namespace Enqueue\Fs; -use Interop\Queue\PsrMessage; +use Interop\Queue\Message; -class FsMessage implements PsrMessage, \JsonSerializable +class FsMessage implements Message, \JsonSerializable { /** * @var string diff --git a/pkg/fs/FsProducer.php b/pkg/fs/FsProducer.php index 465983670..55ff88cc3 100644 --- a/pkg/fs/FsProducer.php +++ b/pkg/fs/FsProducer.php @@ -4,16 +4,16 @@ namespace Enqueue\Fs; -use Interop\Queue\DeliveryDelayNotSupportedException; -use Interop\Queue\InvalidDestinationException; -use Interop\Queue\InvalidMessageException; -use Interop\Queue\PriorityNotSupportedException; -use Interop\Queue\PsrDestination; -use Interop\Queue\PsrMessage; -use Interop\Queue\PsrProducer; +use Interop\Queue\Destination; +use Interop\Queue\Exception\DeliveryDelayNotSupportedException; +use Interop\Queue\Exception\InvalidDestinationException; +use Interop\Queue\Exception\InvalidMessageException; +use Interop\Queue\Exception\PriorityNotSupportedException; +use Interop\Queue\Message; +use Interop\Queue\Producer; use Makasim\File\TempFile; -class FsProducer implements PsrProducer +class FsProducer implements Producer { /** * @var float|int|null @@ -34,7 +34,7 @@ public function __construct(FsContext $context) * @param FsDestination $destination * @param FsMessage $message */ - public function send(PsrDestination $destination, PsrMessage $message): void + public function send(Destination $destination, Message $message): void { InvalidDestinationException::assertDestinationInstanceOf($destination, FsDestination::class); InvalidMessageException::assertMessageInstanceOf($message, FsMessage::class); @@ -67,7 +67,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; @@ -81,7 +81,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; @@ -95,7 +95,7 @@ public function getPriority(): ?int return null; } - public function setTimeToLive(int $timeToLive = null): PsrProducer + public function setTimeToLive(int $timeToLive = null): Producer { $this->timeToLive = $timeToLive; diff --git a/pkg/fs/README.md b/pkg/fs/README.md index 7618d9fcc..7822f354c 100644 --- a/pkg/fs/README.md +++ b/pkg/fs/README.md @@ -5,7 +5,7 @@ [![Total Downloads](https://poser.pugx.org/enqueue/fs/d/total.png)](https://packagist.org/packages/enqueue/fs) [![Latest Stable Version](https://poser.pugx.org/enqueue/fs/version.png)](https://packagist.org/packages/enqueue/fs) -This is an implementation of PSR queue specification. It allows you to send and consume message stored locally in files. +This is an implementation of Queue Interop specification. It allows you to send and consume message stored locally in files. ## Resources diff --git a/pkg/fs/Tests/FsConnectionFactoryTest.php b/pkg/fs/Tests/FsConnectionFactoryTest.php index 30cfc6f69..35558573a 100644 --- a/pkg/fs/Tests/FsConnectionFactoryTest.php +++ b/pkg/fs/Tests/FsConnectionFactoryTest.php @@ -5,7 +5,7 @@ use Enqueue\Fs\FsConnectionFactory; use Enqueue\Fs\FsContext; use Enqueue\Test\ClassExtensionTrait; -use Interop\Queue\PsrConnectionFactory; +use Interop\Queue\ConnectionFactory; class FsConnectionFactoryTest extends \PHPUnit\Framework\TestCase { @@ -13,7 +13,7 @@ class FsConnectionFactoryTest extends \PHPUnit\Framework\TestCase public function testShouldImplementConnectionFactoryInterface() { - $this->assertClassImplements(PsrConnectionFactory::class, FsConnectionFactory::class); + $this->assertClassImplements(ConnectionFactory::class, FsConnectionFactory::class); } public function testShouldCreateContext() diff --git a/pkg/fs/Tests/FsConsumerTest.php b/pkg/fs/Tests/FsConsumerTest.php index b3f14266c..90048b2d0 100644 --- a/pkg/fs/Tests/FsConsumerTest.php +++ b/pkg/fs/Tests/FsConsumerTest.php @@ -8,7 +8,7 @@ use Enqueue\Fs\FsMessage; use Enqueue\Fs\FsProducer; use Enqueue\Test\ClassExtensionTrait; -use Interop\Queue\PsrConsumer; +use Interop\Queue\Consumer; use Makasim\File\TempFile; class FsConsumerTest extends \PHPUnit\Framework\TestCase @@ -17,7 +17,7 @@ class FsConsumerTest extends \PHPUnit\Framework\TestCase public function testShouldImplementConsumerInterface() { - $this->assertClassImplements(PsrConsumer::class, FsConsumer::class); + $this->assertClassImplements(Consumer::class, FsConsumer::class); } public function testCouldBeConstructedWithContextAndDestinationAndPreFetchCountAsArguments() diff --git a/pkg/fs/Tests/FsContextTest.php b/pkg/fs/Tests/FsContextTest.php index 2e33d6992..377ec0007 100644 --- a/pkg/fs/Tests/FsContextTest.php +++ b/pkg/fs/Tests/FsContextTest.php @@ -9,8 +9,8 @@ use Enqueue\Fs\FsProducer; use Enqueue\Null\NullQueue; use Enqueue\Test\ClassExtensionTrait; -use Interop\Queue\InvalidDestinationException; -use Interop\Queue\PsrContext; +use Interop\Queue\Context; +use Interop\Queue\Exception\InvalidDestinationException; use Makasim\File\TempFile; class FsContextTest extends \PHPUnit\Framework\TestCase @@ -19,7 +19,7 @@ class FsContextTest extends \PHPUnit\Framework\TestCase public function testShouldImplementContextInterface() { - $this->assertClassImplements(PsrContext::class, FsContext::class); + $this->assertClassImplements(Context::class, FsContext::class); } public function testCouldBeConstructedWithExpectedArguments() diff --git a/pkg/fs/Tests/FsDestinationTest.php b/pkg/fs/Tests/FsDestinationTest.php index cfe9e1aec..6e5753f6f 100644 --- a/pkg/fs/Tests/FsDestinationTest.php +++ b/pkg/fs/Tests/FsDestinationTest.php @@ -4,8 +4,8 @@ use Enqueue\Fs\FsDestination; use Enqueue\Test\ClassExtensionTrait; -use Interop\Queue\PsrQueue; -use Interop\Queue\PsrTopic; +use Interop\Queue\Queue; +use Interop\Queue\Topic; use Makasim\File\TempFile; class FsDestinationTest extends \PHPUnit\Framework\TestCase @@ -14,8 +14,8 @@ class FsDestinationTest extends \PHPUnit\Framework\TestCase public function testShouldImplementsTopicAndQueueInterfaces() { - $this->assertClassImplements(PsrTopic::class, FsDestination::class); - $this->assertClassImplements(PsrQueue::class, FsDestination::class); + $this->assertClassImplements(Topic::class, FsDestination::class); + $this->assertClassImplements(Queue::class, FsDestination::class); } public function testCouldBeConstructedWithSplFileAsFirstArgument() diff --git a/pkg/fs/Tests/FsProducerTest.php b/pkg/fs/Tests/FsProducerTest.php index 201cac30a..3311287a5 100644 --- a/pkg/fs/Tests/FsProducerTest.php +++ b/pkg/fs/Tests/FsProducerTest.php @@ -9,9 +9,9 @@ use Enqueue\Null\NullMessage; use Enqueue\Null\NullQueue; use Enqueue\Test\ClassExtensionTrait; -use Interop\Queue\InvalidDestinationException; -use Interop\Queue\InvalidMessageException; -use Interop\Queue\PsrProducer; +use Interop\Queue\Exception\InvalidDestinationException; +use Interop\Queue\Exception\InvalidMessageException; +use Interop\Queue\Producer; use Makasim\File\TempFile; class FsProducerTest extends \PHPUnit\Framework\TestCase @@ -20,7 +20,7 @@ class FsProducerTest extends \PHPUnit\Framework\TestCase public function testShouldImplementProducerInterface() { - $this->assertClassImplements(PsrProducer::class, FsProducer::class); + $this->assertClassImplements(Producer::class, FsProducer::class); } public function testCouldBeConstructedWithContextAsFirstArgument() diff --git a/pkg/fs/Tests/Functional/FsConsumptionUseCasesTest.php b/pkg/fs/Tests/Functional/FsConsumptionUseCasesTest.php index 6662f2b16..7ea11c74c 100644 --- a/pkg/fs/Tests/Functional/FsConsumptionUseCasesTest.php +++ b/pkg/fs/Tests/Functional/FsConsumptionUseCasesTest.php @@ -10,9 +10,9 @@ use Enqueue\Consumption\Result; use Enqueue\Fs\FsConnectionFactory; use Enqueue\Fs\FsContext; -use Interop\Queue\PsrContext; -use Interop\Queue\PsrMessage; -use Interop\Queue\PsrProcessor; +use Interop\Queue\Context; +use Interop\Queue\Message; +use Interop\Queue\Processor; use Makasim\File\TempFile; /** @@ -54,7 +54,7 @@ public function testConsumeOneMessageAndExit() $queueConsumer->consume(); - $this->assertInstanceOf(PsrMessage::class, $processor->lastProcessedMessage); + $this->assertInstanceOf(Message::class, $processor->lastProcessedMessage); $this->assertEquals(__METHOD__, $processor->lastProcessedMessage->getBody()); } @@ -85,22 +85,22 @@ 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()); } } -class StubProcessor implements PsrProcessor +class StubProcessor implements Processor { public $result = self::ACK; - /** @var PsrMessage */ + /** @var Message */ public $lastProcessedMessage; - public function process(PsrMessage $message, PsrContext $context) + public function process(Message $message, Context $context) { $this->lastProcessedMessage = $message; diff --git a/pkg/fs/Tests/Spec/FsMessageTest.php b/pkg/fs/Tests/Spec/FsMessageTest.php index da34ab66a..20dd4beca 100644 --- a/pkg/fs/Tests/Spec/FsMessageTest.php +++ b/pkg/fs/Tests/Spec/FsMessageTest.php @@ -3,9 +3,9 @@ namespace Enqueue\Fs\Tests\Spec; use Enqueue\Fs\FsMessage; -use Interop\Queue\Spec\PsrMessageSpec; +use Interop\Queue\Spec\MessageSpec; -class FsMessageTest extends PsrMessageSpec +class FsMessageTest extends MessageSpec { /** * {@inheritdoc} diff --git a/pkg/gearman/GearmanConnectionFactory.php b/pkg/gearman/GearmanConnectionFactory.php index 1102e6cc4..c938a1025 100644 --- a/pkg/gearman/GearmanConnectionFactory.php +++ b/pkg/gearman/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); } diff --git a/pkg/gearman/GearmanConsumer.php b/pkg/gearman/GearmanConsumer.php index 4d4b883ca..7d4bcef23 100644 --- a/pkg/gearman/GearmanConsumer.php +++ b/pkg/gearman/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,7 +36,7 @@ public function __construct(GearmanContext $context, GearmanDestination $destina /** * @return GearmanDestination */ - public function getQueue(): PsrQueue + public function getQueue(): Queue { return $this->destination; } @@ -44,7 +44,7 @@ public function getQueue(): PsrQueue /** * @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,7 +70,7 @@ public function receive(int $timeout = 0): ?PsrMessage /** * @return GearmanMessage */ - public function receiveNoWait(): ?PsrMessage + public function receiveNoWait(): ?Message { return $this->receive(100); } @@ -78,14 +78,14 @@ public function receiveNoWait(): ?PsrMessage /** * @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); diff --git a/pkg/gearman/GearmanContext.php b/pkg/gearman/GearmanContext.php index ec7fb46d0..80a93882e 100644 --- a/pkg/gearman/GearmanContext.php +++ b/pkg/gearman/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,7 +42,7 @@ 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); } @@ -50,7 +50,7 @@ public function createMessage(string $body = '', array $properties = [], array $ /** * @return GearmanDestination */ - public function createTopic(string $topicName): PsrTopic + public function createTopic(string $topicName): Topic { return new GearmanDestination($topicName); } @@ -58,12 +58,12 @@ public function createTopic(string $topicName): PsrTopic /** * @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(); } @@ -71,7 +71,7 @@ public function createTemporaryQueue(): PsrQueue /** * @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(); } diff --git a/pkg/gearman/GearmanDestination.php b/pkg/gearman/GearmanDestination.php index e982cd788..c559d6126 100644 --- a/pkg/gearman/GearmanDestination.php +++ b/pkg/gearman/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 diff --git a/pkg/gearman/GearmanMessage.php b/pkg/gearman/GearmanMessage.php index 486ca523a..625566d62 100644 --- a/pkg/gearman/GearmanMessage.php +++ b/pkg/gearman/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 diff --git a/pkg/gearman/GearmanProducer.php b/pkg/gearman/GearmanProducer.php index 3d6f24df3..83eaef3ae 100644 --- a/pkg/gearman/GearmanProducer.php +++ b/pkg/gearman/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; diff --git a/pkg/gearman/Tests/GearmanContextTest.php b/pkg/gearman/Tests/GearmanContextTest.php index 4b278c5f7..484ab00a0 100644 --- a/pkg/gearman/Tests/GearmanContextTest.php +++ b/pkg/gearman/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() diff --git a/pkg/gearman/Tests/GearmanDestinationTest.php b/pkg/gearman/Tests/GearmanDestinationTest.php index 09b29999f..b98f09fee 100644 --- a/pkg/gearman/Tests/GearmanDestinationTest.php +++ b/pkg/gearman/Tests/GearmanDestinationTest.php @@ -4,8 +4,8 @@ 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 @@ -13,14 +13,14 @@ 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() diff --git a/pkg/gearman/Tests/GearmanProducerTest.php b/pkg/gearman/Tests/GearmanProducerTest.php index d87b2aaf7..907d9ef46 100644 --- a/pkg/gearman/Tests/GearmanProducerTest.php +++ b/pkg/gearman/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 diff --git a/pkg/gearman/Tests/Spec/GearmanConnectionFactoryTest.php b/pkg/gearman/Tests/Spec/GearmanConnectionFactoryTest.php index 83cb4306b..148bf66d2 100644 --- a/pkg/gearman/Tests/Spec/GearmanConnectionFactoryTest.php +++ b/pkg/gearman/Tests/Spec/GearmanConnectionFactoryTest.php @@ -4,9 +4,9 @@ use Enqueue\Gearman\GearmanConnectionFactory; use Enqueue\Gearman\Tests\SkipIfGearmanExtensionIsNotInstalledTrait; -use Interop\Queue\Spec\PsrConnectionFactorySpec; +use Interop\Queue\Spec\ConnectionFactorySpec; -class GearmanConnectionFactoryTest extends PsrConnectionFactorySpec +class GearmanConnectionFactoryTest extends ConnectionFactorySpec { use SkipIfGearmanExtensionIsNotInstalledTrait; diff --git a/pkg/gearman/Tests/Spec/GearmanContextTest.php b/pkg/gearman/Tests/Spec/GearmanContextTest.php index 65cdf118c..431465cc5 100644 --- a/pkg/gearman/Tests/Spec/GearmanContextTest.php +++ b/pkg/gearman/Tests/Spec/GearmanContextTest.php @@ -3,12 +3,12 @@ namespace Enqueue\Gearman\Tests\Spec; use Enqueue\Gearman\GearmanConnectionFactory; -use Interop\Queue\Spec\PsrContextSpec; +use Interop\Queue\Spec\ContextSpec; /** * @group functional */ -class GearmanContextTest extends PsrContextSpec +class GearmanContextTest extends ContextSpec { /** * {@inheritdoc} diff --git a/pkg/gearman/Tests/Spec/GearmanMessageTest.php b/pkg/gearman/Tests/Spec/GearmanMessageTest.php index faed23e65..7ad01d6db 100644 --- a/pkg/gearman/Tests/Spec/GearmanMessageTest.php +++ b/pkg/gearman/Tests/Spec/GearmanMessageTest.php @@ -4,9 +4,9 @@ use Enqueue\Gearman\GearmanMessage; use Enqueue\Gearman\Tests\SkipIfGearmanExtensionIsNotInstalledTrait; -use Interop\Queue\Spec\PsrMessageSpec; +use Interop\Queue\Spec\MessageSpec; -class GearmanMessageTest extends PsrMessageSpec +class GearmanMessageTest extends MessageSpec { use SkipIfGearmanExtensionIsNotInstalledTrait; diff --git a/pkg/gearman/Tests/Spec/GearmanQueueTest.php b/pkg/gearman/Tests/Spec/GearmanQueueTest.php index 8151c8804..3d486849e 100644 --- a/pkg/gearman/Tests/Spec/GearmanQueueTest.php +++ b/pkg/gearman/Tests/Spec/GearmanQueueTest.php @@ -4,9 +4,9 @@ use Enqueue\Gearman\GearmanDestination; use Enqueue\Gearman\Tests\SkipIfGearmanExtensionIsNotInstalledTrait; -use Interop\Queue\Spec\PsrQueueSpec; +use Interop\Queue\Spec\QueueSpec; -class GearmanQueueTest extends PsrQueueSpec +class GearmanQueueTest extends QueueSpec { use SkipIfGearmanExtensionIsNotInstalledTrait; diff --git a/pkg/gearman/Tests/Spec/GearmanSendToAndReceiveFromQueueTest.php b/pkg/gearman/Tests/Spec/GearmanSendToAndReceiveFromQueueTest.php index 2affc25b3..80b13f8df 100644 --- a/pkg/gearman/Tests/Spec/GearmanSendToAndReceiveFromQueueTest.php +++ b/pkg/gearman/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()); } diff --git a/pkg/gearman/Tests/Spec/GearmanSendToAndReceiveNoWaitFromQueueTest.php b/pkg/gearman/Tests/Spec/GearmanSendToAndReceiveNoWaitFromQueueTest.php index 2ec97cdbb..590b8ede5 100644 --- a/pkg/gearman/Tests/Spec/GearmanSendToAndReceiveNoWaitFromQueueTest.php +++ b/pkg/gearman/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()); } diff --git a/pkg/gearman/Tests/Spec/GearmanSendToTopicAndReceiveFromQueueTest.php b/pkg/gearman/Tests/Spec/GearmanSendToTopicAndReceiveFromQueueTest.php index 2b6454765..c90432e00 100644 --- a/pkg/gearman/Tests/Spec/GearmanSendToTopicAndReceiveFromQueueTest.php +++ b/pkg/gearman/Tests/Spec/GearmanSendToTopicAndReceiveFromQueueTest.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\SendToTopicAndReceiveFromQueueSpec; /** @@ -31,7 +31,7 @@ protected function createContext() /** * {@inheritdoc} */ - protected function createQueue(PsrContext $context, $queueName) + protected function createQueue(Context $context, $queueName) { return $context->createQueue($queueName.$this->time); } @@ -39,7 +39,7 @@ protected function createQueue(PsrContext $context, $queueName) /** * {@inheritdoc} */ - protected function createTopic(PsrContext $context, $topicName) + protected function createTopic(Context $context, $topicName) { return $context->createTopic($topicName.$this->time); } diff --git a/pkg/gearman/Tests/Spec/GearmanSendToTopicAndReceiveNoWaitFromQueueTest.php b/pkg/gearman/Tests/Spec/GearmanSendToTopicAndReceiveNoWaitFromQueueTest.php index 3b120afda..469f9e997 100644 --- a/pkg/gearman/Tests/Spec/GearmanSendToTopicAndReceiveNoWaitFromQueueTest.php +++ b/pkg/gearman/Tests/Spec/GearmanSendToTopicAndReceiveNoWaitFromQueueTest.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\SendToTopicAndReceiveNoWaitFromQueueSpec; /** @@ -31,7 +31,7 @@ protected function createContext() /** * {@inheritdoc} */ - protected function createQueue(PsrContext $context, $queueName) + protected function createQueue(Context $context, $queueName) { return $context->createQueue($queueName.$this->time); } @@ -39,7 +39,7 @@ protected function createQueue(PsrContext $context, $queueName) /** * {@inheritdoc} */ - protected function createTopic(PsrContext $context, $topicName) + protected function createTopic(Context $context, $topicName) { return $context->createTopic($topicName.$this->time); } diff --git a/pkg/gearman/Tests/Spec/GearmanTopicTest.php b/pkg/gearman/Tests/Spec/GearmanTopicTest.php index 17d933de2..336c37f7d 100644 --- a/pkg/gearman/Tests/Spec/GearmanTopicTest.php +++ b/pkg/gearman/Tests/Spec/GearmanTopicTest.php @@ -4,9 +4,9 @@ use Enqueue\Gearman\GearmanDestination; use Enqueue\Gearman\Tests\SkipIfGearmanExtensionIsNotInstalledTrait; -use Interop\Queue\Spec\PsrTopicSpec; +use Interop\Queue\Spec\TopicSpec; -class GearmanTopicTest extends PsrTopicSpec +class GearmanTopicTest extends TopicSpec { use SkipIfGearmanExtensionIsNotInstalledTrait; diff --git a/pkg/gps/GpsConnectionFactory.php b/pkg/gps/GpsConnectionFactory.php index e3f61bcb2..bc4a0a52a 100644 --- a/pkg/gps/GpsConnectionFactory.php +++ b/pkg/gps/GpsConnectionFactory.php @@ -6,10 +6,10 @@ use Enqueue\Dsn\Dsn; use Google\Cloud\PubSub\PubSubClient; -use Interop\Queue\PsrConnectionFactory; -use Interop\Queue\PsrContext; +use Interop\Queue\ConnectionFactory; +use Interop\Queue\Context; -class GpsConnectionFactory implements PsrConnectionFactory +class GpsConnectionFactory implements ConnectionFactory { /** * @var array @@ -72,7 +72,7 @@ public function __construct($config = 'gps:') /** * @return GpsContext */ - public function createContext(): PsrContext + public function createContext(): Context { if ($this->config['lazy']) { return new GpsContext(function () { diff --git a/pkg/gps/GpsConsumer.php b/pkg/gps/GpsConsumer.php index 3d4875257..e2a1be272 100644 --- a/pkg/gps/GpsConsumer.php +++ b/pkg/gps/GpsConsumer.php @@ -5,13 +5,13 @@ namespace Enqueue\Gps; use Google\Cloud\Core\Exception\ServiceException; -use Google\Cloud\PubSub\Message; +use Google\Cloud\PubSub\Message as GoogleMessage; use Google\Cloud\PubSub\Subscription; -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 GpsConsumer implements PsrConsumer +class GpsConsumer implements Consumer { /** * @var GpsContext @@ -37,7 +37,7 @@ public function __construct(GpsContext $context, GpsQueue $queue) /** * @return GpsQueue */ - public function getQueue(): PsrQueue + public function getQueue(): Queue { return $this->queue; } @@ -45,7 +45,7 @@ public function getQueue(): PsrQueue /** * @return GpsMessage */ - public function receive(int $timeout = 0): ?PsrMessage + public function receive(int $timeout = 0): ?Message { if (0 === $timeout) { while (true) { @@ -61,7 +61,7 @@ public function receive(int $timeout = 0): ?PsrMessage /** * @return GpsMessage */ - public function receiveNoWait(): ?PsrMessage + public function receiveNoWait(): ?Message { $messages = $this->getSubscription()->pull([ 'maxMessages' => 1, @@ -78,7 +78,7 @@ public function receiveNoWait(): ?PsrMessage /** * @param GpsMessage $message */ - public function acknowledge(PsrMessage $message): void + public function acknowledge(Message $message): void { if (false == $message->getNativeMessage()) { throw new \LogicException('Native google pub/sub message required but it is empty'); @@ -90,7 +90,7 @@ public function acknowledge(PsrMessage $message): void /** * @param GpsMessage $message */ - public function reject(PsrMessage $message, bool $requeue = false): void + public function reject(Message $message, bool $requeue = false): void { if (false == $message->getNativeMessage()) { throw new \LogicException('Native google pub/sub message required but it is empty'); @@ -108,7 +108,7 @@ private function getSubscription(): Subscription return $this->subscription; } - private function convertMessage(Message $message): GpsMessage + private function convertMessage(GoogleMessage $message): GpsMessage { $gpsMessage = GpsMessage::jsonUnserialize($message->data()); $gpsMessage->setNativeMessage($message); diff --git a/pkg/gps/GpsContext.php b/pkg/gps/GpsContext.php index 368e259ef..77e6200cf 100644 --- a/pkg/gps/GpsContext.php +++ b/pkg/gps/GpsContext.php @@ -6,20 +6,20 @@ use Google\Cloud\Core\Exception\ConflictException; use Google\Cloud\PubSub\PubSubClient; -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 GpsContext 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 GpsContext implements Context { /** * @var PubSubClient @@ -63,7 +63,7 @@ public function __construct($client, array $options = []) /** * @return GpsMessage */ - public function createMessage(string $body = '', array $properties = [], array $headers = []): PsrMessage + public function createMessage(string $body = '', array $properties = [], array $headers = []): Message { return new GpsMessage($body, $properties, $headers); } @@ -71,7 +71,7 @@ public function createMessage(string $body = '', array $properties = [], array $ /** * @return GpsTopic */ - public function createTopic(string $topicName): PsrTopic + public function createTopic(string $topicName): Topic { return new GpsTopic($topicName); } @@ -79,12 +79,12 @@ public function createTopic(string $topicName): PsrTopic /** * @return GpsQueue */ - public function createQueue(string $queueName): PsrQueue + public function createQueue(string $queueName): Queue { return new GpsQueue($queueName); } - public function createTemporaryQueue(): PsrQueue + public function createTemporaryQueue(): Queue { throw TemporaryQueueNotSupportedException::providerDoestNotSupportIt(); } @@ -92,7 +92,7 @@ public function createTemporaryQueue(): PsrQueue /** * @return GpsProducer */ - public function createProducer(): PsrProducer + public function createProducer(): Producer { return new GpsProducer($this); } @@ -102,7 +102,7 @@ public function createProducer(): PsrProducer * * @return GpsConsumer */ - public function createConsumer(PsrDestination $destination): PsrConsumer + public function createConsumer(Destination $destination): Consumer { InvalidDestinationException::assertDestinationInstanceOf($destination, GpsQueue::class); @@ -113,12 +113,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(); } diff --git a/pkg/gps/GpsMessage.php b/pkg/gps/GpsMessage.php index 5fae4da08..5e83e078c 100644 --- a/pkg/gps/GpsMessage.php +++ b/pkg/gps/GpsMessage.php @@ -4,10 +4,10 @@ namespace Enqueue\Gps; -use Google\Cloud\PubSub\Message; -use Interop\Queue\PsrMessage; +use Google\Cloud\PubSub\Message as GoogleMessage; +use Interop\Queue\Message; -class GpsMessage implements PsrMessage, \JsonSerializable +class GpsMessage implements Message, \JsonSerializable { /** * @var string @@ -30,7 +30,7 @@ class GpsMessage implements PsrMessage, \JsonSerializable private $redelivered; /** - * @var Message + * @var GoogleMessage */ private $nativeMessage; @@ -168,12 +168,12 @@ public static function jsonUnserialize(string $json): self return new self($data['body'], $data['properties'], $data['headers']); } - public function getNativeMessage(): ?Message + public function getNativeMessage(): ?GoogleMessage { return $this->nativeMessage; } - public function setNativeMessage(Message $message = null): void + public function setNativeMessage(GoogleMessage $message = null): void { $this->nativeMessage = $message; } diff --git a/pkg/gps/GpsProducer.php b/pkg/gps/GpsProducer.php index a6c7f1742..86c9052c0 100644 --- a/pkg/gps/GpsProducer.php +++ b/pkg/gps/GpsProducer.php @@ -5,16 +5,16 @@ namespace Enqueue\Gps; use Google\Cloud\PubSub\Topic; -use Interop\Queue\DeliveryDelayNotSupportedException; -use Interop\Queue\InvalidDestinationException; -use Interop\Queue\InvalidMessageException; -use Interop\Queue\PriorityNotSupportedException; -use Interop\Queue\PsrDestination; -use Interop\Queue\PsrMessage; -use Interop\Queue\PsrProducer; -use Interop\Queue\TimeToLiveNotSupportedException; - -class GpsProducer implements PsrProducer +use Interop\Queue\Destination; +use Interop\Queue\Exception\DeliveryDelayNotSupportedException; +use Interop\Queue\Exception\InvalidDestinationException; +use Interop\Queue\Exception\InvalidMessageException; +use Interop\Queue\Exception\PriorityNotSupportedException; +use Interop\Queue\Exception\TimeToLiveNotSupportedException; +use Interop\Queue\Message; +use Interop\Queue\Producer; + +class GpsProducer implements Producer { /** * @var GpsContext @@ -30,7 +30,7 @@ public function __construct(GpsContext $context) * @param GpsTopic $destination * @param GpsMessage $message */ - public function send(PsrDestination $destination, PsrMessage $message): void + public function send(Destination $destination, Message $message): void { InvalidDestinationException::assertDestinationInstanceOf($destination, GpsTopic::class); InvalidMessageException::assertMessageInstanceOf($message, GpsMessage::class); @@ -42,7 +42,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; @@ -56,7 +56,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; @@ -70,7 +70,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; diff --git a/pkg/gps/GpsQueue.php b/pkg/gps/GpsQueue.php index b11279e82..1c4f1c785 100644 --- a/pkg/gps/GpsQueue.php +++ b/pkg/gps/GpsQueue.php @@ -4,9 +4,9 @@ namespace Enqueue\Gps; -use Interop\Queue\PsrQueue; +use Interop\Queue\Queue; -class GpsQueue implements PsrQueue +class GpsQueue implements Queue { /** * @var string diff --git a/pkg/gps/GpsTopic.php b/pkg/gps/GpsTopic.php index 4f694f7bb..73646c46a 100644 --- a/pkg/gps/GpsTopic.php +++ b/pkg/gps/GpsTopic.php @@ -4,9 +4,9 @@ namespace Enqueue\Gps; -use Interop\Queue\PsrTopic; +use Interop\Queue\Topic; -class GpsTopic implements PsrTopic +class GpsTopic implements Topic { /** * @var string diff --git a/pkg/gps/README.md b/pkg/gps/README.md index 5f03e8e3f..f7ecff23e 100644 --- a/pkg/gps/README.md +++ b/pkg/gps/README.md @@ -5,7 +5,7 @@ [![Total Downloads](https://poser.pugx.org/enqueue/gps/d/total.png)](https://packagist.org/packages/enqueue/gps) [![Latest Stable Version](https://poser.pugx.org/enqueue/gps/version.png)](https://packagist.org/packages/enqueue/gps) -This is an implementation of PSR specification. It allows you to send and consume message through Google Pub/Sub library. +This is an implementation of Queue Interop specification. It allows you to send and consume message through Google Pub/Sub library. ## Resources diff --git a/pkg/gps/Tests/GpsContextTest.php b/pkg/gps/Tests/GpsContextTest.php index 0ca5b437b..355eeff81 100644 --- a/pkg/gps/Tests/GpsContextTest.php +++ b/pkg/gps/Tests/GpsContextTest.php @@ -7,7 +7,7 @@ use Enqueue\Gps\GpsTopic; use Google\Cloud\Core\Exception\ConflictException; use Google\Cloud\PubSub\PubSubClient; -use Interop\Queue\InvalidDestinationException; +use Interop\Queue\Exception\InvalidDestinationException; use PHPUnit\Framework\TestCase; class GpsContextTest extends TestCase diff --git a/pkg/gps/Tests/GpsProducerTest.php b/pkg/gps/Tests/GpsProducerTest.php index 117b93298..6d3191bb8 100644 --- a/pkg/gps/Tests/GpsProducerTest.php +++ b/pkg/gps/Tests/GpsProducerTest.php @@ -9,7 +9,7 @@ use Enqueue\Gps\GpsTopic; use Google\Cloud\PubSub\PubSubClient; use Google\Cloud\PubSub\Topic; -use Interop\Queue\InvalidDestinationException; +use Interop\Queue\Exception\InvalidDestinationException; use PHPUnit\Framework\TestCase; class GpsProducerTest extends TestCase diff --git a/pkg/gps/Tests/Spec/GpsConnectionFactoryTest.php b/pkg/gps/Tests/Spec/GpsConnectionFactoryTest.php index 5a12d7a02..3166d24e7 100644 --- a/pkg/gps/Tests/Spec/GpsConnectionFactoryTest.php +++ b/pkg/gps/Tests/Spec/GpsConnectionFactoryTest.php @@ -3,9 +3,9 @@ namespace Enqueue\Gps\Tests\Spec; use Enqueue\Gps\GpsConnectionFactory; -use Interop\Queue\Spec\PsrConnectionFactorySpec; +use Interop\Queue\Spec\ConnectionFactorySpec; -class GpsConnectionFactoryTest extends PsrConnectionFactorySpec +class GpsConnectionFactoryTest extends ConnectionFactorySpec { protected function createConnectionFactory() { diff --git a/pkg/gps/Tests/Spec/GpsContextTest.php b/pkg/gps/Tests/Spec/GpsContextTest.php index fe31877b6..5aaacaeb0 100644 --- a/pkg/gps/Tests/Spec/GpsContextTest.php +++ b/pkg/gps/Tests/Spec/GpsContextTest.php @@ -4,9 +4,9 @@ use Enqueue\Gps\GpsContext; use Google\Cloud\PubSub\PubSubClient; -use Interop\Queue\Spec\PsrContextSpec; +use Interop\Queue\Spec\ContextSpec; -class GpsContextTest extends PsrContextSpec +class GpsContextTest extends ContextSpec { protected function createContext() { diff --git a/pkg/gps/Tests/Spec/GpsMessageTest.php b/pkg/gps/Tests/Spec/GpsMessageTest.php index 107240923..7d7fe7191 100644 --- a/pkg/gps/Tests/Spec/GpsMessageTest.php +++ b/pkg/gps/Tests/Spec/GpsMessageTest.php @@ -3,9 +3,9 @@ namespace Enqueue\Gps\Tests\Spec; use Enqueue\Gps\GpsMessage; -use Interop\Queue\Spec\PsrMessageSpec; +use Interop\Queue\Spec\MessageSpec; -class GpsMessageTest extends PsrMessageSpec +class GpsMessageTest extends MessageSpec { protected function createMessage() { diff --git a/pkg/gps/Tests/Spec/GpsProducerTest.php b/pkg/gps/Tests/Spec/GpsProducerTest.php index a496c8205..7f973e5d3 100644 --- a/pkg/gps/Tests/Spec/GpsProducerTest.php +++ b/pkg/gps/Tests/Spec/GpsProducerTest.php @@ -4,9 +4,9 @@ use Enqueue\Gps\GpsContext; use Enqueue\Gps\GpsProducer; -use Interop\Queue\Spec\PsrProducerSpec; +use Interop\Queue\Spec\ProducerSpec; -class GpsProducerTest extends PsrProducerSpec +class GpsProducerTest extends ProducerSpec { protected function createProducer() { diff --git a/pkg/gps/Tests/Spec/GpsQueueTest.php b/pkg/gps/Tests/Spec/GpsQueueTest.php index c2eccb4fe..f4e401f6d 100644 --- a/pkg/gps/Tests/Spec/GpsQueueTest.php +++ b/pkg/gps/Tests/Spec/GpsQueueTest.php @@ -3,9 +3,9 @@ namespace Enqueue\Gps\Tests\Spec; use Enqueue\Gps\GpsQueue; -use Interop\Queue\Spec\PsrQueueSpec; +use Interop\Queue\Spec\QueueSpec; -class GpsQueueTest extends PsrQueueSpec +class GpsQueueTest extends QueueSpec { protected function createQueue() { diff --git a/pkg/gps/Tests/Spec/GpsSendToTopicAndReceiveFromQueueTest.php b/pkg/gps/Tests/Spec/GpsSendToTopicAndReceiveFromQueueTest.php index c9b0d524f..30485b072 100644 --- a/pkg/gps/Tests/Spec/GpsSendToTopicAndReceiveFromQueueTest.php +++ b/pkg/gps/Tests/Spec/GpsSendToTopicAndReceiveFromQueueTest.php @@ -4,7 +4,7 @@ use Enqueue\Gps\GpsContext; use Enqueue\Test\GpsExtension; -use Interop\Queue\PsrContext; +use Interop\Queue\Context; use Interop\Queue\Spec\SendToTopicAndReceiveNoWaitFromQueueSpec; /** @@ -25,7 +25,7 @@ protected function createContext() * @param GpsContext $context * @param mixed $queueName */ - protected function createQueue(PsrContext $context, $queueName) + protected function createQueue(Context $context, $queueName) { $queue = parent::createQueue($context, $queueName); @@ -34,7 +34,7 @@ protected function createQueue(PsrContext $context, $queueName) return $queue; } - protected function createTopic(PsrContext $context, $topicName) + protected function createTopic(Context $context, $topicName) { return $this->topic = parent::createTopic($context, $topicName); } diff --git a/pkg/gps/Tests/Spec/GpsSendToTopicAndReceiveNoWaitFromQueueTest.php b/pkg/gps/Tests/Spec/GpsSendToTopicAndReceiveNoWaitFromQueueTest.php index c5a9b2798..240c71a3b 100644 --- a/pkg/gps/Tests/Spec/GpsSendToTopicAndReceiveNoWaitFromQueueTest.php +++ b/pkg/gps/Tests/Spec/GpsSendToTopicAndReceiveNoWaitFromQueueTest.php @@ -4,7 +4,7 @@ use Enqueue\Gps\GpsContext; use Enqueue\Test\GpsExtension; -use Interop\Queue\PsrContext; +use Interop\Queue\Context; use Interop\Queue\Spec\SendToTopicAndReceiveNoWaitFromQueueSpec; /** @@ -25,7 +25,7 @@ protected function createContext() * @param GpsContext $context * @param mixed $queueName */ - protected function createQueue(PsrContext $context, $queueName) + protected function createQueue(Context $context, $queueName) { $queue = parent::createQueue($context, $queueName); @@ -34,7 +34,7 @@ protected function createQueue(PsrContext $context, $queueName) return $queue; } - protected function createTopic(PsrContext $context, $topicName) + protected function createTopic(Context $context, $topicName) { return $this->topic = parent::createTopic($context, $topicName); } diff --git a/pkg/gps/Tests/Spec/GpsTopicTest.php b/pkg/gps/Tests/Spec/GpsTopicTest.php index cd08ae580..3cbb95ad0 100644 --- a/pkg/gps/Tests/Spec/GpsTopicTest.php +++ b/pkg/gps/Tests/Spec/GpsTopicTest.php @@ -3,9 +3,9 @@ namespace Enqueue\Gps\Tests\Spec; use Enqueue\Gps\GpsTopic; -use Interop\Queue\Spec\PsrTopicSpec; +use Interop\Queue\Spec\TopicSpec; -class GpsTopicTest extends PsrTopicSpec +class GpsTopicTest extends TopicSpec { protected function createTopic() { diff --git a/pkg/job-queue/CalculateRootJobStatusProcessor.php b/pkg/job-queue/CalculateRootJobStatusProcessor.php index 3f467ef17..b9b0c4dfb 100644 --- a/pkg/job-queue/CalculateRootJobStatusProcessor.php +++ b/pkg/job-queue/CalculateRootJobStatusProcessor.php @@ -7,12 +7,12 @@ use Enqueue\Consumption\Result; use Enqueue\JobQueue\Doctrine\JobStorage; use Enqueue\Util\JSON; -use Interop\Queue\PsrContext; -use Interop\Queue\PsrMessage; -use Interop\Queue\PsrProcessor; +use Interop\Queue\Context; +use Interop\Queue\Message; +use Interop\Queue\Processor; use Psr\Log\LoggerInterface; -class CalculateRootJobStatusProcessor implements PsrProcessor, CommandSubscriberInterface +class CalculateRootJobStatusProcessor implements Processor, CommandSubscriberInterface { /** * @var JobStorage @@ -46,7 +46,7 @@ public function __construct( $this->logger = $logger; } - public function process(PsrMessage $message, PsrContext $context) + public function process(Message $message, Context $context) { $data = JSON::decode($message->getBody()); diff --git a/pkg/job-queue/DependentJobProcessor.php b/pkg/job-queue/DependentJobProcessor.php index 1bbe345ea..6126be08f 100644 --- a/pkg/job-queue/DependentJobProcessor.php +++ b/pkg/job-queue/DependentJobProcessor.php @@ -2,18 +2,18 @@ namespace Enqueue\JobQueue; -use Enqueue\Client\Message; +use Enqueue\Client\Message as ClientMessage; use Enqueue\Client\ProducerInterface; use Enqueue\Client\TopicSubscriberInterface; use Enqueue\Consumption\Result; use Enqueue\JobQueue\Doctrine\JobStorage; use Enqueue\Util\JSON; -use Interop\Queue\PsrContext; -use Interop\Queue\PsrMessage; -use Interop\Queue\PsrProcessor; +use Interop\Queue\Context; +use Interop\Queue\Message; +use Interop\Queue\Processor; use Psr\Log\LoggerInterface; -class DependentJobProcessor implements PsrProcessor, TopicSubscriberInterface +class DependentJobProcessor implements Processor, TopicSubscriberInterface { /** * @var JobStorage @@ -45,7 +45,7 @@ public function __construct(JobStorage $jobStorage, ProducerInterface $producer, /** * {@inheritdoc} */ - public function process(PsrMessage $message, PsrContext $context) + public function process(Message $message, Context $context) { $data = JSON::decode($message->getBody()); @@ -98,7 +98,7 @@ public function process(PsrMessage $message, PsrContext $context) } foreach ($dependentJobs as $dependentJob) { - $message = new Message(); + $message = new ClientMessage(); $message->setBody($dependentJob['message']); if (isset($dependentJob['priority'])) { diff --git a/pkg/job-queue/Tests/CalculateRootJobStatusProcessorTest.php b/pkg/job-queue/Tests/CalculateRootJobStatusProcessorTest.php index 27ac92203..fe260bad9 100644 --- a/pkg/job-queue/Tests/CalculateRootJobStatusProcessorTest.php +++ b/pkg/job-queue/Tests/CalculateRootJobStatusProcessorTest.php @@ -11,7 +11,7 @@ use Enqueue\JobQueue\Job; use Enqueue\JobQueue\Topics; use Enqueue\Null\NullMessage; -use Interop\Queue\PsrContext; +use Interop\Queue\Context; use Psr\Log\LoggerInterface; class CalculateRootJobStatusProcessorTest extends \PHPUnit\Framework\TestCase @@ -184,11 +184,11 @@ private function createProducerMock() } /** - * @return \PHPUnit_Framework_MockObject_MockObject|PsrContext + * @return \PHPUnit_Framework_MockObject_MockObject|Context */ private function createContextMock() { - return $this->createMock(PsrContext::class); + return $this->createMock(Context::class); } /** diff --git a/pkg/job-queue/Tests/DependentJobProcessorTest.php b/pkg/job-queue/Tests/DependentJobProcessorTest.php index 8f1258fa3..6ae4163f1 100644 --- a/pkg/job-queue/Tests/DependentJobProcessorTest.php +++ b/pkg/job-queue/Tests/DependentJobProcessorTest.php @@ -10,7 +10,7 @@ use Enqueue\JobQueue\Job; use Enqueue\JobQueue\Topics; use Enqueue\Null\NullMessage; -use Interop\Queue\PsrContext; +use Interop\Queue\Context; use Psr\Log\LoggerInterface; class DependentJobProcessorTest extends \PHPUnit\Framework\TestCase @@ -317,11 +317,11 @@ public function testShouldPublishDependentMessageWithPriority() } /** - * @return \PHPUnit_Framework_MockObject_MockObject|PsrContext + * @return \PHPUnit_Framework_MockObject_MockObject|Context */ private function createContextMock() { - return $this->createMock(PsrContext::class); + return $this->createMock(Context::class); } /** diff --git a/pkg/mongodb/MongodbConnectionFactory.php b/pkg/mongodb/MongodbConnectionFactory.php index 280f359d0..28a5fc068 100644 --- a/pkg/mongodb/MongodbConnectionFactory.php +++ b/pkg/mongodb/MongodbConnectionFactory.php @@ -4,11 +4,11 @@ namespace Enqueue\Mongodb; -use Interop\Queue\PsrConnectionFactory; -use Interop\Queue\PsrContext; +use Interop\Queue\ConnectionFactory; +use Interop\Queue\Context; use MongoDB\Client; -class MongodbConnectionFactory implements PsrConnectionFactory +class MongodbConnectionFactory implements ConnectionFactory { /** * @var array @@ -54,7 +54,7 @@ public function __construct($config = 'mongodb:') /** * @return MongodbContext */ - public function createContext(): PsrContext + public function createContext(): Context { $client = new Client($this->config['dsn']); diff --git a/pkg/mongodb/MongodbConsumer.php b/pkg/mongodb/MongodbConsumer.php index 12ddfbeff..062b4d275 100644 --- a/pkg/mongodb/MongodbConsumer.php +++ b/pkg/mongodb/MongodbConsumer.php @@ -4,12 +4,12 @@ namespace Enqueue\Mongodb; -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 MongodbConsumer implements PsrConsumer +class MongodbConsumer implements Consumer { /** * @var MongodbContext @@ -53,7 +53,7 @@ public function getPollingInterval(): int /** * @return MongodbDestination */ - public function getQueue(): PsrQueue + public function getQueue(): Queue { return $this->queue; } @@ -61,7 +61,7 @@ public function getQueue(): PsrQueue /** * @return MongodbMessage */ - public function receive(int $timeout = 0): ?PsrMessage + public function receive(int $timeout = 0): ?Message { $timeout /= 1000; $startAt = microtime(true); @@ -88,7 +88,7 @@ public function receive(int $timeout = 0): ?PsrMessage /** * @return MongodbMessage */ - public function receiveNoWait(): ?PsrMessage + public function receiveNoWait(): ?Message { return $this->receiveMessage(); } @@ -96,7 +96,7 @@ public function receiveNoWait(): ?PsrMessage /** * @param MongodbMessage $message */ - public function acknowledge(PsrMessage $message): void + public function acknowledge(Message $message): void { // does nothing } @@ -104,7 +104,7 @@ public function acknowledge(PsrMessage $message): void /** * @param MongodbMessage $message */ - public function reject(PsrMessage $message, bool $requeue = false): void + public function reject(Message $message, bool $requeue = false): void { InvalidMessageException::assertMessageInstanceOf($message, MongodbMessage::class); diff --git a/pkg/mongodb/MongodbContext.php b/pkg/mongodb/MongodbContext.php index bbfa82a16..f5f9049e7 100644 --- a/pkg/mongodb/MongodbContext.php +++ b/pkg/mongodb/MongodbContext.php @@ -4,21 +4,21 @@ namespace Enqueue\Mongodb; -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\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\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 MongoDB\Client; use MongoDB\Collection; -class MongodbContext implements PsrContext +class MongodbContext implements Context { /** * @var array @@ -44,7 +44,7 @@ public function __construct($client, array $config = []) /** * @return MongodbMessage */ - public function createMessage(string $body = '', array $properties = [], array $headers = []): PsrMessage + public function createMessage(string $body = '', array $properties = [], array $headers = []): Message { $message = new MongodbMessage(); $message->setBody($body); @@ -57,7 +57,7 @@ public function createMessage(string $body = '', array $properties = [], array $ /** * @return MongodbDestination */ - public function createTopic(string $name): PsrTopic + public function createTopic(string $name): Topic { return new MongodbDestination($name); } @@ -65,12 +65,12 @@ public function createTopic(string $name): PsrTopic /** * @return MongodbDestination */ - public function createQueue(string $queueName): PsrQueue + public function createQueue(string $queueName): Queue { return new MongodbDestination($queueName); } - public function createTemporaryQueue(): PsrQueue + public function createTemporaryQueue(): Queue { throw TemporaryQueueNotSupportedException::providerDoestNotSupportIt(); } @@ -78,7 +78,7 @@ public function createTemporaryQueue(): PsrQueue /** * @return MongodbProducer */ - public function createProducer(): PsrProducer + public function createProducer(): Producer { return new MongodbProducer($this); } @@ -88,7 +88,7 @@ public function createProducer(): PsrProducer * * @return MongodbConsumer */ - public function createConsumer(PsrDestination $destination): PsrConsumer + public function createConsumer(Destination $destination): Consumer { InvalidDestinationException::assertDestinationInstanceOf($destination, MongodbDestination::class); @@ -105,7 +105,7 @@ public function close(): void { } - public function createSubscriptionConsumer(): PsrSubscriptionConsumer + public function createSubscriptionConsumer(): SubscriptionConsumer { throw SubscriptionConsumerNotSupportedException::providerDoestNotSupportIt(); } @@ -113,7 +113,7 @@ public function createSubscriptionConsumer(): PsrSubscriptionConsumer /** * @param MongodbDestination $queue */ - public function purgeQueue(PsrQueue $queue): void + public function purgeQueue(Queue $queue): void { $this->getCollection()->deleteMany([ 'queue' => $queue->getQueueName(), diff --git a/pkg/mongodb/MongodbDestination.php b/pkg/mongodb/MongodbDestination.php index 93853320b..06653b4b9 100644 --- a/pkg/mongodb/MongodbDestination.php +++ b/pkg/mongodb/MongodbDestination.php @@ -4,10 +4,10 @@ namespace Enqueue\Mongodb; -use Interop\Queue\PsrQueue; -use Interop\Queue\PsrTopic; +use Interop\Queue\Queue; +use Interop\Queue\Topic; -class MongodbDestination implements PsrTopic, PsrQueue +class MongodbDestination implements Topic, Queue { /** * @var string diff --git a/pkg/mongodb/MongodbMessage.php b/pkg/mongodb/MongodbMessage.php index 3f3bb8105..fbfbd75d6 100644 --- a/pkg/mongodb/MongodbMessage.php +++ b/pkg/mongodb/MongodbMessage.php @@ -4,9 +4,9 @@ namespace Enqueue\Mongodb; -use Interop\Queue\PsrMessage; +use Interop\Queue\Message; -class MongodbMessage implements PsrMessage +class MongodbMessage implements Message { /** * @var string diff --git a/pkg/mongodb/MongodbProducer.php b/pkg/mongodb/MongodbProducer.php index 42eb77b65..d27f014eb 100644 --- a/pkg/mongodb/MongodbProducer.php +++ b/pkg/mongodb/MongodbProducer.php @@ -4,14 +4,14 @@ namespace Enqueue\Mongodb; -use Interop\Queue\Exception; -use Interop\Queue\InvalidDestinationException; -use Interop\Queue\InvalidMessageException; -use Interop\Queue\PsrDestination; -use Interop\Queue\PsrMessage; -use Interop\Queue\PsrProducer; - -class MongodbProducer implements PsrProducer +use Interop\Queue\Destination; +use Interop\Queue\Exception\Exception; +use Interop\Queue\Exception\InvalidDestinationException; +use Interop\Queue\Exception\InvalidMessageException; +use Interop\Queue\Message; +use Interop\Queue\Producer; + +class MongodbProducer implements Producer { /** * @var int|null @@ -42,7 +42,7 @@ public function __construct(MongodbContext $context) * @param MongodbDestination $destination * @param MongodbMessage $message */ - public function send(PsrDestination $destination, PsrMessage $message): void + public function send(Destination $destination, Message $message): void { InvalidDestinationException::assertDestinationInstanceOf($destination, MongodbDestination::class); InvalidMessageException::assertMessageInstanceOf($message, MongodbMessage::class); @@ -117,7 +117,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 { $this->deliveryDelay = $deliveryDelay; @@ -132,7 +132,7 @@ public function getDeliveryDelay(): ?int /** * @return self */ - public function setPriority(int $priority = null): PsrProducer + public function setPriority(int $priority = null): Producer { $this->priority = $priority; @@ -147,7 +147,7 @@ public function getPriority(): ?int /** * @return self */ - public function setTimeToLive(int $timeToLive = null): PsrProducer + public function setTimeToLive(int $timeToLive = null): Producer { $this->timeToLive = $timeToLive; diff --git a/pkg/mongodb/Tests/MongodbConnectionFactoryTest.php b/pkg/mongodb/Tests/MongodbConnectionFactoryTest.php index fa89b3424..51ddde52c 100644 --- a/pkg/mongodb/Tests/MongodbConnectionFactoryTest.php +++ b/pkg/mongodb/Tests/MongodbConnectionFactoryTest.php @@ -5,7 +5,7 @@ use Enqueue\Mongodb\MongodbConnectionFactory; use Enqueue\Mongodb\MongodbContext; use Enqueue\Test\ClassExtensionTrait; -use Interop\Queue\PsrConnectionFactory; +use Interop\Queue\ConnectionFactory; /** * @group mongodb @@ -16,7 +16,7 @@ class MongodbConnectionFactoryTest extends \PHPUnit_Framework_TestCase public function testShouldImplementConnectionFactoryInterface() { - $this->assertClassImplements(PsrConnectionFactory::class, MongodbConnectionFactory::class); + $this->assertClassImplements(ConnectionFactory::class, MongodbConnectionFactory::class); } public function testCouldBeConstructedWithEmptyConfiguration() diff --git a/pkg/mongodb/Tests/MongodbConsumerTest.php b/pkg/mongodb/Tests/MongodbConsumerTest.php index a4ca2b5c3..01e8ca024 100644 --- a/pkg/mongodb/Tests/MongodbConsumerTest.php +++ b/pkg/mongodb/Tests/MongodbConsumerTest.php @@ -8,9 +8,9 @@ use Enqueue\Mongodb\MongodbMessage; use Enqueue\Mongodb\MongodbProducer; use Enqueue\Test\ClassExtensionTrait; -use Interop\Queue\InvalidMessageException; -use Interop\Queue\PsrConsumer; -use Interop\Queue\PsrMessage; +use Interop\Queue\Consumer; +use Interop\Queue\Exception\InvalidMessageException; +use Interop\Queue\Message; /** * @group mongodb @@ -21,7 +21,7 @@ class MongodbConsumerTest extends \PHPUnit_Framework_TestCase public function testShouldImplementConsumerInterface() { - $this->assertClassImplements(PsrConsumer::class, MongodbConsumer::class); + $this->assertClassImplements(Consumer::class, MongodbConsumer::class); } public function testCouldBeConstructedWithRequiredArguments() @@ -128,7 +128,7 @@ private function createContextMock() } } -class InvalidMessage implements PsrMessage +class InvalidMessage implements Message { public function getBody(): string { diff --git a/pkg/mongodb/Tests/MongodbContextTest.php b/pkg/mongodb/Tests/MongodbContextTest.php index 6e44fa202..e23f1b73a 100644 --- a/pkg/mongodb/Tests/MongodbContextTest.php +++ b/pkg/mongodb/Tests/MongodbContextTest.php @@ -8,10 +8,10 @@ use Enqueue\Mongodb\MongodbMessage; use Enqueue\Mongodb\MongodbProducer; use Enqueue\Test\ClassExtensionTrait; -use Interop\Queue\InvalidDestinationException; -use Interop\Queue\PsrContext; -use Interop\Queue\PsrDestination; -use Interop\Queue\TemporaryQueueNotSupportedException; +use Interop\Queue\Context; +use Interop\Queue\Destination; +use Interop\Queue\Exception\InvalidDestinationException; +use Interop\Queue\Exception\TemporaryQueueNotSupportedException; use MongoDB\Client; /** @@ -23,7 +23,7 @@ class MongodbContextTest extends \PHPUnit_Framework_TestCase public function testShouldImplementContextInterface() { - $this->assertClassImplements(PsrContext::class, MongodbContext::class); + $this->assertClassImplements(Context::class, MongodbContext::class); } public function testCouldBeConstructedWithRequiredArguments() @@ -164,6 +164,6 @@ private function createClientMock() } } -class NotSupportedDestination2 implements PsrDestination +class NotSupportedDestination2 implements Destination { } diff --git a/pkg/mongodb/Tests/MongodbDestinationTest.php b/pkg/mongodb/Tests/MongodbDestinationTest.php index 152a701d2..dd76e6518 100644 --- a/pkg/mongodb/Tests/MongodbDestinationTest.php +++ b/pkg/mongodb/Tests/MongodbDestinationTest.php @@ -4,9 +4,9 @@ use Enqueue\Mongodb\MongodbDestination; use Enqueue\Test\ClassExtensionTrait; -use Interop\Queue\PsrDestination; -use Interop\Queue\PsrQueue; -use Interop\Queue\PsrTopic; +use Interop\Queue\Destination; +use Interop\Queue\Queue; +use Interop\Queue\Topic; /** * @group mongodb @@ -17,17 +17,17 @@ class MongodbDestinationTest extends \PHPUnit_Framework_TestCase public function testShouldImplementDestinationInterface() { - $this->assertClassImplements(PsrDestination::class, MongodbDestination::class); + $this->assertClassImplements(Destination::class, MongodbDestination::class); } public function testShouldImplementTopicInterface() { - $this->assertClassImplements(PsrTopic::class, MongodbDestination::class); + $this->assertClassImplements(Topic::class, MongodbDestination::class); } public function testShouldImplementQueueInterface() { - $this->assertClassImplements(PsrQueue::class, MongodbDestination::class); + $this->assertClassImplements(Queue::class, MongodbDestination::class); } public function testShouldReturnTopicAndQueuePreviouslySetInConstructor() diff --git a/pkg/mongodb/Tests/MongodbProducerTest.php b/pkg/mongodb/Tests/MongodbProducerTest.php index fe15b8fbb..8e767cad4 100644 --- a/pkg/mongodb/Tests/MongodbProducerTest.php +++ b/pkg/mongodb/Tests/MongodbProducerTest.php @@ -6,9 +6,9 @@ use Enqueue\Mongodb\MongodbMessage; use Enqueue\Mongodb\MongodbProducer; use Enqueue\Test\ClassExtensionTrait; -use Interop\Queue\InvalidDestinationException; -use Interop\Queue\PsrDestination; -use Interop\Queue\PsrProducer; +use Interop\Queue\Destination; +use Interop\Queue\Exception\InvalidDestinationException; +use Interop\Queue\Producer; /** * @group mongodb @@ -19,7 +19,7 @@ class MongodbProducerTest extends \PHPUnit_Framework_TestCase public function testShouldImplementProducerInterface() { - $this->assertClassImplements(PsrProducer::class, MongodbProducer::class); + $this->assertClassImplements(Producer::class, MongodbProducer::class); } public function testCouldBeConstructedWithRequiredArguments() @@ -50,6 +50,6 @@ private function createContextMock() } } -class NotSupportedDestination1 implements PsrDestination +class NotSupportedDestination1 implements Destination { } diff --git a/pkg/mongodb/Tests/Spec/MongodbConnectionFactoryTest.php b/pkg/mongodb/Tests/Spec/MongodbConnectionFactoryTest.php index 324fe52a6..359b23eff 100644 --- a/pkg/mongodb/Tests/Spec/MongodbConnectionFactoryTest.php +++ b/pkg/mongodb/Tests/Spec/MongodbConnectionFactoryTest.php @@ -3,12 +3,12 @@ namespace Enqueue\Mongodb\Tests\Spec; use Enqueue\Mongodb\MongodbConnectionFactory; -use Interop\Queue\Spec\PsrConnectionFactorySpec; +use Interop\Queue\Spec\ConnectionFactorySpec; /** * @group mongodb */ -class MongodbConnectionFactoryTest extends PsrConnectionFactorySpec +class MongodbConnectionFactoryTest extends ConnectionFactorySpec { /** * {@inheritdoc} diff --git a/pkg/mongodb/Tests/Spec/MongodbContextTest.php b/pkg/mongodb/Tests/Spec/MongodbContextTest.php index 51d4c4b88..22f2f3210 100644 --- a/pkg/mongodb/Tests/Spec/MongodbContextTest.php +++ b/pkg/mongodb/Tests/Spec/MongodbContextTest.php @@ -3,13 +3,13 @@ namespace Enqueue\Mongodb\Tests\Spec; use Enqueue\Test\MongodbExtensionTrait; -use Interop\Queue\Spec\PsrContextSpec; +use Interop\Queue\Spec\ContextSpec; /** * @group functional * @group mongodb */ -class MongodbContextTest extends PsrContextSpec +class MongodbContextTest extends ContextSpec { use MongodbExtensionTrait; diff --git a/pkg/mongodb/Tests/Spec/MongodbMessageTest.php b/pkg/mongodb/Tests/Spec/MongodbMessageTest.php index 51ab55ac5..5efccfa01 100644 --- a/pkg/mongodb/Tests/Spec/MongodbMessageTest.php +++ b/pkg/mongodb/Tests/Spec/MongodbMessageTest.php @@ -3,12 +3,12 @@ namespace Enqueue\Mongodb\Tests\Spec; use Enqueue\Mongodb\MongodbMessage; -use Interop\Queue\Spec\PsrMessageSpec; +use Interop\Queue\Spec\MessageSpec; /** * @group mongodb */ -class MongodbMessageTest extends PsrMessageSpec +class MongodbMessageTest extends MessageSpec { /** * {@inheritdoc} diff --git a/pkg/mongodb/Tests/Spec/MongodbProducerTest.php b/pkg/mongodb/Tests/Spec/MongodbProducerTest.php index 54eb096d0..9b4e18793 100644 --- a/pkg/mongodb/Tests/Spec/MongodbProducerTest.php +++ b/pkg/mongodb/Tests/Spec/MongodbProducerTest.php @@ -3,13 +3,13 @@ namespace Enqueue\Mongodb\Tests\Spec; use Enqueue\Test\MongodbExtensionTrait; -use Interop\Queue\Spec\PsrProducerSpec; +use Interop\Queue\Spec\ProducerSpec; /** * @group functional * @group mongodb */ -class MongodbProducerTest extends PsrProducerSpec +class MongodbProducerTest extends ProducerSpec { use MongodbExtensionTrait; diff --git a/pkg/mongodb/Tests/Spec/MongodbQueueTest.php b/pkg/mongodb/Tests/Spec/MongodbQueueTest.php index a555461a7..f737d765f 100644 --- a/pkg/mongodb/Tests/Spec/MongodbQueueTest.php +++ b/pkg/mongodb/Tests/Spec/MongodbQueueTest.php @@ -3,12 +3,12 @@ namespace Enqueue\Mongodb\Tests\Spec; use Enqueue\Mongodb\MongodbDestination; -use Interop\Queue\Spec\PsrQueueSpec; +use Interop\Queue\Spec\QueueSpec; /** * @group mongodb */ -class MongodbQueueTest extends PsrQueueSpec +class MongodbQueueTest extends QueueSpec { /** * {@inheritdoc} diff --git a/pkg/mongodb/Tests/Spec/MongodbSendAndReceivePriorityMessagesFromQueueTest.php b/pkg/mongodb/Tests/Spec/MongodbSendAndReceivePriorityMessagesFromQueueTest.php index 5400820b8..9869d6e06 100644 --- a/pkg/mongodb/Tests/Spec/MongodbSendAndReceivePriorityMessagesFromQueueTest.php +++ b/pkg/mongodb/Tests/Spec/MongodbSendAndReceivePriorityMessagesFromQueueTest.php @@ -5,7 +5,7 @@ use Enqueue\Mongodb\MongodbContext; use Enqueue\Mongodb\MongodbMessage; use Enqueue\Test\MongodbExtensionTrait; -use Interop\Queue\PsrContext; +use Interop\Queue\Context; use Interop\Queue\Spec\SendAndReceivePriorityMessagesFromQueueSpec; /** @@ -26,7 +26,7 @@ public function setUp() } /** - * @return PsrContext + * @return Context */ protected function createContext() { @@ -40,7 +40,7 @@ protected function createContext() * * @return MongodbMessage */ - protected function createMessage(PsrContext $context, $body) + protected function createMessage(Context $context, $body) { /** @var MongodbMessage $message */ $message = parent::createMessage($context, $body); diff --git a/pkg/mongodb/Tests/Spec/MongodbTopicTest.php b/pkg/mongodb/Tests/Spec/MongodbTopicTest.php index 14a79f5a5..ec524e519 100644 --- a/pkg/mongodb/Tests/Spec/MongodbTopicTest.php +++ b/pkg/mongodb/Tests/Spec/MongodbTopicTest.php @@ -3,12 +3,12 @@ namespace Enqueue\Mongodb\Tests\Spec; use Enqueue\Mongodb\MongodbDestination; -use Interop\Queue\Spec\PsrTopicSpec; +use Interop\Queue\Spec\TopicSpec; /** * @group mongodb */ -class MongodbTopicTest extends PsrTopicSpec +class MongodbTopicTest extends TopicSpec { /** * {@inheritdoc} diff --git a/pkg/null/NullConnectionFactory.php b/pkg/null/NullConnectionFactory.php index fd9c1c517..b89cd5089 100644 --- a/pkg/null/NullConnectionFactory.php +++ b/pkg/null/NullConnectionFactory.php @@ -4,15 +4,15 @@ namespace Enqueue\Null; -use Interop\Queue\PsrConnectionFactory; -use Interop\Queue\PsrContext; +use Interop\Queue\ConnectionFactory; +use Interop\Queue\Context; -class NullConnectionFactory implements PsrConnectionFactory +class NullConnectionFactory implements ConnectionFactory { /** * @return NullContext */ - public function createContext(): PsrContext + public function createContext(): Context { return new NullContext(); } diff --git a/pkg/null/NullConsumer.php b/pkg/null/NullConsumer.php index 71bc74ec6..d9b234870 100644 --- a/pkg/null/NullConsumer.php +++ b/pkg/null/NullConsumer.php @@ -4,24 +4,24 @@ namespace Enqueue\Null; -use Interop\Queue\PsrConsumer; -use Interop\Queue\PsrDestination; -use Interop\Queue\PsrMessage; -use Interop\Queue\PsrQueue; +use Interop\Queue\Consumer; +use Interop\Queue\Destination; +use Interop\Queue\Message; +use Interop\Queue\Queue; -class NullConsumer implements PsrConsumer +class NullConsumer implements Consumer { /** - * @var PsrDestination + * @var Destination */ private $queue; - public function __construct(PsrDestination $queue) + public function __construct(Destination $queue) { $this->queue = $queue; } - public function getQueue(): PsrQueue + public function getQueue(): Queue { return $this->queue; } @@ -29,7 +29,7 @@ public function getQueue(): PsrQueue /** * @return NullMessage */ - public function receive(int $timeout = 0): ?PsrMessage + public function receive(int $timeout = 0): ?Message { return null; } @@ -37,16 +37,16 @@ public function receive(int $timeout = 0): ?PsrMessage /** * @return NullMessage */ - public function receiveNoWait(): ?PsrMessage + public function receiveNoWait(): ?Message { return null; } - public function acknowledge(PsrMessage $message): void + public function acknowledge(Message $message): void { } - public function reject(PsrMessage $message, bool $requeue = false): void + public function reject(Message $message, bool $requeue = false): void { } } diff --git a/pkg/null/NullContext.php b/pkg/null/NullContext.php index d9bb812ce..5f6001cab 100644 --- a/pkg/null/NullContext.php +++ b/pkg/null/NullContext.php @@ -4,21 +4,21 @@ namespace Enqueue\Null; -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\Consumer; +use Interop\Queue\Context; +use Interop\Queue\Destination; +use Interop\Queue\Message; +use Interop\Queue\Producer; +use Interop\Queue\Queue; +use Interop\Queue\SubscriptionConsumer; +use Interop\Queue\Topic; -class NullContext implements PsrContext +class NullContext implements Context { /** * @return NullMessage */ - public function createMessage(string $body = '', array $properties = [], array $headers = []): PsrMessage + public function createMessage(string $body = '', array $properties = [], array $headers = []): Message { $message = new NullMessage(); $message->setBody($body); @@ -31,7 +31,7 @@ public function createMessage(string $body = '', array $properties = [], array $ /** * @return NullQueue */ - public function createQueue(string $name): PsrQueue + public function createQueue(string $name): Queue { return new NullQueue($name); } @@ -39,7 +39,7 @@ public function createQueue(string $name): PsrQueue /** * @return NullQueue */ - public function createTemporaryQueue(): PsrQueue + public function createTemporaryQueue(): Queue { return $this->createQueue(uniqid('', true)); } @@ -47,7 +47,7 @@ public function createTemporaryQueue(): PsrQueue /** * @return NullTopic */ - public function createTopic(string $name): PsrTopic + public function createTopic(string $name): Topic { return new NullTopic($name); } @@ -55,7 +55,7 @@ public function createTopic(string $name): PsrTopic /** * @return NullConsumer */ - public function createConsumer(PsrDestination $destination): PsrConsumer + public function createConsumer(Destination $destination): Consumer { return new NullConsumer($destination); } @@ -63,7 +63,7 @@ public function createConsumer(PsrDestination $destination): PsrConsumer /** * @return NullProducer */ - public function createProducer(): PsrProducer + public function createProducer(): Producer { return new NullProducer(); } @@ -71,12 +71,12 @@ public function createProducer(): PsrProducer /** * @return NullSubscriptionConsumer */ - public function createSubscriptionConsumer(): PsrSubscriptionConsumer + public function createSubscriptionConsumer(): SubscriptionConsumer { return new NullSubscriptionConsumer(); } - public function purgeQueue(PsrQueue $queue): void + public function purgeQueue(Queue $queue): void { } diff --git a/pkg/null/NullMessage.php b/pkg/null/NullMessage.php index c9a3dfca3..bd48a387e 100644 --- a/pkg/null/NullMessage.php +++ b/pkg/null/NullMessage.php @@ -4,9 +4,9 @@ namespace Enqueue\Null; -use Interop\Queue\PsrMessage; +use Interop\Queue\Message; -class NullMessage implements PsrMessage +class NullMessage implements Message { /** * @var string diff --git a/pkg/null/NullProducer.php b/pkg/null/NullProducer.php index fc36aa8d7..47235e7f6 100644 --- a/pkg/null/NullProducer.php +++ b/pkg/null/NullProducer.php @@ -4,11 +4,11 @@ namespace Enqueue\Null; -use Interop\Queue\PsrDestination; -use Interop\Queue\PsrMessage; -use Interop\Queue\PsrProducer; +use Interop\Queue\Destination; +use Interop\Queue\Message; +use Interop\Queue\Producer; -class NullProducer implements PsrProducer +class NullProducer implements Producer { private $priority; @@ -16,14 +16,14 @@ class NullProducer implements PsrProducer private $deliveryDelay; - public function send(PsrDestination $destination, PsrMessage $message): void + public function send(Destination $destination, Message $message): void { } /** * @return NullProducer */ - public function setDeliveryDelay(int $deliveryDelay = null): PsrProducer + public function setDeliveryDelay(int $deliveryDelay = null): Producer { $this->deliveryDelay = $deliveryDelay; @@ -38,7 +38,7 @@ public function getDeliveryDelay(): ?int /** * @return NullProducer */ - public function setPriority(int $priority = null): PsrProducer + public function setPriority(int $priority = null): Producer { $this->priority = $priority; @@ -53,7 +53,7 @@ public function getPriority(): ?int /** * @return NullProducer */ - public function setTimeToLive(int $timeToLive = null): PsrProducer + public function setTimeToLive(int $timeToLive = null): Producer { $this->timeToLive = $timeToLive; diff --git a/pkg/null/NullQueue.php b/pkg/null/NullQueue.php index 0950bb7e8..543111e67 100644 --- a/pkg/null/NullQueue.php +++ b/pkg/null/NullQueue.php @@ -4,9 +4,9 @@ namespace Enqueue\Null; -use Interop\Queue\PsrQueue; +use Interop\Queue\Queue; -class NullQueue implements PsrQueue +class NullQueue implements Queue { /** * @var string diff --git a/pkg/null/NullSubscriptionConsumer.php b/pkg/null/NullSubscriptionConsumer.php index a7940a040..1e9591666 100644 --- a/pkg/null/NullSubscriptionConsumer.php +++ b/pkg/null/NullSubscriptionConsumer.php @@ -4,20 +4,20 @@ namespace Enqueue\Null; -use Interop\Queue\PsrConsumer; -use Interop\Queue\PsrSubscriptionConsumer; +use Interop\Queue\Consumer; +use Interop\Queue\SubscriptionConsumer; -class NullSubscriptionConsumer implements PsrSubscriptionConsumer +class NullSubscriptionConsumer implements SubscriptionConsumer { public function consume(int $timeout = 0): void { } - public function subscribe(PsrConsumer $consumer, callable $callback): void + public function subscribe(Consumer $consumer, callable $callback): void { } - public function unsubscribe(PsrConsumer $consumer): void + public function unsubscribe(Consumer $consumer): void { } diff --git a/pkg/null/NullTopic.php b/pkg/null/NullTopic.php index e95223f32..9c86ad076 100644 --- a/pkg/null/NullTopic.php +++ b/pkg/null/NullTopic.php @@ -2,9 +2,9 @@ namespace Enqueue\Null; -use Interop\Queue\PsrTopic; +use Interop\Queue\Topic; -class NullTopic implements PsrTopic +class NullTopic implements Topic { /** * @var string diff --git a/pkg/null/README.md b/pkg/null/README.md index bebd31257..14f7a0384 100644 --- a/pkg/null/README.md +++ b/pkg/null/README.md @@ -5,7 +5,7 @@ [![Total Downloads](https://poser.pugx.org/enqueue/null/d/total.png)](https://packagist.org/packages/enqueue/null) [![Latest Stable Version](https://poser.pugx.org/enqueue/null/version.png)](https://packagist.org/packages/enqueue/null) -This is an implementation of PSR queue specification. It does not send messages any where and could be used as mock. Suitable in tests. +This is an implementation of Queue Interop specification. It does not send messages any where and could be used as mock. Suitable in tests. ## Resources diff --git a/pkg/null/Tests/NullConnectionFactoryTest.php b/pkg/null/Tests/NullConnectionFactoryTest.php index a1e6e90bb..80cfcc904 100644 --- a/pkg/null/Tests/NullConnectionFactoryTest.php +++ b/pkg/null/Tests/NullConnectionFactoryTest.php @@ -5,7 +5,7 @@ use Enqueue\Null\NullConnectionFactory; use Enqueue\Null\NullContext; use Enqueue\Test\ClassExtensionTrait; -use Interop\Queue\PsrConnectionFactory; +use Interop\Queue\ConnectionFactory; use PHPUnit\Framework\TestCase; class NullConnectionFactoryTest extends TestCase @@ -14,7 +14,7 @@ class NullConnectionFactoryTest extends TestCase public function testShouldImplementConnectionFactoryInterface() { - $this->assertClassImplements(PsrConnectionFactory::class, NullConnectionFactory::class); + $this->assertClassImplements(ConnectionFactory::class, NullConnectionFactory::class); } public function testCouldBeConstructedWithoutAnyArguments() diff --git a/pkg/null/Tests/NullConsumerTest.php b/pkg/null/Tests/NullConsumerTest.php index e7e6ae6f9..6419e9c39 100644 --- a/pkg/null/Tests/NullConsumerTest.php +++ b/pkg/null/Tests/NullConsumerTest.php @@ -6,7 +6,7 @@ use Enqueue\Null\NullMessage; use Enqueue\Null\NullQueue; use Enqueue\Test\ClassExtensionTrait; -use Interop\Queue\PsrConsumer; +use Interop\Queue\Consumer; use PHPUnit\Framework\TestCase; class NullConsumerTest extends TestCase @@ -15,7 +15,7 @@ class NullConsumerTest extends TestCase public function testShouldImplementMessageConsumerInterface() { - $this->assertClassImplements(PsrConsumer::class, NullConsumer::class); + $this->assertClassImplements(Consumer::class, NullConsumer::class); } public function testCouldBeConstructedWithQueueAsArgument() diff --git a/pkg/null/Tests/NullContextTest.php b/pkg/null/Tests/NullContextTest.php index 1a4c90ca5..4e5150990 100644 --- a/pkg/null/Tests/NullContextTest.php +++ b/pkg/null/Tests/NullContextTest.php @@ -9,7 +9,7 @@ use Enqueue\Null\NullQueue; use Enqueue\Null\NullTopic; use Enqueue\Test\ClassExtensionTrait; -use Interop\Queue\PsrContext; +use Interop\Queue\Context; use PHPUnit\Framework\TestCase; class NullContextTest extends TestCase @@ -18,7 +18,7 @@ class NullContextTest extends TestCase public function testShouldImplementSessionInterface() { - $this->assertClassImplements(PsrContext::class, NullContext::class); + $this->assertClassImplements(Context::class, NullContext::class); } public function testCouldBeConstructedWithoutAnyArguments() diff --git a/pkg/null/Tests/NullMessageTest.php b/pkg/null/Tests/NullMessageTest.php index 9870c7c21..f8a7090bb 100644 --- a/pkg/null/Tests/NullMessageTest.php +++ b/pkg/null/Tests/NullMessageTest.php @@ -4,7 +4,7 @@ use Enqueue\Null\NullMessage; use Enqueue\Test\ClassExtensionTrait; -use Interop\Queue\PsrMessage; +use Interop\Queue\Message; use PHPUnit\Framework\TestCase; class NullMessageTest extends TestCase @@ -13,7 +13,7 @@ class NullMessageTest extends TestCase public function testShouldImplementMessageInterface() { - $this->assertClassImplements(PsrMessage::class, NullMessage::class); + $this->assertClassImplements(Message::class, NullMessage::class); } public function testCouldBeConstructedWithoutAnyArguments() diff --git a/pkg/null/Tests/NullProducerTest.php b/pkg/null/Tests/NullProducerTest.php index c9f89b6e3..289dab6c0 100644 --- a/pkg/null/Tests/NullProducerTest.php +++ b/pkg/null/Tests/NullProducerTest.php @@ -6,7 +6,7 @@ use Enqueue\Null\NullProducer; use Enqueue\Null\NullTopic; use Enqueue\Test\ClassExtensionTrait; -use Interop\Queue\PsrProducer; +use Interop\Queue\Producer; use PHPUnit\Framework\TestCase; class NullProducerTest extends TestCase @@ -15,7 +15,7 @@ class NullProducerTest extends TestCase public function testShouldImplementProducerInterface() { - $this->assertClassImplements(PsrProducer::class, NullProducer::class); + $this->assertClassImplements(Producer::class, NullProducer::class); } public function testCouldBeConstructedWithoutAnyArguments() diff --git a/pkg/null/Tests/NullQueueTest.php b/pkg/null/Tests/NullQueueTest.php index ff2c9bd74..0dfaf2f28 100644 --- a/pkg/null/Tests/NullQueueTest.php +++ b/pkg/null/Tests/NullQueueTest.php @@ -4,7 +4,7 @@ use Enqueue\Null\NullQueue; use Enqueue\Test\ClassExtensionTrait; -use Interop\Queue\PsrQueue; +use Interop\Queue\Queue; use PHPUnit\Framework\TestCase; class NullQueueTest extends TestCase @@ -13,7 +13,7 @@ class NullQueueTest extends TestCase public function testShouldImplementQueueInterface() { - $this->assertClassImplements(PsrQueue::class, NullQueue::class); + $this->assertClassImplements(Queue::class, NullQueue::class); } public function testCouldBeConstructedWithNameAsArgument() diff --git a/pkg/null/Tests/NullTopicTest.php b/pkg/null/Tests/NullTopicTest.php index b07641e2f..a40545120 100644 --- a/pkg/null/Tests/NullTopicTest.php +++ b/pkg/null/Tests/NullTopicTest.php @@ -4,7 +4,7 @@ use Enqueue\Null\NullTopic; use Enqueue\Test\ClassExtensionTrait; -use Interop\Queue\PsrTopic; +use Interop\Queue\Topic; use PHPUnit\Framework\TestCase; class NullTopicTest extends TestCase @@ -13,7 +13,7 @@ class NullTopicTest extends TestCase public function testShouldImplementTopicInterface() { - $this->assertClassImplements(PsrTopic::class, NullTopic::class); + $this->assertClassImplements(Topic::class, NullTopic::class); } public function testCouldBeConstructedWithNameAsArgument() diff --git a/pkg/null/Tests/Spec/NullMessageTest.php b/pkg/null/Tests/Spec/NullMessageTest.php index 02b5cc2be..34c6863ed 100644 --- a/pkg/null/Tests/Spec/NullMessageTest.php +++ b/pkg/null/Tests/Spec/NullMessageTest.php @@ -3,9 +3,9 @@ namespace Enqueue\Null\Tests\Spec; use Enqueue\Null\NullMessage; -use Interop\Queue\Spec\PsrMessageSpec; +use Interop\Queue\Spec\MessageSpec; -class NullMessageTest extends PsrMessageSpec +class NullMessageTest extends MessageSpec { /** * {@inheritdoc} diff --git a/pkg/pheanstalk/PheanstalkConnectionFactory.php b/pkg/pheanstalk/PheanstalkConnectionFactory.php index 2b99bd5a3..d3cd5f0c0 100644 --- a/pkg/pheanstalk/PheanstalkConnectionFactory.php +++ b/pkg/pheanstalk/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/pkg/pheanstalk/PheanstalkConsumer.php b/pkg/pheanstalk/PheanstalkConsumer.php index 5e250bf24..337b77d9d 100644 --- a/pkg/pheanstalk/PheanstalkConsumer.php +++ b/pkg/pheanstalk/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,7 +32,7 @@ public function __construct(PheanstalkDestination $destination, Pheanstalk $phea /** * @return PheanstalkDestination */ - public function getQueue(): PsrQueue + public function getQueue(): Queue { return $this->destination; } @@ -40,7 +40,7 @@ public function getQueue(): PsrQueue /** * @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/pkg/pheanstalk/PheanstalkContext.php b/pkg/pheanstalk/PheanstalkContext.php index defaf95ec..3e2fe834d 100644 --- a/pkg/pheanstalk/PheanstalkContext.php +++ b/pkg/pheanstalk/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,7 +33,7 @@ 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); } @@ -41,7 +41,7 @@ public function createMessage(string $body = '', array $properties = [], array $ /** * @return PheanstalkDestination */ - public function createTopic(string $topicName): PsrTopic + public function createTopic(string $topicName): Topic { return new PheanstalkDestination($topicName); } @@ -49,12 +49,12 @@ public function createTopic(string $topicName): PsrTopic /** * @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(); } @@ -62,7 +62,7 @@ public function createTemporaryQueue(): PsrQueue /** * @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/pkg/pheanstalk/PheanstalkDestination.php b/pkg/pheanstalk/PheanstalkDestination.php index 3d0275171..76565b1ae 100644 --- a/pkg/pheanstalk/PheanstalkDestination.php +++ b/pkg/pheanstalk/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/pkg/pheanstalk/PheanstalkMessage.php b/pkg/pheanstalk/PheanstalkMessage.php index 9667824e7..cf4ea1905 100644 --- a/pkg/pheanstalk/PheanstalkMessage.php +++ b/pkg/pheanstalk/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/pkg/pheanstalk/PheanstalkProducer.php b/pkg/pheanstalk/PheanstalkProducer.php index 87c17c11f..e0d538043 100644 --- a/pkg/pheanstalk/PheanstalkProducer.php +++ b/pkg/pheanstalk/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/pkg/pheanstalk/Tests/PheanstalkContextTest.php b/pkg/pheanstalk/Tests/PheanstalkContextTest.php index b9cc4e20f..fb92b6a72 100644 --- a/pkg/pheanstalk/Tests/PheanstalkContextTest.php +++ b/pkg/pheanstalk/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/pkg/pheanstalk/Tests/PheanstalkDestinationTest.php b/pkg/pheanstalk/Tests/PheanstalkDestinationTest.php index 31ea1fd8e..d390f4715 100644 --- a/pkg/pheanstalk/Tests/PheanstalkDestinationTest.php +++ b/pkg/pheanstalk/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/pkg/pheanstalk/Tests/PheanstalkProducerTest.php b/pkg/pheanstalk/Tests/PheanstalkProducerTest.php index 1ce0fe668..7a8d0b483 100644 --- a/pkg/pheanstalk/Tests/PheanstalkProducerTest.php +++ b/pkg/pheanstalk/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/pkg/pheanstalk/Tests/Spec/PheanstalkConnectionFactoryTest.php b/pkg/pheanstalk/Tests/Spec/PheanstalkConnectionFactoryTest.php index d9bdebff4..e05152599 100644 --- a/pkg/pheanstalk/Tests/Spec/PheanstalkConnectionFactoryTest.php +++ b/pkg/pheanstalk/Tests/Spec/PheanstalkConnectionFactoryTest.php @@ -3,9 +3,9 @@ namespace Enqueue\Pheanstalk\Tests\Spec; use Enqueue\Pheanstalk\PheanstalkConnectionFactory; -use Interop\Queue\Spec\PsrConnectionFactorySpec; +use Interop\Queue\Spec\ConnectionFactorySpec; -class PheanstalkConnectionFactoryTest extends PsrConnectionFactorySpec +class PheanstalkConnectionFactoryTest extends ConnectionFactorySpec { /** * {@inheritdoc} diff --git a/pkg/pheanstalk/Tests/Spec/PheanstalkContextTest.php b/pkg/pheanstalk/Tests/Spec/PheanstalkContextTest.php index 16a52a2e1..d69a41ef6 100644 --- a/pkg/pheanstalk/Tests/Spec/PheanstalkContextTest.php +++ b/pkg/pheanstalk/Tests/Spec/PheanstalkContextTest.php @@ -3,10 +3,10 @@ namespace Enqueue\Pheanstalk\Tests\Spec; use Enqueue\Pheanstalk\PheanstalkContext; -use Interop\Queue\Spec\PsrContextSpec; +use Interop\Queue\Spec\ContextSpec; use Pheanstalk\Pheanstalk; -class PheanstalkContextTest extends PsrContextSpec +class PheanstalkContextTest extends ContextSpec { /** * {@inheritdoc} diff --git a/pkg/pheanstalk/Tests/Spec/PheanstalkMessageTest.php b/pkg/pheanstalk/Tests/Spec/PheanstalkMessageTest.php index e62c44828..30fb1cf1b 100644 --- a/pkg/pheanstalk/Tests/Spec/PheanstalkMessageTest.php +++ b/pkg/pheanstalk/Tests/Spec/PheanstalkMessageTest.php @@ -3,9 +3,9 @@ namespace Enqueue\Pheanstalk\Tests\Spec; use Enqueue\Pheanstalk\PheanstalkMessage; -use Interop\Queue\Spec\PsrMessageSpec; +use Interop\Queue\Spec\MessageSpec; -class PheanstalkMessageTest extends PsrMessageSpec +class PheanstalkMessageTest extends MessageSpec { /** * {@inheritdoc} diff --git a/pkg/pheanstalk/Tests/Spec/PheanstalkQueueTest.php b/pkg/pheanstalk/Tests/Spec/PheanstalkQueueTest.php index 03cec7e3b..a71dc4687 100644 --- a/pkg/pheanstalk/Tests/Spec/PheanstalkQueueTest.php +++ b/pkg/pheanstalk/Tests/Spec/PheanstalkQueueTest.php @@ -3,9 +3,9 @@ namespace Enqueue\Pheanstalk\Tests\Spec; use Enqueue\Pheanstalk\PheanstalkDestination; -use Interop\Queue\Spec\PsrQueueSpec; +use Interop\Queue\Spec\QueueSpec; -class PheanstalkQueueTest extends PsrQueueSpec +class PheanstalkQueueTest extends QueueSpec { /** * {@inheritdoc} diff --git a/pkg/pheanstalk/Tests/Spec/PheanstalkSendToAndReceiveFromQueueTest.php b/pkg/pheanstalk/Tests/Spec/PheanstalkSendToAndReceiveFromQueueTest.php index cb2d21ba1..45d0040b4 100644 --- a/pkg/pheanstalk/Tests/Spec/PheanstalkSendToAndReceiveFromQueueTest.php +++ b/pkg/pheanstalk/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/pkg/pheanstalk/Tests/Spec/PheanstalkSendToAndReceiveNoWaitFromQueueTest.php b/pkg/pheanstalk/Tests/Spec/PheanstalkSendToAndReceiveNoWaitFromQueueTest.php index b416dd1a4..8226b512e 100644 --- a/pkg/pheanstalk/Tests/Spec/PheanstalkSendToAndReceiveNoWaitFromQueueTest.php +++ b/pkg/pheanstalk/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/pkg/pheanstalk/Tests/Spec/PheanstalkSendToTopicAndReceiveFromQueueTest.php b/pkg/pheanstalk/Tests/Spec/PheanstalkSendToTopicAndReceiveFromQueueTest.php index 2f001aba1..a6a5f925a 100644 --- a/pkg/pheanstalk/Tests/Spec/PheanstalkSendToTopicAndReceiveFromQueueTest.php +++ b/pkg/pheanstalk/Tests/Spec/PheanstalkSendToTopicAndReceiveFromQueueTest.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\SendToTopicAndReceiveFromQueueSpec; /** @@ -31,7 +31,7 @@ protected function createContext() /** * {@inheritdoc} */ - protected function createQueue(PsrContext $context, $queueName) + protected function createQueue(Context $context, $queueName) { return $context->createQueue($queueName.$this->time); } @@ -39,7 +39,7 @@ protected function createQueue(PsrContext $context, $queueName) /** * {@inheritdoc} */ - protected function createTopic(PsrContext $context, $topicName) + protected function createTopic(Context $context, $topicName) { return $context->createTopic($topicName.$this->time); } diff --git a/pkg/pheanstalk/Tests/Spec/PheanstalkSendToTopicAndReceiveNoWaitFromQueueTest.php b/pkg/pheanstalk/Tests/Spec/PheanstalkSendToTopicAndReceiveNoWaitFromQueueTest.php index b5cea72d5..2bf9f9542 100644 --- a/pkg/pheanstalk/Tests/Spec/PheanstalkSendToTopicAndReceiveNoWaitFromQueueTest.php +++ b/pkg/pheanstalk/Tests/Spec/PheanstalkSendToTopicAndReceiveNoWaitFromQueueTest.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\SendToTopicAndReceiveNoWaitFromQueueSpec; /** @@ -31,7 +31,7 @@ protected function createContext() /** * {@inheritdoc} */ - protected function createQueue(PsrContext $context, $queueName) + protected function createQueue(Context $context, $queueName) { return $context->createQueue($queueName.$this->time); } @@ -39,7 +39,7 @@ protected function createQueue(PsrContext $context, $queueName) /** * {@inheritdoc} */ - protected function createTopic(PsrContext $context, $topicName) + protected function createTopic(Context $context, $topicName) { return $context->createTopic($topicName.$this->time); } diff --git a/pkg/pheanstalk/Tests/Spec/PheanstalkTopicTest.php b/pkg/pheanstalk/Tests/Spec/PheanstalkTopicTest.php index 0b04b89b3..d15d51083 100644 --- a/pkg/pheanstalk/Tests/Spec/PheanstalkTopicTest.php +++ b/pkg/pheanstalk/Tests/Spec/PheanstalkTopicTest.php @@ -3,9 +3,9 @@ namespace Enqueue\Pheanstalk\Tests\Spec; use Enqueue\Pheanstalk\PheanstalkDestination; -use Interop\Queue\Spec\PsrTopicSpec; +use Interop\Queue\Spec\TopicSpec; -class PheanstalkTopicTest extends PsrTopicSpec +class PheanstalkTopicTest extends TopicSpec { /** * {@inheritdoc} diff --git a/pkg/rdkafka/README.md b/pkg/rdkafka/README.md index 7ea76aeac..d0e0bede5 100644 --- a/pkg/rdkafka/README.md +++ b/pkg/rdkafka/README.md @@ -5,7 +5,7 @@ [![Total Downloads](https://poser.pugx.org/enqueue/rdkafka/d/total.png)](https://packagist.org/packages/enqueue/rdkafka) [![Latest Stable Version](https://poser.pugx.org/enqueue/rdkafka/version.png)](https://packagist.org/packages/enqueue/rdkafka) -This is an implementation of PSR specification. It allows you to send and consume message via Kafka protocol. +This is an implementation of Queue Interop specification. It allows you to send and consume message via Kafka protocol. ## Resources diff --git a/pkg/rdkafka/RdKafkaConnectionFactory.php b/pkg/rdkafka/RdKafkaConnectionFactory.php index 272a40b46..988473d23 100644 --- a/pkg/rdkafka/RdKafkaConnectionFactory.php +++ b/pkg/rdkafka/RdKafkaConnectionFactory.php @@ -4,10 +4,10 @@ namespace Enqueue\RdKafka; -use Interop\Queue\PsrConnectionFactory; -use Interop\Queue\PsrContext; +use Interop\Queue\ConnectionFactory; +use Interop\Queue\Context; -class RdKafkaConnectionFactory implements PsrConnectionFactory +class RdKafkaConnectionFactory implements ConnectionFactory { /** * @var array @@ -53,7 +53,7 @@ public function __construct($config = 'kafka:') /** * @return RdKafkaContext */ - public function createContext(): PsrContext + public function createContext(): Context { return new RdKafkaContext($this->config); } diff --git a/pkg/rdkafka/RdKafkaConsumer.php b/pkg/rdkafka/RdKafkaConsumer.php index a598545a5..5e89f3d34 100644 --- a/pkg/rdkafka/RdKafkaConsumer.php +++ b/pkg/rdkafka/RdKafkaConsumer.php @@ -4,14 +4,14 @@ namespace Enqueue\RdKafka; -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 RdKafka\KafkaConsumer; use RdKafka\TopicPartition; -class RdKafkaConsumer implements PsrConsumer +class RdKafkaConsumer implements Consumer { use SerializerAwareTrait; @@ -75,7 +75,7 @@ public function setOffset(int $offset = null): void $this->offset = $offset; } - public function getQueue(): PsrQueue + public function getQueue(): Queue { return $this->topic; } @@ -83,7 +83,7 @@ public function getQueue(): PsrQueue /** * @return RdKafkaMessage */ - public function receive(int $timeout = 0): ?PsrMessage + public function receive(int $timeout = 0): ?Message { if (false === $this->subscribed) { if (null === $this->offset) { @@ -116,7 +116,7 @@ public function receive(int $timeout = 0): ?PsrMessage /** * @return RdKafkaMessage */ - public function receiveNoWait(): ?PsrMessage + public function receiveNoWait(): ?Message { throw new \LogicException('Not implemented'); } @@ -124,7 +124,7 @@ public function receiveNoWait(): ?PsrMessage /** * @param RdKafkaMessage $message */ - public function acknowledge(PsrMessage $message): void + public function acknowledge(Message $message): void { InvalidMessageException::assertMessageInstanceOf($message, RdKafkaMessage::class); @@ -142,7 +142,7 @@ public function acknowledge(PsrMessage $message): void /** * @param RdKafkaMessage $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/pkg/rdkafka/RdKafkaContext.php b/pkg/rdkafka/RdKafkaContext.php index fc7a0f794..cfe8e0eb1 100644 --- a/pkg/rdkafka/RdKafkaContext.php +++ b/pkg/rdkafka/RdKafkaContext.php @@ -4,24 +4,24 @@ namespace Enqueue\RdKafka; -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 RdKafka\Conf; use RdKafka\KafkaConsumer; -use RdKafka\Producer; +use RdKafka\Producer as VendorProducer; use RdKafka\TopicConf; -class RdKafkaContext implements PsrContext +class RdKafkaContext implements Context { use SerializerAwareTrait; @@ -59,7 +59,7 @@ public function __construct(array $config) /** * @return RdKafkaMessage */ - public function createMessage(string $body = '', array $properties = [], array $headers = []): PsrMessage + public function createMessage(string $body = '', array $properties = [], array $headers = []): Message { return new RdKafkaMessage($body, $properties, $headers); } @@ -67,7 +67,7 @@ public function createMessage(string $body = '', array $properties = [], array $ /** * @return RdKafkaTopic */ - public function createTopic(string $topicName): PsrTopic + public function createTopic(string $topicName): Topic { return new RdKafkaTopic($topicName); } @@ -75,12 +75,12 @@ public function createTopic(string $topicName): PsrTopic /** * @return RdKafkaTopic */ - public function createQueue(string $queueName): PsrQueue + public function createQueue(string $queueName): Queue { return new RdKafkaTopic($queueName); } - public function createTemporaryQueue(): PsrQueue + public function createTemporaryQueue(): Queue { throw TemporaryQueueNotSupportedException::providerDoestNotSupportIt(); } @@ -88,7 +88,7 @@ public function createTemporaryQueue(): PsrQueue /** * @return RdKafkaProducer */ - public function createProducer(): PsrProducer + public function createProducer(): Producer { return new RdKafkaProducer($this->getProducer(), $this->getSerializer()); } @@ -98,7 +98,7 @@ public function createProducer(): PsrProducer * * @return RdKafkaConsumer */ - public function createConsumer(PsrDestination $destination): PsrConsumer + public function createConsumer(Destination $destination): Consumer { InvalidDestinationException::assertDestinationInstanceOf($destination, RdKafkaTopic::class); @@ -128,20 +128,20 @@ 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(); } - private function getProducer(): Producer + private function getProducer(): VendorProducer { if (null === $this->producer) { - $this->producer = new Producer($this->getConf()); + $this->producer = new VendorProducer($this->getConf()); if (isset($this->config['log_level'])) { $this->producer->setLogLevel($this->config['log_level']); diff --git a/pkg/rdkafka/RdKafkaMessage.php b/pkg/rdkafka/RdKafkaMessage.php index cad2b10a1..0785a5644 100644 --- a/pkg/rdkafka/RdKafkaMessage.php +++ b/pkg/rdkafka/RdKafkaMessage.php @@ -4,10 +4,10 @@ namespace Enqueue\RdKafka; -use Interop\Queue\PsrMessage; -use RdKafka\Message; +use Interop\Queue\Message; +use RdKafka\Message as VendorMessage; -class RdKafkaMessage implements PsrMessage +class RdKafkaMessage implements Message { /** * @var string @@ -174,12 +174,12 @@ public function setKey(string $key = null): void $this->key = $key; } - public function getKafkaMessage(): ?Message + public function getKafkaMessage(): ?VendorMessage { return $this->kafkaMessage; } - public function setKafkaMessage(Message $message = null): void + public function setKafkaMessage(VendorMessage $message = null): void { $this->kafkaMessage = $message; } diff --git a/pkg/rdkafka/RdKafkaProducer.php b/pkg/rdkafka/RdKafkaProducer.php index b11179cfa..feb40c46b 100644 --- a/pkg/rdkafka/RdKafkaProducer.php +++ b/pkg/rdkafka/RdKafkaProducer.php @@ -4,23 +4,23 @@ namespace Enqueue\RdKafka; -use Interop\Queue\InvalidDestinationException; -use Interop\Queue\InvalidMessageException; -use Interop\Queue\PsrDestination; -use Interop\Queue\PsrMessage; -use Interop\Queue\PsrProducer; -use RdKafka\Producer; - -class RdKafkaProducer implements PsrProducer +use Interop\Queue\Destination; +use Interop\Queue\Exception\InvalidDestinationException; +use Interop\Queue\Exception\InvalidMessageException; +use Interop\Queue\Message; +use Interop\Queue\Producer; +use RdKafka\Producer as VendorProducer; + +class RdKafkaProducer implements Producer { use SerializerAwareTrait; /** - * @var Producer + * @var VendorProducer */ private $producer; - public function __construct(Producer $producer, Serializer $serializer) + public function __construct(VendorProducer $producer, Serializer $serializer) { $this->producer = $producer; @@ -31,7 +31,7 @@ public function __construct(Producer $producer, Serializer $serializer) * @param RdKafkaTopic $destination * @param RdKafkaMessage $message */ - public function send(PsrDestination $destination, PsrMessage $message): void + public function send(Destination $destination, Message $message): void { InvalidDestinationException::assertDestinationInstanceOf($destination, RdKafkaTopic::class); InvalidMessageException::assertMessageInstanceOf($message, RdKafkaMessage::class); @@ -47,7 +47,7 @@ public function send(PsrDestination $destination, PsrMessage $message): void /** * @return RdKafkaProducer */ - public function setDeliveryDelay(int $deliveryDelay = null): PsrProducer + public function setDeliveryDelay(int $deliveryDelay = null): Producer { if (null === $deliveryDelay) { return $this; @@ -64,7 +64,7 @@ public function getDeliveryDelay(): ?int /** * @return RdKafkaProducer */ - public function setPriority(int $priority = null): PsrProducer + public function setPriority(int $priority = null): Producer { if (null === $priority) { return $this; @@ -78,7 +78,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; diff --git a/pkg/rdkafka/RdKafkaTopic.php b/pkg/rdkafka/RdKafkaTopic.php index 8ee1a7707..a7bde1021 100644 --- a/pkg/rdkafka/RdKafkaTopic.php +++ b/pkg/rdkafka/RdKafkaTopic.php @@ -4,11 +4,11 @@ namespace Enqueue\RdKafka; -use Interop\Queue\PsrQueue; -use Interop\Queue\PsrTopic; +use Interop\Queue\Queue; +use Interop\Queue\Topic; use RdKafka\TopicConf; -class RdKafkaTopic implements PsrTopic, PsrQueue +class RdKafkaTopic implements Topic, Queue { /** * @var string diff --git a/pkg/rdkafka/Tests/RdKafkaContextTest.php b/pkg/rdkafka/Tests/RdKafkaContextTest.php index 72ce311d7..e787efb55 100644 --- a/pkg/rdkafka/Tests/RdKafkaContextTest.php +++ b/pkg/rdkafka/Tests/RdKafkaContextTest.php @@ -6,8 +6,8 @@ use Enqueue\RdKafka\JsonSerializer; use Enqueue\RdKafka\RdKafkaContext; use Enqueue\RdKafka\Serializer; -use Interop\Queue\InvalidDestinationException; -use Interop\Queue\TemporaryQueueNotSupportedException; +use Interop\Queue\Exception\InvalidDestinationException; +use Interop\Queue\Exception\TemporaryQueueNotSupportedException; use PHPUnit\Framework\TestCase; /** diff --git a/pkg/rdkafka/Tests/RdKafkaProducerTest.php b/pkg/rdkafka/Tests/RdKafkaProducerTest.php index 1c076e498..be5b94a6a 100644 --- a/pkg/rdkafka/Tests/RdKafkaProducerTest.php +++ b/pkg/rdkafka/Tests/RdKafkaProducerTest.php @@ -8,8 +8,8 @@ use Enqueue\RdKafka\RdKafkaProducer; use Enqueue\RdKafka\RdKafkaTopic; use Enqueue\RdKafka\Serializer; -use Interop\Queue\InvalidDestinationException; -use Interop\Queue\InvalidMessageException; +use Interop\Queue\Exception\InvalidDestinationException; +use Interop\Queue\Exception\InvalidMessageException; use PHPUnit\Framework\TestCase; use RdKafka\Producer; use RdKafka\ProducerTopic; diff --git a/pkg/rdkafka/Tests/Spec/RdKafkaConnectionFactoryTest.php b/pkg/rdkafka/Tests/Spec/RdKafkaConnectionFactoryTest.php index 1132e3930..3327c952d 100644 --- a/pkg/rdkafka/Tests/Spec/RdKafkaConnectionFactoryTest.php +++ b/pkg/rdkafka/Tests/Spec/RdKafkaConnectionFactoryTest.php @@ -3,12 +3,12 @@ namespace Enqueue\RdKafka\Tests\Spec; use Enqueue\RdKafka\RdKafkaConnectionFactory; -use Interop\Queue\Spec\PsrConnectionFactorySpec; +use Interop\Queue\Spec\ConnectionFactorySpec; /** * @group rdkafka */ -class RdKafkaConnectionFactoryTest extends PsrConnectionFactorySpec +class RdKafkaConnectionFactoryTest extends ConnectionFactorySpec { protected function createConnectionFactory() { diff --git a/pkg/rdkafka/Tests/Spec/RdKafkaContextTest.php b/pkg/rdkafka/Tests/Spec/RdKafkaContextTest.php index c99c9f051..fe9625677 100644 --- a/pkg/rdkafka/Tests/Spec/RdKafkaContextTest.php +++ b/pkg/rdkafka/Tests/Spec/RdKafkaContextTest.php @@ -3,12 +3,12 @@ namespace Enqueue\RdKafka\Tests\Spec; use Enqueue\RdKafka\RdKafkaContext; -use Interop\Queue\Spec\PsrContextSpec; +use Interop\Queue\Spec\ContextSpec; /** * @group rdkafka */ -class RdKafkaContextTest extends PsrContextSpec +class RdKafkaContextTest extends ContextSpec { protected function createContext() { diff --git a/pkg/rdkafka/Tests/Spec/RdKafkaMessageTest.php b/pkg/rdkafka/Tests/Spec/RdKafkaMessageTest.php index 6cff6667c..a29780b0f 100644 --- a/pkg/rdkafka/Tests/Spec/RdKafkaMessageTest.php +++ b/pkg/rdkafka/Tests/Spec/RdKafkaMessageTest.php @@ -3,12 +3,12 @@ namespace Enqueue\RdKafka\Tests\Spec; use Enqueue\RdKafka\RdKafkaMessage; -use Interop\Queue\Spec\PsrMessageSpec; +use Interop\Queue\Spec\MessageSpec; /** * @group rdkafka */ -class RdKafkaMessageTest extends PsrMessageSpec +class RdKafkaMessageTest extends MessageSpec { /** * {@inheritdoc} diff --git a/pkg/rdkafka/Tests/Spec/RdKafkaQueueTest.php b/pkg/rdkafka/Tests/Spec/RdKafkaQueueTest.php index e6bf40156..93bc7ac14 100644 --- a/pkg/rdkafka/Tests/Spec/RdKafkaQueueTest.php +++ b/pkg/rdkafka/Tests/Spec/RdKafkaQueueTest.php @@ -3,12 +3,12 @@ namespace Enqueue\RdKafka\Tests\Spec; use Enqueue\RdKafka\RdKafkaTopic; -use Interop\Queue\Spec\PsrQueueSpec; +use Interop\Queue\Spec\QueueSpec; /** * @group rdkafka */ -class RdKafkaQueueTest extends PsrQueueSpec +class RdKafkaQueueTest extends QueueSpec { protected function createQueue() { diff --git a/pkg/rdkafka/Tests/Spec/RdKafkaSendToAndReceiveFromTopicTest.php b/pkg/rdkafka/Tests/Spec/RdKafkaSendToAndReceiveFromTopicTest.php index 05b5abfe2..6604eb127 100644 --- a/pkg/rdkafka/Tests/Spec/RdKafkaSendToAndReceiveFromTopicTest.php +++ b/pkg/rdkafka/Tests/Spec/RdKafkaSendToAndReceiveFromTopicTest.php @@ -3,7 +3,7 @@ namespace Enqueue\RdKafka\Tests\Spec; use Enqueue\RdKafka\RdKafkaConnectionFactory; -use Interop\Queue\PsrMessage; +use Interop\Queue\Message; use Interop\Queue\Spec\SendToAndReceiveFromTopicSpec; /** @@ -27,7 +27,7 @@ public function test() $message = $consumer->receive(10000); // 10 sec - $this->assertInstanceOf(PsrMessage::class, $message); + $this->assertInstanceOf(Message::class, $message); $consumer->acknowledge($message); $this->assertSame($expectedBody, $message->getBody()); diff --git a/pkg/rdkafka/Tests/Spec/RdKafkaTopicTest.php b/pkg/rdkafka/Tests/Spec/RdKafkaTopicTest.php index a5c61ade9..26aacc78d 100644 --- a/pkg/rdkafka/Tests/Spec/RdKafkaTopicTest.php +++ b/pkg/rdkafka/Tests/Spec/RdKafkaTopicTest.php @@ -3,12 +3,12 @@ namespace Enqueue\RdKafka\Tests\Spec; use Enqueue\RdKafka\RdKafkaTopic; -use Interop\Queue\Spec\PsrTopicSpec; +use Interop\Queue\Spec\TopicSpec; /** * @group rdkafka */ -class RdKafkaTopicTest extends PsrTopicSpec +class RdKafkaTopicTest extends TopicSpec { /** * {@inheritdoc} diff --git a/pkg/redis/README.md b/pkg/redis/README.md index b77b1df65..631a4dc05 100644 --- a/pkg/redis/README.md +++ b/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 diff --git a/pkg/redis/RedisConnectionFactory.php b/pkg/redis/RedisConnectionFactory.php index b56d51d9c..e691810ff 100644 --- a/pkg/redis/RedisConnectionFactory.php +++ b/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 () { diff --git a/pkg/redis/RedisConsumer.php b/pkg/redis/RedisConsumer.php index bfd9a222d..0fb9db787 100644 --- a/pkg/redis/RedisConsumer.php +++ b/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,7 +30,7 @@ public function __construct(RedisContext $context, RedisDestination $queue) /** * @return RedisDestination */ - public function getQueue(): PsrQueue + public function getQueue(): Queue { return $this->queue; } @@ -38,7 +38,7 @@ public function getQueue(): PsrQueue /** * @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,7 +71,7 @@ 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 } @@ -79,7 +79,7 @@ public function acknowledge(PsrMessage $message): void /** * @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); diff --git a/pkg/redis/RedisContext.php b/pkg/redis/RedisContext.php index 67160027e..e69385884 100644 --- a/pkg/redis/RedisContext.php +++ b/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,7 +50,7 @@ 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); } @@ -58,7 +58,7 @@ public function createMessage(string $body = '', array $properties = [], array $ /** * @return RedisDestination */ - public function createTopic(string $topicName): PsrTopic + public function createTopic(string $topicName): Topic { return new RedisDestination($topicName); } @@ -66,7 +66,7 @@ public function createTopic(string $topicName): PsrTopic /** * @return RedisDestination */ - public function createQueue(string $queueName): PsrQueue + public function createQueue(string $queueName): Queue { return new RedisDestination($queueName); } @@ -74,7 +74,7 @@ public function createQueue(string $queueName): PsrQueue /** * @param RedisDestination $queue */ - public function deleteQueue(PsrQueue $queue): void + public function deleteQueue(Queue $queue): void { InvalidDestinationException::assertDestinationInstanceOf($queue, RedisDestination::class); @@ -84,14 +84,14 @@ 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(); } @@ -99,7 +99,7 @@ public function createTemporaryQueue(): PsrQueue /** * @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,7 +119,7 @@ public function createConsumer(PsrDestination $destination): PsrConsumer /** * @return RedisSubscriptionConsumer */ - public function createSubscriptionConsumer(): PsrSubscriptionConsumer + public function createSubscriptionConsumer(): SubscriptionConsumer { return new RedisSubscriptionConsumer($this); } @@ -127,7 +127,7 @@ public function createSubscriptionConsumer(): PsrSubscriptionConsumer /** * @param RedisDestination $queue */ - public function purgeQueue(PsrQueue $queue): void + public function purgeQueue(Queue $queue): void { $this->getRedis()->del($queue->getName()); } diff --git a/pkg/redis/RedisDestination.php b/pkg/redis/RedisDestination.php index e4ad9728a..72e61e5a1 100644 --- a/pkg/redis/RedisDestination.php +++ b/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 diff --git a/pkg/redis/RedisMessage.php b/pkg/redis/RedisMessage.php index cfebf1a8a..ab614f773 100644 --- a/pkg/redis/RedisMessage.php +++ b/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 diff --git a/pkg/redis/RedisProducer.php b/pkg/redis/RedisProducer.php index e991af5da..81ca13b7e 100644 --- a/pkg/redis/RedisProducer.php +++ b/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; diff --git a/pkg/redis/RedisSubscriptionConsumer.php b/pkg/redis/RedisSubscriptionConsumer.php index d6b6978ba..6e1a24dc0 100644 --- a/pkg/redis/RedisSubscriptionConsumer.php +++ b/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))); diff --git a/pkg/redis/ServerException.php b/pkg/redis/ServerException.php index efadf1d1a..f7503f57b 100644 --- a/pkg/redis/ServerException.php +++ b/pkg/redis/ServerException.php @@ -4,7 +4,7 @@ namespace Enqueue\Redis; -use Interop\Queue\Exception; +use Interop\Queue\Exception\Exception; class ServerException extends Exception { diff --git a/pkg/redis/Tests/Functional/ConsumptionUseCasesTrait.php b/pkg/redis/Tests/Functional/ConsumptionUseCasesTrait.php index d582bb3ba..0f69070f6 100644 --- a/pkg/redis/Tests/Functional/ConsumptionUseCasesTrait.php +++ b/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()); } diff --git a/pkg/redis/Tests/Functional/StubProcessor.php b/pkg/redis/Tests/Functional/StubProcessor.php index 1aeef3c39..b7c15ada2 100644 --- a/pkg/redis/Tests/Functional/StubProcessor.php +++ b/pkg/redis/Tests/Functional/StubProcessor.php @@ -2,18 +2,18 @@ namespace Enqueue\Redis\Tests\Functional; -use Interop\Queue\PsrContext; -use Interop\Queue\PsrMessage; -use Interop\Queue\PsrProcessor; +use Interop\Queue\Context; +use Interop\Queue\Message; +use Interop\Queue\Processor; -class StubProcessor implements PsrProcessor +class StubProcessor implements Processor { public $result = self::ACK; - /** @var PsrMessage */ + /** @var Message */ public $lastProcessedMessage; - public function process(PsrMessage $message, PsrContext $context) + public function process(Message $message, Context $context) { $this->lastProcessedMessage = $message; diff --git a/pkg/redis/Tests/RedisConnectionFactoryTest.php b/pkg/redis/Tests/RedisConnectionFactoryTest.php index b5d7347ab..049feaef9 100644 --- a/pkg/redis/Tests/RedisConnectionFactoryTest.php +++ b/pkg/redis/Tests/RedisConnectionFactoryTest.php @@ -5,7 +5,7 @@ use Enqueue\Redis\RedisConnectionFactory; use Enqueue\Redis\RedisContext; use Enqueue\Test\ClassExtensionTrait; -use Interop\Queue\PsrConnectionFactory; +use Interop\Queue\ConnectionFactory; use PHPUnit\Framework\TestCase; class RedisConnectionFactoryTest extends TestCase @@ -14,7 +14,7 @@ class RedisConnectionFactoryTest extends TestCase public function testShouldImplementConnectionFactoryInterface() { - $this->assertClassImplements(PsrConnectionFactory::class, RedisConnectionFactory::class); + $this->assertClassImplements(ConnectionFactory::class, RedisConnectionFactory::class); } public function testShouldCreateLazyContext() diff --git a/pkg/redis/Tests/RedisConsumerTest.php b/pkg/redis/Tests/RedisConsumerTest.php index 8def4588f..d8b0c4e7b 100644 --- a/pkg/redis/Tests/RedisConsumerTest.php +++ b/pkg/redis/Tests/RedisConsumerTest.php @@ -10,7 +10,7 @@ use Enqueue\Redis\RedisProducer; use Enqueue\Redis\RedisResult; use Enqueue\Test\ClassExtensionTrait; -use Interop\Queue\PsrConsumer; +use Interop\Queue\Consumer; class RedisConsumerTest extends \PHPUnit\Framework\TestCase { @@ -18,7 +18,7 @@ class RedisConsumerTest extends \PHPUnit\Framework\TestCase public function testShouldImplementConsumerInterface() { - $this->assertClassImplements(PsrConsumer::class, RedisConsumer::class); + $this->assertClassImplements(Consumer::class, RedisConsumer::class); } public function testCouldBeConstructedWithContextAndDestinationAndPreFetchCountAsArguments() diff --git a/pkg/redis/Tests/RedisContextTest.php b/pkg/redis/Tests/RedisContextTest.php index b9a1da559..94fb626f1 100644 --- a/pkg/redis/Tests/RedisContextTest.php +++ b/pkg/redis/Tests/RedisContextTest.php @@ -12,9 +12,9 @@ use Enqueue\Redis\RedisProducer; use Enqueue\Redis\RedisSubscriptionConsumer; 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; class RedisContextTest extends \PHPUnit\Framework\TestCase { @@ -22,7 +22,7 @@ class RedisContextTest extends \PHPUnit\Framework\TestCase public function testShouldImplementContextInterface() { - $this->assertClassImplements(PsrContext::class, RedisContext::class); + $this->assertClassImplements(Context::class, RedisContext::class); } public function testCouldBeConstructedWithRedisAsFirstArgument() diff --git a/pkg/redis/Tests/RedisDestinationTest.php b/pkg/redis/Tests/RedisDestinationTest.php index 26d93cd05..4e73849fc 100644 --- a/pkg/redis/Tests/RedisDestinationTest.php +++ b/pkg/redis/Tests/RedisDestinationTest.php @@ -4,8 +4,8 @@ use Enqueue\Redis\RedisDestination; use Enqueue\Test\ClassExtensionTrait; -use Interop\Queue\PsrQueue; -use Interop\Queue\PsrTopic; +use Interop\Queue\Queue; +use Interop\Queue\Topic; class RedisDestinationTest extends \PHPUnit\Framework\TestCase { @@ -13,8 +13,8 @@ class RedisDestinationTest extends \PHPUnit\Framework\TestCase public function testShouldImplementsTopicAndQueueInterfaces() { - $this->assertClassImplements(PsrTopic::class, RedisDestination::class); - $this->assertClassImplements(PsrQueue::class, RedisDestination::class); + $this->assertClassImplements(Topic::class, RedisDestination::class); + $this->assertClassImplements(Queue::class, RedisDestination::class); } public function testShouldReturnNameSetInConstructor() diff --git a/pkg/redis/Tests/RedisProducerTest.php b/pkg/redis/Tests/RedisProducerTest.php index 7c2ac63ee..98934826c 100644 --- a/pkg/redis/Tests/RedisProducerTest.php +++ b/pkg/redis/Tests/RedisProducerTest.php @@ -9,9 +9,9 @@ use Enqueue\Redis\RedisMessage; use Enqueue\Redis\RedisProducer; use Enqueue\Test\ClassExtensionTrait; -use Interop\Queue\InvalidDestinationException; -use Interop\Queue\InvalidMessageException; -use Interop\Queue\PsrProducer; +use Interop\Queue\Exception\InvalidDestinationException; +use Interop\Queue\Exception\InvalidMessageException; +use Interop\Queue\Producer; use PHPUnit\Framework\TestCase; class RedisProducerTest extends TestCase @@ -20,7 +20,7 @@ class RedisProducerTest extends TestCase public function testShouldImplementProducerInterface() { - $this->assertClassImplements(PsrProducer::class, RedisProducer::class); + $this->assertClassImplements(Producer::class, RedisProducer::class); } public function testCouldBeConstructedWithRedisAsFirstArgument() diff --git a/pkg/redis/Tests/RedisSubscriptionConsumerTest.php b/pkg/redis/Tests/RedisSubscriptionConsumerTest.php index 486a2f995..98c6142f9 100644 --- a/pkg/redis/Tests/RedisSubscriptionConsumerTest.php +++ b/pkg/redis/Tests/RedisSubscriptionConsumerTest.php @@ -5,18 +5,18 @@ use Enqueue\Redis\RedisConsumer; use Enqueue\Redis\RedisContext; use Enqueue\Redis\RedisSubscriptionConsumer; -use Interop\Queue\PsrConsumer; -use Interop\Queue\PsrQueue; -use Interop\Queue\PsrSubscriptionConsumer; +use Interop\Queue\Consumer; +use Interop\Queue\Queue; +use Interop\Queue\SubscriptionConsumer; use PHPUnit\Framework\TestCase; class RedisSubscriptionConsumerTest extends TestCase { - public function testShouldImplementPsrSubscriptionConsumerInterface() + public function testShouldImplementSubscriptionConsumerInterface() { $rc = new \ReflectionClass(RedisSubscriptionConsumer::class); - $this->assertTrue($rc->implementsInterface(PsrSubscriptionConsumer::class)); + $this->assertTrue($rc->implementsInterface(SubscriptionConsumer::class)); } public function testCouldBeConstructedWithAmqpContextAsFirstArgument() @@ -152,11 +152,11 @@ private function createRedisContextMock() /** * @param null|mixed $queueName * - * @return PsrConsumer|\PHPUnit_Framework_MockObject_MockObject + * @return Consumer|\PHPUnit_Framework_MockObject_MockObject */ private function createConsumerStub($queueName = null) { - $queueMock = $this->createMock(PsrQueue::class); + $queueMock = $this->createMock(Queue::class); $queueMock ->expects($this->any()) ->method('getQueueName') diff --git a/pkg/redis/Tests/Spec/RedisConnectionFactoryTest.php b/pkg/redis/Tests/Spec/RedisConnectionFactoryTest.php index bda37f4e0..e086bccab 100644 --- a/pkg/redis/Tests/Spec/RedisConnectionFactoryTest.php +++ b/pkg/redis/Tests/Spec/RedisConnectionFactoryTest.php @@ -3,12 +3,12 @@ namespace Enqueue\Redis\Tests\Spec; use Enqueue\Redis\RedisConnectionFactory; -use Interop\Queue\Spec\PsrConnectionFactorySpec; +use Interop\Queue\Spec\ConnectionFactorySpec; /** * @group Redis */ -class RedisConnectionFactoryTest extends PsrConnectionFactorySpec +class RedisConnectionFactoryTest extends ConnectionFactorySpec { /** * {@inheritdoc} diff --git a/pkg/redis/Tests/Spec/RedisContextTest.php b/pkg/redis/Tests/Spec/RedisContextTest.php index b43e487ac..3377fb89b 100644 --- a/pkg/redis/Tests/Spec/RedisContextTest.php +++ b/pkg/redis/Tests/Spec/RedisContextTest.php @@ -3,13 +3,13 @@ namespace Enqueue\Redis\Tests\Spec; use Enqueue\Test\RedisExtension; -use Interop\Queue\Spec\PsrContextSpec; +use Interop\Queue\Spec\ContextSpec; /** * @group functional * @group Redis */ -class RedisContextTest extends PsrContextSpec +class RedisContextTest extends ContextSpec { use RedisExtension; diff --git a/pkg/redis/Tests/Spec/RedisMessageTest.php b/pkg/redis/Tests/Spec/RedisMessageTest.php index 2e2b18736..bb8af845d 100644 --- a/pkg/redis/Tests/Spec/RedisMessageTest.php +++ b/pkg/redis/Tests/Spec/RedisMessageTest.php @@ -3,12 +3,12 @@ namespace Enqueue\Redis\Tests\Spec; use Enqueue\Redis\RedisMessage; -use Interop\Queue\Spec\PsrMessageSpec; +use Interop\Queue\Spec\MessageSpec; /** * @group Redis */ -class RedisMessageTest extends PsrMessageSpec +class RedisMessageTest extends MessageSpec { /** * {@inheritdoc} diff --git a/pkg/redis/Tests/Spec/RedisProducerTest.php b/pkg/redis/Tests/Spec/RedisProducerTest.php index 9ebd2992b..fa9fbfefb 100644 --- a/pkg/redis/Tests/Spec/RedisProducerTest.php +++ b/pkg/redis/Tests/Spec/RedisProducerTest.php @@ -3,13 +3,13 @@ namespace Enqueue\Redis\Tests\Spec; use Enqueue\Test\RedisExtension; -use Interop\Queue\Spec\PsrProducerSpec; +use Interop\Queue\Spec\ProducerSpec; /** * @group functional * @group Redis */ -class RedisProducerTest extends PsrProducerSpec +class RedisProducerTest extends ProducerSpec { use RedisExtension; diff --git a/pkg/redis/Tests/Spec/RedisQueueTest.php b/pkg/redis/Tests/Spec/RedisQueueTest.php index 1975b22f4..ab7b9937b 100644 --- a/pkg/redis/Tests/Spec/RedisQueueTest.php +++ b/pkg/redis/Tests/Spec/RedisQueueTest.php @@ -3,12 +3,12 @@ namespace Enqueue\Redis\Tests\Spec; use Enqueue\Redis\RedisDestination; -use Interop\Queue\Spec\PsrQueueSpec; +use Interop\Queue\Spec\QueueSpec; /** * @group Redis */ -class RedisQueueTest extends PsrQueueSpec +class RedisQueueTest extends QueueSpec { /** * {@inheritdoc} diff --git a/pkg/redis/Tests/Spec/RedisSubscriptionConsumerConsumeFromAllSubscribedQueuesTest.php b/pkg/redis/Tests/Spec/RedisSubscriptionConsumerConsumeFromAllSubscribedQueuesTest.php index 0be7127b7..21d514fa5 100644 --- a/pkg/redis/Tests/Spec/RedisSubscriptionConsumerConsumeFromAllSubscribedQueuesTest.php +++ b/pkg/redis/Tests/Spec/RedisSubscriptionConsumerConsumeFromAllSubscribedQueuesTest.php @@ -5,7 +5,7 @@ use Enqueue\Redis\RedisContext; use Enqueue\Redis\RedisDestination; use Enqueue\Test\RedisExtension; -use Interop\Queue\PsrContext; +use Interop\Queue\Context; use Interop\Queue\Spec\SubscriptionConsumerConsumeFromAllSubscribedQueuesSpec; /** @@ -31,7 +31,7 @@ protected function createContext() * * {@inheritdoc} */ - protected function createQueue(PsrContext $context, $queueName) + protected function createQueue(Context $context, $queueName) { /** @var RedisDestination $queue */ $queue = parent::createQueue($context, $queueName); diff --git a/pkg/redis/Tests/Spec/RedisSubscriptionConsumerConsumeUntilUnsubscribedTest.php b/pkg/redis/Tests/Spec/RedisSubscriptionConsumerConsumeUntilUnsubscribedTest.php index 866629352..9524e5b6f 100644 --- a/pkg/redis/Tests/Spec/RedisSubscriptionConsumerConsumeUntilUnsubscribedTest.php +++ b/pkg/redis/Tests/Spec/RedisSubscriptionConsumerConsumeUntilUnsubscribedTest.php @@ -5,7 +5,7 @@ use Enqueue\Redis\RedisContext; use Enqueue\Redis\RedisDestination; use Enqueue\Test\RedisExtension; -use Interop\Queue\PsrContext; +use Interop\Queue\Context; use Interop\Queue\Spec\SubscriptionConsumerConsumeUntilUnsubscribedSpec; /** @@ -31,7 +31,7 @@ protected function createContext() * * {@inheritdoc} */ - protected function createQueue(PsrContext $context, $queueName) + protected function createQueue(Context $context, $queueName) { /** @var RedisDestination $queue */ $queue = parent::createQueue($context, $queueName); diff --git a/pkg/redis/Tests/Spec/RedisSubscriptionConsumerStopOnFalseTest.php b/pkg/redis/Tests/Spec/RedisSubscriptionConsumerStopOnFalseTest.php index f86daf8ce..5a033a872 100644 --- a/pkg/redis/Tests/Spec/RedisSubscriptionConsumerStopOnFalseTest.php +++ b/pkg/redis/Tests/Spec/RedisSubscriptionConsumerStopOnFalseTest.php @@ -5,7 +5,7 @@ use Enqueue\Redis\RedisContext; use Enqueue\Redis\RedisDestination; use Enqueue\Test\RedisExtension; -use Interop\Queue\PsrContext; +use Interop\Queue\Context; use Interop\Queue\Spec\SubscriptionConsumerStopOnFalseSpec; /** @@ -31,7 +31,7 @@ protected function createContext() * * {@inheritdoc} */ - protected function createQueue(PsrContext $context, $queueName) + protected function createQueue(Context $context, $queueName) { /** @var RedisDestination $queue */ $queue = parent::createQueue($context, $queueName); diff --git a/pkg/redis/Tests/Spec/RedisTopicTest.php b/pkg/redis/Tests/Spec/RedisTopicTest.php index 3117cb8e3..52001aa66 100644 --- a/pkg/redis/Tests/Spec/RedisTopicTest.php +++ b/pkg/redis/Tests/Spec/RedisTopicTest.php @@ -3,12 +3,12 @@ namespace Enqueue\Redis\Tests\Spec; use Enqueue\Redis\RedisDestination; -use Interop\Queue\Spec\PsrTopicSpec; +use Interop\Queue\Spec\TopicSpec; /** * @group Redis */ -class RedisTopicTest extends PsrTopicSpec +class RedisTopicTest extends TopicSpec { /** * {@inheritdoc} diff --git a/pkg/simple-client/SimpleClient.php b/pkg/simple-client/SimpleClient.php index bdcd9a63d..a74836420 100644 --- a/pkg/simple-client/SimpleClient.php +++ b/pkg/simple-client/SimpleClient.php @@ -25,10 +25,10 @@ use Enqueue\Rpc\Promise; use Enqueue\Rpc\RpcFactory; use Enqueue\Symfony\DependencyInjection\TransportFactory; -use Interop\Queue\PsrProcessor; +use Interop\Queue\Processor; use Symfony\Component\Config\Definition\Builder\TreeBuilder; use Symfony\Component\Config\Definition\NodeInterface; -use Symfony\Component\Config\Definition\Processor; +use Symfony\Component\Config\Definition\Processor as ConfigProcessor; final class SimpleClient { @@ -110,7 +110,7 @@ public function __construct($config) } /** - * @param callable|PsrProcessor $processor + * @param callable|Processor $processor */ public function bindTopic(string $topic, $processor, string $processorName = null): void { @@ -118,8 +118,8 @@ public function bindTopic(string $topic, $processor, string $processorName = nul $processor = new CallbackProcessor($processor); } - if (false == $processor instanceof PsrProcessor) { - throw new \LogicException('The processor must be either callable or instance of PsrProcessor'); + if (false == $processor instanceof Processor) { + throw new \LogicException('The processor must be either callable or instance of Processor'); } $processorName = $processorName ?: uniqid(get_class($processor)); @@ -129,7 +129,7 @@ public function bindTopic(string $topic, $processor, string $processorName = nul } /** - * @param callable|PsrProcessor $processor + * @param callable|Processor $processor */ public function bindCommand(string $command, $processor, string $processorName = null): void { @@ -137,8 +137,8 @@ public function bindCommand(string $command, $processor, string $processorName = $processor = new CallbackProcessor($processor); } - if (false == $processor instanceof PsrProcessor) { - throw new \LogicException('The processor must be either callable or instance of PsrProcessor'); + if (false == $processor instanceof Processor) { + throw new \LogicException('The processor must be either callable or instance of Processor'); } $processorName = $processorName ?: uniqid(get_class($processor)); @@ -211,7 +211,7 @@ public function setupBroker(): void public function build(array $configs): void { - $configProcessor = new Processor(); + $configProcessor = new ConfigProcessor(); $simpleClientConfig = $configProcessor->process($this->createConfiguration(), $configs); if (isset($simpleClientConfig['transport']['factory_service'])) { diff --git a/pkg/simple-client/Tests/Functional/SimpleClientTest.php b/pkg/simple-client/Tests/Functional/SimpleClientTest.php index d486ccf62..61e061811 100644 --- a/pkg/simple-client/Tests/Functional/SimpleClientTest.php +++ b/pkg/simple-client/Tests/Functional/SimpleClientTest.php @@ -7,8 +7,8 @@ use Enqueue\Consumption\Extension\LimitConsumptionTimeExtension; use Enqueue\Consumption\Result; use Enqueue\SimpleClient\SimpleClient; -use Interop\Queue\PsrMessage; -use Interop\Queue\PurgeQueueNotSupportedException; +use Interop\Queue\Exception\PurgeQueueNotSupportedException; +use Interop\Queue\Message; use PHPUnit\Framework\TestCase; /** @@ -75,7 +75,7 @@ public function testSendEventWithOneSubscriber(array $config, string $timeLimit) $client = new SimpleClient($config); - $client->bindTopic('foo_topic', function (PsrMessage $message) use (&$actualMessage) { + $client->bindTopic('foo_topic', function (Message $message) use (&$actualMessage) { $actualMessage = $message; return Result::ACK; @@ -92,7 +92,7 @@ public function testSendEventWithOneSubscriber(array $config, string $timeLimit) new LimitConsumedMessagesExtension(2), ])); - $this->assertInstanceOf(PsrMessage::class, $actualMessage); + $this->assertInstanceOf(Message::class, $actualMessage); $this->assertSame('Hello there!', $actualMessage->getBody()); } diff --git a/pkg/sqs/README.md b/pkg/sqs/README.md index 55497f67b..f5f7589ed 100644 --- a/pkg/sqs/README.md +++ b/pkg/sqs/README.md @@ -5,7 +5,7 @@ [![Total Downloads](https://poser.pugx.org/enqueue/sqs/d/total.png)](https://packagist.org/packages/enqueue/sqs) [![Latest Stable Version](https://poser.pugx.org/enqueue/sqs/version.png)](https://packagist.org/packages/enqueue/sqs) -This is an implementation of PSR specification. It allows you to send and consume message through Amazon SQS library. +This is an implementation of Queue Interop specification. It allows you to send and consume message through Amazon SQS library. ## Resources diff --git a/pkg/sqs/SqsConnectionFactory.php b/pkg/sqs/SqsConnectionFactory.php index 05690c19f..50dad89c2 100644 --- a/pkg/sqs/SqsConnectionFactory.php +++ b/pkg/sqs/SqsConnectionFactory.php @@ -6,10 +6,10 @@ use Aws\Sqs\SqsClient; use Enqueue\Dsn\Dsn; -use Interop\Queue\PsrConnectionFactory; -use Interop\Queue\PsrContext; +use Interop\Queue\ConnectionFactory; +use Interop\Queue\Context; -class SqsConnectionFactory implements PsrConnectionFactory +class SqsConnectionFactory implements ConnectionFactory { /** * @var array @@ -69,7 +69,7 @@ public function __construct($config = 'sqs:') /** * @return SqsContext */ - public function createContext(): PsrContext + public function createContext(): Context { if ($this->config['lazy']) { return new SqsContext(function () { diff --git a/pkg/sqs/SqsConsumer.php b/pkg/sqs/SqsConsumer.php index 8a1d72142..1ee37a99d 100644 --- a/pkg/sqs/SqsConsumer.php +++ b/pkg/sqs/SqsConsumer.php @@ -4,12 +4,12 @@ namespace Enqueue\Sqs; -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 SqsConsumer implements PsrConsumer +class SqsConsumer implements Consumer { /** * @var SqsDestination @@ -75,7 +75,7 @@ public function setMaxNumberOfMessages(int $maxNumberOfMessages): void /** * @return SqsDestination */ - public function getQueue(): PsrQueue + public function getQueue(): Queue { return $this->queue; } @@ -83,7 +83,7 @@ public function getQueue(): PsrQueue /** * @return SqsMessage */ - public function receive(int $timeout = 0): ?PsrMessage + public function receive(int $timeout = 0): ?Message { $maxLongPollingTime = 20; // 20 is max allowed long polling value @@ -107,7 +107,7 @@ public function receive(int $timeout = 0): ?PsrMessage /** * @return SqsMessage */ - public function receiveNoWait(): ?PsrMessage + public function receiveNoWait(): ?Message { return $this->receiveMessage(0); } @@ -115,7 +115,7 @@ public function receiveNoWait(): ?PsrMessage /** * @param SqsMessage $message */ - public function acknowledge(PsrMessage $message): void + public function acknowledge(Message $message): void { InvalidMessageException::assertMessageInstanceOf($message, SqsMessage::class); @@ -128,7 +128,7 @@ public function acknowledge(PsrMessage $message): void /** * @param SqsMessage $message */ - public function reject(PsrMessage $message, bool $requeue = false): void + public function reject(Message $message, bool $requeue = false): void { InvalidMessageException::assertMessageInstanceOf($message, SqsMessage::class); diff --git a/pkg/sqs/SqsContext.php b/pkg/sqs/SqsContext.php index dd59f5d19..cb3a9edfa 100644 --- a/pkg/sqs/SqsContext.php +++ b/pkg/sqs/SqsContext.php @@ -5,19 +5,19 @@ namespace Enqueue\Sqs; use Aws\Sqs\SqsClient; -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\SubscriptionConsumerNotSupportedException; -use Interop\Queue\TemporaryQueueNotSupportedException; - -class SqsContext implements PsrContext +use Interop\Queue\Consumer; +use Interop\Queue\Context; +use Interop\Queue\Destination; +use Interop\Queue\Exception\InvalidDestinationException; +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 SqsContext implements Context { /** * @var SqsClient @@ -57,7 +57,7 @@ public function __construct($client) /** * @return SqsMessage */ - public function createMessage(string $body = '', array $properties = [], array $headers = []): PsrMessage + public function createMessage(string $body = '', array $properties = [], array $headers = []): Message { return new SqsMessage($body, $properties, $headers); } @@ -65,7 +65,7 @@ public function createMessage(string $body = '', array $properties = [], array $ /** * @return SqsDestination */ - public function createTopic(string $topicName): PsrTopic + public function createTopic(string $topicName): Topic { return new SqsDestination($topicName); } @@ -73,12 +73,12 @@ public function createTopic(string $topicName): PsrTopic /** * @return SqsDestination */ - public function createQueue(string $queueName): PsrQueue + public function createQueue(string $queueName): Queue { return new SqsDestination($queueName); } - public function createTemporaryQueue(): PsrQueue + public function createTemporaryQueue(): Queue { throw TemporaryQueueNotSupportedException::providerDoestNotSupportIt(); } @@ -86,7 +86,7 @@ public function createTemporaryQueue(): PsrQueue /** * @return SqsProducer */ - public function createProducer(): PsrProducer + public function createProducer(): Producer { return new SqsProducer($this); } @@ -96,7 +96,7 @@ public function createProducer(): PsrProducer * * @return SqsConsumer */ - public function createConsumer(PsrDestination $destination): PsrConsumer + public function createConsumer(Destination $destination): Consumer { InvalidDestinationException::assertDestinationInstanceOf($destination, SqsDestination::class); @@ -110,7 +110,7 @@ public function close(): void /** * @param SqsDestination $queue */ - public function purgeQueue(PsrQueue $queue): void + public function purgeQueue(Queue $queue): void { InvalidDestinationException::assertDestinationInstanceOf($queue, SqsDestination::class); @@ -119,7 +119,7 @@ public function purgeQueue(PsrQueue $queue): void ]); } - public function createSubscriptionConsumer(): PsrSubscriptionConsumer + public function createSubscriptionConsumer(): SubscriptionConsumer { throw SubscriptionConsumerNotSupportedException::providerDoestNotSupportIt(); } diff --git a/pkg/sqs/SqsDestination.php b/pkg/sqs/SqsDestination.php index 62b8d094e..21fc17828 100644 --- a/pkg/sqs/SqsDestination.php +++ b/pkg/sqs/SqsDestination.php @@ -4,10 +4,10 @@ namespace Enqueue\Sqs; -use Interop\Queue\PsrQueue; -use Interop\Queue\PsrTopic; +use Interop\Queue\Queue; +use Interop\Queue\Topic; -class SqsDestination implements PsrTopic, PsrQueue +class SqsDestination implements Topic, Queue { /** * @var string diff --git a/pkg/sqs/SqsMessage.php b/pkg/sqs/SqsMessage.php index 2782e901c..1d9d26bec 100644 --- a/pkg/sqs/SqsMessage.php +++ b/pkg/sqs/SqsMessage.php @@ -4,9 +4,9 @@ namespace Enqueue\Sqs; -use Interop\Queue\PsrMessage; +use Interop\Queue\Message; -class SqsMessage implements PsrMessage +class SqsMessage implements Message { /** * @var string diff --git a/pkg/sqs/SqsProducer.php b/pkg/sqs/SqsProducer.php index d85bb8fea..332bee505 100644 --- a/pkg/sqs/SqsProducer.php +++ b/pkg/sqs/SqsProducer.php @@ -4,15 +4,15 @@ namespace Enqueue\Sqs; -use Interop\Queue\InvalidDestinationException; -use Interop\Queue\InvalidMessageException; -use Interop\Queue\PriorityNotSupportedException; -use Interop\Queue\PsrDestination; -use Interop\Queue\PsrMessage; -use Interop\Queue\PsrProducer; -use Interop\Queue\TimeToLiveNotSupportedException; - -class SqsProducer implements PsrProducer +use Interop\Queue\Destination; +use Interop\Queue\Exception\InvalidDestinationException; +use Interop\Queue\Exception\InvalidMessageException; +use Interop\Queue\Exception\PriorityNotSupportedException; +use Interop\Queue\Exception\TimeToLiveNotSupportedException; +use Interop\Queue\Message; +use Interop\Queue\Producer; + +class SqsProducer implements Producer { /** * @var int|null @@ -33,7 +33,7 @@ public function __construct(SqsContext $context) * @param SqsDestination $destination * @param SqsMessage $message */ - public function send(PsrDestination $destination, PsrMessage $message): void + public function send(Destination $destination, Message $message): void { InvalidDestinationException::assertDestinationInstanceOf($destination, SqsDestination::class); InvalidMessageException::assertMessageInstanceOf($message, SqsMessage::class); @@ -80,7 +80,7 @@ public function send(PsrDestination $destination, PsrMessage $message): void /** * @return SqsProducer */ - public function setDeliveryDelay(int $deliveryDelay = null): PsrProducer + public function setDeliveryDelay(int $deliveryDelay = null): Producer { $this->deliveryDelay = $deliveryDelay; @@ -95,7 +95,7 @@ public function getDeliveryDelay(): ?int /** * @return SqsProducer */ - public function setPriority(int $priority = null): PsrProducer + public function setPriority(int $priority = null): Producer { if (null === $priority) { return $this; @@ -112,7 +112,7 @@ public function getPriority(): ?int /** * @return SqsProducer */ - public function setTimeToLive(int $timeToLive = null): PsrProducer + public function setTimeToLive(int $timeToLive = null): Producer { if (null === $timeToLive) { return $this; diff --git a/pkg/sqs/Tests/Functional/SqsConsumptionUseCasesTest.php b/pkg/sqs/Tests/Functional/SqsConsumptionUseCasesTest.php index c5ac9ed50..b9c1a2987 100644 --- a/pkg/sqs/Tests/Functional/SqsConsumptionUseCasesTest.php +++ b/pkg/sqs/Tests/Functional/SqsConsumptionUseCasesTest.php @@ -11,9 +11,9 @@ use Enqueue\Sqs\SqsContext; use Enqueue\Test\RetryTrait; use Enqueue\Test\SqsExtension; -use Interop\Queue\PsrContext; -use Interop\Queue\PsrMessage; -use Interop\Queue\PsrProcessor; +use Interop\Queue\Context; +use Interop\Queue\Message; +use Interop\Queue\Processor; use PHPUnit\Framework\TestCase; class SqsConsumptionUseCasesTest extends TestCase @@ -65,7 +65,7 @@ public function testConsumeOneMessageAndExit() $queueConsumer->consume(); - $this->assertInstanceOf(PsrMessage::class, $processor->lastProcessedMessage); + $this->assertInstanceOf(Message::class, $processor->lastProcessedMessage); $this->assertEquals(__METHOD__, $processor->lastProcessedMessage->getBody()); } @@ -98,22 +98,22 @@ 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()); } } -class StubProcessor implements PsrProcessor +class StubProcessor implements Processor { public $result = self::ACK; - /** @var PsrMessage */ + /** @var Message */ public $lastProcessedMessage; - public function process(PsrMessage $message, PsrContext $context) + public function process(Message $message, Context $context) { $this->lastProcessedMessage = $message; diff --git a/pkg/sqs/Tests/Spec/SqsMessageTest.php b/pkg/sqs/Tests/Spec/SqsMessageTest.php index c658840e9..9007df099 100644 --- a/pkg/sqs/Tests/Spec/SqsMessageTest.php +++ b/pkg/sqs/Tests/Spec/SqsMessageTest.php @@ -3,9 +3,9 @@ namespace Enqueue\Sqs\Tests\Spec; use Enqueue\Sqs\SqsMessage; -use Interop\Queue\Spec\PsrMessageSpec; +use Interop\Queue\Spec\MessageSpec; -class SqsMessageTest extends PsrMessageSpec +class SqsMessageTest extends MessageSpec { /** * {@inheritdoc} diff --git a/pkg/sqs/Tests/Spec/SqsProducerTest.php b/pkg/sqs/Tests/Spec/SqsProducerTest.php index 19e55383b..c241a2165 100644 --- a/pkg/sqs/Tests/Spec/SqsProducerTest.php +++ b/pkg/sqs/Tests/Spec/SqsProducerTest.php @@ -3,12 +3,12 @@ namespace Enqueue\Sqs\Tests\Spec; use Enqueue\Test\SqsExtension; -use Interop\Queue\Spec\PsrProducerSpec; +use Interop\Queue\Spec\ProducerSpec; /** * @group functional */ -class SqsProducerTest extends PsrProducerSpec +class SqsProducerTest extends ProducerSpec { use SqsExtension; diff --git a/pkg/sqs/Tests/Spec/SqsSendAndReceiveDelayedMessageFromQueueTest.php b/pkg/sqs/Tests/Spec/SqsSendAndReceiveDelayedMessageFromQueueTest.php index 2623969f4..2c8f2a21a 100644 --- a/pkg/sqs/Tests/Spec/SqsSendAndReceiveDelayedMessageFromQueueTest.php +++ b/pkg/sqs/Tests/Spec/SqsSendAndReceiveDelayedMessageFromQueueTest.php @@ -6,7 +6,7 @@ use Enqueue\Sqs\SqsDestination; use Enqueue\Test\RetryTrait; use Enqueue\Test\SqsExtension; -use Interop\Queue\PsrContext; +use Interop\Queue\Context; use Interop\Queue\Spec\SendAndReceiveDelayedMessageFromQueueSpec; /** @@ -50,7 +50,7 @@ protected function createContext() * * @param SqsContext $context */ - protected function createQueue(PsrContext $context, $queueName) + protected function createQueue(Context $context, $queueName) { $queueName = $queueName.time(); diff --git a/pkg/sqs/Tests/Spec/SqsSendToAndReceiveFromQueueTest.php b/pkg/sqs/Tests/Spec/SqsSendToAndReceiveFromQueueTest.php index e694e88aa..934dda60e 100644 --- a/pkg/sqs/Tests/Spec/SqsSendToAndReceiveFromQueueTest.php +++ b/pkg/sqs/Tests/Spec/SqsSendToAndReceiveFromQueueTest.php @@ -5,7 +5,7 @@ use Enqueue\Sqs\SqsContext; use Enqueue\Sqs\SqsDestination; use Enqueue\Test\SqsExtension; -use Interop\Queue\PsrContext; +use Interop\Queue\Context; use Interop\Queue\Spec\SendToAndReceiveFromQueueSpec; /** @@ -47,7 +47,7 @@ protected function createContext() * * @param SqsContext $context */ - protected function createQueue(PsrContext $context, $queueName) + protected function createQueue(Context $context, $queueName) { $queueName = $queueName.time(); diff --git a/pkg/sqs/Tests/Spec/SqsSendToAndReceiveFromTopicTest.php b/pkg/sqs/Tests/Spec/SqsSendToAndReceiveFromTopicTest.php index 56ca7dc08..f21e33903 100644 --- a/pkg/sqs/Tests/Spec/SqsSendToAndReceiveFromTopicTest.php +++ b/pkg/sqs/Tests/Spec/SqsSendToAndReceiveFromTopicTest.php @@ -6,7 +6,7 @@ use Enqueue\Sqs\SqsDestination; use Enqueue\Test\RetryTrait; use Enqueue\Test\SqsExtension; -use Interop\Queue\PsrContext; +use Interop\Queue\Context; use Interop\Queue\Spec\SendToAndReceiveFromTopicSpec; /** @@ -50,7 +50,7 @@ protected function createContext() * * @param SqsContext $context */ - protected function createTopic(PsrContext $context, $topicName) + protected function createTopic(Context $context, $topicName) { $topicName = $topicName.time(); diff --git a/pkg/sqs/Tests/SqsConnectionFactoryTest.php b/pkg/sqs/Tests/SqsConnectionFactoryTest.php index aa3cf88de..c4544c9e0 100644 --- a/pkg/sqs/Tests/SqsConnectionFactoryTest.php +++ b/pkg/sqs/Tests/SqsConnectionFactoryTest.php @@ -6,7 +6,7 @@ use Enqueue\Sqs\SqsConnectionFactory; use Enqueue\Sqs\SqsContext; use Enqueue\Test\ClassExtensionTrait; -use Interop\Queue\PsrConnectionFactory; +use Interop\Queue\ConnectionFactory; class SqsConnectionFactoryTest extends \PHPUnit\Framework\TestCase { @@ -14,7 +14,7 @@ class SqsConnectionFactoryTest extends \PHPUnit\Framework\TestCase public function testShouldImplementConnectionFactoryInterface() { - $this->assertClassImplements(PsrConnectionFactory::class, SqsConnectionFactory::class); + $this->assertClassImplements(ConnectionFactory::class, SqsConnectionFactory::class); } public function testCouldBeConstructedWithEmptyConfiguration() diff --git a/pkg/sqs/Tests/SqsConsumerTest.php b/pkg/sqs/Tests/SqsConsumerTest.php index aa4011a82..6d6e62a58 100644 --- a/pkg/sqs/Tests/SqsConsumerTest.php +++ b/pkg/sqs/Tests/SqsConsumerTest.php @@ -10,9 +10,9 @@ use Enqueue\Sqs\SqsMessage; use Enqueue\Sqs\SqsProducer; use Enqueue\Test\ClassExtensionTrait; -use Interop\Queue\InvalidMessageException; -use Interop\Queue\PsrConsumer; -use Interop\Queue\PsrMessage; +use Interop\Queue\Consumer; +use Interop\Queue\Exception\InvalidMessageException; +use Interop\Queue\Message; class SqsConsumerTest extends \PHPUnit_Framework_TestCase { @@ -20,7 +20,7 @@ class SqsConsumerTest extends \PHPUnit_Framework_TestCase public function testShouldImplementConsumerInterface() { - $this->assertClassImplements(PsrConsumer::class, SqsConsumer::class); + $this->assertClassImplements(Consumer::class, SqsConsumer::class); } public function testCouldBeConstructedWithRequiredArguments() @@ -40,10 +40,10 @@ public function testShouldReturnInstanceOfDestination() public function testAcknowledgeShouldThrowIfInstanceOfMessageIsInvalid() { $this->expectException(InvalidMessageException::class); - $this->expectExceptionMessage('The message must be an instance of Enqueue\Sqs\SqsMessage but it is Mock_PsrMessage'); + $this->expectExceptionMessage('The message must be an instance of Enqueue\Sqs\SqsMessage but it is Mock_Message'); $consumer = new SqsConsumer($this->createContextMock(), new SqsDestination('queue')); - $consumer->acknowledge($this->createMock(PsrMessage::class)); + $consumer->acknowledge($this->createMock(Message::class)); } public function testCouldAcknowledgeMessage() @@ -77,10 +77,10 @@ public function testCouldAcknowledgeMessage() public function testRejectShouldThrowIfInstanceOfMessageIsInvalid() { $this->expectException(InvalidMessageException::class); - $this->expectExceptionMessage('The message must be an instance of Enqueue\Sqs\SqsMessage but it is Mock_PsrMessage'); + $this->expectExceptionMessage('The message must be an instance of Enqueue\Sqs\SqsMessage but it is Mock_Message'); $consumer = new SqsConsumer($this->createContextMock(), new SqsDestination('queue')); - $consumer->reject($this->createMock(PsrMessage::class)); + $consumer->reject($this->createMock(Message::class)); } public function testShouldRejectMessage() diff --git a/pkg/sqs/Tests/SqsContextTest.php b/pkg/sqs/Tests/SqsContextTest.php index a8f491271..f6567d870 100644 --- a/pkg/sqs/Tests/SqsContextTest.php +++ b/pkg/sqs/Tests/SqsContextTest.php @@ -10,10 +10,10 @@ use Enqueue\Sqs\SqsMessage; use Enqueue\Sqs\SqsProducer; use Enqueue\Test\ClassExtensionTrait; -use Interop\Queue\InvalidDestinationException; -use Interop\Queue\PsrContext; -use Interop\Queue\PsrQueue; -use Interop\Queue\TemporaryQueueNotSupportedException; +use Interop\Queue\Context; +use Interop\Queue\Exception\InvalidDestinationException; +use Interop\Queue\Exception\TemporaryQueueNotSupportedException; +use Interop\Queue\Queue; class SqsContextTest extends \PHPUnit\Framework\TestCase { @@ -21,7 +21,7 @@ class SqsContextTest extends \PHPUnit\Framework\TestCase public function testShouldImplementContextInterface() { - $this->assertClassImplements(PsrContext::class, SqsContext::class); + $this->assertClassImplements(Context::class, SqsContext::class); } public function testCouldBeConstructedWithSqsClientAsFirstArgument() @@ -112,9 +112,9 @@ public function testShouldThrowIfNotSqsDestinationGivenOnCreateConsumer() $context = new SqsContext($this->createSqsClientMock()); $this->expectException(InvalidDestinationException::class); - $this->expectExceptionMessage('The destination must be an instance of Enqueue\Sqs\SqsDestination but got Mock_PsrQueue'); + $this->expectExceptionMessage('The destination must be an instance of Enqueue\Sqs\SqsDestination but got Mock_Queue'); - $context->createConsumer($this->createMock(PsrQueue::class)); + $context->createConsumer($this->createMock(Queue::class)); } public function testShouldCreateConsumer() diff --git a/pkg/sqs/Tests/SqsDestinationTest.php b/pkg/sqs/Tests/SqsDestinationTest.php index 42e14178b..a2b13a0cb 100644 --- a/pkg/sqs/Tests/SqsDestinationTest.php +++ b/pkg/sqs/Tests/SqsDestinationTest.php @@ -4,8 +4,8 @@ use Enqueue\Sqs\SqsDestination; use Enqueue\Test\ClassExtensionTrait; -use Interop\Queue\PsrQueue; -use Interop\Queue\PsrTopic; +use Interop\Queue\Queue; +use Interop\Queue\Topic; class SqsDestinationTest extends \PHPUnit_Framework_TestCase { @@ -13,8 +13,8 @@ class SqsDestinationTest extends \PHPUnit_Framework_TestCase public function testShouldImplementsTopicAndQueueInterfaces() { - $this->assertClassImplements(PsrTopic::class, SqsDestination::class); - $this->assertClassImplements(PsrQueue::class, SqsDestination::class); + $this->assertClassImplements(Topic::class, SqsDestination::class); + $this->assertClassImplements(Queue::class, SqsDestination::class); } public function testShouldReturnNameSetInConstructor() diff --git a/pkg/sqs/Tests/SqsProducerTest.php b/pkg/sqs/Tests/SqsProducerTest.php index 0219e6416..64a57812f 100644 --- a/pkg/sqs/Tests/SqsProducerTest.php +++ b/pkg/sqs/Tests/SqsProducerTest.php @@ -9,10 +9,10 @@ use Enqueue\Sqs\SqsMessage; use Enqueue\Sqs\SqsProducer; use Enqueue\Test\ClassExtensionTrait; -use Interop\Queue\InvalidDestinationException; -use Interop\Queue\InvalidMessageException; -use Interop\Queue\PsrDestination; -use Interop\Queue\PsrProducer; +use Interop\Queue\Destination; +use Interop\Queue\Exception\InvalidDestinationException; +use Interop\Queue\Exception\InvalidMessageException; +use Interop\Queue\Producer; class SqsProducerTest extends \PHPUnit_Framework_TestCase { @@ -20,7 +20,7 @@ class SqsProducerTest extends \PHPUnit_Framework_TestCase public function testShouldImplementProducerInterface() { - $this->assertClassImplements(PsrProducer::class, SqsProducer::class); + $this->assertClassImplements(Producer::class, SqsProducer::class); } public function testCouldBeConstructedWithRequiredArguments() @@ -43,11 +43,11 @@ public function testShouldThrowIfBodyOfInvalidType() public function testShouldThrowIfDestinationOfInvalidType() { $this->expectException(InvalidDestinationException::class); - $this->expectExceptionMessage('The destination must be an instance of Enqueue\Sqs\SqsDestination but got Mock_PsrDestinat'); + $this->expectExceptionMessage('The destination must be an instance of Enqueue\Sqs\SqsDestination but got Mock_Destinat'); $producer = new SqsProducer($this->createSqsContextMock()); - $producer->send($this->createMock(PsrDestination::class), new SqsMessage()); + $producer->send($this->createMock(Destination::class), new SqsMessage()); } public function testShouldThrowIfSendMessageFailed() diff --git a/pkg/stomp/README.md b/pkg/stomp/README.md index 1d60451a7..909623c0b 100644 --- a/pkg/stomp/README.md +++ b/pkg/stomp/README.md @@ -5,7 +5,7 @@ [![Total Downloads](https://poser.pugx.org/enqueue/stomp/d/total.png)](https://packagist.org/packages/enqueue/stomp) [![Latest Stable Version](https://poser.pugx.org/enqueue/stomp/version.png)](https://packagist.org/packages/enqueue/stomp) -This is an implementation of PSR specification. It allows you to send and consume message via STOMP protocol. +This is an implementation of Queue Interop specification. It allows you to send and consume message via STOMP protocol. ## Resources diff --git a/pkg/stomp/StompConnectionFactory.php b/pkg/stomp/StompConnectionFactory.php index 51d52f8d2..329d3fa95 100644 --- a/pkg/stomp/StompConnectionFactory.php +++ b/pkg/stomp/StompConnectionFactory.php @@ -5,11 +5,11 @@ namespace Enqueue\Stomp; use Enqueue\Dsn\Dsn; -use Interop\Queue\PsrConnectionFactory; -use Interop\Queue\PsrContext; +use Interop\Queue\ConnectionFactory; +use Interop\Queue\Context; use Stomp\Network\Connection; -class StompConnectionFactory implements PsrConnectionFactory +class StompConnectionFactory implements ConnectionFactory { /** * @var array @@ -64,7 +64,7 @@ public function __construct($config = 'stomp:') /** * @return StompContext */ - public function createContext(): PsrContext + public function createContext(): Context { if ($this->config['lazy']) { return new StompContext(function () { diff --git a/pkg/stomp/StompConsumer.php b/pkg/stomp/StompConsumer.php index 6aa8e4c34..7f792163c 100644 --- a/pkg/stomp/StompConsumer.php +++ b/pkg/stomp/StompConsumer.php @@ -4,14 +4,14 @@ namespace Enqueue\Stomp; -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 Stomp\Client; use Stomp\Transport\Frame; -class StompConsumer implements PsrConsumer +class StompConsumer implements Consumer { const ACK_AUTO = 'auto'; const ACK_CLIENT = 'client'; @@ -87,12 +87,12 @@ public function setPrefetchCount(int $prefetchCount): void /** * @return StompDestination */ - public function getQueue(): PsrQueue + public function getQueue(): Queue { return $this->queue; } - public function receive(int $timeout = 0): ?PsrMessage + public function receive(int $timeout = 0): ?Message { $this->subscribe(); @@ -111,7 +111,7 @@ public function receive(int $timeout = 0): ?PsrMessage return null; } - public function receiveNoWait(): ?PsrMessage + public function receiveNoWait(): ?Message { $this->subscribe(); @@ -125,7 +125,7 @@ public function receiveNoWait(): ?PsrMessage /** * @param StompMessage $message */ - public function acknowledge(PsrMessage $message): void + public function acknowledge(Message $message): void { InvalidMessageException::assertMessageInstanceOf($message, StompMessage::class); @@ -137,7 +137,7 @@ public function acknowledge(PsrMessage $message): void /** * @param StompMessage $message */ - public function reject(PsrMessage $message, bool $requeue = false): void + public function reject(Message $message, bool $requeue = false): void { InvalidMessageException::assertMessageInstanceOf($message, StompMessage::class); diff --git a/pkg/stomp/StompContext.php b/pkg/stomp/StompContext.php index 5bd4aebbe..596eacba5 100644 --- a/pkg/stomp/StompContext.php +++ b/pkg/stomp/StompContext.php @@ -4,19 +4,19 @@ namespace Enqueue\Stomp; -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; - -class StompContext 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\Message; +use Interop\Queue\Producer; +use Interop\Queue\Queue; +use Interop\Queue\SubscriptionConsumer; +use Interop\Queue\Topic; + +class StompContext implements Context { /** * @var BufferedStompClient @@ -45,7 +45,7 @@ public function __construct($stomp) /** * @return StompMessage */ - public function createMessage(string $body = '', array $properties = [], array $headers = []): PsrMessage + public function createMessage(string $body = '', array $properties = [], array $headers = []): Message { return new StompMessage($body, $properties, $headers); } @@ -53,7 +53,7 @@ public function createMessage(string $body = '', array $properties = [], array $ /** * @return StompDestination */ - public function createQueue(string $name): PsrQueue + public function createQueue(string $name): Queue { if (0 !== strpos($name, '/')) { $destination = new StompDestination(); @@ -69,7 +69,7 @@ public function createQueue(string $name): PsrQueue /** * @return StompDestination */ - public function createTemporaryQueue(): PsrQueue + public function createTemporaryQueue(): Queue { $queue = $this->createQueue(uniqid('', true)); $queue->setType(StompDestination::TYPE_TEMP_QUEUE); @@ -80,7 +80,7 @@ public function createTemporaryQueue(): PsrQueue /** * @return StompDestination */ - public function createTopic(string $name): PsrTopic + public function createTopic(string $name): Topic { if (0 !== strpos($name, '/')) { $destination = new StompDestination(); @@ -156,7 +156,7 @@ public function createDestination(string $destination): StompDestination * * @return StompConsumer */ - public function createConsumer(PsrDestination $destination): PsrConsumer + public function createConsumer(Destination $destination): Consumer { InvalidDestinationException::assertDestinationInstanceOf($destination, StompDestination::class); @@ -166,7 +166,7 @@ public function createConsumer(PsrDestination $destination): PsrConsumer /** * @return StompProducer */ - public function createProducer(): PsrProducer + public function createProducer(): Producer { return new StompProducer($this->getStomp()); } @@ -176,12 +176,12 @@ public function close(): void $this->getStomp()->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/pkg/stomp/StompDestination.php b/pkg/stomp/StompDestination.php index 66346f8e8..b54dde0da 100644 --- a/pkg/stomp/StompDestination.php +++ b/pkg/stomp/StompDestination.php @@ -4,10 +4,10 @@ namespace Enqueue\Stomp; -use Interop\Queue\PsrQueue; -use Interop\Queue\PsrTopic; +use Interop\Queue\Queue; +use Interop\Queue\Topic; -class StompDestination implements PsrTopic, PsrQueue +class StompDestination implements Topic, Queue { const TYPE_TOPIC = 'topic'; const TYPE_EXCHANGE = 'exchange'; diff --git a/pkg/stomp/StompMessage.php b/pkg/stomp/StompMessage.php index b00588519..bb563c8cd 100644 --- a/pkg/stomp/StompMessage.php +++ b/pkg/stomp/StompMessage.php @@ -4,10 +4,10 @@ namespace Enqueue\Stomp; -use Interop\Queue\PsrMessage; +use Interop\Queue\Message; use Stomp\Transport\Frame; -class StompMessage implements PsrMessage +class StompMessage implements Message { /** * @var string diff --git a/pkg/stomp/StompProducer.php b/pkg/stomp/StompProducer.php index f5ddbe84c..31e03f301 100644 --- a/pkg/stomp/StompProducer.php +++ b/pkg/stomp/StompProducer.php @@ -4,15 +4,15 @@ namespace Enqueue\Stomp; -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 Stomp\Client; use Stomp\Transport\Message as StompLibMessage; -class StompProducer implements PsrProducer +class StompProducer implements Producer { /** * @var Client @@ -31,7 +31,7 @@ public function __construct(Client $stomp) * @param StompDestination $destination * @param StompMessage $message */ - public function send(PsrDestination $destination, PsrMessage $message): void + public function send(Destination $destination, Message $message): void { InvalidDestinationException::assertDestinationInstanceOf($destination, StompDestination::class); InvalidMessageException::assertMessageInstanceOf($message, StompMessage::class); @@ -44,7 +44,7 @@ public function send(PsrDestination $destination, PsrMessage $message): void $this->stomp->send($destination->getQueueName(), $stompMessage); } - public function setDeliveryDelay(int $deliveryDelay = null): PsrProducer + public function setDeliveryDelay(int $deliveryDelay = null): Producer { if (null === $deliveryDelay) { return $this; @@ -58,7 +58,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; @@ -72,7 +72,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; diff --git a/pkg/stomp/Tests/Functional/StompConsumptionUseCasesTest.php b/pkg/stomp/Tests/Functional/StompConsumptionUseCasesTest.php index 0c6de93f5..3ab8498ab 100644 --- a/pkg/stomp/Tests/Functional/StompConsumptionUseCasesTest.php +++ b/pkg/stomp/Tests/Functional/StompConsumptionUseCasesTest.php @@ -11,9 +11,9 @@ use Enqueue\Stomp\StompContext; use Enqueue\Test\RabbitManagementExtensionTrait; use Enqueue\Test\RabbitmqStompExtension; -use Interop\Queue\PsrContext; -use Interop\Queue\PsrMessage; -use Interop\Queue\PsrProcessor; +use Interop\Queue\Context; +use Interop\Queue\Message; +use Interop\Queue\Processor; /** * @group functional @@ -57,7 +57,7 @@ public function testConsumeOneMessageAndExit() $queueConsumer->consume(); - $this->assertInstanceOf(PsrMessage::class, $processor->lastProcessedMessage); + $this->assertInstanceOf(Message::class, $processor->lastProcessedMessage); $this->assertEquals(__METHOD__, $processor->lastProcessedMessage->getBody()); } @@ -88,22 +88,22 @@ 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()); } } -class StubProcessor implements PsrProcessor +class StubProcessor implements Processor { public $result = self::ACK; - /** @var PsrMessage */ + /** @var Message */ public $lastProcessedMessage; - public function process(PsrMessage $message, PsrContext $context) + public function process(Message $message, Context $context) { $this->lastProcessedMessage = $message; diff --git a/pkg/stomp/Tests/Spec/StompMessageTest.php b/pkg/stomp/Tests/Spec/StompMessageTest.php index 39d8bb7d1..dd9e733ea 100644 --- a/pkg/stomp/Tests/Spec/StompMessageTest.php +++ b/pkg/stomp/Tests/Spec/StompMessageTest.php @@ -3,9 +3,9 @@ namespace Enqueue\Stomp\Tests\Spec; use Enqueue\Stomp\StompMessage; -use Interop\Queue\Spec\PsrMessageSpec; +use Interop\Queue\Spec\MessageSpec; -class StompMessageTest extends PsrMessageSpec +class StompMessageTest extends MessageSpec { /** * {@inheritdoc} diff --git a/pkg/stomp/Tests/StompConnectionFactoryTest.php b/pkg/stomp/Tests/StompConnectionFactoryTest.php index 8e57e5f57..18a13463f 100644 --- a/pkg/stomp/Tests/StompConnectionFactoryTest.php +++ b/pkg/stomp/Tests/StompConnectionFactoryTest.php @@ -5,7 +5,7 @@ use Enqueue\Stomp\StompConnectionFactory; use Enqueue\Stomp\StompContext; use Enqueue\Test\ClassExtensionTrait; -use Interop\Queue\PsrConnectionFactory; +use Interop\Queue\ConnectionFactory; class StompConnectionFactoryTest extends \PHPUnit\Framework\TestCase { @@ -13,7 +13,7 @@ class StompConnectionFactoryTest extends \PHPUnit\Framework\TestCase public function testShouldImplementConnectionFactoryInterface() { - $this->assertClassImplements(PsrConnectionFactory::class, StompConnectionFactory::class); + $this->assertClassImplements(ConnectionFactory::class, StompConnectionFactory::class); } public function testShouldCreateLazyContext() diff --git a/pkg/stomp/Tests/StompConsumerTest.php b/pkg/stomp/Tests/StompConsumerTest.php index 10ef15bf6..19b16096e 100644 --- a/pkg/stomp/Tests/StompConsumerTest.php +++ b/pkg/stomp/Tests/StompConsumerTest.php @@ -7,9 +7,9 @@ use Enqueue\Stomp\StompDestination; use Enqueue\Stomp\StompMessage; use Enqueue\Test\ClassExtensionTrait; -use Interop\Queue\InvalidMessageException; -use Interop\Queue\PsrConsumer; -use Interop\Queue\PsrMessage; +use Interop\Queue\Consumer; +use Interop\Queue\Exception\InvalidMessageException; +use Interop\Queue\Message; use Stomp\Protocol\Protocol; use Stomp\Transport\Frame; @@ -19,7 +19,7 @@ class StompConsumerTest extends \PHPUnit\Framework\TestCase public function testShouldImplementMessageConsumerInterface() { - $this->assertClassImplements(PsrConsumer::class, StompConsumer::class); + $this->assertClassImplements(Consumer::class, StompConsumer::class); } public function testCouldBeConstructedWithRequiredAttributes() @@ -79,7 +79,7 @@ public function testAcknowledgeShouldThrowInvalidMessageExceptionIfMessageIsWron $this->expectExceptionMessage('The message must be an instance of'); $consumer = new StompConsumer($this->createStompClientMock(), $this->createDummyDestination()); - $consumer->acknowledge($this->createMock(PsrMessage::class)); + $consumer->acknowledge($this->createMock(Message::class)); } public function testShouldAcknowledgeMessage() @@ -116,7 +116,7 @@ public function testRejectShouldThrowInvalidMessageExceptionIfMessageIsWrongType $this->expectExceptionMessage('The message must be an instance of'); $consumer = new StompConsumer($this->createStompClientMock(), $this->createDummyDestination()); - $consumer->reject($this->createMock(PsrMessage::class)); + $consumer->reject($this->createMock(Message::class)); } public function testShouldRejectMessage() diff --git a/pkg/stomp/Tests/StompContextTest.php b/pkg/stomp/Tests/StompContextTest.php index e5e316984..036491b63 100644 --- a/pkg/stomp/Tests/StompContextTest.php +++ b/pkg/stomp/Tests/StompContextTest.php @@ -9,9 +9,9 @@ use Enqueue\Stomp\StompMessage; use Enqueue\Stomp\StompProducer; use Enqueue\Test\ClassExtensionTrait; -use Interop\Queue\InvalidDestinationException; -use Interop\Queue\PsrContext; -use Interop\Queue\PsrQueue; +use Interop\Queue\Context; +use Interop\Queue\Exception\InvalidDestinationException; +use Interop\Queue\Queue; class StompContextTest extends \PHPUnit\Framework\TestCase { @@ -19,7 +19,7 @@ class StompContextTest extends \PHPUnit\Framework\TestCase public function testShouldImplementSessionInterface() { - $this->assertClassImplements(PsrContext::class, StompContext::class); + $this->assertClassImplements(Context::class, StompContext::class); } public function testCouldBeCreatedWithRequiredArguments() @@ -110,7 +110,7 @@ public function testThrowInvalidDestinationException() $this->expectExceptionMessage('The destination must be an instance of'); $session = new StompContext($this->createStompClientMock()); - $session->createConsumer($this->createMock(PsrQueue::class)); + $session->createConsumer($this->createMock(Queue::class)); } public function testShouldCreateMessageConsumerInstance() diff --git a/pkg/stomp/Tests/StompDestinationTest.php b/pkg/stomp/Tests/StompDestinationTest.php index 07da89178..0f5261866 100644 --- a/pkg/stomp/Tests/StompDestinationTest.php +++ b/pkg/stomp/Tests/StompDestinationTest.php @@ -4,8 +4,8 @@ use Enqueue\Stomp\StompDestination; use Enqueue\Test\ClassExtensionTrait; -use Interop\Queue\PsrQueue; -use Interop\Queue\PsrTopic; +use Interop\Queue\Queue; +use Interop\Queue\Topic; class StompDestinationTest extends \PHPUnit\Framework\TestCase { @@ -13,8 +13,8 @@ class StompDestinationTest extends \PHPUnit\Framework\TestCase public function testShouldImplementsTopicAndQueueInterfaces() { - $this->assertClassImplements(PsrTopic::class, StompDestination::class); - $this->assertClassImplements(PsrQueue::class, StompDestination::class); + $this->assertClassImplements(Topic::class, StompDestination::class); + $this->assertClassImplements(Queue::class, StompDestination::class); } public function testShouldReturnDestinationStringWithRoutingKey() diff --git a/pkg/stomp/Tests/StompProducerTest.php b/pkg/stomp/Tests/StompProducerTest.php index 4db44c5fe..a197a5870 100644 --- a/pkg/stomp/Tests/StompProducerTest.php +++ b/pkg/stomp/Tests/StompProducerTest.php @@ -6,13 +6,13 @@ use Enqueue\Stomp\StompMessage; use Enqueue\Stomp\StompProducer; use Enqueue\Test\ClassExtensionTrait; -use Interop\Queue\InvalidDestinationException; -use Interop\Queue\InvalidMessageException; -use Interop\Queue\PsrMessage; -use Interop\Queue\PsrProducer; -use Interop\Queue\PsrQueue; +use Interop\Queue\Exception\InvalidDestinationException; +use Interop\Queue\Exception\InvalidMessageException; +use Interop\Queue\Message; +use Interop\Queue\Producer; +use Interop\Queue\Queue; use Stomp\Client; -use Stomp\Transport\Message; +use Stomp\Transport\Message as VendorMessage; class StompProducerTest extends \PHPUnit\Framework\TestCase { @@ -20,7 +20,7 @@ class StompProducerTest extends \PHPUnit\Framework\TestCase public function testShouldImplementProducerInterface() { - $this->assertClassImplements(PsrProducer::class, StompProducer::class); + $this->assertClassImplements(Producer::class, StompProducer::class); } public function testShouldThrowInvalidDestinationExceptionWhenDestinationIsWrongType() @@ -30,7 +30,7 @@ public function testShouldThrowInvalidDestinationExceptionWhenDestinationIsWrong $producer = new StompProducer($this->createStompClientMock()); - $producer->send($this->createMock(PsrQueue::class), new StompMessage()); + $producer->send($this->createMock(Queue::class), new StompMessage()); } public function testShouldThrowInvalidMessageExceptionWhenMessageIsWrongType() @@ -40,7 +40,7 @@ public function testShouldThrowInvalidMessageExceptionWhenMessageIsWrongType() $producer = new StompProducer($this->createStompClientMock()); - $producer->send(new StompDestination(), $this->createMock(PsrMessage::class)); + $producer->send(new StompDestination(), $this->createMock(Message::class)); } public function testShouldSendMessage() @@ -49,7 +49,7 @@ public function testShouldSendMessage() $client ->expects($this->once()) ->method('send') - ->with('/queue/name', $this->isInstanceOf(Message::class)) + ->with('/queue/name', $this->isInstanceOf(VendorMessage::class)) ; $producer = new StompProducer($client); @@ -68,7 +68,7 @@ public function testShouldEncodeMessageHeadersAndProperties() $client ->expects($this->once()) ->method('send') - ->willReturnCallback(function ($destination, Message $message) use (&$stompMessage) { + ->willReturnCallback(function ($destination, VendorMessage $message) use (&$stompMessage) { $stompMessage = $message; }) ;