[console] Resolve missing module variable. Fix #3670 (#3671)

* Replace code getting module from the input with ModuleTrait method * Add the validator service for the commands, which receiving module as a parameter * Fix missing variable presented in PR 3653
hechoendrupal · Jan 10, 2018 · 39c432d · 39c432d
1 parent 5aef231
commit 39c432d
Show file tree

Hide file tree

Showing 13 changed files with 17 additions and 18 deletions.
diff --git a/src/Command/Config/ExportSingleCommand.php b/src/Command/Config/ExportSingleCommand.php
@@ -229,9 +229,7 @@ protected function interact(InputInterface $input, OutputInterface $output)
         }
 
         // --module option
-        $this->moduleFromInput($io, $input);
-
-        $module = $input->getOption('module');
+        $module = $this->moduleFromInput($io, $input);
         if ($module) {
             $optionalConfig = $input->getOption('optional');
             if (!$optionalConfig) {

diff --git a/src/Command/Generate/CacheContextCommand.php b/src/Command/Generate/CacheContextCommand.php
@@ -144,7 +144,7 @@ protected function interact(InputInterface $input, OutputInterface $output)
         $io = new DrupalStyle($input, $output);
 
         // --module option
-        $this->moduleFromInput($io, $input);
+        $module = $this->moduleFromInput($io, $input);
 
         // --cache_context option
         $cache_context = $input->getOption('cache-context');

diff --git a/src/Command/Generate/ControllerCommand.php b/src/Command/Generate/ControllerCommand.php
@@ -173,7 +173,7 @@ protected function interact(InputInterface $input, OutputInterface $output)
         $io = new DrupalStyle($input, $output);
 
         // --module option
-        $this->moduleFromInput($io, $input);
+        $module = $this->moduleFromInput($io, $input);
 
         // --class option
         $class = $input->getOption('class');

diff --git a/src/Command/Generate/EventSubscriberCommand.php b/src/Command/Generate/EventSubscriberCommand.php
@@ -163,7 +163,7 @@ protected function interact(InputInterface $input, OutputInterface $output)
         $io = new DrupalStyle($input, $output);
 
         // --module option
-        $this->moduleFromInput($io, $input);
+        $module = $this->moduleFromInput($io, $input);
 
         // --service-name option
         $name = $input->getOption('name');

diff --git a/src/Command/Generate/FormCommand.php b/src/Command/Generate/FormCommand.php
@@ -231,7 +231,7 @@ protected function interact(InputInterface $input, OutputInterface $output)
         $io = new DrupalStyle($input, $output);
 
         // --module option
-        $this->moduleFromInput($io, $input);
+        $module = $this->moduleFromInput($io, $input);
 
         // --class option
         $className = $input->getOption('class');

diff --git a/src/Command/Generate/PluginCKEditorButtonCommand.php b/src/Command/Generate/PluginCKEditorButtonCommand.php
@@ -154,7 +154,7 @@ protected function interact(InputInterface $input, OutputInterface $output)
         $io = new DrupalStyle($input, $output);
 
         // --module option
-        $this->moduleFromInput($io, $input);
+        $module = $this->moduleFromInput($io, $input);
 
         // --class option
         $class_name = $input->getOption('class');

diff --git a/src/Command/Generate/PluginMigrateProcessCommand.php b/src/Command/Generate/PluginMigrateProcessCommand.php
@@ -129,7 +129,7 @@ protected function interact(InputInterface $input, OutputInterface $output)
         $io = new DrupalStyle($input, $output);
 
         // 'module-name' option.
-        $this->moduleFromInput($io, $input);
+        $module = $this->moduleFromInput($io, $input);
 
         // 'class-name' option
         $class = $input->getOption('class');

diff --git a/src/Command/Generate/PluginMigrateSourceCommand.php b/src/Command/Generate/PluginMigrateSourceCommand.php
@@ -190,7 +190,7 @@ protected function interact(InputInterface $input, OutputInterface $output)
         $io = new DrupalStyle($input, $output);
 
         // 'module-name' option.
-        $this->moduleFromInput($io, $input);
+        $module = $this->moduleFromInput($io, $input);
 
         $class = $input->getOption('class');
         if (!$class) {

diff --git a/src/Command/Generate/RouteSubscriberCommand.php b/src/Command/Generate/RouteSubscriberCommand.php
@@ -130,12 +130,11 @@ protected function interact(InputInterface $input, OutputInterface $output)
         $io = new DrupalStyle($input, $output);
 
         // --module option
-        $this->moduleFromInput($io, $input);
+        $module = $this->moduleFromInput($io, $input);
 
         // --name option
         $name = $input->getOption('name');
         if (!$name) {
-            $module = $input->getOption('module');
             $name = $io->ask(
                 $this->trans('commands.generate.routesubscriber.questions.name'),
                 $module.'.route_subscriber'

diff --git a/src/Command/Generate/ServiceCommand.php b/src/Command/Generate/ServiceCommand.php
@@ -184,12 +184,11 @@ protected function interact(InputInterface $input, OutputInterface $output)
         $io = new DrupalStyle($input, $output);
 
         // --module option
-        $this->moduleFromInput($io, $input);
+        $module = $this->moduleFromInput($io, $input);
 
         //--name option
         $name = $input->getOption('name');
         if (!$name) {
-            $module = $input->getOption('module');
             $name = $io->ask(
                 $this->trans('commands.generate.service.questions.service-name'),
                 $module.'.default'

diff --git a/src/Command/Generate/TwigExtensionCommand.php b/src/Command/Generate/TwigExtensionCommand.php
@@ -161,12 +161,11 @@ protected function interact(InputInterface $input, OutputInterface $output)
         $io = new DrupalStyle($input, $output);
 
         // --module option
-        $this->moduleFromInput($io, $input);
+        $module = $this->moduleFromInput($io, $input);
 
         // --name option
         $name = $input->getOption('name');
         if (!$name) {
-            $module = $input->getOption('module');
             $name = $io->ask(
                 $this->trans('commands.generate.twig.extension.questions.name'),
                 $module.'.twig.extension'

diff --git a/src/Command/Generate/UpdateCommand.php b/src/Command/Generate/UpdateCommand.php
@@ -139,9 +139,8 @@ protected function interact(InputInterface $input, OutputInterface $output)
         $this->site->loadLegacyFile('/core/includes/schema.inc');
 
         // --module option
-        $this->moduleFromInput($io, $input);
+        $module = $this->moduleFromInput($io, $input);
 
-        $module = $input->getOption('module');
         $lastUpdateSchema = $this->getLastUpdate($module);
         $nextUpdateSchema = $lastUpdateSchema ? ($lastUpdateSchema + 1): 8001;
 

diff --git a/src/Command/Shared/ModuleTrait.php b/src/Command/Shared/ModuleTrait.php
@@ -95,6 +95,9 @@ public function moduleRequirement(array $module, DrupalStyle $io)
      *   Console interface.
      * @param  InputInterface                         $input
      *   Input interface.
+     *
+     * @return mixed|string
+     *   Module name.
      * @throws \Exception
      *   When module is not found.
      */
@@ -118,5 +121,7 @@ public function moduleFromInput(DrupalStyle $io, InputInterface $input)
                 );
             }
         }
+
+        return $module;
     }
 }