Fix logic and tests

fabpot · fabpot · commit 68f31acf0471 · 2022-07-21T12:04:37.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -2501,21 +2501,15 @@ private function registerNotifierConfiguration(array $config, ContainerBuilder $
             $container->removeDefinition('notifier.channel.email');
         }
 
-        $servicesWithBusArgument = ['texter', 'chatter', 'notifier.channel.chat', 'notifier.channel.email', 'notifier.channel.sms'];
-        if (false === $messageBus = $config['message_bus']) {
-            foreach ($servicesWithBusArgument as $serviceId) {
-                if ($container->hasDefinition($serviceId)) {
-                    $container->getDefinition($serviceId)->replaceArgument(1, null);
-                }
+        foreach (['texter', 'chatter', 'notifier.channel.chat', 'notifier.channel.email', 'notifier.channel.sms'] as $serviceId) {
+            if (!$container->hasDefinition($serviceId)) {
+                continue;
             }
-        } else {
-            foreach ($servicesWithBusArgument as $serviceId) {
-                if ($container->hasDefinition($serviceId)) {
-                    $container->getDefinition($serviceId)
-                        ->setArgument(0, null)
-                        ->replaceArgument(1, new Reference($messageBus, ContainerInterface::NULL_ON_INVALID_REFERENCE))
-                    ;
-                }
+
+            if (false === $messageBus = $config['message_bus']) {
+                $container->getDefinition($serviceId)->replaceArgument(1, null);
+            } else {
+                $container->getDefinition($serviceId)->replaceArgument(1, $messageBus ? new Reference($messageBus) : new Reference('messenger.default_bus', ContainerInterface::NULL_ON_INVALID_REFERENCE));
             }
         }
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -2158,12 +2158,6 @@ public function testNotifierWithSpecificMessageBus()
         $this->assertEquals(new Reference('app.another_bus'), $container->getDefinition('notifier.channel.chat')->getArgument(1));
         $this->assertEquals(new Reference('app.another_bus'), $container->getDefinition('notifier.channel.email')->getArgument(1));
         $this->assertEquals(new Reference('app.another_bus'), $container->getDefinition('notifier.channel.sms')->getArgument(1));
-
-        $this->assertNull($container->getDefinition('chatter')->getArgument(0));
-        $this->assertNull($container->getDefinition('texter')->getArgument(0));
-        $this->assertNull($container->getDefinition('notifier.channel.chat')->getArgument(0));
-        $this->assertNull($container->getDefinition('notifier.channel.email')->getArgument(0));
-        $this->assertNull($container->getDefinition('notifier.channel.sms')->getArgument(0));
     }
 
     protected function createContainer(array $data = [])
