feat: support set option value by setOpt

Author: inhere

src/Contract/ParserInterface.php

@@ -108,6 +108,14 @@ public function hasOpt(string $name): bool;
      */
     public function getOpt(string $name, $default = null);
 
+    /**
+     * @param string $name
+     * @param mixed $value
+     *
+     * @return mixed
+     */
+    public function setOpt(string $name, $value): void;
+
     /**
      * @param string|int $nameOrIndex
      *

src/Flag/AbstractFlag.php

@@ -19,6 +19,7 @@
 use Toolkit\Stdlib\OS;
 use function is_array;
 use function is_bool;
+use function is_scalar;
 use function trim;
 
 /**
@@ -190,7 +191,8 @@ public function setValue($value): void
         $value = FlagType::fmtBasicTypeValue($this->type, $value);
 
         // has validator
-        if ($cb = $this->validator) {
+        $cb = $this->validator;
+        if ($cb && is_scalar($value)) {
             $ok  = true;
             $ret = $cb($value, $this->name);
 
@@ -206,7 +208,11 @@ public function setValue($value): void
         }
 
         if ($this->isArray()) {
-            $this->value[] = $value;
+            if (is_array($value)) {
+                $this->value = $value;
+            } else {
+                $this->value[] = $value;
+            }
         } else {
             $this->value = $value;
         }
@@ -285,6 +291,14 @@ public function setName(string $name): void
         $this->name = $name;
     }
 
+    /**
+     * @return array|false|float|int|string|null
+     */
+    public function getTypeDefault()
+    {
+        return FlagType::getDefault($this->type);
+    }
+
     /**
      * @return mixed
      */

src/Flags.php

@@ -783,7 +783,7 @@ protected function addMatched(Option $option): void
      */
     public function hasOpt(string $name): bool
     {
-        return isset($this->matched[$name]);
+        return isset($this->options[$name]);
     }
 
     /**
@@ -804,11 +804,30 @@ public function hasMatched(string $name): bool
      */
     public function getOpt(string $name, $default = null)
     {
-        if ($opt = $this->getOption($name)) {
+        $opt = $this->getDefinedOption($name);
+        if (!$opt) { // not exist option
+            throw new FlagException("flag option '$name' is undefined");
+        }
+
+        if ($opt->hasValue()) {
             return $opt->getValue();
         }
 
-        return $default;
+        return $default ?? $opt->getTypeDefault();
+    }
+
+    /**
+     * @param string $name
+     * @param mixed $value
+     */
+    public function setOpt(string $name, $value): void
+    {
+        $opt = $this->getDefinedOption($name);
+        if (!$opt) { // not exist option
+            throw new FlagException("flag option '$name' is undefined");
+        }
+
+        $opt->setValue($value);
     }
 
     /**

src/SFlags.php

@@ -740,7 +740,7 @@ protected function addArgDefine(array $define): void
      */
     public function hasOpt(string $name): bool
     {
-        return isset($this->opts[$name]);
+        return isset($this->optDefines[$name]);
     }
 
     /**
@@ -784,6 +784,20 @@ public function getOpt(string $name, $default = null)
         return $default ?? FlagType::getDefault($define['type']);
     }
 
+    /**
+     * @param string $name
+     * @param mixed $value
+     */
+    public function setOpt(string $name, $value): void
+    {
+        $define = $this->optDefines[$name] ?? [];
+        if (!$define) { // not exist option
+            throw new FlagException("flag option '$name' is undefined");
+        }
+
+        $this->opts[$name] = FlagType::fmtBasicTypeValue($define['type'], $value);
+    }
+
     /**
      * @return array
      */