Merge branch '6.3' into 6.4

* 6.3: Fix passing null to trim()
symfony · Oct 28, 2023 · 245813a · 245813a
2 parents 63b478d + 9758b6c
commit 245813a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/Inline.php b/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/Tests/InlineTest.php b/Tests/InlineTest.php
@@ -318,6 +318,7 @@ public static function getTestsForParse()
     {
         return [
             ['', ''],
+            [null, ''],
             ['null', null],
             ['false', false],
             ['true', true],