Fix #35 - do not load secondary arguments into value of primary

PhpGt · May 31, 2019 · 5bbb67b · 5bbb67b
1 parent b659eb1
commit 5bbb67b
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 2 deletions.
diff --git a/src/Argument/ArgumentList.php b/src/Argument/ArgumentList.php
@@ -67,9 +67,18 @@ protected function buildArgumentList(array $arguments):void {
  );
  }
  else {
- $skipNextArgument = true;
  $name = $arg;
- $value = $arguments[$i + 1] ?? null;
+
+ $nextArgument = $arguments[$i + 1] ?? null;
+
+ if($nextArgument
+ && strpos($nextArgument, "-") !== 0) {
+ $value = $arguments[$i + 1];
+ $skipNextArgument = true;
+ }
+ else {
+ $value = null;
+ }
  }
 
  if ($arg[1] === "-") {

diff --git a/test/unit/Argument/ArgumentListTest.php b/test/unit/Argument/ArgumentListTest.php
@@ -303,6 +303,31 @@ public function testGetValueParameterWithShortOption(string...$args) {
  self::assertEquals($args[2], $value);
  }
 
+ public function testGetValueForParameterForMultiple() {
+ $argumentList = new ArgumentList(
+ "test-script",
+ "test-command",
+ "--one",
+ "--two",
+ "--three",
+ "--four"
+ );
+
+ $param1 = self::createMock(Parameter::class);
+ $param1->method("getLongOption")->willReturn("one");
+ $param2 = self::createMock(Parameter::class);
+ $param2->method("getLongOption")->willReturn("two");
+ $param3 = self::createMock(Parameter::class);
+ $param3->method("getLongOption")->willReturn("three");
+ $param4 = self::createMock(Parameter::class);
+ $param4->method("getLongOption")->willReturn("four");
+
+ self::assertTrue($argumentList->contains($param1));
+ self::assertTrue($argumentList->contains($param2));
+ self::assertTrue($argumentList->contains($param3));
+ self::assertTrue($argumentList->contains($param4));
+ }
+
  public function data_randomNamedArgs():array {
  $dataSet = [];