[Console] Fixed different behaviour of key and value user inputs in multiple choice question

maks-rafalko · fabpot · commit 2861bd7b0103 · 2017-05-27T07:10:26.000-07:00
diff --git a/src/Symfony/Component/Console/Question/ChoiceQuestion.php b/src/Symfony/Component/Console/Question/ChoiceQuestion.php
@@ -135,7 +135,7 @@ private function getDefaultValidator()
 
             if ($multiselect) {
                 // Check for a separated comma values
-                if (!preg_match('/^[a-zA-Z0-9_-]+(?:,[a-zA-Z0-9_-]+)*$/', $selectedChoices, $matches)) {
+                if (!preg_match('/^[^,]+(?:,[^,]+)*$/', $selectedChoices, $matches)) {
                     throw new \InvalidArgumentException(sprintf($errorMessage, $selected));
                 }
                 $selectedChoices = explode(',', $selectedChoices);
diff --git a/src/Symfony/Component/Console/Tests/Helper/QuestionHelperTest.php b/src/Symfony/Component/Console/Tests/Helper/QuestionHelperTest.php
@@ -273,6 +273,37 @@ public function simpleAnswerProvider()
         );
     }
 
+    /**
+     * @dataProvider specialCharacterInMultipleChoice
+     */
+    public function testSpecialCharacterChoiceFromMultipleChoiceList($providedAnswer, $expectedValue)
+    {
+        $possibleChoices = array(
+            '.',
+            'src',
+        );
+
+        $dialog = new QuestionHelper();
+        $dialog->setInputStream($this->getInputStream($providedAnswer."\n"));
+        $helperSet = new HelperSet(array(new FormatterHelper()));
+        $dialog->setHelperSet($helperSet);
+
+        $question = new ChoiceQuestion('Please select the directory', $possibleChoices);
+        $question->setMaxAttempts(1);
+        $question->setMultiselect(true);
+        $answer = $dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question);
+
+        $this->assertSame($expectedValue, $answer);
+    }
+
+    public function specialCharacterInMultipleChoice()
+    {
+        return array(
+            array('.', array('.')),
+            array('., src', array('.', 'src')),
+        );
+    }
+
     /**
      * @dataProvider mixedKeysChoiceListAnswerProvider
      */

Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ private function getDefaultValidator()`
`135`	`135`
`136`	`136`	`if ($multiselect) {`
`137`	`137`	`// Check for a separated comma values`
`138`		`- if (!preg_match('/^[a-zA-Z0-9_-]+(?:,[a-zA-Z0-9_-]+)*$/', $selectedChoices, $matches)) {`
	`138`	`+ if (!preg_match('/^[^,]+(?:,[^,]+)*$/', $selectedChoices, $matches)) {`
`139`	`139`	`throw new \InvalidArgumentException(sprintf($errorMessage, $selected));`
`140`	`140`	`}`
`141`	`141`	`$selectedChoices = explode(',', $selectedChoices);`