[chain] Improve placeholder default values management. (#100)

hechoendrupal · Dec 8, 2016 · eec3f76 · eec3f76
1 parent 9582b34
commit eec3f76
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 17 deletions.
diff --git a/src/Command/Chain/ChainCommand.php b/src/Command/Chain/ChainCommand.php
@@ -84,7 +84,6 @@ protected function configure()
     protected function interact(InputInterface $input, OutputInterface $output)
     {
         $io = new DrupalStyle($input, $output);
-        // Check if the constructor passed a value for file.
         $file = $input->getOption('file');
 
         if (!$file) {
@@ -169,8 +168,31 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
 
         $chainContent = $this->getFileContents($file);
-        $environmentPlaceHolders = $this->extractEnvironmentPlaceHolders($chainContent);
+        $inlinePlaceHolders = $this->extractInlinePlaceHolders($chainContent);
+
+        if ($inlinePlaceHolders) {
+            foreach ($inlinePlaceHolders as $key => $inlinePlaceHolder) {
+                if (!strpos($inlinePlaceHolder, '|')) {
+                    continue;
+                }
+
+                $placeholderParts = explode('|', $inlinePlaceHolder);
+                $inlinePlaceHolder = $placeholderParts[0];
+                $inlinePlaceHolderDefault = $placeholderParts[1];
+
+                if (!$inlinePlaceHolderDefault) {
+                    continue;
+                }
+
+                if ($placeholder && array_key_exists($inlinePlaceHolder, $placeholder[0])) {
+                    continue;
+                }
+
+                $placeholder[0][$inlinePlaceHolder] = $inlinePlaceHolderDefault;
+            }
+        }
 
+        $environmentPlaceHolders = $this->extractEnvironmentPlaceHolders($chainContent);
         $envPlaceHolderMap = [];
         $missingEnvironmentPlaceHolders = [];
         foreach ($environmentPlaceHolders as $envPlaceHolder) {
@@ -230,6 +252,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
 
         $missingInlinePlaceHolders = [];
+
         foreach ($inlinePlaceHolders as $inlinePlaceHolder) {
             if (!array_key_exists($inlinePlaceHolder, $inlinePlaceHolderMap)) {
                 $missingInlinePlaceHolders[$inlinePlaceHolder] = sprintf(

diff --git a/src/Command/Chain/ChainCustomCommand.php b/src/Command/Chain/ChainCustomCommand.php
@@ -13,6 +13,7 @@
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Command\Command;
 use Drupal\Console\Command\Shared\CommandTrait;
+use Drupal\Console\Command\Shared\InputTrait;
 
 /**
  * Class ChainCustomCommand
@@ -22,6 +23,7 @@
 class ChainCustomCommand extends Command
 {
     use CommandTrait;
+    use InputTrait;
 
     /**
      * @var string
@@ -39,12 +41,12 @@ class ChainCustomCommand extends Command
     protected $file;
 
     /**
-   * ChainRegister constructor.
-   *
-   * @param $name
-   * @param $description
-   * @param $file
-   */
+     * ChainRegister constructor.
+     *
+     * @param $name
+     * @param $description
+     * @param $file
+     */
     public function __construct($name, $description, $file)
     {
         $this->name = $name;
@@ -55,8 +57,8 @@ public function __construct($name, $description, $file)
     }
 
     /**
-   * {@inheritdoc}
-   */
+     * {@inheritdoc}
+     */
     protected function configure()
     {
         $this
@@ -71,23 +73,34 @@ protected function configure()
     }
 
     /**
-   * {@inheritdoc}
-   */
+     * {@inheritdoc}
+     */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         $command = $this->getApplication()->find('chain');
 
         $arguments = [
             'command' => 'chain',
             '--file'  => $this->file,
-            '--placeholder'  => $input->getOption('placeholder'),
-            '--generate-inline'  => $input->hasOption('generate-inline'),
-            '--generate-chain'  => $input->hasOption('generate-chain'),
-            '--learning'  => $input->hasOption('learning'),
-            '--no-interaction'  => $input->hasOption('no-interaction')
         ];
 
+        if ($placeholder = $input->getOption('placeholder')) {
+            $arguments['--placeholder'] = $this->inlineValueAsArray($placeholder);
+        }
+
+        foreach($input->getOptions() as $option => $value) {
+            if ($option != 'placeholder' && $value) {
+                if (is_bool($value)) {
+                    $value = true;
+                }
+                $arguments['--'.$option] = $value;
+            }
+        }
+
         $commandInput = new ArrayInput($arguments);
+        if (array_key_exists('--no-interaction', $arguments)) {
+            $commandInput->setInteractive(false);
+        }
 
         return $command->run($commandInput, $output);
     }