Add new trait ArrayInputTrait, which will parse nested data. Switch m…

…uti value options to array to handle them properly, when receive params through the options (#3712)
hechoendrupal · Jan 20, 2018 · 723d580 · 723d580
1 parent ca88d11
commit 723d580
Show file tree

Hide file tree

Showing 2 changed files with 67 additions and 6 deletions.
diff --git a/src/Command/Generate/ThemeCommand.php b/src/Command/Generate/ThemeCommand.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\Console\Command\Generate;
 
+use Drupal\Console\Command\Shared\ArrayInputTrait;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -32,6 +33,7 @@ class ThemeCommand extends Command
     use ConfirmationTrait;
     use ThemeRegionTrait;
     use ThemeBreakpointTrait;
+    use ArrayInputTrait;
 
     /**
  * @var Manager
@@ -148,7 +150,7 @@ protected function configure()
             ->addOption(
                 'libraries',
                 null,
-                InputOption::VALUE_OPTIONAL,
+                InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY,
                 $this->trans('commands.generate.theme.options.libraries')
             )
             ->addOption(
@@ -160,13 +162,13 @@ protected function configure()
             ->addOption(
                 'regions',
                 null,
-                InputOption::VALUE_OPTIONAL,
+                InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY,
                 $this->trans('commands.generate.theme.options.regions')
             )
             ->addOption(
                 'breakpoints',
                 null,
-                InputOption::VALUE_OPTIONAL,
+                InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY,
                 $this->trans('commands.generate.theme.options.breakpoints')
             )
             ->setAliases(['gt']);
@@ -199,6 +201,14 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $libraries = $input->getOption('libraries');
         $regions = $input->getOption('regions');
         $breakpoints = $input->getOption('breakpoints');
+        $noInteraction = $input->getOption('no-interaction');
+
+        // Parse nested data.
+        if ($noInteraction) {
+            $libraries = $this->explodeInlineArray($libraries);
+            $regions = $this->explodeInlineArray($regions);
+            $breakpoints = $this->explodeInlineArray($breakpoints);
+        }
 
         $this->generator->generate(
             $theme,
@@ -345,9 +355,11 @@ function ($theme_path) use ($machine_name) {
             ) {
                 // @see \Drupal\Console\Command\Shared\ThemeRegionTrait::libraryQuestion
                 $libraries = $this->libraryQuestion();
-                $input->setOption('libraries', $libraries);
             }
+        } else {
+            $libraries = $this->explodeInlineArray($libraries);
         }
+        $input->setOption('libraries', $libraries);
 
         // --regions option.
         $regions = $input->getOption('regions');
@@ -359,9 +371,11 @@ function ($theme_path) use ($machine_name) {
             ) {
                 // @see \Drupal\Console\Command\Shared\ThemeRegionTrait::regionQuestion
                 $regions = $this->regionQuestion();
-                $input->setOption('regions', $regions);
             }
+        } else {
+            $regions = $this->explodeInlineArray($regions);
         }
+        $input->setOption('regions', $regions);
 
         // --breakpoints option.
         $breakpoints = $input->getOption('breakpoints');
@@ -373,8 +387,10 @@ function ($theme_path) use ($machine_name) {
             ) {
                 // @see \Drupal\Console\Command\Shared\ThemeRegionTrait::regionQuestion
                 $breakpoints = $this->breakpointQuestion();
-                $input->setOption('breakpoints', $breakpoints);
             }
+        } else {
+            $breakpoints = $this->explodeInlineArray($breakpoints);
         }
+        $input->setOption('breakpoints', $breakpoints);
     }
 }
diff --git a/src/Command/Shared/ArrayInputTrait.php b/src/Command/Shared/ArrayInputTrait.php
@@ -0,0 +1,45 @@
+<?php
+
+/**
+ * @file
+ * Contains Drupal\Console\Command\Shared\ArrayInputTrait.
+ */
+
+namespace Drupal\Console\Command\Shared;
+
+/**
+ * Class ArrayInputTrait
+ *
+ * @package Drupal\Console\Command
+ */
+trait ArrayInputTrait
+{
+    /**
+     * Parse strings to array '"key":"value","key1":"value1"'.
+     *
+     * @param string $inlineInputs
+     *   Input from the user.
+     * @return array
+     *   Input array.
+     */
+    public function explodeInlineArray($inlineInputs)
+    {
+        $inputs = [];
+        foreach ($inlineInputs as $inlineInput) {
+            $explodeInput = explode(',', $inlineInput);
+            $parameters = [];
+            foreach ($explodeInput as $inlineParameter) {
+                $inlineParameter = trim($inlineParameter);
+                list($key, $value) = explode(':', $inlineParameter);
+                $key = rtrim(ltrim($key, '"'), '"');
+                $value = rtrim(ltrim($value, '"'), '"');
+                if (!empty($value)) {
+                    $parameters[$key] = $value;
+                }
+            }
+            $inputs[] = $parameters;
+        }
+
+        return $inputs;
+    }
+}