[ExpressionLanguage] Fix null-safe chaining

HypeMC · HypeMC · commit b958c52ddd58 · 2022-05-25T07:04:09.000+02:00
diff --git a/src/Symfony/Component/ExpressionLanguage/Node/GetAttrNode.php b/src/Symfony/Component/ExpressionLanguage/Node/GetAttrNode.php
@@ -67,12 +67,13 @@ public function compile(Compiler $compiler)
 
     public function evaluate(array $functions, array $values)
     {
+        if ($this->isEvaluationShortCircuited($functions, $values)) {
+            return null;
+        }
+
         switch ($this->attributes['type']) {
             case self::PROPERTY_CALL:
                 $obj = $this->nodes['node']->evaluate($functions, $values);
-                if (null === $obj && $this->nodes['attribute']->isNullSafe) {
-                    return null;
-                }
                 if (!\is_object($obj)) {
                     throw new \RuntimeException(sprintf('Unable to get property "%s" of non-object "%s".', $this->nodes['attribute']->dump(), $this->nodes['node']->dump()));
                 }
@@ -83,9 +84,6 @@ public function evaluate(array $functions, array $values)
 
             case self::METHOD_CALL:
                 $obj = $this->nodes['node']->evaluate($functions, $values);
-                if (null === $obj && $this->nodes['attribute']->isNullSafe) {
-                    return null;
-                }
                 if (!\is_object($obj)) {
                     throw new \RuntimeException(sprintf('Unable to call method "%s" of non-object "%s".', $this->nodes['attribute']->dump(), $this->nodes['node']->dump()));
                 }
@@ -105,6 +103,24 @@ public function evaluate(array $functions, array $values)
         }
     }
 
+    private function isEvaluationShortCircuited(array $functions, array $values): bool
+    {
+        $node = $this;
+
+        do {
+            if (
+                $node->nodes['attribute'] instanceof ConstantNode
+                && $node->nodes['attribute']->isNullSafe
+                && null === $node->nodes['node']->evaluate($functions, $values)
+            ) {
+                return true;
+            }
+            $node = $node->nodes['node'];
+        } while ($node instanceof self);
+
+        return false;
+    }
+
     public function toArray()
     {
         switch ($this->attributes['type']) {
diff --git a/src/Symfony/Component/ExpressionLanguage/Tests/ExpressionLanguageTest.php b/src/Symfony/Component/ExpressionLanguage/Tests/ExpressionLanguageTest.php
@@ -255,7 +255,7 @@ public function testNullsafeCompile($expression, $foo)
         $this->assertNull(eval(sprintf('return %s;', $expressionLanguage->compile($expression, ['foo' => 'foo']))));
     }
 
-    public function provideNullsafe()
+    public function provideNullSafe()
     {
         $foo = new class() extends \stdClass {
             public function bar()
@@ -272,6 +272,47 @@ public function bar()
         yield ['foo["bar"]?.baz()', ['bar' => null]];
         yield ['foo.bar()?.baz', $foo];
         yield ['foo.bar()?.baz()', $foo];
+
+        yield ['foo?.bar.baz', null];
+        yield ['foo?.bar["baz"]', null];
+        yield ['foo?.bar["baz"]["qux"]', null];
+        yield ['foo?.bar["baz"]["qux"].quux', null];
+        yield ['foo?.bar["baz"]["qux"].quux()', null];
+        yield ['foo?.bar().baz', null];
+        yield ['foo?.bar()["baz"]', null];
+        yield ['foo?.bar()["baz"]["qux"]', null];
+        yield ['foo?.bar()["baz"]["qux"].quux', null];
+        yield ['foo?.bar()["baz"]["qux"].quux()', null];
+    }
+
+    /**
+     * @dataProvider provideInvalidNullSafe
+     */
+    public function testNullSafeEvaluateFails($expression, $foo, $message)
+    {
+        $expressionLanguage = new ExpressionLanguage();
+
+        $this->expectException(\RuntimeException::class);
+        $this->expectExceptionMessage($message);
+        $expressionLanguage->evaluate($expression, ['foo' => $foo]);
+    }
+
+    /**
+     * @dataProvider provideInvalidNullSafe
+     */
+    public function testNullsafeCompileFails($expression, $foo)
+    {
+        $expressionLanguage = new ExpressionLanguage();
+
+        $this->expectWarning();
+        eval(sprintf('return %s;', $expressionLanguage->compile($expression, ['foo' => 'foo'])));
+    }
+
+    public function provideInvalidNullSafe()
+    {
+        yield ['foo?.bar.baz', (object) ['bar' => null], 'Unable to get property "baz" of non-object "foo.bar".'];
+        yield ['foo?.bar["baz"]', (object) ['bar' => null], 'Unable to get an item of non-array "foo.bar".'];
+        yield ['foo?.bar["baz"].qux.quux', (object) ['bar' => ['baz' => null]], 'Unable to get property "qux" of non-object "foo.bar["baz"]".'];
     }
 
     /**
