bug symfony#59124 [FrameworkBundle] fix: notifier push channel bus abstract arg (raphael-geffroy)

nicolas-grekas · nicolas-grekas · commit 91835ef8031f · 2024-12-07T14:22:06.000+01:00
This PR was merged into the 6.4 branch. Discussion ---------- [FrameworkBundle] fix: notifier push channel bus abstract arg | Q | A | ------------- | --- | Branch? | 6.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | none | License | MIT From what I understand the Desktop and Push channels are not configured the same way as the other channels, they don't use the 'message bus' abstract arg which allows the component to disable or selecting message bus through configuration. So if another message_bus than the default bus is configured inside framework.notifier.message_bus it is ignored for those two. And same if it is set to false inside the configuration. ![image](https://github.com/user-attachments/assets/dd9ecd1b-0edc-4da4-8976-34d6fddefa4c) Commits ------- 97d6e68 fix: notifier push channel bus abstract arg
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -2765,7 +2765,7 @@ private function registerNotifierConfiguration(array $config, ContainerBuilder $
             $container->removeDefinition('notifier.channel.email');
         }
 
-        foreach (['texter', 'chatter', 'notifier.channel.chat', 'notifier.channel.email', 'notifier.channel.sms'] as $serviceId) {
+        foreach (['texter', 'chatter', 'notifier.channel.chat', 'notifier.channel.email', 'notifier.channel.sms', 'notifier.channel.push'] as $serviceId) {
             if (!$container->hasDefinition($serviceId)) {
                 continue;
             }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier.php
@@ -73,7 +73,10 @@
             ->tag('notifier.channel', ['channel' => 'email'])
 
         ->set('notifier.channel.push', PushChannel::class)
-            ->args([service('texter.transports'), service('messenger.default_bus')->ignoreOnInvalid()])
+            ->args([
+                service('texter.transports'),
+                abstract_arg('message bus'),
+            ])
             ->tag('notifier.channel', ['channel' => 'push'])
 
         ->set('notifier.monolog_handler', NotifierHandler::class)

Original file line number	Diff line number	Diff line change
`@@ -2765,7 +2765,7 @@ private function registerNotifierConfiguration(array $config, ContainerBuilder $`
`2765`	`2765`	`$container->removeDefinition('notifier.channel.email');`
`2766`	`2766`	`}`
`2767`	`2767`
`2768`		`- foreach (['texter', 'chatter', 'notifier.channel.chat', 'notifier.channel.email', 'notifier.channel.sms'] as $serviceId) {`
	`2768`	`+ foreach (['texter', 'chatter', 'notifier.channel.chat', 'notifier.channel.email', 'notifier.channel.sms', 'notifier.channel.push'] as $serviceId) {`
`2769`	`2769`	`if (!$container->hasDefinition($serviceId)) {`
`2770`	`2770`	`continue;`
`2771`	`2771`	`}`