Merge branch '5.4' into 6.2

* 5.4:
  [Tests] Remove occurrences of `withConsecutive()`
  Fix support binary values in parameters.
  [Dotenv] Improve Dotenv::usePutenv phpdoc

Author: nicolas-grekas

Dumper/XmlDumper.php

@@ -349,7 +349,7 @@ private function convertParameters(array $parameters, string $type, \DOMElement
                 $element->setAttribute('type', 'expression');
                 $text = $this->document->createTextNode(self::phpToXml((string) $value));
                 $element->appendChild($text);
-            } elseif (\is_string($value) && !preg_match('/^[^\x00-\x08\x0B\x0E-\x1A\x1C-\x1F\x7F]*+$/u', $value)) {
+            } elseif (\is_string($value) && !preg_match('/^[^\x00-\x08\x0B\x0C\x0E-\x1F\x7F]*+$/u', $value)) {
                 $element->setAttribute('type', 'binary');
                 $text = $this->document->createTextNode(self::phpToXml(base64_encode($value)));
                 $element->appendChild($text);

Tests/Config/ContainerParametersResourceCheckerTest.php

@@ -64,14 +64,17 @@ public static function isFreshProvider()
         yield 'fresh on every identical parameters' => [function (MockObject $container) {
             $container->expects(self::exactly(2))->method('hasParameter')->willReturn(true);
             $container->expects(self::exactly(2))->method('getParameter')
-                ->withConsecutive(
-                    [self::equalTo('locales')],
-                    [self::equalTo('default_locale')]
-                )
-                ->willReturnMap([
-                    ['locales', ['fr', 'en']],
-                    ['default_locale', 'fr'],
-                ])
+                ->willReturnCallback(function (...$args) {
+                    static $series = [
+                        [['locales'], ['fr', 'en']],
+                        [['default_locale'], 'fr'],
+                    ];
+
+                    [$expectedArgs, $return] = array_shift($series);
+                    self::assertSame($expectedArgs, $args);
+
+                    return $return;
+                })
             ;
         }, true];
     }

Tests/Fixtures/containers/container8.php

@@ -9,8 +9,10 @@
     'bar' => 'foo is %%foo bar',
     'escape' => '@escapeme',
     'values' => [true, false, null, 0, 1000.3, 'true', 'false', 'null'],
+    'utf-8 valid string' => "\u{021b}\u{1b56}\ttest",
     'binary' => "\xf0\xf0\xf0\xf0",
     'binary-control-char' => "This is a Bell char \x07",
+    'console banner' => "\e[37;44m#StandWith\e[30;43mUkraine\e[0m",
     'null string' => 'null',
     'string of digits' => '123',
     'string of digits prefixed with minus character' => '-123',

Tests/Fixtures/php/services8.php

@@ -95,8 +95,10 @@ protected function getDefaultParameters(): array
                 6 => 'false',
                 7 => 'null',
             ],
+            'utf-8 valid string' => 'ț᭖	test',
             'binary' => 'ðððð',
             'binary-control-char' => 'This is a Bell char ',
+            'console banner' => '#StandWithUkraine',
             'null string' => 'null',
             'string of digits' => '123',
             'string of digits prefixed with minus character' => '-123',

Tests/Fixtures/xml/services8.xml

@@ -18,8 +18,10 @@
       <parameter type="string">false</parameter>
       <parameter type="string">null</parameter>
     </parameter>
+    <parameter key="utf-8 valid string">&#x21B;&#x1B56;	test</parameter>
     <parameter key="binary" type="binary">8PDw8A==</parameter>
     <parameter key="binary-control-char" type="binary">VGhpcyBpcyBhIEJlbGwgY2hhciAH</parameter>
+    <parameter key="console banner" type="binary">G1szNzs0NG0jU3RhbmRXaXRoG1szMDs0M21Va3JhaW5lG1swbQ==</parameter>
     <parameter key="null string" type="string">null</parameter>
     <parameter key="string of digits" type="string">123</parameter>
     <parameter key="string of digits prefixed with minus character" type="string">-123</parameter>

Tests/Fixtures/yaml/services8.yml

@@ -4,8 +4,10 @@ parameters:
     bar: 'foo is %%foo bar'
     escape: '@@escapeme'
     values: [true, false, null, 0, 1000.3, 'true', 'false', 'null']
+    utf-8 valid string: "ț᭖\ttest"
     binary: !!binary 8PDw8A==
     binary-control-char: !!binary VGhpcyBpcyBhIEJlbGwgY2hhciAH
+    console banner: "\e[37;44m#StandWith\e[30;43mUkraine\e[0m"
     null string: 'null'
     string of digits: '123'
     string of digits prefixed with minus character: '-123'