fix: not set value, should return typed default value

Author: inhere

src/FlagType.php

@@ -114,6 +114,42 @@ public static function getHelpName(string $type, bool $toUpper = true): string
         return $toUpper ? strtoupper($name) : $name;
     }
 
+    /**
+     * Get type default value.
+     *
+     * @param string $type
+     *
+     * @return array|false|float|int|string|null
+     */
+    public static function getDefault(string $type)
+    {
+        $value = null;
+        switch ($type) {
+            case self::INT:
+                $value = 0;
+                break;
+            case self::BOOL:
+                $value = false;
+                break;
+            case self::FLOAT:
+                $value = (float)0;
+                break;
+            case self::STRING:
+                $value = '';
+                break;
+            case self::INTS:
+            case self::ARRAY:
+            case self::STRINGS:
+                $value = [];
+                break;
+            default:
+                // nothing
+                break;
+        }
+
+        return $value;
+    }
+
     /**
      * @param string $type
      * @param mixed  $value

src/SFlags.php

@@ -122,11 +122,11 @@ class SFlags extends AbstractFlags
      *
      * ```php
      * [
-     *  'name' => self::DEFINE_ITEM,
+     *  self::DEFINE_ITEM,
      * ]
      * ```
      *
-     * @var array
+     * @var array[]
      */
     private $argDefines = [];
 
@@ -704,7 +704,16 @@ public function getOption(string $name, $default = null)
      */
     public function getOpt(string $name, $default = null)
     {
-        return $this->opts[$name] ?? $default;
+        if (isset($this->opts[$name])) {
+            return $this->opts[$name];
+        }
+
+        $define = $this->optDefines[$name] ?? [];
+        if (!$define) { // not exist option
+            throw new FlagException("flag option '$name' is undefined");
+        }
+
+        return $default ?? FlagType::getDefault($define['type']);
     }
 
     /**
@@ -722,17 +731,9 @@ public function getOpts(): array
      */
     public function hasArg($nameOrIndex): bool
     {
-        if (is_string($nameOrIndex)) {
-            if (!isset($this->name2index[$nameOrIndex])) {
-                return false;
-            }
-
-            $index = $this->name2index[$nameOrIndex];
-        } else {
-            $index = (int)$nameOrIndex;
-        }
+        $index = $this->getArgIndex($nameOrIndex);
 
-        return isset($this->args[$index]);
+        return $index > -1 && isset($this->args[$index]);
     }
 
     /**
@@ -754,17 +755,18 @@ public function getArgument($nameOrIndex, $default = null)
      */
     public function getArg($nameOrIndex, $default = null)
     {
-        if (is_string($nameOrIndex)) {
-            if (!isset($this->name2index[$nameOrIndex])) {
-                throw new FlagException("flag argument name '$nameOrIndex' is undefined");
-            }
+        $index = $this->getArgIndex($nameOrIndex);
+        if ($index < 0) {
+            throw new FlagException("flag argument '$nameOrIndex' is undefined");
+        }
 
-            $index = $this->name2index[$nameOrIndex];
-        } else {
-            $index = (int)$nameOrIndex;
+        if (isset($this->args[$index])) {
+            return $this->args[$index];
         }
 
-        return $this->args[$index] ?? $default;
+        // get default with type format
+        $define = $this->argDefines[$index];
+        return $default ?? FlagType::getDefault($define['type']);
     }
 
     /**
@@ -780,19 +782,16 @@ public function getFirstArg($default = null)
     /**
      * @param string|int $nameOrIndex
      *
-     * @return int
+     * @return int Will return -1 if arg not exists
      */
-    public function getArgIndex($nameOrIndex): int
+    protected function getArgIndex($nameOrIndex): int
     {
         if (!is_string($nameOrIndex)) {
-            return (int)$nameOrIndex;
-        }
-
-        if (!isset($this->name2index[$nameOrIndex])) {
-            throw new FlagException("flag argument name '$nameOrIndex' is undefined");
+            $index = (int)$nameOrIndex;
+            return isset($this->argDefines[$index]) ? $index : -1;
         }
 
-        return $this->name2index[$nameOrIndex];
+        return $this->name2index[$nameOrIndex] ?? -1;
     }
 
     /**
@@ -842,6 +841,18 @@ public function addArgRule(string $name, $rule): self
         return $this;
     }
 
+    /**
+     * @param string|int $nameOrIndex
+     *
+     * @return bool
+     */
+    public function hasDefineArg($nameOrIndex): bool
+    {
+        $index = $this->getArgIndex($nameOrIndex);
+
+        return isset($this->argDefines[$index]);
+    }
+
     /**
      * @return array
      */
@@ -881,6 +892,16 @@ public function addOptRule(string $name, $rule): self
         return $this;
     }
 
+    /**
+     * @param string $name
+     *
+     * @return bool
+     */
+    public function hasDefineOpt(string $name): bool
+    {
+        return isset($this->optDefines[$name]);
+    }
+
     /**
      * @return array
      */