update: update some logic for defaut value

inhere · inhere · commit 944a4431ed6b · 2021-08-24T23:00:40.000+08:00
diff --git a/src/Flag/AbstractFlag.php b/src/Flag/AbstractFlag.php
@@ -13,6 +13,7 @@
 use Toolkit\PFlag\Contract\FlagInterface;
 use Toolkit\PFlag\Exception\FlagException;
 use Toolkit\PFlag\FlagType;
+use function vdump;
 
 /**
  * Class Flag
@@ -101,19 +102,11 @@ public function __construct(string $name, string $desc = '', bool $required = fa
 
     public function init(): void
     {
-        if ($this->isArray()) {
-            $this->type = FlagType::ARRAY;
+        if ($this->default !== null) {
+            $this->default = FlagType::fmtBasicTypeValue($this->type, $this->default);
         }
     }
 
-    /**
-     * @return bool
-     */
-    public function hasDefault(): bool
-    {
-        return $this->default !== null;
-    }
-
     /**
      * @return mixed
      */
@@ -159,6 +152,22 @@ public function setValidator(callable $validator): void
         $this->validator = $validator;
     }
 
+    /**
+     * @return bool
+     */
+    public function hasValue(): bool
+    {
+        return $this->value !== null;
+    }
+
+    /**
+     * @return bool
+     */
+    public function hasDefault(): bool
+    {
+        return $this->default !== null;
+    }
+
     /******************************************************************
      *
      *****************************************************************/
@@ -185,6 +194,10 @@ public function getType(): string
      */
     public function setType(string $type): void
     {
+        if (!$type) {
+            return;
+        }
+
         if (!FlagType::isValid($type)) {
             $name = $this->name;
             throw new FlagException("cannot define invalid flag type: $type(name: $name)");
diff --git a/src/Flag/Argument.php b/src/Flag/Argument.php
@@ -33,6 +33,10 @@ class Argument extends AbstractFlag
      */
     public function setType(string $type): void
     {
+        if (!$type) {
+            return;
+        }
+
         if (!FlagType::isValid($type)) {
             $name = $this->getName();
             $mark = $name ? "(name: $name)" : "(#$this->index)";
diff --git a/src/Flag/Option.php b/src/Flag/Option.php
@@ -74,11 +74,11 @@ public function getShortcut(): string
     }
 
     /**
-     * @param string $shortcut eg: 'a|b'
+     * @param string $shortcut eg: 'a,b' Or '-a,-b'
      */
     public function setShortcut(string $shortcut): void
     {
-        $shortcuts = preg_split('{(\|)-?}', ltrim($shortcut, '-'));
+        $shortcuts = preg_split('{(,)-?}', ltrim($shortcut, '-'));
         $shortcuts = array_filter($shortcuts);
 
         $this->setShorts($shortcuts);
diff --git a/src/FlagType.php b/src/FlagType.php
@@ -10,6 +10,7 @@
 namespace Toolkit\PFlag;
 
 use Toolkit\Cli\Helper\FlagHelper;
+use function is_scalar;
 use function is_string;
 
 /**
@@ -100,6 +101,10 @@ public static function isArray(string $type): bool
      */
     public static function fmtBasicTypeValue(string $type, $value)
     {
+        if (!is_scalar($value)) {
+            return $value;
+        }
+
         // format value by type
         switch ($type) {
             case self::INT:
diff --git a/src/Traits/FlagArgumentsTrait.php b/src/Traits/FlagArgumentsTrait.php
@@ -11,6 +11,7 @@
 
 use Toolkit\PFlag\Exception\FlagException;
 use Toolkit\PFlag\Flag\Argument;
+use Toolkit\PFlag\FlagType;
 use function count;
 use function is_string;
 
@@ -49,24 +50,24 @@ trait FlagArgumentsTrait
     /**
      * @param string     $name
      * @param string     $desc
+     * @param string     $type The argument data type. default is: string. {@see FlagType}
      * @param bool       $required
-     * @param string     $type The argument data type. (eg: 'string', 'array', 'mixed')
      * @param null|mixed $default
      * @param string     $alias
      */
     public function addArg(
         string $name,
-        string $desc = '',
-        bool $required = false,
+        string $desc,
         string $type = '',
+        bool $required = false,
         $default = null,
         string $alias = ''
     ): void {
-        $argObj = Argument::new($name, $desc, $required, $default);
-        $argObj->setType($type);
-        $argObj->setAlias($alias);
+        /** @var Argument $arg */
+        $arg = Argument::new($name, $desc, $required, $default);
+        $arg->setType($type);
 
-        $this->addArgument($argObj);
+        $this->addArgument($arg);
     }
 
     /**
@@ -79,7 +80,9 @@ public function addArgument(Argument $argument): void
 
         $index = count($this->arguments);
         $argument->setIndex($index);
+        $argument->init();
 
+        $name = $argument->getName();
         $mark = $argument->getNameMark();
 
         // NOTICE: only allow one array argument and must be at last.
@@ -94,10 +97,10 @@ public function addArgument(Argument $argument): void
         $this->arrayArg    = $this->arrayArg || $isArray;
         $this->optionalArg = $this->optionalArg || !$required;
 
-        // record index
-        $this->name2index[$argument->getName()] = count($this->arguments);
         // append
         $this->arguments[] = $argument;
+        // record index
+        $this->name2index[$name] = $index;
     }
 
     /**
diff --git a/src/Traits/FlagOptionsTrait.php b/src/Traits/FlagOptionsTrait.php
@@ -38,12 +38,24 @@ trait FlagOptionsTrait
      * @param string $name
      * @param string $shorts
      * @param string $desc
+     * @param string $type The argument data type. default is: string. {@see FlagType}
      * @param bool   $required
      * @param mixed  $default
+     * @param string $alias
      */
-    public function addOpt(string $name, string $shorts, string $desc, bool $required = false, $default = null): void
-    {
+    public function addOpt(
+        string $name,
+        string $shorts,
+        string $desc,
+        string $type = '',
+        bool $required = false,
+        $default = null,
+        string $alias = ''
+    ): void {
+        /** @var Option $opt */
         $opt = Option::new($name, $desc, $required, $default);
+        $opt->setType($type);
+        $opt->setAlias($alias);
         $opt->setShortcut($shorts);
 
         $this->addOption($opt);
@@ -70,6 +82,8 @@ public function addOption(Option $option): void
             }
         }
 
+        $option->init();
+
         // add to defined
         $this->defined[$name] = $option;
     }
@@ -84,6 +98,25 @@ public function addOptions(array $options): void
         }
     }
 
+    /**
+     * @param string     $name
+     * @param null|mixed $default
+     *
+     * @return mixed|null
+     */
+    public function getOpt(string $name, $default = null)
+    {
+        if ($arg = $this->getOption($name)) {
+            return $arg->getValue();
+        }
+
+        if ($default === null && ($arg = $this->getDefinedOption($name))) {
+            return $arg->hasDefault() ? $arg->getDefault() : $default;
+        }
+
+        return $default;
+    }
+
     /**
      * @param string $name
      *
@@ -94,6 +127,16 @@ public function getOption(string $name): ?Option
         return $this->matched[$name] ?? null;
     }
 
+    /**
+     * @param string $name
+     *
+     * @return Option|null
+     */
+    public function getDefinedOption(string $name): ?Option
+    {
+        return $this->defined[$name] ?? null;
+    }
+
     /**
      * @param string $name
      *
diff --git a/test/FlagsTest.php b/test/FlagsTest.php
@@ -12,6 +12,8 @@
 use Toolkit\PFlag\Exception\FlagException;
 use Toolkit\PFlag\Flags;
 use Toolkit\PFlag\Flag\Option;
+use Toolkit\PFlag\FlagType;
+use function vdump;
 
 /**
  * Class FlagsTest
@@ -24,12 +26,21 @@ public function testParse(): void
     {
         $fs = Flags::new();
         $fs->addOption(Option::new('name'));
+        $fs->addOpt('age', '', 'age desc', FlagType::INT);
+        $fs->addOpt('int1', '', 'opt1 desc', FlagType::INT, false, '89');
+        // vdump($fs->getDefinedOption('int1'));
+
         self::assertTrue($fs->hasDefined('name'));
         self::assertFalse($fs->hasMatched('name'));
 
         $args = ['--name', 'inhere', 'arg0', 'arg1'];
         $fs->parse($args);
+
         self::assertTrue($fs->hasMatched('name'));
+        $this->assertNotEmpty( $fs->getOption('name'));
+        $this->assertSame('inhere', $fs->getOpt('name'));
+        $this->assertSame(0, $fs->getOpt('age', 0));
+        $this->assertSame(89, $fs->getOpt('int1'));
 
         $fs->reset();
         $args = ['--name', 'inhere', '-s', 'sv', '-f'];

Original file line number	Diff line number	Diff line change
`@@ -74,11 +74,11 @@ public function getShortcut(): string`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`/**`
`77`		`- * @param string $shortcut eg: 'a\|b'`
	`77`	`+ * @param string $shortcut eg: 'a,b' Or '-a,-b'`
`78`	`78`	`*/`
`79`	`79`	`public function setShortcut(string $shortcut): void`
`80`	`80`	`{`
`81`		`- $shortcuts = preg_split('{(\\|)-?}', ltrim($shortcut, '-'));`
	`81`	`+ $shortcuts = preg_split('{(,)-?}', ltrim($shortcut, '-'));`
`82`	`82`	`$shortcuts = array_filter($shortcuts);`
`83`	`83`
`84`	`84`	`$this->setShorts($shortcuts);`