@@ -117,9 +117,11 @@ public function findArrayFor(ConsoleArgumentDefinition $argumentDefinition): Con
117117 $ values = [];
118118
119119 foreach ($ this ->arguments as $ argument ) {
120- if ($ argumentDefinition ->matchesArgument ($ argument )) {
121- $ values [] = $ argument -> value ;
120+ if (! $ argumentDefinition ->matchesArgument ($ argument )) {
121+ continue ;
122122 }
123+
124+ $ values [] = $ argument ->value ;
123125 }
124126
125127 return new ConsoleInputArgument (
@@ -137,13 +139,15 @@ public function findForVariadicArgument(ConsoleArgumentDefinition $argumentDefin
137139 $ arguments = [];
138140
139141 foreach ($ this ->arguments as $ argument ) {
140- if ($ argument ->position >= $ argumentDefinition ->position ) {
141- $ arguments [] = new ConsoleInputArgument (
142- name: $ argumentDefinition ->name ,
143- position: $ argument ->position ,
144- value: $ this ->resolveArgumentValue ($ argumentDefinition , $ argument )->value ,
145- );
142+ if ($ argument ->position < $ argumentDefinition ->position ) {
143+ continue ;
146144 }
145+
146+ $ arguments [] = new ConsoleInputArgument (
147+ name: $ argumentDefinition ->name ,
148+ position: $ argument ->position ,
149+ value: $ this ->resolveArgumentValue ($ argumentDefinition , $ argument )->value ,
150+ );
147151 }
148152
149153 return $ arguments ;
@@ -173,16 +177,18 @@ public function addMany(array $arguments): self
173177
174178 // Otherwise, $arguments is an array of flags or positional argument.
175179 foreach ($ arguments as $ key => $ argument ) {
176- if (str_starts_with ($ argument , '- ' ) && ! str_starts_with ($ argument , '-- ' )) {
177- $ flags = str_split ( $ argument ) ;
178- unset( $ flags [ 0 ]);
180+ if (! ( str_starts_with ($ argument , '- ' ) && ! str_starts_with ($ argument , '-- ' ) )) {
181+ continue ;
182+ }
179183
180- foreach ($ flags as $ flag ) {
181- $ arguments [] = "- {$ flag }" ;
182- }
184+ $ flags = str_split ($ argument );
185+ unset($ flags [0 ]);
183186
184- unset($ arguments [$ key ]);
187+ foreach ($ flags as $ flag ) {
188+ $ arguments [] = "- {$ flag }" ;
185189 }
190+
191+ unset($ arguments [$ key ]);
186192 }
187193
188194 $ position = count ($ this ->arguments );
0 commit comments