Deprecate Environment::mergeGlobals()

2026-09-19 22:07:40 +00:00 · 2024-09-07 14:00:41 +02:00
parent e1b64b1937
commit b86575cfd6
8 changed files with 30 additions and 19 deletions
@@ -73,7 +73,7 @@ class MacroNode extends Node
            ->write("{\n")
            ->indent()
            ->write("\$macros = \$this->macros;\n")
-            ->write("\$context = \$this->env->mergeGlobals([\n")
+            ->write("\$context = [\n")
            ->indent()
        ;

@@ -94,7 +94,7 @@ class MacroNode extends Node
            ->raw(' => ')
            ->raw("\$__varargs__,\n")
            ->outdent()
-            ->write("]);\n\n")
+            ->write("] + \$this->env->getGlobals();\n\n")
            ->write("\$blocks = [];\n\n")
            ->write('return ')
            ->subcompile($node)