Merge pull request #64 from peter279k/add_split_extra_arg

c9s · Apr 14, 2023 · aab2728 · aab2728
2 parents 9a433c6 + 3d8bd1d
commit aab2728
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/OptionParser.php b/src/OptionParser.php
@@ -98,7 +98,6 @@ protected function preprocessingArguments(array $argv)
         foreach ($argv as $arg) {
             if ($arg === '--') {
                 $afterDash = true;
-                continue;
             }
             if ($afterDash) {
                 $newArgv[] = $arg;
@@ -175,6 +174,11 @@ public function parse(array $argv)
             }
 
             $spec = $this->specs->get($arg->getOptionName());
+
+            if ($arg->arg === '--') {
+                continue;
+            }
+
             if (!$spec) {
                 throw new InvalidOptionException('Invalid option: '.$arg);
             }

diff --git a/tests/ContinuousOptionParserTest.php b/tests/ContinuousOptionParserTest.php
@@ -46,7 +46,7 @@ public function argumentProvider()
                 ['program','-v', '-c', 'subcommand1', '--as', 99, 'arg1', 'arg2', 'arg3', '--','zz','xx','vv'],
                 [
                     'app' => ['verbose' => true],
-                    'args' => ['arg1', 'arg2', 'arg3', 'zz', 'xx', 'vv']
+                    'args' => ['arg1', 'arg2', 'arg3', '--', 'zz', 'xx', 'vv']
                 ],
             ],
         ];