bug #32781 [Console] Fix disabling ChoiceQuestion answer trimming (chalasr)

fabpot · fabpot · commit a29aff03709f · 2019-07-27T19:07:55.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- [Console] Fix disabling ChoiceQuestion answer trimming | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Commits ------- 44ee056 [Console] Fix disabling ChoiceQuestion answer trimming
diff --git a/src/Symfony/Component/Console/Question/ChoiceQuestion.php b/src/Symfony/Component/Console/Question/ChoiceQuestion.php
@@ -135,9 +135,15 @@ private function getDefaultValidator(): callable
                     throw new InvalidArgumentException(sprintf($errorMessage, $selected));
                 }
 
-                $selectedChoices = array_map('trim', explode(',', $selected));
+                $selectedChoices = explode(',', $selected);
             } else {
-                $selectedChoices = [trim($selected)];
+                $selectedChoices = [$selected];
+            }
+
+            if ($this->isTrimmable()) {
+                foreach ($selectedChoices as $k => $v) {
+                    $selectedChoices[$k] = trim($v);
+                }
             }
 
             $multiselectChoices = [];
diff --git a/src/Symfony/Component/Console/Tests/Question/ChoiceQuestionTest.php b/src/Symfony/Component/Console/Tests/Question/ChoiceQuestionTest.php
@@ -61,4 +61,20 @@ public function selectUseCases()
             ],
         ];
     }
+
+    public function testNonTrimmable()
+    {
+        $question = new ChoiceQuestion('A question', [
+            'First response ',
+            ' Second response',
+            '  Third response  ',
+        ]);
+        $question->setTrimmable(false);
+
+        $this->assertSame('  Third response  ', $question->getValidator()('  Third response  '));
+
+        $question->setMultiselect(true);
+
+        $this->assertSame(['First response ', ' Second response'], $question->getValidator()('First response , Second response'));
+    }
 }
