Merge branch '3.4' into 4.2

xabbuh · xabbuh · commit 6181df9a2d0b · 2019-07-24T19:13:20.000+02:00
* 3.4:
  make tests forward compatible with DI 4.4
  Fix multiSelect ChoiceQuestion when answers have spaces
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -1368,6 +1368,7 @@ protected function createContainerFromFile($file, $data = [], $resetCompilerPass
         if ($resetCompilerPasses) {
             $container->getCompilerPassConfig()->setOptimizationPasses([]);
             $container->getCompilerPassConfig()->setRemovingPasses([]);
+            $container->getCompilerPassConfig()->setAfterRemovingPasses([]);
         }
         $container->getCompilerPassConfig()->setBeforeOptimizationPasses([new LoggerPass()]);
         $container->getCompilerPassConfig()->setBeforeRemovingPasses([new AddConstraintValidatorsPass(), new TranslatorPass('translator.default', 'translation.reader')]);
@@ -1390,6 +1391,7 @@ protected function createContainerFromClosure($closure, $data = [])
 
         $container->getCompilerPassConfig()->setOptimizationPasses([]);
         $container->getCompilerPassConfig()->setRemovingPasses([]);
+        $container->getCompilerPassConfig()->setAfterRemovingPasses([]);
         $container->compile();
 
         return $container;
diff --git a/src/Symfony/Component/Console/Question/ChoiceQuestion.php b/src/Symfony/Component/Console/Question/ChoiceQuestion.php
@@ -129,17 +129,15 @@ private function getDefaultValidator(): callable
         $isAssoc = $this->isAssoc($choices);
 
         return function ($selected) use ($choices, $errorMessage, $multiselect, $isAssoc) {
-            // Collapse all spaces.
-            $selectedChoices = str_replace(' ', '', $selected);
-
             if ($multiselect) {
                 // Check for a separated comma values
-                if (!preg_match('/^[^,]+(?:,[^,]+)*$/', $selectedChoices, $matches)) {
+                if (!preg_match('/^[^,]+(?:,[^,]+)*$/', $selected, $matches)) {
                     throw new InvalidArgumentException(sprintf($errorMessage, $selected));
                 }
-                $selectedChoices = explode(',', $selectedChoices);
+
+                $selectedChoices = array_map('trim', explode(',', $selected));
             } else {
-                $selectedChoices = [$selected];
+                $selectedChoices = [trim($selected)];
             }
 
             $multiselectChoices = [];
diff --git a/src/Symfony/Component/Console/Tests/Question/ChoiceQuestionTest.php b/src/Symfony/Component/Console/Tests/Question/ChoiceQuestionTest.php
@@ -0,0 +1,64 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Console\Tests\Question;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Console\Question\ChoiceQuestion;
+
+class ChoiceQuestionTest extends TestCase
+{
+    /**
+     * @dataProvider selectUseCases
+     */
+    public function testSelectUseCases($multiSelect, $answers, $expected, $message)
+    {
+        $question = new ChoiceQuestion('A question', [
+            'First response',
+            'Second response',
+            'Third response',
+            'Fourth response',
+        ]);
+
+        $question->setMultiselect($multiSelect);
+
+        foreach ($answers as $answer) {
+            $validator = $question->getValidator();
+            $actual = $validator($answer);
+
+            $this->assertEquals($actual, $expected, $message);
+        }
+    }
+
+    public function selectUseCases()
+    {
+        return [
+            [
+                false,
+                ['First response', 'First response ', ' First response', ' First response '],
+                'First response',
+                'When passed single answer on singleSelect, the defaultValidator must return this answer as a string',
+            ],
+            [
+                true,
+                ['First response', 'First response ', ' First response', ' First response '],
+                ['First response'],
+                'When passed single answer on MultiSelect, the defaultValidator must return this answer as an array',
+            ],
+            [
+                true,
+                ['First response,Second response', ' First response , Second response '],
+                ['First response', 'Second response'],
+                'When passed multiple answers on MultiSelect, the defaultValidator must return these answers as an array',
+            ],
+        ];
+    }
+}
