geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-11-11 04:36:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor the with node to avoid leaking the parent scope to the template

Browse Source
This commit is contained in:
Christophe Coevoet
2019-04-24 15:13:25 +02:00
parent 49b3d73491
commit 8e63f6ef3e
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Node/WithNode.php
+6 -6
View File
@@ -34,6 +34,10 @@ class WithNode extends Node
{
$compiler->addDebugInfo($this);
$parentContextName = $compiler->getVarName();
$compiler->write(sprintf("\$%s = \$context;\n", $parentContextName));
if ($this->hasNode('variables')) {
$node = $this->getNode('variables');
$varsName = $compiler->getVarName();
@@ -52,19 +56,15 @@ class WithNode extends Node
;
if ($this->getAttribute('only')) {
$compiler->write("\$context = ['_parent' => \$context];\n");
} else {
$compiler->write("\$context['_parent'] = \$context;\n");
$compiler->write("\$context = [];\n");
}
$compiler->write(sprintf("\$context = \$this->env->mergeGlobals(array_merge(\$context, \$%s));\n", $varsName));
} else {
$compiler->write("\$context['_parent'] = \$context;\n");
}
$compiler
->subcompile($this->getNode('body'))
->write("\$context = \$context['_parent'];\n")
->write(sprintf("\$context = \$%s;\n", $parentContextName))
;
}
}