Merge branch '4.4' into 5.3

nicolas-grekas · nicolas-grekas · commit e108a7f4124c · 2022-01-26T17:05:39.000+01:00
* 4.4:
  [Cache] workaround PHP crash
  [Console] Fix PHP 8.1 deprecation in ChoiceQuestion
  Making the parser stateless
diff --git a/src/Symfony/Component/Cache/Traits/ContractsTrait.php b/src/Symfony/Component/Cache/Traits/ContractsTrait.php
@@ -42,7 +42,7 @@ trait ContractsTrait
     public function setCallbackWrapper(?callable $callbackWrapper): callable
     {
         if (!isset($this->callbackWrapper)) {
-            $this->callbackWrapper = \Closure::fromCallable([LockRegistry::class, 'compute']);
+            $this->callbackWrapper = [LockRegistry::class, 'compute'];
 
             if (\in_array(\PHP_SAPI, ['cli', 'phpdbg'], true)) {
                 $this->setCallbackWrapper(null);
diff --git a/src/Symfony/Component/Console/Question/ChoiceQuestion.php b/src/Symfony/Component/Console/Question/ChoiceQuestion.php
@@ -125,18 +125,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',
+            ],
             [
                 false,
                 [0],
diff --git a/src/Symfony/Component/Yaml/Parser.php b/src/Symfony/Component/Yaml/Parser.php
@@ -99,6 +99,8 @@ public function parse(string $value, int $flags = 0)
             if (null !== $mbEncoding) {
                 mb_internal_encoding($mbEncoding);
             }
+            $this->refsBeingParsed = [];
+            $this->offset = 0;
             $this->lines = [];
             $this->currentLine = '';
             $this->numberOfParsedLines = 0;
diff --git a/src/Symfony/Component/Yaml/Tests/ParserTest.php b/src/Symfony/Component/Yaml/Tests/ParserTest.php
@@ -84,6 +84,20 @@ public function invalidIndentation(): array
         ];
     }
 
+    public function testParserIsStateless()
+    {
+        $yamlString = '# translations/messages.en.yaml
+
+';
+        $this->parser->parse($yamlString);
+        $this->parser->parse($yamlString);
+
+        $this->expectException(ParseException::class);
+        $this->expectExceptionMessage("A YAML file cannot contain tabs as indentation at line 2 (near \"\tabc\")");
+
+        $this->parser->parse("abc:\n\tabc");
+    }
+
     /**
      * @dataProvider validTokenSeparators
      */

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ trait ContractsTrait`
`42`	`42`	`public function setCallbackWrapper(?callable $callbackWrapper): callable`
`43`	`43`	`{`
`44`	`44`	`if (!isset($this->callbackWrapper)) {`
`45`		`- $this->callbackWrapper = \Closure::fromCallable([LockRegistry::class, 'compute']);`
	`45`	`+ $this->callbackWrapper = [LockRegistry::class, 'compute'];`
`46`	`46`
`47`	`47`	`if (\in_array(\PHP_SAPI, ['cli', 'phpdbg'], true)) {`
`48`	`48`	`$this->setCallbackWrapper(null);`
Original file line number	Diff line number	Diff line change
`@@ -125,18 +125,18 @@ private function getDefaultValidator(): callable`
`125`	`125`	`return function ($selected) use ($choices, $errorMessage, $multiselect, $isAssoc) {`
`126`	`126`	`if ($multiselect) {`
`127`	`127`	`// Check for a separated comma values`
`128`		`- if (!preg_match('/^[^,]+(?:,[^,]+)*$/', $selected, $matches)) {`
	`128`	`+ if (!preg_match('/^[^,]+(?:,[^,]+)*$/', (string) $selected, $matches)) {`
`129`	`129`	`throw new InvalidArgumentException(sprintf($errorMessage, $selected));`
`130`	`130`	`}`
`131`	`131`
`132`		`- $selectedChoices = explode(',', $selected);`
	`132`	`+ $selectedChoices = explode(',', (string) $selected);`
`133`	`133`	`} else {`
`134`	`134`	`$selectedChoices = [$selected];`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`if ($this->isTrimmable()) {`
`138`	`138`	`foreach ($selectedChoices as $k => $v) {`
`139`		`- $selectedChoices[$k] = trim($v);`
	`139`	`+ $selectedChoices[$k] = trim((string) $v);`
`140`	`140`	`}`
`141`	`141`	`}`
`142`	`142`
Original file line number	Diff line number	Diff line change
`@@ -99,6 +99,8 @@ public function parse(string $value, int $flags = 0)`
`99`	`99`	`if (null !== $mbEncoding) {`
`100`	`100`	`mb_internal_encoding($mbEncoding);`
`101`	`101`	`}`
	`102`	`+ $this->refsBeingParsed = [];`
	`103`	`+ $this->offset = 0;`
`102`	`104`	`$this->lines = [];`
`103`	`105`	`$this->currentLine = '';`
`104`	`106`	`$this->numberOfParsedLines = 0;`