From cacaa08c306ca665a2e36bc9c45a0ac597afc5ac Mon Sep 17 00:00:00 2001 From: Jesus Manuel Olivas Date: Sat, 6 Jan 2018 23:32:39 -0800 Subject: [PATCH] [console] Fix ModuleTrait class. (#3650) --- src/Command/Shared/ModuleTrait.php | 57 +++++++++++++++--------------- 1 file changed, 29 insertions(+), 28 deletions(-) diff --git a/src/Command/Shared/ModuleTrait.php b/src/Command/Shared/ModuleTrait.php index a8b784896..a414d0193 100644 --- a/src/Command/Shared/ModuleTrait.php +++ b/src/Command/Shared/ModuleTrait.php @@ -3,6 +3,7 @@ namespace Drupal\Console\Command\Shared; use Drupal\Console\Core\Style\DrupalStyle; +use Symfony\Component\Console\Input\InputInterface; /** * Class ModuleTrait @@ -87,35 +88,35 @@ public function moduleRequirement(array $module, DrupalStyle $io) } } - /** - * Get module name from user. - * - * @param \Drupal\Console\Core\Style\DrupalStyle $io - * Console interface. - * @param \Drupal\Console\Command\Shared\InputInterface $input - * Input interface. - * @throws \Exception - * When module is not found. - */ + /** + * Get module name from user. + * + * @param \Drupal\Console\Core\Style\DrupalStyle $io + * Console interface. + * @param InputInterface $input + * Input interface. + * @throws \Exception + * When module is not found. + */ public function moduleFromInput( DrupalStyle $io, InputInterface $input) { - $module = $input->getOption('module'); - if (!$module) { - // @see Drupal\Console\Command\Shared\ModuleTrait::moduleQuestion - $module = $this->moduleQuestion($io); - $input->setOption('module', $module); - } - else { - $missing_modules = $this->validator->getMissingModules([$module]); - if ($missing_modules) { - throw new \Exception( - sprintf( - $this->trans( - 'commands.module.download.messages.no-releases' - ), - $module - ) - ); + $module = $input->getOption('module'); + if (!$module) { + // @see Drupal\Console\Command\Shared\ModuleTrait::moduleQuestion + $module = $this->moduleQuestion($io); + $input->setOption('module', $module); + } + else { + $missing_modules = $this->validator->getMissingModules([$module]); + if ($missing_modules) { + throw new \Exception( + sprintf( + $this->trans( + 'commands.module.download.messages.no-releases' + ), + $module + ) + ); + } } - } } }