fix: remian args is not string list

Author: inhere

src/Flags.php

@@ -17,12 +17,11 @@
 use Toolkit\PFlag\Flag\Option;
 use Toolkit\Stdlib\Str;
 use function array_shift;
+use function array_values;
 use function count;
 use function implode;
 use function is_array;
-use function is_numeric;
 use function is_string;
-use function ltrim;
 use function sprintf;
 use function str_split;
 use function strlen;
@@ -282,33 +281,6 @@ private function appendRawArgs(array $args): void
         }
     }
 
-    /**
-     * check and get option Name
-     *
-     * invalid:
-     * - empty string
-     * - no prefix '-' (is argument)
-     * - invalid option name as argument. eg: '- '
-     *
-     * @param string $val
-     *
-     * @return string
-     */
-    private function filterOptionName(string $val): string
-    {
-        // is not an option.
-        if ('' === $val || $val[0] !== '-') {
-            return '';
-        }
-
-        $name = ltrim($val, '-');
-        if (is_numeric($name)) {
-            return '';
-        }
-
-        return $name;
-    }
-
     /**
      * @param string $shorts eg: 'abc' from '-abc'
      */
@@ -413,11 +385,14 @@ public function bindingArguments(): self
             }
         }
 
-        if ($this->strictMatchArgs && $args) {
-            throw new FlagException(sprintf('unknown arguments (error: "%s").', implode(' ', $args)));
+        if ($args) {
+            if ($this->strictMatchArgs) {
+                throw new FlagException(sprintf('unknown arguments (error: "%s").', implode(' ', $args)));
+            }
+
+            $this->remainArgs = array_values($args);
         }
 
-        $this->remainArgs = $args;
         return $this;
     }
 
@@ -474,7 +449,6 @@ public function addArg(
         mixed $default = null,
         array $moreInfo = []
     ): static {
-        /** @var Argument $arg */
         $arg = Argument::new($name, $desc, $type, $required, $default);
 
         $this->addArgument($arg);
@@ -489,13 +463,12 @@ public function addArg(
      *
      * @return self
      * @see argRules for an rule
-     *
      */
     public function addArgByRule(string $name, array|string $rule): static
     {
         $index  = count($this->arguments);
         $define = $this->parseRule($rule, $name, $index, false);
-        /** @var Argument $arg */
+
         $arg = Argument::newByArray($name, $define);
 
         parent::addArgByRule($name, $rule);
@@ -578,7 +551,7 @@ public function hasArg(int|string $nameOrIndex): bool
 
             $index = $this->name2index[$nameOrIndex];
         } else {
-            $index = (int)$nameOrIndex;
+            $index = $nameOrIndex;
         }
 
         return isset($this->arguments[$index]);
@@ -696,7 +669,7 @@ public function getArgIndex(int|string $nameOrIndex): int
             return $this->name2index[$nameOrIndex] ?? -1;
         }
 
-        $index = (int)$nameOrIndex;
+        $index = $nameOrIndex;
         return isset($this->arguments[$index]) ? $index : -1;
     }
 
@@ -772,7 +745,6 @@ public function addOpt(
         mixed $default = null,
         array $moreInfo = []
     ): static {
-        /** @var Option $opt */
         $opt = Option::new($name, $desc, $type, $required, $default);
         $opt->setAliases($moreInfo['aliases'] ?? []);
         $opt->setShortcut($shortcut);
@@ -793,7 +765,6 @@ public function addOpt(
     public function addOptByRule(string $name, array|string $rule): static
     {
         $define = $this->parseRule($rule, $name);
-        /** @var Option $option */
         $option = Option::newByArray($define['name'], $define);
 
         if (is_array($rule) && isset($rule['aliases'])) {
@@ -955,9 +926,7 @@ public function setTrustedOpt(string $name, mixed $value): void
      */
     public function getOptDefine(string $name): array
     {
-        $opt = $this->mustGetOption($name);
-
-        return $opt->toArray();
+        return $this->mustGetOption($name)->toArray();
     }
 
     /**

src/SFlags.php

@@ -14,6 +14,7 @@
 use Toolkit\PFlag\Exception\FlagParseException;
 use Toolkit\Stdlib\OS;
 use Toolkit\Stdlib\Str;
+use function array_values;
 use function count;
 use function current;
 use function explode;
@@ -567,11 +568,13 @@ public function bindingArguments(): void
             }
         }
 
-        if ($this->strictMatchArgs && $args) {
-            throw new FlagException(sprintf('unknown arguments (error: "%s").', implode(', ', $args)));
-        }
+        if ($args) {
+            if ($this->strictMatchArgs) {
+                throw new FlagException(sprintf('unknown arguments (error: "%s").', implode(', ', $args)));
+            }
 
-        $this->remainArgs = $args;
+            $this->remainArgs = array_values($args);
+        }
     }
 
     /**
@@ -951,6 +954,7 @@ public function getArg(int|string $nameOrIndex, mixed $default = null): mixed
 
     /**
      * @param int|string $nameOrIndex
+     * @param string $errMsg
      *
      * @return mixed
      */
@@ -993,7 +997,7 @@ protected function mustGetArgIndex(int|string $nameOrIndex): int
     public function getArgIndex(int|string $nameOrIndex): int
     {
         if (!is_string($nameOrIndex)) {
-            $index = (int)$nameOrIndex;
+            $index = $nameOrIndex;
             return isset($this->argDefines[$index]) ? $index : -1;
         }