Merge branch '6.3' into 6.4

fabpot · fabpot · commit 31bd20a9583a · 2023-10-28T16:31:16.000-07:00
* 6.3:
  Fix passing null to trim()
diff --git a/src/Symfony/Component/Yaml/Inline.php b/src/Symfony/Component/Yaml/Inline.php
@@ -57,6 +57,10 @@ public static function initialize(int $flags, int $parsedLineNumber = null, stri
      */
     public static function parse(string $value = null, int $flags = 0, array &$references = []): mixed
     {
+        if (null === $value) {
+            return '';
+        }
+
         self::initialize($flags);
 
         $value = trim($value);
diff --git a/src/Symfony/Component/Yaml/Tests/InlineTest.php b/src/Symfony/Component/Yaml/Tests/InlineTest.php
@@ -318,6 +318,7 @@ public static function getTestsForParse()
     {
         return [
             ['', ''],
+            [null, ''],
             ['null', null],
             ['false', false],
             ['true', true],

Original file line number	Diff line number	Diff line change
`@@ -318,6 +318,7 @@ public static function getTestsForParse()`
`318`	`318`	`{`
`319`	`319`	`return [`
`320`	`320`	`['', ''],`
	`321`	`+ [null, ''],`
`321`	`322`	`['null', null],`
`322`	`323`	`['false', false],`
`323`	`324`	`['true', true],`