bug #52964 [ExpressionLanguage] Fix null coalescing propagation (fancyweb)

fabpot · fabpot · commit 1c87e55dfbd4 · 2023-12-09T13:15:13.000+01:00
This PR was merged into the 6.3 branch. Discussion ---------- [ExpressionLanguage] Fix null coalescing propagation | Q | A | ------------- | --- | Branch? | 6.3 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | #47192 | License | MIT This PR replaces #47446 since the author didn't reply. I think my patch suggestion is better. Commits ------- 6c5ca23 [ExpressionLanguage] Fix null coalescing propagation
diff --git a/src/Symfony/Component/ExpressionLanguage/Node/NullCoalesceNode.php b/src/Symfony/Component/ExpressionLanguage/Node/NullCoalesceNode.php
@@ -39,7 +39,7 @@ public function compile(Compiler $compiler): void
     public function evaluate(array $functions, array $values): mixed
     {
         if ($this->nodes['expr1'] instanceof GetAttrNode) {
-            $this->nodes['expr1']->attributes['is_null_coalesce'] = true;
+            $this->addNullCoalesceAttributeToGetAttrNodes($this->nodes['expr1']);
         }
 
         return $this->nodes['expr1']->evaluate($functions, $values) ?? $this->nodes['expr2']->evaluate($functions, $values);
@@ -49,4 +49,17 @@ public function toArray(): array
     {
         return ['(', $this->nodes['expr1'], ') ?? (', $this->nodes['expr2'], ')'];
     }
+
+    private function addNullCoalesceAttributeToGetAttrNodes(Node $node): void
+    {
+        if (!$node instanceof GetAttrNode) {
+            return;
+        }
+
+        $node->attributes['is_null_coalesce'] = true;
+
+        foreach ($node->nodes as $node) {
+            $this->addNullCoalesceAttributeToGetAttrNodes($node);
+        }
+    }
 }
diff --git a/src/Symfony/Component/ExpressionLanguage/Tests/ExpressionLanguageTest.php b/src/Symfony/Component/ExpressionLanguage/Tests/ExpressionLanguageTest.php
@@ -424,6 +424,9 @@ public function bar()
         yield ['foo["bar"]["baz"] ?? "default"', ['bar' => null]];
         yield ['foo["bar"].baz ?? "default"', ['bar' => null]];
         yield ['foo.bar().baz ?? "default"', $foo];
+        yield ['foo.bar.baz.bam ?? "default"', (object) ['bar' => null]];
+        yield ['foo?.bar?.baz?.qux ?? "default"', (object) ['bar' => null]];
+        yield ['foo[123][456][789] ?? "default"', [123 => []]];
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public function compile(Compiler $compiler): void`
`39`	`39`	`public function evaluate(array $functions, array $values): mixed`
`40`	`40`	`{`
`41`	`41`	`if ($this->nodes['expr1'] instanceof GetAttrNode) {`
`42`		`- $this->nodes['expr1']->attributes['is_null_coalesce'] = true;`
	`42`	`+ $this->addNullCoalesceAttributeToGetAttrNodes($this->nodes['expr1']);`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`return $this->nodes['expr1']->evaluate($functions, $values) ?? $this->nodes['expr2']->evaluate($functions, $values);`
`@@ -49,4 +49,17 @@ public function toArray(): array`
`49`	`49`	`{`
`50`	`50`	`return ['(', $this->nodes['expr1'], ') ?? (', $this->nodes['expr2'], ')'];`
`51`	`51`	`}`
	`52`	`+`
	`53`	`+ private function addNullCoalesceAttributeToGetAttrNodes(Node $node): void`
	`54`	`+ {`
	`55`	`+ if (!$node instanceof GetAttrNode) {`
	`56`	`+ return;`
	`57`	`+ }`
	`58`	`+`
	`59`	`+ $node->attributes['is_null_coalesce'] = true;`
	`60`	`+`
	`61`	`+ foreach ($node->nodes as $node) {`
	`62`	`+ $this->addNullCoalesceAttributeToGetAttrNodes($node);`
	`63`	`+ }`
	`64`	`+ }`
`52`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -424,6 +424,9 @@ public function bar()`
`424`	`424`	`yield ['foo["bar"]["baz"] ?? "default"', ['bar' => null]];`
`425`	`425`	`yield ['foo["bar"].baz ?? "default"', ['bar' => null]];`
`426`	`426`	`yield ['foo.bar().baz ?? "default"', $foo];`
	`427`	`+ yield ['foo.bar.baz.bam ?? "default"', (object) ['bar' => null]];`
	`428`	`+ yield ['foo?.bar?.baz?.qux ?? "default"', (object) ['bar' => null]];`
	`429`	`+ yield ['foo[123][456][789] ?? "default"', [123 => []]];`
`427`	`430`	`}`
`428`	`431`
`429`	`432`	`/**`