Commit338c78d

Amrouche Hamza

committed

[Console] fix a bug when you are passing a default value and passing -n would ouput the index

1 parent76b7cac commit338c78dCopy full SHA for 338c78d

File tree

+11

-1

lines changed

src/Symfony/Component/Console
- Helper
  - QuestionHelper.php
- Tests/Helper
  - QuestionHelperTest.php

+11

-1

lines changed

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,13 @@ public function ask(InputInterface $input, OutputInterface $output, Question $qu`
`44`	`44`	`$output =$output->getErrorOutput();`
`45`	`45`	`}`
`46`	`46`
`47`		`-if (!$input->isInteractive()) {`
	`47`	`+$isNotInteractive = !$input->isInteractive();`
	`48`	`+`
	`49`	`+if ($isNotInteractive &&$questioninstanceof ChoiceQuestion) {`
	`50`	`+return$question->getChoices()[$question->getDefault()];`
	`51`	`+ }`
	`52`	`+`
	`53`	`+if ($isNotInteractive) {`
`48`	`54`	`return$question->getDefault();`
`49`	`55`	`}`
`50`	`56`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,10 @@ public function testAskChoice()`
`84`	`84`	`$question->setMultiselect(true);`
`85`	`85`
`86`	`86`	`$this->assertEquals(array('Superman','Batman'),$questionHelper->ask($this->createInputInterfaceMock(),$this->createOutputInterface(),$question));`
	`87`	`+`
	`88`	`+$question =newChoiceQuestion('What is your favorite superhero?',$heroes,0);`
	`89`	`+// We are supposed to get the default value since we are in interactive mode`
	`90`	`+$this->assertEquals('Superman',$questionHelper->ask($this->createInputInterfaceMock(true),$this->createOutputInterface(),$question));`
`87`	`91`	`}`
`88`	`92`
`89`	`93`	`publicfunctiontestAsk()`

Comments

(0)