From 133cbb77536bcb0e8c553e0808e795ecccb91826 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Tue, 9 Jul 2024 10:19:44 +0200
Subject: [PATCH] Add more tests

---
 tests/NodeVisitor/OptimizerTest.php | 36 ++++++++++++++++++++++++-----
 1 file changed, 30 insertions(+), 6 deletions(-)

diff --git a/tests/NodeVisitor/OptimizerTest.php b/tests/NodeVisitor/OptimizerTest.php
index e6435ca0273..96d5ef5b11c 100644
--- a/tests/NodeVisitor/OptimizerTest.php
+++ b/tests/NodeVisitor/OptimizerTest.php
@@ -15,6 +15,7 @@
 use Twig\Environment;
 use Twig\Loader\LoaderInterface;
 use Twig\Node\Expression\BlockReferenceExpression;
+use Twig\Node\Expression\NameExpression;
 use Twig\Node\Expression\ParentExpression;
 use Twig\Node\ForNode;
 use Twig\Node\Node;
@@ -46,21 +47,44 @@ public function testRenderParentBlockOptimizer()
         $this->assertTrue($node->getAttribute('output'));
     }
 
+    public function testForVarOptimizer()
+    {
+        $env = new Environment($this->createMock(LoaderInterface::class), ['cache' => false, 'autoescape' => false]);
+
+        $template = '{% for i, j in foo %}{{ loop.index }}{{ i }}{{ j }}{% endfor %}';
+        $stream = $env->parse($env->tokenize(new Source($template, 'index')));
+
+        foreach (['loop', 'i', 'j'] as $target) {
+            $this->checkForVarConfiguration($stream, $target);
+        }
+    }
+
+    public function checkForVarConfiguration(Node $node, $target)
+    {
+        foreach ($node as $n) {
+            if (NameExpression::class === get_class($n) && $target === $n->getAttribute('name')) {
+                $this->assertTrue($n->getAttribute('always_defined'));
+            } else {
+                $this->checkForVarConfiguration($n, $target);
+            }
+        }
+    }
+
     /**
-     * @dataProvider getTestsForForOptimizer
+     * @dataProvider getTestsForForLoopOptimizer
      */
-    public function testForOptimizer($template, $expected)
+    public function testForLoopOptimizer($template, $expected)
     {
         $env = new Environment($this->createMock(LoaderInterface::class), ['cache' => false]);
 
         $stream = $env->parse($env->tokenize(new Source($template, 'index')));
 
         foreach ($expected as $target => $withLoop) {
-            $this->assertTrue($this->checkForConfiguration($stream, $target, $withLoop), \sprintf('variable %s is %soptimized', $target, $withLoop ? 'not ' : ''));
+            $this->assertTrue($this->checkForLoopConfiguration($stream, $target, $withLoop), \sprintf('variable %s is %soptimized', $target, $withLoop ? 'not ' : ''));
         }
     }
 
-    public function getTestsForForOptimizer()
+    public function getTestsForForLoopOptimizer()
     {
         return [
             ['{% for i in foo %}{% endfor %}', ['i' => false]],
@@ -99,7 +123,7 @@ public function getTestsForForOptimizer()
         ];
     }
 
-    public function checkForConfiguration(Node $node, $target, $withLoop)
+    public function checkForLoopConfiguration(Node $node, $target, $withLoop)
     {
         foreach ($node as $n) {
             if ($n instanceof ForNode) {
@@ -108,7 +132,7 @@ public function checkForConfiguration(Node $node, $target, $withLoop)
                 }
             }
 
-            $ret = $this->checkForConfiguration($n, $target, $withLoop);
+            $ret = $this->checkForLoopConfiguration($n, $target, $withLoop);
             if (null !== $ret) {
                 return $ret;
             }