Ensure the tests and implementation matches the merged #28190 PR

sroze · sroze · commit 852e5605510b · 2018-09-02T17:33:01.000+01:00
diff --git a/src/Symfony/Component/Messenger/DependencyInjection/MessengerPass.php b/src/Symfony/Component/Messenger/DependencyInjection/MessengerPass.php
@@ -69,7 +69,7 @@ public function process(ContainerBuilder $container)
             }
         }
 
-        $this->registerReceivers($container);
+        $this->registerReceivers($container, $busIds);
         $this->registerSenders($container);
         $this->registerHandlers($container, $busIds);
     }
@@ -232,7 +232,7 @@ private function guessHandledClasses(\ReflectionClass $handlerClass, string $ser
         return array((string) $parameters[0]->getType());
     }
 
-    private function registerReceivers(ContainerBuilder $container)
+    private function registerReceivers(ContainerBuilder $container, array $busIds)
     {
         $receiverMapping = array();
 
@@ -256,7 +256,16 @@ private function registerReceivers(ContainerBuilder $container)
             foreach ($receiverMapping as $name => $reference) {
                 $receiverNames[(string) $reference] = $name;
             }
-            $container->getDefinition('console.command.messenger_consume_messages')->replaceArgument(3, array_values($receiverNames));
+            $buses = array();
+            foreach ($busIds as $busId) {
+                $buses[$busId] = new Reference($busId);
+            }
+
+            $container->getDefinition('console.command.messenger_consume_messages')
+                ->replaceArgument(0, ServiceLocatorTagPass::register($container, $buses))
+                ->replaceArgument(3, array_values($receiverNames))
+                ->replaceArgument(4, $busIds);
+            ;
         }
 
         $container->getDefinition('messenger.receiver_locator')->replaceArgument(0, $receiverMapping);
diff --git a/src/Symfony/Component/Messenger/Tests/DependencyInjection/MessengerPassTest.php b/src/Symfony/Component/Messenger/Tests/DependencyInjection/MessengerPassTest.php
@@ -241,10 +241,11 @@ public function testItRegistersMultipleReceiversAndSetsTheReceiverNamesOnTheComm
     {
         $container = $this->getContainerBuilder();
         $container->register('console.command.messenger_consume_messages', ConsumeMessagesCommand::class)->setArguments(array(
-            new Reference('message_bus'),
+            null,
             new Reference('messenger.receiver_locator'),
             null,
             null,
+            null,
         ));
 
         $container->register(AmqpReceiver::class, AmqpReceiver::class)->addTag('messenger.receiver', array('alias' => 'amqp'));
@@ -253,6 +254,7 @@ public function testItRegistersMultipleReceiversAndSetsTheReceiverNamesOnTheComm
         (new MessengerPass())->process($container);
 
         $this->assertSame(array('amqp', 'dummy'), $container->getDefinition('console.command.messenger_consume_messages')->getArgument(3));
+        $this->assertSame(array('message_bus'), $container->getDefinition('console.command.messenger_consume_messages')->getArgument(4));
     }
 
     public function testItRegistersSenders()

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ public function process(ContainerBuilder $container)`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`
`72`		`- $this->registerReceivers($container);`
	`72`	`+ $this->registerReceivers($container, $busIds);`
`73`	`73`	`$this->registerSenders($container);`
`74`	`74`	`$this->registerHandlers($container, $busIds);`
`75`	`75`	`}`
`@@ -232,7 +232,7 @@ private function guessHandledClasses(\ReflectionClass $handlerClass, string $ser`
`232`	`232`	`return array((string) $parameters[0]->getType());`
`233`	`233`	`}`
`234`	`234`
`235`		`- private function registerReceivers(ContainerBuilder $container)`
	`235`	`+ private function registerReceivers(ContainerBuilder $container, array $busIds)`
`236`	`236`	`{`
`237`	`237`	`$receiverMapping = array();`
`238`	`238`
`@@ -256,7 +256,16 @@ private function registerReceivers(ContainerBuilder $container)`
`256`	`256`	`foreach ($receiverMapping as $name => $reference) {`
`257`	`257`	`$receiverNames[(string) $reference] = $name;`
`258`	`258`	`}`
`259`		`- $container->getDefinition('console.command.messenger_consume_messages')->replaceArgument(3, array_values($receiverNames));`
	`259`	`+ $buses = array();`
	`260`	`+ foreach ($busIds as $busId) {`
	`261`	`+ $buses[$busId] = new Reference($busId);`
	`262`	`+ }`
	`263`	`+`
	`264`	`+ $container->getDefinition('console.command.messenger_consume_messages')`
	`265`	`+ ->replaceArgument(0, ServiceLocatorTagPass::register($container, $buses))`
	`266`	`+ ->replaceArgument(3, array_values($receiverNames))`
	`267`	`+ ->replaceArgument(4, $busIds);`
	`268`	`+ ;`
`260`	`269`	`}`
`261`	`270`
`262`	`271`	`$container->getDefinition('messenger.receiver_locator')->replaceArgument(0, $receiverMapping);`