Skip to content

Commit af6c33e

Browse files
committed
Merge branch '7.2' into 7.3
* 7.2: fix: notifier channel bus abstract arg fix risky test that doesn't perform any assertions fix: notifier push channel bus abstract arg [Scheduler] remove dead code add test covering null regions
2 parents 6ef18ca + 1c630f4 commit af6c33e

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

DependencyInjection/FrameworkExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2805,7 +2805,7 @@ private function registerNotifierConfiguration(array $config, ContainerBuilder $
28052805
$container->removeDefinition('notifier.channel.email');
28062806
}
28072807

2808-
foreach (['texter', 'chatter', 'notifier.channel.chat', 'notifier.channel.email', 'notifier.channel.sms'] as $serviceId) {
2808+
foreach (['texter', 'chatter', 'notifier.channel.chat', 'notifier.channel.email', 'notifier.channel.sms', 'notifier.channel.push', 'notifier.channel.desktop'] as $serviceId) {
28092809
if (!$container->hasDefinition($serviceId)) {
28102810
continue;
28112811
}

Resources/config/notifier.php

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,17 @@
7575
->tag('notifier.channel', ['channel' => 'email'])
7676

7777
->set('notifier.channel.push', PushChannel::class)
78-
->args([service('texter.transports'), service('messenger.default_bus')->ignoreOnInvalid()])
78+
->args([
79+
service('texter.transports'),
80+
abstract_arg('message bus'),
81+
])
7982
->tag('notifier.channel', ['channel' => 'push'])
8083

8184
->set('notifier.channel.desktop', DesktopChannel::class)
82-
->args([service('texter.transports'), service('messenger.default_bus')->ignoreOnInvalid()])
85+
->args([
86+
service('texter.transports'),
87+
abstract_arg('message bus'),
88+
])
8389
->tag('notifier.channel', ['channel' => 'desktop'])
8490

8591
->set('notifier.monolog_handler', NotifierHandler::class)

0 commit comments

Comments
 (0)