[Console] Fix PHP 8.1 deprecation in ChoiceQuestion

Gaufrosuk · nicolas-grekas · commit aa89814da09e · 2022-01-26T16:00:53.000+01:00
diff --git a/src/Symfony/Component/Console/Question/ChoiceQuestion.php b/src/Symfony/Component/Console/Question/ChoiceQuestion.php
@@ -131,18 +131,18 @@ private function getDefaultValidator(): callable
         return function ($selected) use ($choices, $errorMessage, $multiselect, $isAssoc) {
             if ($multiselect) {
                 // Check for a separated comma values
-                if (!preg_match('/^[^,]+(?:,[^,]+)*$/', $selected, $matches)) {
+                if (!preg_match('/^[^,]+(?:,[^,]+)*$/', (string) $selected, $matches)) {
                     throw new InvalidArgumentException(sprintf($errorMessage, $selected));
                 }
 
-                $selectedChoices = explode(',', $selected);
+                $selectedChoices = explode(',', (string) $selected);
             } else {
                 $selectedChoices = [$selected];
             }
 
             if ($this->isTrimmable()) {
                 foreach ($selectedChoices as $k => $v) {
-                    $selectedChoices[$k] = trim($v);
+                    $selectedChoices[$k] = trim((string) $v);
                 }
             }
 
diff --git a/src/Symfony/Component/Console/Tests/Question/ChoiceQuestionTest.php b/src/Symfony/Component/Console/Tests/Question/ChoiceQuestionTest.php
@@ -19,14 +19,15 @@ class ChoiceQuestionTest extends TestCase
     /**
      * @dataProvider selectUseCases
      */
-    public function testSelectUseCases($multiSelect, $answers, $expected, $message)
+    public function testSelectUseCases($multiSelect, $answers, $expected, $message, $default = null)
     {
         $question = new ChoiceQuestion('A question', [
             'First response',
             'Second response',
             'Third response',
             'Fourth response',
-        ]);
+            null,
+        ], $default);
 
         $question->setMultiselect($multiSelect);
 
@@ -59,6 +60,19 @@ public function selectUseCases()
                 ['First response', 'Second response'],
                 'When passed multiple answers on MultiSelect, the defaultValidator must return these answers as an array',
             ],
+            [
+                false,
+                [null],
+                null,
+                'When used null as default single answer on singleSelect, the defaultValidator must return this answer as null',
+            ],
+            [
+                false,
+                ['First response'],
+                'First response',
+                'When used a string as default single answer on singleSelect, the defaultValidator must return this answer as a string',
+                'First response',
+            ],
         ];
     }
 

Original file line number	Diff line number	Diff line change
`@@ -131,18 +131,18 @@ private function getDefaultValidator(): callable`
`131`	`131`	`return function ($selected) use ($choices, $errorMessage, $multiselect, $isAssoc) {`
`132`	`132`	`if ($multiselect) {`
`133`	`133`	`// Check for a separated comma values`
`134`		`- if (!preg_match('/^[^,]+(?:,[^,]+)*$/', $selected, $matches)) {`
	`134`	`+ if (!preg_match('/^[^,]+(?:,[^,]+)*$/', (string) $selected, $matches)) {`
`135`	`135`	`throw new InvalidArgumentException(sprintf($errorMessage, $selected));`
`136`	`136`	`}`
`137`	`137`
`138`		`- $selectedChoices = explode(',', $selected);`
	`138`	`+ $selectedChoices = explode(',', (string) $selected);`
`139`	`139`	`} else {`
`140`	`140`	`$selectedChoices = [$selected];`
`141`	`141`	`}`
`142`	`142`
`143`	`143`	`if ($this->isTrimmable()) {`
`144`	`144`	`foreach ($selectedChoices as $k => $v) {`
`145`		`- $selectedChoices[$k] = trim($v);`
	`145`	`+ $selectedChoices[$k] = trim((string) $v);`
`146`	`146`	`}`
`147`	`147`	`}`
`148`	`148`