Skip to content

Commit 8331307

Browse files
makasimmakasim
committed
[enqueue] Do not use deprecated classes.
1 parent 8ce999c commit 8331307

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+141
-141
lines changed

‎pkg/enqueue/Client/ConsumptionExtension/ExclusiveCommandExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public function __construct(DriverInterface $driver)
3131
public function onPreReceived(Context $context)
3232
{
3333
$message = $context->getInteropMessage();
34-
$queue = $context->getPsrQueue();
34+
$queue = $context->getInteropQueue();
3535

3636
if ($message->getProperty(Config::PARAMETER_TOPIC_NAME)) {
3737
return;

‎pkg/enqueue/Client/ConsumptionExtension/SetRouterPropertiesExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public function onPreReceived(Context $context)
3434

3535
$config = $this->driver->getConfig();
3636
$queue = $this->driver->createQueue($config->getRouterQueueName());
37-
if ($context->getPsrQueue()->getQueueName() != $queue->getQueueName()) {
37+
if ($context->getInteropQueue()->getQueueName() != $queue->getQueueName()) {
3838
return;
3939
}
4040

‎pkg/enqueue/Client/Driver/AmqpDriver.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
use Interop\Queue\Destination;
1515
use Interop\Queue\Message as InteropMessage;
1616
use Interop\Queue\Producer as InteropProducer;
17-
use Interop\Queue\PsrQueue;
17+
use Interop\Queue\Queue as InteropQueue;
1818
use Psr\Log\LoggerInterface;
1919
use Psr\Log\NullLogger;
2020

@@ -110,7 +110,7 @@ protected function createRouterTopic(): Destination
110110
/**
111111
* @return AmqpQueue
112112
*/
113-
protected function doCreateQueue(string $transportQueueName): PsrQueue
113+
protected function doCreateQueue(string $transportQueueName): InteropQueue
114114
{
115115
/** @var AmqpQueue $queue */
116116
$queue = parent::doCreateQueue($transportQueueName);

‎pkg/enqueue/Client/Driver/GenericDriver.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
use Interop\Queue\Destination;
1515
use Interop\Queue\Message as InteropMessage;
1616
use Interop\Queue\Producer as InteropProducer;
17-
use Interop\Queue\PsrQueue;
18-
use Interop\Queue\PsrTopic;
17+
use Interop\Queue\Queue as InteropQueue;
18+
use Interop\Queue\Topic as InteropTopic;
1919
use Psr\Log\LoggerInterface;
2020

2121
class GenericDriver implements DriverInterface
@@ -66,7 +66,7 @@ public function sendToProcessor(Message $message): void
6666
$topic = $message->getProperty(Config::PARAMETER_TOPIC_NAME);
6767
$command = $message->getProperty(Config::PARAMETER_COMMAND_NAME);
6868

69-
/** @var PsrQueue $queue */
69+
/** @var InteropQueue $queue */
7070
$queue = null;
7171
if ($topic && $processor = $message->getProperty(Config::PARAMETER_PROCESSOR_NAME)) {
7272
$route = $this->routeCollection->topicAndProcessor($topic, $processor);
@@ -117,14 +117,14 @@ public function setupBroker(LoggerInterface $logger = null): void
117117
{
118118
}
119119

120-
public function createQueue(string $clientQueueName, bool $prefix = true): PsrQueue
120+
public function createQueue(string $clientQueueName, bool $prefix = true): InteropQueue
121121
{
122122
$transportName = $this->createTransportQueueName($clientQueueName, $prefix);
123123

124124
return $this->doCreateQueue($transportName);
125125
}
126126

127-
public function createRouteQueue(Route $route): PsrQueue
127+
public function createRouteQueue(Route $route): InteropQueue
128128
{
129129
$transportName = $this->createTransportQueueName(
130130
$route->getQueue() ?: $this->config->getDefaultProcessorQueueName(),
@@ -218,7 +218,7 @@ protected function doSendToRouter(InteropProducer $producer, Destination $topic,
218218
$producer->send($topic, $transportMessage);
219219
}
220220

221-
protected function doSendToProcessor(InteropProducer $producer, PsrQueue $queue, InteropMessage $transportMessage): void
221+
protected function doSendToProcessor(InteropProducer $producer, InteropQueue $queue, InteropMessage $transportMessage): void
222222
{
223223
$producer->send($queue, $transportMessage);
224224
}
@@ -243,12 +243,12 @@ protected function createTransportQueueName(string $name, bool $prefix): string
243243
return strtolower(implode($this->config->getSeparator(), array_filter([$clientPrefix, $clientAppName, $name])));
244244
}
245245

246-
protected function doCreateQueue(string $transportQueueName): PsrQueue
246+
protected function doCreateQueue(string $transportQueueName): InteropQueue
247247
{
248248
return $this->context->createQueue($transportQueueName);
249249
}
250250

251-
protected function doCreateTopic(string $transportTopicName): PsrTopic
251+
protected function doCreateTopic(string $transportTopicName): InteropTopic
252252
{
253253
return $this->context->createTopic($transportTopicName);
254254
}

‎pkg/enqueue/Client/Driver/RabbitMqDriver.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
namespace Enqueue\Client\Driver;
44

55
use Interop\Amqp\AmqpQueue;
6-
use Interop\Queue\PsrQueue;
6+
use Interop\Queue\Queue as InteropQueue;
77

88
class RabbitMqDriver extends AmqpDriver
99
{
1010
/**
1111
* @return AmqpQueue
1212
*/
13-
protected function doCreateQueue(string $transportQueueName): PsrQueue
13+
protected function doCreateQueue(string $transportQueueName): InteropQueue
1414
{
1515
$queue = parent::doCreateQueue($transportQueueName);
1616
$queue->setArguments(['x-max-priority' => 4]);

‎pkg/enqueue/Client/Driver/RabbitMqStompDriver.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
use Interop\Queue\Destination;
1313
use Interop\Queue\Message as InteropMessage;
1414
use Interop\Queue\Producer as InteropProducer;
15-
use Interop\Queue\PsrQueue;
15+
use Interop\Queue\Queue as InteropQueue;
1616
use Psr\Log\LoggerInterface;
1717
use Psr\Log\NullLogger;
1818

@@ -138,7 +138,7 @@ public function setupBroker(LoggerInterface $logger = null): void
138138
/**
139139
* @return StompDestination
140140
*/
141-
protected function doCreateQueue(string $transportQueueName): PsrQueue
141+
protected function doCreateQueue(string $transportQueueName): InteropQueue
142142
{
143143
$queue = parent::doCreateQueue($transportQueueName);
144144
$queue->setHeader('x-max-priority', 4);
@@ -167,7 +167,7 @@ protected function doSendToRouter(InteropProducer $producer, Destination $topic,
167167
* @param StompDestination $destination
168168
* @param StompMessage $transportMessage
169169
*/
170-
protected function doSendToProcessor(InteropProducer $producer, PsrQueue $destination, InteropMessage $transportMessage): void
170+
protected function doSendToProcessor(InteropProducer $producer, InteropQueue $destination, InteropMessage $transportMessage): void
171171
{
172172
if ($delay = $transportMessage->getProperty('X-Enqueue-Delay')) {
173173
$producer->setDeliveryDelay(null);

‎pkg/enqueue/Client/Driver/SqsDriver.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
/**
1111
* @method SqsContext getContext
12-
* @method SqsDestination createQueue(string $clientQueueName): PsrQueue
12+
* @method SqsDestination createQueue(string $clientQueueName): InteropQueue
1313
*/
1414
class SqsDriver extends GenericDriver
1515
{

‎pkg/enqueue/Client/Driver/StompDriver.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
use Enqueue\Stomp\StompMessage;
99
use Interop\Queue\Destination;
1010
use Interop\Queue\Message as InteropMessage;
11-
use Interop\Queue\PsrQueue;
11+
use Interop\Queue\Queue as InteropQueue;
1212
use Psr\Log\LoggerInterface;
1313
use Psr\Log\NullLogger;
1414

@@ -43,7 +43,7 @@ public function createTransportMessage(Message $message): InteropMessage
4343
/**
4444
* @return StompDestination
4545
*/
46-
protected function doCreateQueue(string $transportQueueName): PsrQueue
46+
protected function doCreateQueue(string $transportQueueName): InteropQueue
4747
{
4848
/** @var StompDestination $queue */
4949
$queue = parent::doCreateQueue($transportQueueName);

‎pkg/enqueue/Client/DriverFactory.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
use Enqueue\Dsn\Dsn;
99
use Enqueue\Stomp\StompConnectionFactory;
1010
use Interop\Amqp\AmqpConnectionFactory;
11-
use Interop\Queue\PsrConnectionFactory;
11+
use Interop\Queue\ConnectionFactory;
1212

1313
final class DriverFactory implements DriverFactoryInterface
1414
{
@@ -28,7 +28,7 @@ public function __construct(Config $config, RouteCollection $routeCollection)
2828
$this->routeCollection = $routeCollection;
2929
}
3030

31-
public function create(PsrConnectionFactory $factory, string $dsn, array $config): DriverInterface
31+
public function create(ConnectionFactory $factory, string $dsn, array $config): DriverInterface
3232
{
3333
$dsn = new Dsn($dsn);
3434

‎pkg/enqueue/Client/DriverFactoryInterface.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
namespace Enqueue\Client;
44

5-
use Interop\Queue\PsrConnectionFactory;
5+
use Interop\Queue\ConnectionFactory;
66

77
interface DriverFactoryInterface
88
{
9-
public function create(PsrConnectionFactory $factory, string $dsn, array $config): DriverInterface;
9+
public function create(ConnectionFactory $factory, string $dsn, array $config): DriverInterface;
1010
}

‎pkg/enqueue/Client/DriverInterface.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
use Interop\Queue\Context;
88
use Interop\Queue\Message as InteropMessage;
9-
use Interop\Queue\PsrQueue;
9+
use Interop\Queue\Queue as InteropQueue;
1010
use Psr\Log\LoggerInterface;
1111

1212
interface DriverInterface
@@ -19,9 +19,9 @@ public function sendToRouter(Message $message): void;
1919

2020
public function sendToProcessor(Message $message): void;
2121

22-
public function createQueue(string $queueName, bool $prefix = true): PsrQueue;
22+
public function createQueue(string $queueName, bool $prefix = true): InteropQueue;
2323

24-
public function createRouteQueue(Route $route): PsrQueue;
24+
public function createRouteQueue(Route $route): InteropQueue;
2525

2626
/**
2727
* Prepare broker for work.

‎pkg/enqueue/ConnectionFactoryFactory.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
namespace Enqueue;
44

55
use Enqueue\Dsn\Dsn;
6-
use Interop\Queue\PsrConnectionFactory;
6+
use Interop\Queue\ConnectionFactory;
77

88
final class ConnectionFactoryFactory implements ConnectionFactoryFactoryInterface
99
{
10-
public function create($config): PsrConnectionFactory
10+
public function create($config): ConnectionFactory
1111
{
1212
if (is_string($config)) {
1313
$config = ['dsn' => $config];

‎pkg/enqueue/ConnectionFactoryFactoryInterface.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace Enqueue;
44

5-
use Interop\Queue\PsrConnectionFactory;
5+
use Interop\Queue\ConnectionFactory;
66

77
interface ConnectionFactoryFactoryInterface
88
{
@@ -18,5 +18,5 @@ interface ConnectionFactoryFactoryInterface
1818
*
1919
* @throws \InvalidArgumentException if invalid config provided
2020
*/
21-
public function create($config): PsrConnectionFactory;
21+
public function create($config): ConnectionFactory;
2222
}

‎pkg/enqueue/Consumption/Context.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
use Interop\Queue\Context as InteropContext;
88
use Interop\Queue\Message as InteropMessage;
99
use Interop\Queue\Processor;
10-
use Interop\Queue\PsrQueue;
10+
use Interop\Queue\Queue as InteropQueue;
1111
use Psr\Log\LoggerInterface;
1212

1313
class Context
@@ -48,9 +48,9 @@ class Context
4848
private $result;
4949

5050
/**
51-
* @var PsrQueue
51+
* @var InteropQueue
5252
*/
53-
private $psrQueue;
53+
private $InteropQueue;
5454

5555
/**
5656
* @var bool
@@ -212,22 +212,22 @@ public function setLogger(LoggerInterface $logger)
212212
}
213213

214214
/**
215-
* @return PsrQueue
215+
* @return InteropQueue
216216
*/
217-
public function getPsrQueue()
217+
public function getInteropQueue()
218218
{
219-
return $this->psrQueue;
219+
return $this->InteropQueue;
220220
}
221221

222222
/**
223-
* @param PsrQueue $psrQueue
223+
* @param InteropQueue $InteropQueue
224224
*/
225-
public function setPsrQueue(PsrQueue $psrQueue)
225+
public function setInteropQueue(InteropQueue $InteropQueue)
226226
{
227-
if ($this->psrQueue) {
227+
if ($this->InteropQueue) {
228228
throw new IllegalContextModificationException('The queue modification is not allowed');
229229
}
230230

231-
$this->psrQueue = $psrQueue;
231+
$this->InteropQueue = $InteropQueue;
232232
}
233233
}

‎pkg/enqueue/Consumption/FallbackSubscriptionConsumer.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
namespace Enqueue\Consumption;
44

55
use Interop\Queue\Consumer;
6-
use Interop\Queue\PsrSubscriptionConsumer;
6+
use Interop\Queue\SubscriptionConsumer;
77

8-
final class FallbackSubscriptionConsumer implements PsrSubscriptionConsumer
8+
final class FallbackSubscriptionConsumer implements SubscriptionConsumer
99
{
1010
/**
1111
* an item contains an array: [Consumer $consumer, callable $callback];.

‎pkg/enqueue/Consumption/QueueConsumer.php

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
use Interop\Queue\Exception\SubscriptionConsumerNotSupportedException;
1212
use Interop\Queue\Message as InteropMessage;
1313
use Interop\Queue\Processor;
14-
use Interop\Queue\PsrQueue;
15-
use Interop\Queue\PsrSubscriptionConsumer;
14+
use Interop\Queue\Queue as InteropQueue;
15+
use Interop\Queue\SubscriptionConsumer;
1616
use Psr\Log\LoggerInterface;
1717
use Psr\Log\NullLogger;
1818

@@ -30,7 +30,7 @@ final class QueueConsumer implements QueueConsumerInterface
3030

3131
/**
3232
* [
33-
* [PsrQueue, Processor],
33+
* [InteropQueue, Processor],
3434
* ].
3535
*
3636
* @var array
@@ -58,7 +58,7 @@ final class QueueConsumer implements QueueConsumerInterface
5858
private $logger;
5959

6060
/**
61-
* @var PsrSubscriptionConsumer
61+
* @var SubscriptionConsumer
6262
*/
6363
private $fallbackSubscriptionConsumer;
6464

@@ -121,7 +121,7 @@ public function bind($queue, Processor $processor): QueueConsumerInterface
121121
$queue = $this->interopContext->createQueue($queue);
122122
}
123123

124-
InvalidArgumentException::assertInstanceOf($queue, PsrQueue::class);
124+
InvalidArgumentException::assertInstanceOf($queue, InteropQueue::class);
125125

126126
if (empty($queue->getQueueName())) {
127127
throw new LogicException('The queue name must be not empty.');
@@ -154,7 +154,7 @@ public function consume(ExtensionInterface $runtimeExtension = null): void
154154

155155
/** @var Consumer[] $consumers */
156156
$consumers = [];
157-
/** @var PsrQueue $queue */
157+
/** @var InteropQueue $queue */
158158
foreach ($this->boundProcessors as list($queue, $processor)) {
159159
$consumers[$queue->getQueueName()] = $this->interopContext->createConsumer($queue);
160160
}
@@ -185,7 +185,7 @@ public function consume(ExtensionInterface $runtimeExtension = null): void
185185
$callback = function (InteropMessage $message, Consumer $consumer) use (&$context) {
186186
$currentProcessor = null;
187187

188-
/** @var PsrQueue $queue */
188+
/** @var InteropQueue $queue */
189189
foreach ($this->boundProcessors as list($queue, $processor)) {
190190
if ($queue->getQueueName() === $consumer->getQueue()->getQueueName()) {
191191
$currentProcessor = $processor;
@@ -198,7 +198,7 @@ public function consume(ExtensionInterface $runtimeExtension = null): void
198198

199199
$context = new Context($this->interopContext);
200200
$context->setLogger($this->logger);
201-
$context->setPsrQueue($consumer->getQueue());
201+
$context->setInteropQueue($consumer->getQueue());
202202
$context->setConsumer($consumer);
203203
$context->setProcessor($currentProcessor);
204204
$context->setInteropMessage($message);
@@ -262,9 +262,9 @@ public function consume(ExtensionInterface $runtimeExtension = null): void
262262
/**
263263
* @internal
264264
*
265-
* @param PsrSubscriptionConsumer $fallbackSubscriptionConsumer
265+
* @param SubscriptionConsumer $fallbackSubscriptionConsumer
266266
*/
267-
public function setFallbackSubscriptionConsumer(PsrSubscriptionConsumer $fallbackSubscriptionConsumer): void
267+
public function setFallbackSubscriptionConsumer(SubscriptionConsumer $fallbackSubscriptionConsumer): void
268268
{
269269
$this->fallbackSubscriptionConsumer = $fallbackSubscriptionConsumer;
270270
}
@@ -313,7 +313,7 @@ private function onInterruptionByException(ExtensionInterface $extension, Contex
313313

314314
private function processMessage(Consumer $consumer, Processor $processor, InteropMessage $message, Context $context)
315315
{
316-
$this->logger->info('Message received from the queue: '.$context->getPsrQueue()->getQueueName());
316+
$this->logger->info('Message received from the queue: '.$context->getInteropQueue()->getQueueName());
317317
$this->logger->debug('Headers: {headers}', ['headers' => new VarExport($message->getHeaders())]);
318318
$this->logger->debug('Properties: {properties}', ['properties' => new VarExport($message->getProperties())]);
319319
$this->logger->debug('Payload: {payload}', ['payload' => new VarExport($message->getBody())]);

0 commit comments

Comments
 (0)