From 0b62ce89df079fc806145ddf4c4a7c5a2277a0e2 Mon Sep 17 00:00:00 2001 From: HypeMC Date: Mon, 17 Jul 2023 00:46:33 +0200 Subject: [PATCH] [Messenger] Deprecate `StopWorkerOnSignalsListener` --- UPGRADE-6.4.md | 5 +++++ .../Bundle/FrameworkBundle/Resources/config/messenger.php | 3 ++- src/Symfony/Component/Messenger/CHANGELOG.md | 5 +++++ .../EventListener/StopWorkerOnSignalsListener.php | 3 +++ .../EventListener/StopWorkerOnSigtermSignalListener.php | 7 ++++--- 5 files changed, 19 insertions(+), 4 deletions(-) diff --git a/UPGRADE-6.4.md b/UPGRADE-6.4.md index 1e88fcae44717..a2a29e53b29bf 100644 --- a/UPGRADE-6.4.md +++ b/UPGRADE-6.4.md @@ -46,6 +46,11 @@ HttpKernel * `BundleInterface` no longer extends `ContainerAwareInterface` * Add native return types to `TraceableEventDispatcher` and to `MergeExtensionConfigurationPass` +Messenger +--------- + + * Deprecate `StopWorkerOnSignalsListener` in favor of using the `SignalableCommandInterface` + MonologBridge ------------- diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.php index 3fe593ac673ff..5e4726265db3f 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.php +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.php @@ -202,6 +202,7 @@ ->tag('monolog.logger', ['channel' => 'messenger']) ->set('messenger.listener.stop_worker_signals_listener', StopWorkerOnSignalsListener::class) + ->deprecate('6.4', 'symfony/messenger', 'The "%service_id%" service is deprecated, use the "Symfony\Component\Console\Command\SignalableCommandInterface" instead.') ->args([ null, service('logger')->ignoreOnInvalid(), @@ -210,7 +211,7 @@ ->tag('monolog.logger', ['channel' => 'messenger']) ->alias('messenger.listener.stop_worker_on_sigterm_signal_listener', 'messenger.listener.stop_worker_signals_listener') - ->deprecate('6.3', 'symfony/messenger', 'The "%alias_id%" service is deprecated, use "messenger.listener.stop_worker_signals_listener" instead.') + ->deprecate('6.3', 'symfony/messenger', 'The "%alias_id%" service is deprecated, use the "Symfony\Component\Console\Command\SignalableCommandInterface" instead.') ->set('messenger.listener.stop_worker_on_stop_exception_listener', StopWorkerOnCustomStopExceptionListener::class) ->tag('kernel.event_subscriber') diff --git a/src/Symfony/Component/Messenger/CHANGELOG.md b/src/Symfony/Component/Messenger/CHANGELOG.md index aabf140f6ce73..512225204f229 100644 --- a/src/Symfony/Component/Messenger/CHANGELOG.md +++ b/src/Symfony/Component/Messenger/CHANGELOG.md @@ -1,6 +1,11 @@ CHANGELOG ========= +6.4 +--- + + * Deprecate `StopWorkerOnSignalsListener` in favor of using the `SignalableCommandInterface` + 6.3 --- diff --git a/src/Symfony/Component/Messenger/EventListener/StopWorkerOnSignalsListener.php b/src/Symfony/Component/Messenger/EventListener/StopWorkerOnSignalsListener.php index 368c5c5b61862..573d191d21c50 100644 --- a/src/Symfony/Component/Messenger/EventListener/StopWorkerOnSignalsListener.php +++ b/src/Symfony/Component/Messenger/EventListener/StopWorkerOnSignalsListener.php @@ -12,12 +12,15 @@ namespace Symfony\Component\Messenger\EventListener; use Psr\Log\LoggerInterface; +use Symfony\Component\Console\Command\SignalableCommandInterface; use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\Messenger\Event\WorkerStartedEvent; /** * @author Tobias Schultze * @author Grégoire Pineau + * + * @deprecated since Symfony 6.4, use the {@see SignalableCommandInterface} instead */ class StopWorkerOnSignalsListener implements EventSubscriberInterface { diff --git a/src/Symfony/Component/Messenger/EventListener/StopWorkerOnSigtermSignalListener.php b/src/Symfony/Component/Messenger/EventListener/StopWorkerOnSigtermSignalListener.php index 0b330338d19be..8954044f1c286 100644 --- a/src/Symfony/Component/Messenger/EventListener/StopWorkerOnSigtermSignalListener.php +++ b/src/Symfony/Component/Messenger/EventListener/StopWorkerOnSigtermSignalListener.php @@ -11,14 +11,15 @@ namespace Symfony\Component\Messenger\EventListener; -trigger_deprecation('symfony/messenger', '6.3', '"%s" is deprecated, use "%s" instead.', StopWorkerOnSigtermSignalListener::class, StopWorkerOnSignalsListener::class); - use Psr\Log\LoggerInterface; +use Symfony\Component\Console\Command\SignalableCommandInterface; + +trigger_deprecation('symfony/messenger', '6.3', '"%s" is deprecated, use the "%s" instead.', StopWorkerOnSigtermSignalListener::class, SignalableCommandInterface::class); /** * @author Tobias Schultze * - * @deprecated since Symfony 6.3, use the StopWorkerOnSignalsListener instead + * @deprecated since Symfony 6.3, use the {@see SignalableCommandInterface} instead */ class StopWorkerOnSigtermSignalListener extends StopWorkerOnSignalsListener {