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

Amrouche Hamza · Amrouche Hamza · commit 338c78d39a74 · 2017-12-16T12:43:19.000+01:00
diff --git a/src/Symfony/Component/Console/Helper/QuestionHelper.php b/src/Symfony/Component/Console/Helper/QuestionHelper.php
@@ -44,7 +44,13 @@ public function ask(InputInterface $input, OutputInterface $output, Question $qu
             $output = $output->getErrorOutput();
         }
 
-        if (!$input->isInteractive()) {
+        $isNotInteractive = !$input->isInteractive();
+
+        if ($isNotInteractive && $question instanceof ChoiceQuestion) {
+            return $question->getChoices()[$question->getDefault()];
+        }
+
+        if ($isNotInteractive) {
             return $question->getDefault();
         }
 
diff --git a/src/Symfony/Component/Console/Tests/Helper/QuestionHelperTest.php b/src/Symfony/Component/Console/Tests/Helper/QuestionHelperTest.php
@@ -84,6 +84,10 @@ public function testAskChoice()
         $question->setMultiselect(true);
 
         $this->assertEquals(array('Superman', 'Batman'), $questionHelper->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question));
+
+        $question = new ChoiceQuestion('What is your favorite superhero?', $heroes, 0);
+        // We are supposed to get the default value since we are in interactive mode
+        $this->assertEquals('Superman', $questionHelper->ask($this->createInputInterfaceMock(true), $this->createOutputInterface(), $question));
     }
 
     public function testAsk()

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 && $question instanceof ChoiceQuestion) {`
	`50`	`+ return $question->getChoices()[$question->getDefault()];`
	`51`	`+ }`
	`52`	`+`
	`53`	`+ if ($isNotInteractive) {`
`48`	`54`	`return $question->getDefault();`
`49`	`55`	`}`
`50`	`56`
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 = new ChoiceQuestion('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`	`public function testAsk()`