Bus argument is a required option when multiple buses are defined

sroze · sroze · commit 0fb758d17f6f · 2018-08-26T14:37:53.000+01:00
diff --git a/src/Symfony/Component/Messenger/Command/ConsumeMessagesCommand.php b/src/Symfony/Component/Messenger/Command/ConsumeMessagesCommand.php
@@ -57,14 +57,15 @@ public function __construct(ContainerInterface $busLocator, ContainerInterface $
     protected function configure(): void
     {
         $defaultReceiverName = 1 === \count($this->receiverNames) ? current($this->receiverNames) : null;
+        $defaultBusName = 1 === \count($this->busNames) ? current($this->busNames) : null;
 
         $this
             ->setDefinition(array(
                 new InputArgument('receiver', $defaultReceiverName ? InputArgument::OPTIONAL : InputArgument::REQUIRED, 'Name of the receiver', $defaultReceiverName),
                 new InputOption('limit', 'l', InputOption::VALUE_REQUIRED, 'Limit the number of received messages'),
                 new InputOption('memory-limit', 'm', InputOption::VALUE_REQUIRED, 'The memory limit the worker can consume'),
                 new InputOption('time-limit', 't', InputOption::VALUE_REQUIRED, 'The time limit in seconds the worker can run'),
-                new InputOption('bus', 'b', InputOption::VALUE_REQUIRED, 'Name of the bus to which received messages should be dispatched', 'message_bus'),
+                new InputOption('bus', 'b', InputOption::VALUE_REQUIRED, 'Name of the bus to which received messages should be dispatched', $defaultBusName),
             ))
             ->setDescription('Consumes messages')
             ->setHelp(<<<'EOF'
@@ -107,11 +108,12 @@ protected function interact(InputInterface $input, OutputInterface $output)
             }
         }
 
-
         $busName = $input->getOption('bus');
-
-        if ($busName && $this->busNames && !$this->busLocator->has($busName) && $alternatives = $this->findAlternatives($busName, $this->busNames)) {
-            if ($alternatives = $this->findAlternatives($busName, $this->busNames)) {
+        if ($this->busNames && !$this->busLocator->has($busName)) {
+            if (null === $busName) {
+                $style->block('Missing bus argument.', null, 'error', ' ', true);
+                $input->setOption('bus', $style->choice('Select one of the available buses', $this->busNames));
+            } elseif ($alternatives = $this->findAlternatives($busName, $this->busNames)) {
                 $style->block(sprintf('Bus "%s" is not defined.', $busName), null, 'error', ' ', true);
 
                 if (1 === \count($alternatives)) {
@@ -135,7 +137,7 @@ protected function execute(InputInterface $input, OutputInterface $output): void
         }
 
         if (!$this->busLocator->has($busName = $input->getOption('bus'))) {
-            throw new RuntimeException(sprintf('Bus "%s" does not exist.', $receiverName));
+            throw new RuntimeException(sprintf('Bus "%s" does not exist.', $busName));
         }
 
         $receiver = $this->receiverLocator->get($receiverName);
diff --git a/src/Symfony/Component/Messenger/DependencyInjection/MessengerPass.php b/src/Symfony/Component/Messenger/DependencyInjection/MessengerPass.php
@@ -195,7 +195,6 @@ private function registerHandlers(ContainerBuilder $container, array $busIds)
                 ->replaceArgument(0, ServiceLocatorTagPass::register($container, $buses))
                 ->replaceArgument(4, $busIds);
         }
-
     }
 
     private function guessHandledClasses(\ReflectionClass $handlerClass, string $serviceId): iterable
diff --git a/src/Symfony/Component/Messenger/Tests/Command/ConsumeMessagesCommandTest.php b/src/Symfony/Component/Messenger/Tests/Command/ConsumeMessagesCommandTest.php
@@ -14,7 +14,6 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\ServiceLocator;
 use Symfony\Component\Messenger\Command\ConsumeMessagesCommand;
-use Symfony\Component\Messenger\MessageBus;
 
 class ConsumeMessagesCommandTest extends TestCase
 {
diff --git a/src/Symfony/Component/Messenger/Tests/DependencyInjection/MessengerPassTest.php b/src/Symfony/Component/Messenger/Tests/DependencyInjection/MessengerPassTest.php
@@ -245,7 +245,7 @@ public function testItRegistersMultipleReceiversAndSetsTheReceiverNamesOnTheComm
             new Reference('messenger.receiver_locator'),
             null,
             null,
-            null
+            null,
         ));
 
         $container->register(AmqpReceiver::class, AmqpReceiver::class)->addTag('messenger.receiver', array('alias' => 'amqp'));

Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,6 @@ private function registerHandlers(ContainerBuilder $container, array $busIds)`
`195`	`195`	`->replaceArgument(0, ServiceLocatorTagPass::register($container, $buses))`
`196`	`196`	`->replaceArgument(4, $busIds);`
`197`	`197`	`}`
`198`		`-`
`199`	`198`	`}`
`200`	`199`
`201`	`200`	`private function guessHandledClasses(\ReflectionClass $handlerClass, string $serviceId): iterable`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,6 @@`
`14`	`14`	`use PHPUnit\Framework\TestCase;`
`15`	`15`	`use Symfony\Component\DependencyInjection\ServiceLocator;`
`16`	`16`	`use Symfony\Component\Messenger\Command\ConsumeMessagesCommand;`
`17`		`-use Symfony\Component\Messenger\MessageBus;`
`18`	`17`
`19`	`18`	`class ConsumeMessagesCommandTest extends TestCase`
`20`	`19`	`{`