up: support string for get same opts and args

Author: inhere

src/Concern/InputArgumentsTrait.php

@@ -252,30 +252,26 @@ public function getArrayArg($key, array $default = []): array
 
     /**
      * Get same args value
-     * eg: des description
+     * eg: des = description
      *
      * ```php
+     * $input->sameArg('des, description');
      * $input->sameArg(['des', 'description']);
      * ```
      *
-     * @param array $names
-     * @param mixed $default
-     *
-     * @return bool|mixed|null
-     */
-    public function getSameArg(array $names, $default = null)
-    {
-        return $this->sameArg($names, $default);
-    }
-
-    /**
-     * @param array $names
+     * @param string|array $names
      * @param mixed $default
      *
      * @return mixed
      */
-    public function sameArg(array $names, $default = null)
+    public function getSameArg($names, $default = null)
     {
+        if (is_string($names)) {
+            $names = array_map('trim', explode(',', $names));
+        } elseif (!is_array($names)) {
+            $names = (array)$names;
+        }
+
         foreach ($names as $name) {
             if ($this->hasArg($name)) {
                 return $this->get($name);
@@ -285,6 +281,17 @@ public function sameArg(array $names, $default = null)
         return $default;
     }
 
+    /**
+     * @param string|array $names
+     * @param mixed $default
+     *
+     * @return mixed
+     */
+    public function sameArg($names, $default = null)
+    {
+        return $this->getSameArg($names, $default);
+    }
+
     /**
      * clear args
      */

src/Concern/InputOptionsTrait.php

@@ -3,8 +3,12 @@
 namespace Inhere\Console\Concern;
 
 use Inhere\Console\Exception\PromptException;
+use function array_map;
 use function array_merge;
+use function explode;
+use function is_array;
 use function is_bool;
+use function is_string;
 
 /**
  * Trait InputOptionsTrait
@@ -13,7 +17,6 @@
  */
 trait InputOptionsTrait
 {
-
     /**
      * Input short-opts data
      *
@@ -99,12 +102,12 @@ public function getStringOpt(string $name, string $default = ''): string
     /**
      * Get an string option(long/short) value
      *
-     * @param string[] $names eg ['n', 'name']
+     * @param string|string[] $names eg 'n,name' OR ['n', 'name']
      * @param string $default
      *
      * @return string
      */
-    public function getSameStringOpt(array $names, string $default = ''): string
+    public function getSameStringOpt($names, string $default = ''): string
     {
         return (string)$this->getSameOpt($names, $default);
     }
@@ -140,12 +143,12 @@ public function getBoolOpt(string $name, bool $default = false): bool
      * Get (long/short)option value(bool)
      * eg: -h --help
      *
-     * @param string[] $names
+     * @param string|string[] $names eg 'n,name' OR ['n', 'name']
      * @param bool     $default
      *
      * @return bool
      */
-    public function getSameBoolOpt(array $names, bool $default = false): bool
+    public function getSameBoolOpt($names, bool $default = false): bool
     {
         return (bool)$this->getSameOpt($names, $default);
     }
@@ -180,36 +183,43 @@ public function hasOpt(string $name): bool
      * eg: -h --help
      *
      * ```php
+     * $input->sameOpt('h,help');
      * $input->sameOpt(['h','help']);
      * ```
      *
-     * @param array $names
+     * @param string|string[] $names eg 'n,name' OR ['n', 'name']
      * @param mixed $default
      *
      * @return bool|mixed|null
      */
-    public function getSameOpt(array $names, $default = null)
+    public function getSameOpt($names, $default = null)
     {
-        return $this->sameOpt($names, $default);
+        if (is_string($names)) {
+            $names = array_map('trim', explode(',', $names));
+        } elseif (!is_array($names)) {
+            $names = (array)$names;
+        }
+
+        foreach ($names as $name) {
+            if ($this->hasOpt($name)) {
+                return $this->getOpt($name);
+            }
+        }
+
+        return $default;
     }
 
     /**
      * Alias of the getSameOpt()
      *
-     * @param array $names
-     * @param null  $default
+     * @param string|array $names
+     * @param mixed  $default
      *
      * @return bool|mixed|null
      */
-    public function sameOpt(array $names, $default = null)
+    public function sameOpt($names, $default = null)
     {
-        foreach ($names as $name) {
-            if ($this->hasOpt($name)) {
-                return $this->getOpt($name);
-            }
-        }
-
-        return $default;
+        return $this->getSameOpt($names, $default);
     }
 
     /**

src/Concern/InputOutputAwareTrait.php

@@ -90,13 +90,13 @@ public function getRequiredArg($name)
     }
 
     /**
-     * @param array $names
+     * @param string|array $names
      * @param mixed  $default
      *
      * @return bool|mixed|null
      * @see Input::getSameArg()
      */
-    public function getSameArg(array $names, $default = null)
+    public function getSameArg($names, $default = null)
     {
         return $this->input->getSameArg($names, $default);
     }
@@ -113,12 +113,12 @@ public function getOpt($name, $default = null)
     }
 
     /**
-     * @param array $names
+     * @param string|string[] $names eg 'n,name' OR ['n', 'name']
      * @param mixed $default
      *
      * @return mixed
      */
-    public function getSameOpt(array $names, $default = null)
+    public function getSameOpt($names, $default = null)
     {
         return $this->input->getSameOpt($names, $default);
     }