Merge branch '7.1' into 7.2

nicolas-grekas · nicolas-grekas · commit 4d4421c6b0d9 · 2024-12-07T14:22:50.000+01:00
* 7.1:
  fix: notifier push channel bus abstract arg
  [Scheduler] remove dead code
diff --git a/DependencyInjection/FrameworkExtension.php b/DependencyInjection/FrameworkExtension.php
@@ -2784,7 +2784,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/Resources/config/notifier.php b/Resources/config/notifier.php
@@ -75,7 +75,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.channel.desktop', DesktopChannel::class)

Original file line number	Diff line number	Diff line change
`@@ -2784,7 +2784,7 @@ private function registerNotifierConfiguration(array $config, ContainerBuilder $`
`2784`	`2784`	`$container->removeDefinition('notifier.channel.email');`
`2785`	`2785`	`}`
`2786`	`2786`
`2787`		`- foreach (['texter', 'chatter', 'notifier.channel.chat', 'notifier.channel.email', 'notifier.channel.sms'] as $serviceId) {`
	`2787`	`+ foreach (['texter', 'chatter', 'notifier.channel.chat', 'notifier.channel.email', 'notifier.channel.sms', 'notifier.channel.push'] as $serviceId) {`
`2788`	`2788`	`if (!$container->hasDefinition($serviceId)) {`
`2789`	`2789`	`continue;`
`2790`	`2790`	`}`