[Console] Fix an autocompletion question helper issue with non-sequentially indexed choices

jakzal · jakzal · commit 9c3247cfd4f8 · 2016-03-09T16:30:49.000Z
diff --git a/src/Symfony/Component/Console/Question/Question.php b/src/Symfony/Component/Console/Question/Question.php
@@ -135,8 +135,8 @@ public function getAutocompleterValues()
      */
     public function setAutocompleterValues($values)
     {
-        if (is_array($values) && $this->isAssoc($values)) {
-            $values = array_merge(array_keys($values), array_values($values));
+        if (is_array($values)) {
+            $values = $this->isAssoc($values) ? array_merge(array_keys($values), array_values($values)) : array_values($values);
         }
 
         if (null !== $values && !is_array($values)) {
diff --git a/src/Symfony/Component/Console/Tests/Helper/QuestionHelperTest.php b/src/Symfony/Component/Console/Tests/Helper/QuestionHelperTest.php
@@ -135,6 +135,26 @@ public function testAskWithAutocomplete()
         $this->assertEquals('FooBundle', $dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question));
     }
 
+    public function testAskWithAutocompleteWithNonSequentialKeys()
+    {
+        if (!$this->hasSttyAvailable()) {
+            $this->markTestSkipped('`stty` is required to test autocomplete functionality');
+        }
+
+        // <UP ARROW><UP ARROW><NEWLINE><DOWN ARROW><DOWN ARROW><NEWLINE>
+        $inputStream = $this->getInputStream("\033[A\033[A\n\033[B\033[B\n");
+
+        $dialog = new QuestionHelper();
+        $dialog->setInputStream($inputStream);
+        $dialog->setHelperSet(new HelperSet(array(new FormatterHelper())));
+
+        $question = new ChoiceQuestion('Please select a bundle', array(1 => 'AcmeDemoBundle', 4 => 'AsseticBundle'));
+        $question->setMaxAttempts(1);
+
+        $this->assertEquals('AcmeDemoBundle', $dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question));
+        $this->assertEquals('AsseticBundle', $dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question));
+    }
+
     public function testAskHiddenResponse()
     {
         if ('\\' === DIRECTORY_SEPARATOR) {

Original file line number	Diff line number	Diff line change
`@@ -135,8 +135,8 @@ public function getAutocompleterValues()`
`135`	`135`	`*/`
`136`	`136`	`public function setAutocompleterValues($values)`
`137`	`137`	`{`
`138`		`- if (is_array($values) && $this->isAssoc($values)) {`
`139`		`- $values = array_merge(array_keys($values), array_values($values));`
	`138`	`+ if (is_array($values)) {`
	`139`	`+ $values = $this->isAssoc($values) ? array_merge(array_keys($values), array_values($values)) : array_values($values);`
`140`	`140`	`}`
`141`	`141`
`142`	`142`	`if (null !== $values && !is_array($values)) {`