Merge pull request #29 from adhocore/develop

fix(option): default values for variadic options

Author: adhocore

src/Input/Argument.php

@@ -17,26 +17,21 @@ class Argument extends Parameter
      */
     protected function parse(string $arg)
     {
-        $this->required = $arg[0] === '<';
-        $this->variadic = \strpos($arg, '...') !== false;
-        $this->name     = $name = \str_replace(['<', '>', '[', ']', '.'], '', $arg);
+        $this->name = $name = \str_replace(['<', '>', '[', ']', '.'], '', $arg);
 
-        // Format is "name:default+value1,default+value2" ('+'' => ' ')!
+        // Format is "name:default+value1,default+value2" ('+' => ' ')!
         if (\strpos($name, ':') !== false) {
             $name                             = \str_replace('+', ' ', $name);
             list($this->name, $this->default) = \explode(':', $name, 2);
         }
+
+        $this->prepDefault();
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function default()
+    protected function prepDefault()
     {
-        if (!$this->variadic) {
-            return $this->default;
+        if ($this->variadic && $this->default && !\is_array($this->default)) {
+            $this->default = \explode(',', $this->default, 2);
         }
-
-        return null === $this->default ? [] : \explode(',', $this->default);
     }
 }

src/Input/Parameter.php

@@ -139,6 +139,10 @@ public function variadic(): bool
      */
     public function default()
     {
+        if ($this->variadic()) {
+            return (array) $this->default;
+        }
+
         return $this->default;
     }
 

src/Input/Parser.php

@@ -84,13 +84,10 @@ protected function parseArgs(string $arg)
             return $this->set(null, $arg);
         }
 
-        $name     = $argument->attributeName();
-        $variadic = $argument->variadic();
-
-        $this->set($name, $argument->filter($arg), $variadic);
+        $this->setValue($argument, $arg);
 
         // Otherwise we will always collect same arguments again!
-        if (!$variadic) {
+        if (!$argument->variadic()) {
             \array_shift($this->_arguments);
         }
     }
@@ -169,7 +166,7 @@ protected function setValue(Parameter $parameter, string $value = null): bool
         $name  = $parameter->attributeName();
         $value = $this->_normalizer->normalizeValue($parameter, $value);
 
-        return $this->set($name, $value);
+        return $this->set($name, $value, $parameter->variadic());
     }
 
     /**
@@ -186,7 +183,7 @@ protected function set($key, $value, bool $variadic = false): bool
         if (null === $key) {
             $this->_values[] = $value;
         } elseif ($variadic) {
-            $this->_values[$key][] = $value;
+            $this->_values[$key] = \array_merge($this->_values[$key], (array) $value);
         } else {
             $this->_values[$key] = $value;
         }