[chain] Avoid overwrite chain command options with global/default opt…

…ions
hechoendrupal · May 25, 2017 · 1096794 · 1096794
1 parent 9c76535
commit 1096794
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/services.yml b/services.yml
@@ -7,7 +7,7 @@ services:
   console.requirement_checker:
     class: Drupal\Console\Core\Utils\RequirementChecker
   console.chain_queue:
-    class: Drupal\Console\Core\Utils\ChainQueue
+    class: Drupal\Console\Core\Uconsole.init_generatortils\ChainQueue
   console.nested_array:
     class: Drupal\Console\Core\Utils\NestedArray
   console.show_file:

diff --git a/src/Command/Chain/ChainCommand.php b/src/Command/Chain/ChainCommand.php
@@ -294,8 +294,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $commands = $configData['commands'];
         }
 
-        $parameterOptions = $input->getOptions();
-        unset($parameterOptions['file']);
+        $chainInlineOptions = $input->getOptions();
+        unset($chainInlineOptions['file']);
 
         foreach ($commands as $command) {
             $moduleInputs = [];
@@ -310,11 +310,13 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 $moduleInputs['--'.$key] = is_null($value) ? '' : $value;
             }
 
+            // Get application global options
             foreach ($this->getApplication()->getDefinition()->getOptions() as $option) {
                 $optionName = $option->getName();
-                if (array_key_exists($optionName, $parameterOptions)) {
-                    $optionValue = $parameterOptions[$optionName];
-                    if ($optionValue) {
+                if (array_key_exists($optionName, $chainInlineOptions)) {
+                    $optionValue = $chainInlineOptions[$optionName];
+                    // Set global option only if is not available in command options
+                    if (!isset($moduleInputs['--' . $optionName]) && $optionValue) {
                         $moduleInputs['--' . $optionName] = $optionValue;
                     }
                 }