support nested variable lookup

keepsuit · Aug 21, 2024 · 23010e4 · 23010e4
1 parent 1b5763d
commit 23010e4
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/src/Nodes/VariableLookup.php b/src/Nodes/VariableLookup.php
@@ -93,6 +93,8 @@ public function evaluate(RenderContext $context): mixed
         }
 
         foreach ($variables as $object) {
+            $object = $context->evaluate($object);
+
             if ($object instanceof \Generator) {
                 $object = iterator_to_array($object, preserve_keys: false);
             }
@@ -102,7 +104,7 @@ public function evaluate(RenderContext $context): mixed
 
                 assert(is_string($key) || is_int($key));
 
-                $nextObject = $context->internalContextLookup($object, $key);
+                $nextObject = $context->evaluate($context->internalContextLookup($object, $key));
 
                 if ($nextObject instanceof MissingValue && is_iterable($object) && in_array($i, $this->lookupFilters)) {
                     $nextObject = $context->applyFilter($lookup, $object);

diff --git a/tests/Integration/VariableTest.php b/tests/Integration/VariableTest.php
@@ -62,6 +62,18 @@
     ], factory: $templateFactory);
 });
 
+test('nested variable lookup', function () {
+    assertTemplateResult('1', '{{ c.b }}', [
+        'a' => ['b' => 1],
+        'c' => new \Keepsuit\Liquid\Nodes\VariableLookup('a'),
+    ]);
+
+    assertTemplateResult('1', '{{ c.d.b }}', [
+        'a' => ['b' => 1],
+        'c' => ['d' => new \Keepsuit\Liquid\Nodes\VariableLookup('a')],
+    ]);
+});
+
 function generator(): Generator
 {
     yield '1';