Skip to content

Commit 5cd3d98

Browse files
andrewmyandrewmy
committed
Drop Symfony < 5.1 🔥
1 parent e7c891b commit 5cd3d98

File tree

5 files changed

+43
-132
lines changed

5 files changed

+43
-132
lines changed

‎Profiler/MessageQueueCollector.php

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

55
use Symfony\Component\HttpFoundation\Request;
66
use Symfony\Component\HttpFoundation\Response;
7-
use Symfony\Component\HttpKernel\Kernel;
7+
use Throwable;
88

9-
if (Kernel::MAJOR_VERSION < 5) {
10-
class MessageQueueCollector extends AbstractMessageQueueCollector
9+
class MessageQueueCollector extends AbstractMessageQueueCollector
10+
{
11+
public function collect(Request $request, Response $response, Throwable $exception = null)
1112
{
12-
/**
13-
* {@inheritdoc}
14-
*/
15-
public function collect(Request $request, Response $response, \Exception $exception = null)
16-
{
17-
$this->collectInternal($request, $response);
18-
}
19-
}
20-
} else {
21-
class MessageQueueCollector extends AbstractMessageQueueCollector
22-
{
23-
/**
24-
* {@inheritdoc}
25-
*/
26-
public function collect(Request $request, Response $response, \Throwable $exception = null)
27-
{
28-
$this->collectInternal($request, $response);
29-
}
13+
$this->collectInternal($request, $response);
3014
}
3115
}

‎Tests/Functional/App/AsyncListener.php

Lines changed: 6 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2,36 +2,15 @@
22

33
namespace Enqueue\Bundle\Tests\Functional\App;
44

5-
use Symfony\Component\EventDispatcher\Event;
6-
use Symfony\Contracts\EventDispatcher\Event as ContractEvent;
5+
use Symfony\Contracts\EventDispatcher\Event;
76

8-
if (class_exists(Event::class)) {
7+
class AsyncListener extends AbstractAsyncListener
8+
{
99
/**
10-
* Symfony < 5.0.
10+
* @param string $eventName
1111
*/
12-
class AsyncListener extends AbstractAsyncListener
12+
public function onEvent(Event $event, $eventName)
1313
{
14-
/**
15-
* @param Event|ContractEvent $event
16-
* @param string $eventName
17-
*/
18-
public function onEvent($event, $eventName)
19-
{
20-
$this->onEventInternal($event, $eventName);
21-
}
22-
}
23-
} else {
24-
/**
25-
* Symfony >= 5.0.
26-
*/
27-
class AsyncListener extends AbstractAsyncListener
28-
{
29-
/**
30-
* @param string $eventName
31-
*/
32-
public function onEvent(ContractEvent $event, $eventName)
33-
{
34-
$this->onEventInternal($event, $eventName);
35-
}
14+
$this->onEventInternal($event, $eventName);
3615
}
3716
}

‎Tests/Functional/App/TestAsyncEventTransformer.php

Lines changed: 26 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -6,96 +6,46 @@
66
use Enqueue\Util\JSON;
77
use Interop\Queue\Context;
88
use Interop\Queue\Message;
9-
use Symfony\Component\EventDispatcher\Event;
109
use Symfony\Component\EventDispatcher\GenericEvent;
11-
use Symfony\Contracts\EventDispatcher\Event as ContractEvent;
10+
use Symfony\Contracts\EventDispatcher\Event;
1211

13-
if (class_exists(Event::class)) {
12+
class TestAsyncEventTransformer implements EventTransformer
13+
{
1414
/**
15-
* Symfony < 5.0.
15+
* @var Context
1616
*/
17-
class TestAsyncEventTransformer implements EventTransformer
17+
private $context;
18+
19+
public function __construct(Context $context)
1820
{
19-
/**
20-
* @var Context
21-
*/
22-
private $context;
21+
$this->context = $context;
22+
}
2323

24-
public function __construct(Context $context)
25-
{
26-
$this->context = $context;
24+
public function toMessage($eventName, Event $event = null)
25+
{
26+
if (Event::class === get_class($event)) {
27+
return $this->context->createMessage(json_encode(''));
2728
}
2829

29-
public function toMessage($eventName, $event = null)
30-
{
31-
if (Event::class === get_class($event) || ContractEvent::class === get_class($event)) {
32-
return $this->context->createMessage(json_encode(''));
33-
}
34-
35-
/** @var GenericEvent $event */
36-
if (false == $event instanceof GenericEvent) {
37-
throw new \LogicException('Must be GenericEvent');
38-
}
39-
40-
return $this->context->createMessage(json_encode([
41-
'subject' => $event->getSubject(),
42-
'arguments' => $event->getArguments(),
43-
]));
30+
/** @var GenericEvent $event */
31+
if (false == $event instanceof GenericEvent) {
32+
throw new \LogicException('Must be GenericEvent');
4433
}
4534

46-
public function toEvent($eventName, Message $message)
47-
{
48-
$data = JSON::decode($message->getBody());
49-
50-
if ('' === $data) {
51-
return new Event();
52-
}
53-
54-
return new GenericEvent($data['subject'], $data['arguments']);
55-
}
35+
return $this->context->createMessage(json_encode([
36+
'subject' => $event->getSubject(),
37+
'arguments' => $event->getArguments(),
38+
]));
5639
}
57-
} else {
58-
/**
59-
* Symfony >= 5.0.
60-
*/
61-
class TestAsyncEventTransformer implements EventTransformer
62-
{
63-
/**
64-
* @var Context
65-
*/
66-
private $context;
67-
68-
public function __construct(Context $context)
69-
{
70-
$this->context = $context;
71-
}
72-
73-
public function toMessage($eventName, ContractEvent $event = null)
74-
{
75-
if (ContractEvent::class === get_class($event)) {
76-
return $this->context->createMessage(json_encode(''));
77-
}
7840

79-
/** @var GenericEvent $event */
80-
if (false == $event instanceof GenericEvent) {
81-
throw new \LogicException('Must be GenericEvent');
82-
}
41+
public function toEvent($eventName, Message $message)
42+
{
43+
$data = JSON::decode($message->getBody());
8344

84-
return $this->context->createMessage(json_encode([
85-
'subject' => $event->getSubject(),
86-
'arguments' => $event->getArguments(),
87-
]));
45+
if ('' === $data) {
46+
return new Event();
8847
}
8948

90-
public function toEvent($eventName, Message $message)
91-
{
92-
$data = JSON::decode($message->getBody());
93-
94-
if ('' === $data) {
95-
return new ContractEvent();
96-
}
97-
98-
return new GenericEvent($data['subject'], $data['arguments']);
99-
}
49+
return new GenericEvent($data['subject'], $data['arguments']);
10050
}
10151
}

‎Tests/Functional/App/config/config-sf5.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,7 @@ services:
8787
class: 'Enqueue\Bundle\Tests\Functional\App\TestAsyncListener'
8888
public: true
8989
tags:
90-
- { name: 'kernel.event_listener', async: true, event: 'test_async', method: 'onEvent' }
91-
# In Symfony 6 you would also add "dispatcher: 'enqueue.events.event_dispatcher'"
90+
- { name: 'kernel.event_listener', async: true, event: 'test_async', method: 'onEvent', dispatcher: 'enqueue.events.event_dispatcher' }
9291

9392
test_command_subscriber_processor:
9493
class: 'Enqueue\Bundle\Tests\Functional\App\TestCommandSubscriberProcessor'
@@ -112,8 +111,7 @@ services:
112111
class: 'Enqueue\Bundle\Tests\Functional\App\TestAsyncSubscriber'
113112
public: true
114113
tags:
115-
- { name: 'kernel.event_subscriber', async: true }
116-
# In Symfony 6 you would also add "dispatcher: 'enqueue.events.event_dispatcher'"
114+
- { name: 'kernel.event_subscriber', async: true, dispatcher: 'enqueue.events.event_dispatcher' }
117115

118116
test_async_event_transformer:
119117
class: 'Enqueue\Bundle\Tests\Functional\App\TestAsyncEventTransformer'

‎composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"license": "MIT",
88
"require": {
99
"php": "^7.3|^8.0",
10-
"symfony/framework-bundle": "^4.3|^5|^6.0",
10+
"symfony/framework-bundle": "^5.1|^6.0",
1111
"queue-interop/amqp-interop": "^0.8.2",
1212
"queue-interop/queue-interop": "^0.8",
1313
"enqueue/enqueue": "^0.10",
@@ -39,9 +39,9 @@
3939
"doctrine/doctrine-bundle": "^2.0",
4040
"doctrine/mongodb-odm-bundle": "^3.5|^4.3",
4141
"alcaeus/mongo-php-adapter": "^1.0",
42-
"symfony/browser-kit": "^4.3|^5|^6.0",
43-
"symfony/expression-language": "^4.3|^5|^6.0",
44-
"symfony/yaml": "^4.3|^5|^6.0"
42+
"symfony/browser-kit": "^5.1|^6.0",
43+
"symfony/expression-language": "^5.1|^6.0",
44+
"symfony/yaml": "^5.1|^6.0"
4545
},
4646
"suggest": {
4747
"enqueue/async-command": "If want to run Symfony command via message queue",

0 commit comments

Comments
 (0)