[Messenger] Fix incompatibility with FrameworkBundle <4.3.1

Robin Chalas · Robin Chalas · commit cc9a2465185f · 2019-07-28T22:26:18.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/console.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/console.xml
@@ -82,7 +82,7 @@
         </service>
 
         <service id="console.command.messenger_consume_messages" class="Symfony\Component\Messenger\Command\ConsumeMessagesCommand">
-            <argument type="service" id="messenger.routable_message_bus" />
+            <argument /> <!-- Routable message bus -->
             <argument type="service" id="messenger.receiver_locator" />
             <argument type="service" id="logger" on-invalid="null" />
             <argument type="collection" /> <!-- Receiver names -->
diff --git a/src/Symfony/Component/Messenger/DependencyInjection/MessengerPass.php b/src/Symfony/Component/Messenger/DependencyInjection/MessengerPass.php
@@ -253,14 +253,19 @@ private function registerReceivers(ContainerBuilder $container, array $busIds)
             $buses[$busId] = new Reference($busId);
         }
 
-        if ($container->hasDefinition('messenger.routable_message_bus')) {
+        if ($hasRoutableMessageBus = $container->hasDefinition('messenger.routable_message_bus')) {
             $container->getDefinition('messenger.routable_message_bus')
                 ->replaceArgument(0, ServiceLocatorTagPass::register($container, $buses));
         }
 
         if ($container->hasDefinition('console.command.messenger_consume_messages')) {
-            $container->getDefinition('console.command.messenger_consume_messages')
-                ->replaceArgument(3, array_values($receiverNames));
+            $consumeCommandDefinition = $container->getDefinition('console.command.messenger_consume_messages');
+
+            if ($hasRoutableMessageBus) {
+                $consumeCommandDefinition->replaceArgument(0, 'messenger.routable_message_bus');
+            }
+
+            $consumeCommandDefinition->replaceArgument(3, array_values($receiverNames));
         }
 
         if ($container->hasDefinition('console.command.messenger_setup_transports')) {
