Commitbe4491a

committed

[Console] Fix autocompletion of argument with default value

1 parent70d96aa commitbe4491aCopy full SHA for be4491a

File tree

+18

-4

lines changed

src/Symfony/Component/Console
- Completion
  - CompletionInput.php
- Tests/Completion
  - CompletionInputTest.php

+18

-4

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -109,12 +109,12 @@ public function bind(InputDefinition $definition): void`
`109`	`109`	`// complete argument value`
`110`	`110`	`$this->completionType =self::TYPE_ARGUMENT_VALUE;`
`111`	`111`
`112`		`-$arguments =$this->getArguments();`
`113`		`-foreach ($argumentsas$argumentName =>$argumentValue) {`
`114`		`-if (null ===$argumentValue) {`
	`112`	`+foreach ($this->definition->getArguments()as$argumentName =>$argument) {`
	`113`	`+if (!isset($this->arguments[$argumentName])) {`
`115`	`114`	`break;`
`116`	`115`	`}`
`117`	`116`
	`117`	`+$argumentValue =$this->arguments[$argumentName];`
`118`	`118`	`$this->completionName =$argumentName;`
`119`	`119`	`if (\is_array($argumentValue)) {`
`120`	`120`	`$this->completionValue =$argumentValue ?$argumentValue[array_key_last($argumentValue)] :null;`
`@@ -124,7 +124,7 @@ public function bind(InputDefinition $definition): void`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`if ($this->currentIndex >=\count($this->tokens)) {`
`127`		`-if (null ===$arguments[$argumentName] \|\|$this->definition->getArgument($argumentName)->isArray()) {`
	`127`	`+if (!isset($this->arguments[$argumentName]) \|\|$this->definition->getArgument($argumentName)->isArray()) {`
`128`	`128`	`$this->completionName =$argumentName;`
`129`	`129`	`$this->completionValue ='';`
`130`	`130`	`}else {`

Lines changed: 14 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -97,6 +97,20 @@ public function provideBindWithLastArrayArgumentData()`
`97`	`97`	`yield [CompletionInput::fromTokens(['bin/console','symfony','sen'],2),'sen'];`
`98`	`98`	`}`
`99`	`99`
	`100`	`+publicfunctiontestBindArgumentWithDefault()`
	`101`	`+ {`
	`102`	`+$definition =newInputDefinition([`
	`103`	`+newInputArgument('arg-with-default', InputArgument::OPTIONAL,'','default'),`
	`104`	`+ ]);`
	`105`	`+`
	`106`	`+$input = CompletionInput::fromTokens(['bin/console'],1);`
	`107`	`+$input->bind($definition);`
	`108`	`+`
	`109`	`+$this->assertEquals(CompletionInput::TYPE_ARGUMENT_VALUE,$input->getCompletionType(),'Unexpected type');`
	`110`	`+$this->assertEquals('arg-with-default',$input->getCompletionName(),'Unexpected name');`
	`111`	`+$this->assertEquals('',$input->getCompletionValue(),'Unexpected value');`
	`112`	`+ }`
	`113`	`+`
`100`	`114`	`/**`
`101`	`115`	`* @dataProvider provideFromStringData`
`102`	`116`	`*/`

Comments

(0)