Bus argument is a required option when multiple buses are defined

sroze · sroze · commit 3ca0dbd612ea · 2018-08-26T14:34:55.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'
@@ -108,9 +109,11 @@ 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)) {
@@ -134,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);
