fix: the remian args collect error

php-toolkit · Jan 19, 2022 · 6822123 · 6822123
1 parent 96b4050
commit 6822123
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 6 deletions.
diff --git a/src/Flags.php b/src/Flags.php
@@ -374,8 +374,8 @@ public function bindingArguments(): self
                 continue;
             }
 
+            // collect all remain args
             if ($arg->isArray()) {
-                // collect all remain args
                 foreach ($args as $value) {
                     $arg->setValue($value);
                 }
@@ -387,13 +387,14 @@ public function bindingArguments(): self
         }
 
         if ($args) {
+            $args = array_values($args);
+
             if ($this->strictMatchArgs) {
                 throw new FlagException(sprintf('unknown arguments (error: "%s").', implode(' ', $args)));
             }
-
-            $this->remainArgs = array_values($args);
         }
 
+        $this->remainArgs = $args;
         return $this;
     }
 

diff --git a/src/FlagsParser.php b/src/FlagsParser.php
@@ -102,7 +102,7 @@ abstract class FlagsParser implements ParserInterface
     protected array $flags = [];
 
     /**
-     * The remaining raw args, after option parsed from {@see $flags}
+     * The raw args, after option parsed from {@see $flags}
      *
      * @var string[]
      */
@@ -495,6 +495,18 @@ public function popFirstRawArg(): string
         return array_shift($this->rawArgs);
     }
 
+    /**
+     * @return array
+     */
+    public function getInfo(): array
+    {
+        return [
+            'flags'      => $this->flags,
+            'rawArgs'    => $this->rawArgs,
+            'remainArgs' => $this->remainArgs,
+        ];
+    }
+
     /**
      * @return bool
      */

diff --git a/src/SFlags.php b/src/SFlags.php
@@ -572,12 +572,14 @@ public function bindingArguments(): void
         }
 
         if ($args) {
+            $args = array_values($args);
+
             if ($this->strictMatchArgs) {
                 throw new FlagException(sprintf('unknown arguments (error: "%s").', implode(', ', $args)));
             }
-
-            $this->remainArgs = array_values($args);
         }
+
+        $this->remainArgs = $args;
     }
 
     /**