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

hechoendrupal · Dec 9, 2016 · 56a5cdf · 56a5cdf
1 parent eec3f76
commit 56a5cdf
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 4 deletions.
diff --git a/config/dist/chain/site.new.yml b/config/dist/chain/site.new.yml
@@ -0,0 +1,18 @@
+# How to use
+# site:new --placeholder="directory:/path/to/drupal-project/" --placeholder="profile:minimal"
+command:
+  name: site:new
+  description: 'Create, install and launch a new Drupal project'
+commands:
+  # Create Drupal project using DrupalComposer
+  - command: exec
+    arguments:
+      bin: composer create-project %{{repository|drupal-composer/drupal-project:8.x-dev}} %{{directory}} --prefer-dist --no-progress --no-interaction
+  # Install Drupal
+  - command: exec
+    arguments:
+      bin: drupal site:install %{{profile|standard}} --root=%{{directory}} --no-interaction
+  # Start PHP bult-in server
+  - command: exec
+    arguments:
+      bin: drupal server --root=%{{directory}}
diff --git a/src/Command/Chain/ChainCommand.php b/src/Command/Chain/ChainCommand.php
@@ -101,6 +101,7 @@ protected function interact(InputInterface $input, OutputInterface $output)
         $chainContent = $this->getFileContents($file);
 
         $placeholder = $input->getOption('placeholder');
+
         $inlinePlaceHolders = $this->extractInlinePlaceHolders($chainContent);
 
         if (!$placeholder && $inlinePlaceHolders) {
@@ -140,15 +141,13 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $learning = $input->hasOption('learning')?$input->getOption('learning'):false;
 
         $file = $input->getOption('file');
-
         if (!$file) {
             $io->error($this->trans('commands.chain.messages.missing_file'));
 
             return 1;
         }
 
         $fileSystem = new Filesystem();
-
         $file = calculateRealPath($file);
 
         if (!$fileSystem->exists($file)) {
@@ -166,6 +165,10 @@ protected function execute(InputInterface $input, OutputInterface $output)
         if ($placeholder) {
             $placeholder = $this->inlineValueAsArray($placeholder);
         }
+        $placeHolderOptions = [];
+        foreach ($placeholder as $placeholderItem) {
+            $placeHolderOptions[] = key($placeholderItem);
+        }
 
         $chainContent = $this->getFileContents($file);
         $inlinePlaceHolders = $this->extractInlinePlaceHolders($chainContent);
@@ -184,11 +187,11 @@ protected function execute(InputInterface $input, OutputInterface $output)
                     continue;
                 }
 
-                if ($placeholder && array_key_exists($inlinePlaceHolder, $placeholder[0])) {
+                if (in_array($inlinePlaceHolder, $placeHolderOptions)) {
                     continue;
                 }
 
-                $placeholder[0][$inlinePlaceHolder] = $inlinePlaceHolderDefault;
+                $placeholder[] = [$inlinePlaceHolder => $inlinePlaceHolderDefault];
             }
         }