symfony · fabpot · May 31, 2024 · Apr 28, 2024
diff --git a/src/Symfony/Component/ExpressionLanguage/CHANGELOG.md b/src/Symfony/Component/ExpressionLanguage/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+7.2
+---
+
+ * Add support for null-coalescing unknown variables
+
 7.1
 ---
 

diff --git a/src/Symfony/Component/ExpressionLanguage/Node/NullCoalescedNameNode.php b/src/Symfony/Component/ExpressionLanguage/Node/NullCoalescedNameNode.php
@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\ExpressionLanguage\Node;
+
+use Symfony\Component\ExpressionLanguage\Compiler;
+
+/**
+ * @author Adam Kiss <hello@adamkiss.com>
+ *
+ * @internal
+ */
+class NullCoalescedNameNode extends Node
+{
+    public function __construct(string $name)
+    {
+        parent::__construct(
+            [],
+            ['name' => $name]
+        );
+    }
+
+    public function compile(Compiler $compiler): void
+    {
+        $compiler->raw('$'.$this->attributes['name'].' ?? null');
+    }
+
+    public function evaluate(array $functions, array $values): null
+    {
+        return null;
+    }
+
+    public function toArray(): array
+    {
+        return [$this->attributes['name'].' ?? null'];
+    }
+}
diff --git a/src/Symfony/Component/ExpressionLanguage/Parser.php b/src/Symfony/Component/ExpressionLanguage/Parser.php
@@ -246,6 +246,10 @@ public function parsePrimaryExpression(): Node\Node
                         } else {
                             if (!($this->flags & self::IGNORE_UNKNOWN_VARIABLES)) {
                                 if (!\in_array($token->value, $this->names, true)) {
+                                    if ($this->stream->current->test(Token::PUNCTUATION_TYPE, '??')) {
+                                        return new Node\NullCoalescedNameNode($token->value);
+                                    }
+
                                     throw new SyntaxError(sprintf('Variable "%s" is not valid.', $token->value), $token->cursor, $this->stream->getExpression(), $token->value, $this->names);
                                 }
 

diff --git a/src/Symfony/Component/ExpressionLanguage/Tests/ExpressionLanguageTest.php b/src/Symfony/Component/ExpressionLanguage/Tests/ExpressionLanguageTest.php
@@ -433,6 +433,7 @@ public function bar()
             }
         };
 
+        yield ['bar ?? "default"', null];
         yield ['foo.bar ?? "default"', null];
         yield ['foo.bar.baz ?? "default"', (object) ['bar' => null]];
         yield ['foo.bar ?? foo.baz ?? "default"', null];

diff --git a/src/Symfony/Component/ExpressionLanguage/Tests/Node/NullCoalescedNameNodeTest.php b/src/Symfony/Component/ExpressionLanguage/Tests/Node/NullCoalescedNameNodeTest.php
@@ -0,0 +1,38 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\ExpressionLanguage\Tests\Node;
+
+use Symfony\Component\ExpressionLanguage\Node\NullCoalescedNameNode;
+
+class NullCoalescedNameNodeTest extends AbstractNodeTestCase
+{
+    public static function getEvaluateData(): array
+    {
+        return [
+            [null, new NullCoalescedNameNode('foo'), []],
+        ];
+    }
+
+    public static function getCompileData(): array
+    {
+        return [
+            ['$foo ?? null', new NullCoalescedNameNode('foo')],
+        ];
+    }
+
+    public static function getDumpData(): array
+    {
+        return [
+            ['foo ?? null', new NullCoalescedNameNode('foo')],
+        ];
+    }
+}