fix variables extraction

Author: danilopolani

src/Helpers/TemplateManager.php

@@ -6,6 +6,7 @@
 use MailCarrier\Models\Template;
 use Twig\Environment;
 use Twig\Loader\ArrayLoader;
+use Twig\Node;
 use Twig\Source;
 
 class TemplateManager
@@ -31,6 +32,7 @@ public static function makeFromId(string $templateId, string $content): static
 
     public function extractVariableNames(): array
     {
+        $variables = [];
         $source = $this->template->layout?->content . $this->template->content;
 
         $twig = new Environment(new ArrayLoader);
@@ -43,9 +45,9 @@ public function extractVariableNames(): array
             return [];
         }
 
-        preg_match_all("|Twig\\\Node\\\Expression\\\NameExpression\(name\: '(.*)'|mi", (string) $nodes, $matches);
+        $this->extractVariables($nodes, $variables);
 
-        return array_values(array_unique($matches[1]));
+        return array_values(array_unique($variables));
     }
 
     protected function getLoader(): ArrayLoader
@@ -63,4 +65,17 @@ protected function getLoader(): ArrayLoader
             $layoutFileName => $this->template->layout?->content,
         ]);
     }
+
+    protected function extractVariables(Node\Node $node, array &$variables): void
+    {
+        if ($node instanceof Node\Expression\Variable\ContextVariable) {
+            $variables[] = $node->getAttribute('name');
+        }
+
+        foreach ($node as $child) {
+            if ($child instanceof Node\Node) {
+                $this->extractVariables($child, $variables);
+            }
+        }
+    }
 }