geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-15 03:46:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix the For optimizer, "include" function was always optimized

Browse Source
This commit is contained in:
Albert Casademont
2014-12-04 15:28:30 +01:00
parent efed4fa3b1
commit 4319bb9b84
2 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Twig/NodeVisitor/Optimizer.php
+10
View File
@@ -205,6 +205,16 @@ class Twig_NodeVisitor_Optimizer implements Twig_NodeVisitorInterface
$this->addLoopToAll();
}
// include function without the with_context=false parameter
elseif ($node instanceof Twig_Node_Expression_Function
&& 'include' === $node->getAttribute('name')
&& (!$node->getNode('arguments')->hasNode('with_context')
|| false !== $node->getNode('arguments')->getNode('with_context')->getAttribute('value')
)
) {
$this->addLoopToAll();
}
// the loop variable is referenced via an attribute
elseif ($node instanceof Twig_Node_Expression_GetAttr
&& (!$node->getNode('attribute') instanceof Twig_Node_Expression_Constant
test/Twig/Tests/NodeVisitor/OptimizerTest.php
+10
View File
@@ -89,6 +89,16 @@ class Twig_Tests_NodeVisitor_OptimizerTest extends PHPUnit_Framework_TestCase
array('{% for i in foo %}{% for j in foo %}{{ foo.parent.loop.index }}{% endfor %}{% endfor %}', array('i' => false, 'j' => false)),
array('{% for i in foo %}{% for j in foo %}{{ loop["parent"].loop.index }}{% endfor %}{% endfor %}', array('i' => true, 'j' => true)),
array('{% for i in foo %}{{ include("foo") }}{% endfor %}', array('i' => true)),
array('{% for i in foo %}{{ include("foo", with_context = false) }}{% endfor %}', array('i' => false)),
array('{% for i in foo %}{{ include("foo", with_context = true) }}{% endfor %}', array('i' => true)),
array('{% for i in foo %}{{ include("foo", { "foo": "bar" }, with_context = false) }}{% endfor %}', array('i' => false)),
array('{% for i in foo %}{{ include("foo", { "foo": loop.index }, with_context = false) }}{% endfor %}', array('i' => true)),
);
}