bug #32792 [Messenger] Fix incompatibility with FrameworkBundle <4.3.1 (chalasr)

fabpot · fabpot · commit b13e6affe4cd · 2019-08-05T07:38:57.000+02:00
This PR was merged into the 4.3 branch. Discussion ---------- [Messenger] Fix incompatibility with FrameworkBundle <4.3.1 | Q | A | ------------- | --- | Branch? | 4.3 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #32738 | License | MIT | Doc PR | - Aims to fix an edge case where you install (or upgrade to) symfony/messenger >=4.3.1 while having symfony/framework-bundle <4.3.1 installed. Commits ------- 5d73970 [Messenger] Fix incompatibility with FrameworkBundle <4.3.1
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/Command/ConsumeMessagesCommand.php b/src/Symfony/Component/Messenger/Command/ConsumeMessagesCommand.php
@@ -57,6 +57,8 @@ public function __construct($routableBus, ContainerInterface $receiverLocator, L
         // to be deprecated in 4.4
         if ($routableBus instanceof ContainerInterface) {
             $routableBus = new RoutableMessageBus($routableBus);
+        } elseif (!$routableBus instanceof RoutableMessageBus) {
+            throw new \TypeError(sprintf('The first argument must be an instance of "%s".', RoutableMessageBus::class));
         }
 
         if (\is_array($retryStrategyLocator)) {
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, new Reference('messenger.routable_message_bus'));
+            }
+
+            $consumeCommandDefinition->replaceArgument(3, array_values($receiverNames));
         }
 
         if ($container->hasDefinition('console.command.messenger_setup_transports')) {

Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,8 @@ public function __construct($routableBus, ContainerInterface $receiverLocator, L`
`57`	`57`	`// to be deprecated in 4.4`
`58`	`58`	`if ($routableBus instanceof ContainerInterface) {`
`59`	`59`	`$routableBus = new RoutableMessageBus($routableBus);`
	`60`	`+ } elseif (!$routableBus instanceof RoutableMessageBus) {`
	`61`	`+ throw new \TypeError(sprintf('The first argument must be an instance of "%s".', RoutableMessageBus::class));`
`60`	`62`	`}`
`61`	`63`
`62`	`64`	`if (\is_array($retryStrategyLocator)) {`