bug #25521 [Console] fix a bug when you are passing a default value and passing -n would output the index (Simperfit)

nicolas-grekas · nicolas-grekas · commit 98bfe8040823 · 2017-12-18T20:55:28.000+01:00
This PR was merged into the 2.7 branch. Discussion ---------- [Console] fix a bug when you are passing a default value and passing -n would output the index | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no  | BC breaks? | no | Deprecations? | no  | Tests pass? | yes | Fixed tickets | #25470 | License | MIT | Doc PR | We are fixing a bug when you are using a default value with -n, it would output the index instead of the value. Simple reproducer Simperfit/symfony-reproducer@5079dd1?diff=split#diff-77efcc28bc5309e1af9ac07a1e073009R40 Commits ------- 41ffc69 [Console] fix a bug when you are passing a default value and passing -n would ouput the index
diff --git a/src/Symfony/Component/Console/Helper/QuestionHelper.php b/src/Symfony/Component/Console/Helper/QuestionHelper.php
@@ -45,6 +45,12 @@ public function ask(InputInterface $input, OutputInterface $output, Question $qu
         }
 
         if (!$input->isInteractive()) {
+            if ($question instanceof ChoiceQuestion) {
+                $choices = $question->getChoices();
+
+                return $choices[$question->getDefault()];
+            }
+
             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 not 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
`@@ -45,6 +45,12 @@ public function ask(InputInterface $input, OutputInterface $output, Question $qu`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`if (!$input->isInteractive()) {`
	`48`	`+ if ($question instanceof ChoiceQuestion) {`
	`49`	`+ $choices = $question->getChoices();`
	`50`	`+`
	`51`	`+ return $choices[$question->getDefault()];`
	`52`	`+ }`
	`53`	`+`
`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 not in interactive mode`
	`90`	`+ $this->assertEquals('Superman', $questionHelper->ask($this->createInputInterfaceMock(true), $this->createOutputInterface(), $question));`
`87`	`91`	`}`
`88`	`92`
`89`	`93`	`public function testAsk()`