Commit d16d233

committed

fix bug default argument value

1 parent 6bac55b commit d16d233Copy full SHA for d16d233

File tree

+18

-6

lines changed

+18

-6

lines changed

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -94,6 +94,11 @@ private function execute(CommandInterface $command, CommandParser $commandParser`
`94`	`94`	`$argvOptions = [];`
`95`	`95`
`96`	`96`	`$options = $command->getOptions();`
	`97`	`+ foreach ($options as $option) {`
	`98`	`+ if ($option->isFlag()) {`
	`99`	`+ $argvOptions["--{$option->getName()}"] = false;`
	`100`	`+ }`
	`101`	`+ }`
`97`	`102`	`foreach ($commandParser->getOptions() as $name => $value) {`
`98`	`103`	`$hasOption = false;`
`99`	`104`	`foreach ($options as $option) {`
`@@ -121,6 +126,8 @@ private function execute(CommandInterface $command, CommandParser $commandParser`
`121`	`126`	`}`
`122`	`127`	`if ($commandParser->hasArgument($key)) {`
`123`	`128`	`$argv["--{$argument->getName()}"] = $commandParser->getArgumentValue($key);`
	`129`	`+ }else {`
	`130`	`+ $argv["--{$argument->getName()}"] = $argument->getDefaultValue();`
`124`	`131`	`}`
`125`	`132`	`}`
`126`	`133`

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,6 @@ public function hasOption(string $name): bool`
`39`	`39`	`if (!self::startsWith($name, '--')) {`
`40`	`40`	`$name = "--$name";`
`41`	`41`	`}`
`42`		`-`
`43`	`42`	`return array_key_exists($name, $this->options);`
`44`	`43`	`}`
`45`	`44`
`@@ -57,6 +56,9 @@ public function getOptionValue(string $name)`
`57`	`56`
`58`	`57`	`public function getArgumentValue(string $name)`
`59`	`58`	`{`
	`59`	`+ if (!self::startsWith($name, '--')) {`
	`60`	`+ $name = "--$name";`
	`61`	`+ }`
`60`	`62`	`if (!$this->hasArgument($name)) {`
`61`	`63`	`throw new \InvalidArgumentException(sprintf('Argument "%s" is not defined.', $name));`
`62`	`64`	`}`
`@@ -65,6 +67,9 @@ public function getArgumentValue(string $name)`
`65`	`67`
`66`	`68`	`public function hasArgument(string $name): bool`
`67`	`69`	`{`
	`70`	`+ if (!self::startsWith($name, '--')) {`
	`71`	`+ $name = "--$name";`
	`72`	`+ }`
`68`	`73`	`return array_key_exists($name, $this->arguments);`
`69`	`74`	`}`
`70`	`75`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public function getOptions(): array`
`31`	`31`	`public function getArguments(): array`
`32`	`32`	`{`
`33`	`33`	`return [`
`34`		`- new CommandArgument('input', false, null, 'The input file for the foo operation')`
	`34`	`+ new CommandArgument('input', false, 'none', 'The input file for the foo operation')`
`35`	`35`	`];`
`36`	`36`	`}`
`37`	`37`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -93,4 +93,4 @@ public function testExecute(): void`
`93`	`93`
`94`	`94`	`$this->assertEquals(6, $lines);`
`95`	`95`	`}`
`96`		`-}`
	`96`	`+}`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public function testGetOptionValue()`
`71`	`71`
`72`	`72`	`public function testGetArgumentValue()`
`73`	`73`	`{`
`74`		`- $input = new Input('test', [], ['argument' => 'value']);`
	`74`	`+ $input = new Input('test', [], ['--argument' => 'value']);`
`75`	`75`	`$this->assertEquals('value', $input->getArgumentValue('argument'));`
`76`	`76`	`$this->expectException(\InvalidArgumentException::class, function () use ($input) {`
`77`	`77`	`$input->getArgumentValue('invalid');`
`@@ -80,8 +80,8 @@ public function testGetArgumentValue()`
`80`	`80`
`81`	`81`	`public function testHasArgument()`
`82`	`82`	`{`
`83`		`- $input = new Input('test', [], ['argument' => 'value']);`
	`83`	`+ $input = new Input('test', [], ['--argument' => 'value']);`
`84`	`84`	`$this->assertTrue($input->hasArgument('argument'));`
`85`	`85`	`$this->assertFalse($input->hasArgument('invalid'));`
`86`	`86`	`}`
`87`		`-}`
	`87`	`+}`

Comments

(0)