Skip to content

Commit ba6185d

Browse files
committed
[bundle] Do not use deprecated classes.
1 parent 8331307 commit ba6185d

19 files changed

Lines changed: 102 additions & 117 deletions

‎pkg/enqueue-bundle/Resources/config/client.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
services:
22
enqueue.client.default.context:
3-
class: 'Interop\Queue\PsrContext'
3+
class: 'Interop\Queue\Context'
44
factory: ['@enqueue.client.default.driver', 'getContext']
55

66
enqueue.client.default.driver_factory:

‎pkg/enqueue-bundle/Tests/Functional/App/AsyncListener.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ public function onEvent(Event $event = null, $eventName)
3939
if (false == $this->isSyncMode($eventName)) {
4040
$transformerName = $this->registry->getTransformerNameForEvent($eventName);
4141

42-
$psrMessage = $this->registry->getTransformer($transformerName)->toMessage($eventName, $event);
43-
$message = new Message($psrMessage->getBody());
42+
$interopMessage = $this->registry->getTransformer($transformerName)->toMessage($eventName, $event);
43+
$message = new Message($interopMessage->getBody());
4444
$message->setScope(Message::SCOPE_APP);
4545
$message->setProperty('event_name', $eventName);
4646
$message->setProperty('transformer_name', $transformerName);

‎pkg/enqueue-bundle/Tests/Functional/App/SqsCustomConnectionFactoryFactory.php‎

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

55
use Enqueue\ConnectionFactoryFactoryInterface;
66
use Enqueue\Sqs\SqsConnectionFactory;
7-
use Interop\Queue\PsrConnectionFactory;
7+
use Interop\Queue\ConnectionFactory;
88
use Symfony\Component\DependencyInjection\ContainerInterface;
99

1010
class SqsCustomConnectionFactoryFactory implements ConnectionFactoryFactoryInterface
@@ -19,7 +19,7 @@ public function __construct(ContainerInterface $container)
1919
$this->container = $container;
2020
}
2121

22-
public function create($config): PsrConnectionFactory
22+
public function create($config): ConnectionFactory
2323
{
2424
if (false == isset($config['service'])) {
2525
throw new \LogicException('The sqs client has to be set');

‎pkg/enqueue-bundle/Tests/Functional/App/TestAsyncEventTransformer.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,22 @@
44

55
use Enqueue\AsyncEventDispatcher\EventTransformer;
66
use Enqueue\Util\JSON;
7-
use Interop\Queue\PsrContext;
8-
use Interop\Queue\PsrMessage;
7+
use Interop\Queue\Context;
8+
use Interop\Queue\Message;
99
use Symfony\Component\EventDispatcher\Event;
1010
use Symfony\Component\EventDispatcher\GenericEvent;
1111

1212
class TestAsyncEventTransformer implements EventTransformer
1313
{
1414
/**
15-
* @var PsrContext
15+
* @var Context
1616
*/
1717
private $context;
1818

1919
/**
20-
* @param PsrContext $context
20+
* @param Context $context
2121
*/
22-
public function __construct(PsrContext $context)
22+
public function __construct(Context $context)
2323
{
2424
$this->context = $context;
2525
}
@@ -41,7 +41,7 @@ public function toMessage($eventName, Event $event)
4141
]));
4242
}
4343

44-
public function toEvent($eventName, PsrMessage $message)
44+
public function toEvent($eventName, Message $message)
4545
{
4646
$data = JSON::decode($message->getBody());
4747

‎pkg/enqueue-bundle/Tests/Functional/App/TestCommandSubscriberProcessor.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44

55
use Enqueue\Client\CommandSubscriberInterface;
66
use Enqueue\Consumption\Result;
7-
use Interop\Queue\PsrContext;
8-
use Interop\Queue\PsrMessage;
9-
use Interop\Queue\PsrProcessor;
7+
use Interop\Queue\Context;
8+
use Interop\Queue\Message;
9+
use Interop\Queue\Processor;
1010

11-
class TestCommandSubscriberProcessor implements PsrProcessor, CommandSubscriberInterface
11+
class TestCommandSubscriberProcessor implements Processor, CommandSubscriberInterface
1212
{
1313
public $calls = [];
1414

15-
public function process(PsrMessage $message, PsrContext $context)
15+
public function process(Message $message, Context $context)
1616
{
1717
$this->calls[] = $message;
1818

‎pkg/enqueue-bundle/Tests/Functional/App/TestExclusiveCommandSubscriberProcessor.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44

55
use Enqueue\Client\CommandSubscriberInterface;
66
use Enqueue\Consumption\Result;
7-
use Interop\Queue\PsrContext;
8-
use Interop\Queue\PsrMessage;
9-
use Interop\Queue\PsrProcessor;
7+
use Interop\Queue\Context;
8+
use Interop\Queue\Message;
9+
use Interop\Queue\Processor;
1010

11-
class TestExclusiveCommandSubscriberProcessor implements PsrProcessor, CommandSubscriberInterface
11+
class TestExclusiveCommandSubscriberProcessor implements Processor, CommandSubscriberInterface
1212
{
1313
public $calls = [];
1414

15-
public function process(PsrMessage $message, PsrContext $context)
15+
public function process(Message $message, Context $context)
1616
{
1717
$this->calls[] = $message;
1818

‎pkg/enqueue-bundle/Tests/Functional/App/TestTopicSubscriberProcessor.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44

55
use Enqueue\Client\TopicSubscriberInterface;
66
use Enqueue\Consumption\Result;
7-
use Interop\Queue\PsrContext;
8-
use Interop\Queue\PsrMessage;
9-
use Interop\Queue\PsrProcessor;
7+
use Interop\Queue\Context;
8+
use Interop\Queue\Message;
9+
use Interop\Queue\Processor;
1010

11-
class TestTopicSubscriberProcessor implements PsrProcessor, TopicSubscriberInterface
11+
class TestTopicSubscriberProcessor implements Processor, TopicSubscriberInterface
1212
{
1313
public $calls = [];
1414

15-
public function process(PsrMessage $message, PsrContext $context)
15+
public function process(Message $message, Context $context)
1616
{
1717
$this->calls[] = $message;
1818

‎pkg/enqueue-bundle/Tests/Functional/ContextTest.php‎

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

33
namespace Enqueue\Bundle\Tests\Functional;
44

5-
use Interop\Queue\PsrContext;
5+
use Interop\Queue\Context;
66

77
/**
88
* @group functional
@@ -13,6 +13,6 @@ public function testCouldBeGetFromContainerAsService()
1313
{
1414
$connection = static::$container->get('test_enqueue.transport.default.context');
1515

16-
$this->assertInstanceOf(PsrContext::class, $connection);
16+
$this->assertInstanceOf(Context::class, $connection);
1717
}
1818
}

‎pkg/enqueue-bundle/Tests/Functional/Events/AsyncProcessorTest.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
use Enqueue\Null\NullContext;
1111
use Enqueue\Null\NullMessage;
1212
use Enqueue\Util\JSON;
13-
use Interop\Queue\PsrProcessor;
13+
use Interop\Queue\Processor;
1414
use Symfony\Component\EventDispatcher\GenericEvent;
1515

1616
/**
@@ -45,7 +45,7 @@ public function testShouldRejectIfMessageDoesNotContainEventNameProperty()
4545

4646
$message = new NullMessage();
4747

48-
$this->assertEquals(PsrProcessor::REJECT, $processor->process($message, new NullContext()));
48+
$this->assertEquals(Processor::REJECT, $processor->process($message, new NullContext()));
4949
}
5050

5151
public function testShouldRejectIfMessageDoesNotContainTransformerNameProperty()
@@ -56,7 +56,7 @@ public function testShouldRejectIfMessageDoesNotContainTransformerNameProperty()
5656
$message = new NullMessage();
5757
$message->setProperty('event_name', 'anEventName');
5858

59-
$this->assertEquals(PsrProcessor::REJECT, $processor->process($message, new NullContext()));
59+
$this->assertEquals(Processor::REJECT, $processor->process($message, new NullContext()));
6060
}
6161

6262
public function testShouldCallRealListener()
@@ -72,7 +72,7 @@ public function testShouldCallRealListener()
7272
'arguments' => ['fooArg' => 'fooVal'],
7373
]));
7474

75-
$this->assertEquals(PsrProcessor::ACK, $processor->process($message, new NullContext()));
75+
$this->assertEquals(Processor::ACK, $processor->process($message, new NullContext()));
7676

7777
/** @var TestAsyncListener $listener */
7878
$listener = static::$container->get('test_async_listener');
@@ -103,7 +103,7 @@ public function testShouldCallRealSubscriber()
103103
'arguments' => ['fooArg' => 'fooVal'],
104104
]));
105105

106-
$this->assertEquals(PsrProcessor::ACK, $processor->process($message, new NullContext()));
106+
$this->assertEquals(Processor::ACK, $processor->process($message, new NullContext()));
107107

108108
/** @var TestAsyncSubscriber $subscriber */
109109
$subscriber = static::$container->get('test_async_subscriber');

‎pkg/enqueue-bundle/Tests/Functional/TestCommandProcessor.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@
33
namespace Enqueue\Bundle\Tests\Functional;
44

55
use Enqueue\Client\CommandSubscriberInterface;
6-
use Interop\Queue\PsrContext;
7-
use Interop\Queue\PsrMessage;
8-
use Interop\Queue\PsrProcessor;
6+
use Interop\Queue\Context;
7+
use Interop\Queue\Message;
8+
use Interop\Queue\Processor;
99

10-
class TestCommandProcessor implements PsrProcessor, CommandSubscriberInterface
10+
class TestCommandProcessor implements Processor, CommandSubscriberInterface
1111
{
1212
const COMMAND = 'test-command';
1313

1414
/**
15-
* @var PsrMessage
15+
* @var Message
1616
*/
1717
public $message;
1818

19-
public function process(PsrMessage $message, PsrContext $context)
19+
public function process(Message $message, Context $context)
2020
{
2121
$this->message = $message;
2222

0 commit comments

Comments
 (0)