geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-16 12:26:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

optimized compilation for arrays when using a['b'] notation under certain conditions

Browse Source
This commit is contained in:
Fabien Potencier
2018-01-30 10:54:31 +01:00
parent 734d2d886f
commit d501e0e5bd
2 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Twig/Node/Expression/GetAttr.php
+21
View File
@@ -23,6 +23,27 @@ class Twig_Node_Expression_GetAttr extends Twig_Node_Expression
public function compile(Twig_Compiler $compiler)
{
// optimize array calls
if (
(!$compiler->getEnvironment()->isStrictVariables() || $this->getAttribute('ignore_strict_check'))
&& !$this->getAttribute('is_defined_test')
&& Twig_Template::ARRAY_CALL === $this->getAttribute('type')
) {
$compiler
->raw('(is_array(')
->subcompile($this->getNode('node'))
->raw(') || ')
->subcompile($this->getNode('node'))
->raw(' instanceof ArrayAccess ? (')
->subcompile($this->getNode('node'))
->raw('[')
->subcompile($this->getNode('attribute'))
->raw('] ?? null) : null)')
;
return;
}
$compiler->raw('twig_get_attribute($this->env, $this->source, ');
if ($this->getAttribute('ignore_strict_check')) {
test/Twig/Tests/Node/Expression/GetAttrTest.php
+1 -1
View File
@@ -37,7 +37,7 @@ class Twig_Tests_Node_Expression_GetAttrTest extends Twig_Test_NodeTestCase
$tests[] = array($node, sprintf('%s%s, "bar", array())', $this->getAttributeGetter(), $this->getVariableGetter('foo', 1)));
$node = new Twig_Node_Expression_GetAttr($expr, $attr, $args, Twig_Template::ARRAY_CALL, 1);
$tests[] = array($node, sprintf('%s%s, "bar", array(), "array")', $this->getAttributeGetter(), $this->getVariableGetter('foo', 1)));
$tests[] = array($node, sprintf('(is_array(%s) || ($context["foo"] ?? null) instanceof ArrayAccess ? (($context["foo"] ?? null)["bar"] ?? null) : null)', $this->getVariableGetter('foo', 1), $this->getVariableGetter('foo', 1)));
$args = new Twig_Node_Expression_Array(array(), 1);
$args->addElement(new Twig_Node_Expression_Name('foo', 1));