Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 67a869f

Browse filesBrowse files
minor #51064 [Messenger] Remove deprecated StopWorkerOnSignalsListener (HypeMC)
This PR was merged into the 7.0 branch. Discussion ---------- [Messenger] Remove deprecated `StopWorkerOnSignalsListener` | Q | A | ------------- | --- | Branch? | 7.0 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Followup to #50997. Commits ------- 4366044 [Messenger] Remove deprecated `StopWorkerOnSignalsListener`
2 parents 9429997 + 4366044 commit 67a869f
Copy full SHA for 67a869f

File tree

Expand file treeCollapse file tree

6 files changed

+6
-83
lines changed
Filter options
Expand file treeCollapse file tree

6 files changed

+6
-83
lines changed

‎UPGRADE-7.0.md

Copy file name to clipboardExpand all lines: UPGRADE-7.0.md
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,8 @@ Messenger
172172

173173
* Add parameter `$isSameDatabase` to `DoctrineTransport::configureSchema()`
174174
* Remove `MessageHandlerInterface` and `MessageSubscriberInterface`, use `#[AsMessageHandler]` instead
175-
* Remove `StopWorkerOnSigtermSignalListener` in favor of
176-
`StopWorkerOnSignalsListener` and make it configurable with SIGINT and
175+
* Remove `StopWorkerOnSigtermSignalListener` in favor of using the `SignalableCommandInterface`
176+
* Remove `StopWorkerOnSignalsListener` in favor of using the `SignalableCommandInterface`
177177
* Remove `Symfony\Component\Messenger\Transport\InMemoryTransport` and
178178
`Symfony\Component\Messenger\Transport\InMemoryTransportFactory` in favor of
179179
`Symfony\Component\Messenger\Transport\InMemory\InMemoryTransport` and

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
-7Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@
108108
use Symfony\Component\Messenger\Attribute\AsMessageHandler;
109109
use Symfony\Component\Messenger\Bridge as MessengerBridge;
110110
use Symfony\Component\Messenger\Command\StatsCommand;
111-
use Symfony\Component\Messenger\EventListener\StopWorkerOnSignalsListener;
112111
use Symfony\Component\Messenger\Handler\BatchHandlerInterface;
113112
use Symfony\Component\Messenger\MessageBus;
114113
use Symfony\Component\Messenger\MessageBusInterface;
@@ -2035,12 +2034,6 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder
20352034
$container->getDefinition('messenger.transport.beanstalkd.factory')->addTag('messenger.transport_factory');
20362035
}
20372036

2038-
if (!class_exists(StopWorkerOnSignalsListener::class)) {
2039-
$container->removeDefinition('messenger.listener.stop_worker_signals_listener');
2040-
} elseif ($config['stop_worker_on_signals']) {
2041-
$container->getDefinition('messenger.listener.stop_worker_signals_listener')->replaceArgument(0, $config['stop_worker_on_signals']);
2042-
}
2043-
20442037
if (null === $config['default_bus'] && 1 === \count($config['buses'])) {
20452038
$config['default_bus'] = key($config['buses']);
20462039
}

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.php
-10Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
use Symfony\Component\Messenger\EventListener\SendFailedMessageToFailureTransportListener;
2424
use Symfony\Component\Messenger\EventListener\StopWorkerOnCustomStopExceptionListener;
2525
use Symfony\Component\Messenger\EventListener\StopWorkerOnRestartSignalListener;
26-
use Symfony\Component\Messenger\EventListener\StopWorkerOnSignalsListener;
2726
use Symfony\Component\Messenger\Handler\RedispatchMessageHandler;
2827
use Symfony\Component\Messenger\Middleware\AddBusNameStampMiddleware;
2928
use Symfony\Component\Messenger\Middleware\DispatchAfterCurrentBusMiddleware;
@@ -201,15 +200,6 @@
201200
->tag('kernel.event_subscriber')
202201
->tag('monolog.logger', ['channel' => 'messenger'])
203202

204-
->set('messenger.listener.stop_worker_signals_listener', StopWorkerOnSignalsListener::class)
205-
->deprecate('6.4', 'symfony/messenger', 'The "%service_id%" service is deprecated, use the "Symfony\Component\Console\Command\SignalableCommandInterface" instead.')
206-
->args([
207-
null,
208-
service('logger')->ignoreOnInvalid(),
209-
])
210-
->tag('kernel.event_subscriber')
211-
->tag('monolog.logger', ['channel' => 'messenger'])
212-
213203
->set('messenger.listener.stop_worker_on_stop_exception_listener', StopWorkerOnCustomStopExceptionListener::class)
214204
->tag('kernel.event_subscriber')
215205

‎src/Symfony/Component/Messenger/Bridge/Amqp/Tests/Fixtures/long_receiver.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Messenger/Bridge/Amqp/Tests/Fixtures/long_receiver.php
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
use Symfony\Component\Messenger\Bridge\Amqp\Transport\Connection;
1818
use Symfony\Component\Messenger\Envelope;
1919
use Symfony\Component\Messenger\EventListener\DispatchPcntlSignalListener;
20-
use Symfony\Component\Messenger\EventListener\StopWorkerOnSignalsListener;
2120
use Symfony\Component\Messenger\MessageBusInterface;
2221
use Symfony\Component\Messenger\Transport\Serialization\Serializer;
2322
use Symfony\Component\Messenger\Worker;
@@ -33,7 +32,6 @@
3332
$connection = Connection::fromDsn(getenv('DSN'));
3433
$receiver = new AmqpReceiver($connection, $serializer);
3534
$eventDispatcher = new EventDispatcher();
36-
$eventDispatcher->addSubscriber(new StopWorkerOnSignalsListener());
3735
$eventDispatcher->addSubscriber(new DispatchPcntlSignalListener());
3836

3937
$worker = new Worker(['the_receiver' => $receiver], new class() implements MessageBusInterface {
@@ -49,5 +47,7 @@ public function dispatch($envelope, array $stamps = []): Envelope
4947
}
5048
}, $eventDispatcher);
5149

50+
pcntl_signal(15, fn () => $worker->stop());
51+
5252
echo "Receiving messages...\n";
5353
$worker->run();

‎src/Symfony/Component/Messenger/CHANGELOG.md

Copy file name to clipboardExpand all lines: src/Symfony/Component/Messenger/CHANGELOG.md
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ CHANGELOG
66

77
* Add parameter `$isSameDatabase` to `DoctrineTransport::configureSchema()`
88
* Remove `MessageHandlerInterface` and `MessageSubscriberInterface`, use `#[AsMessageHandler]` instead
9-
* Remove `StopWorkerOnSigtermSignalListener` in favor of
10-
`StopWorkerOnSignalsListener` and make it configurable with SIGINT and
9+
* Remove `StopWorkerOnSigtermSignalListener` in favor of using the `SignalableCommandInterface`
10+
* Remove `StopWorkerOnSignalsListener` in favor of using the `SignalableCommandInterface`
1111
* Remove `Symfony\Component\Messenger\Transport\InMemoryTransport` and
1212
`Symfony\Component\Messenger\Transport\InMemoryTransportFactory` in favor of
1313
`Symfony\Component\Messenger\Transport\InMemory\InMemoryTransport` and

‎src/Symfony/Component/Messenger/EventListener/StopWorkerOnSignalsListener.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Messenger/EventListener/StopWorkerOnSignalsListener.php
-60Lines changed: 0 additions & 60 deletions
This file was deleted.

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.