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

Optimize NameExpression compilation

Browse Source
This commit is contained in:
Fabien Potencier
2025-01-02 11:17:57 +01:00
parent 15ef38c661
commit efd12ef0cc
2 changed files with 40 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Node/Expression/NameExpression.php
+1 -1
View File
@@ -39,7 +39,7 @@ class NameExpression extends AbstractExpression
$compiler->addDebugInfo($this);
if ($this->getAttribute('is_defined_test')) {
if (isset($this->specialVars[$name])) {
if (isset($this->specialVars[$name]) || $this->getAttribute('always_defined')) {
$compiler->repr(true);
} elseif (\PHP_VERSION_ID >= 70400) {
$compiler
tests/Node/Expression/Variable/ContextVariableTest.php
+39 -12
View File
@@ -27,20 +27,47 @@ class ContextVariableTest extends NodeTestCase
public static function provideTests(): iterable
{
// special variables
foreach (['_self' => '$this->getTemplateName()', '_context' => '$context', '_charset' => '$this->env->getCharset()'] as $special => $compiled) {
$node = new ContextVariable($special, 1);
yield $special => [$node, "// line 1\n$compiled"];
$node = new ContextVariable($special, 1);
$node->setAttribute('is_defined_test', true);
yield $special.'_defined_test' => [$node, "// line 1\ntrue"];
}
$env = new Environment(new ArrayLoader(), ['strict_variables' => false]);
$envStrict = new Environment(new ArrayLoader(), ['strict_variables' => true]);
// regular
$node = new ContextVariable('foo', 1);
$self = new ContextVariable('_self', 1);
$context = new ContextVariable('_context', 1);
$env = new Environment(new ArrayLoader(), ['strict_variables' => true]);
$env1 = new Environment(new ArrayLoader(), ['strict_variables' => false]);
$output = '(isset($context["foo"]) || array_key_exists("foo", $context) ? $context["foo"] : (function () { throw new RuntimeError(\'Variable "foo" does not exist.\', 1, $this->source); })())';
yield 'strict' => [$node, "// line 1\n".$output, $envStrict];
yield 'non_strict' => [$node, self::createVariableGetter('foo', 1), $env];
return [
[$node, "// line 1\n".$output, $env],
[$node, self::createVariableGetter('foo', 1), $env1],
[$self, "// line 1\n\$this->getTemplateName()"],
[$context, "// line 1\n\$context"],
];
// ignore strict check
$node = new ContextVariable('foo', 1);
$node->setAttribute('ignore_strict_check', true);
yield 'ignore_strict_check_strict' => [$node, "// line 1\n(\$context[\"foo\"] ?? null)", $envStrict];
yield 'ignore_strict_check_non_strict' => [$node, "// line 1\n(\$context[\"foo\"] ?? null)", $env];
// always defined
$node = new ContextVariable('foo', 1);
$node->setAttribute('always_defined', true);
yield 'always_defined_strict' => [$node, "// line 1\n\$context[\"foo\"]", $envStrict];
yield 'always_defined_non_strict' => [$node, "// line 1\n\$context[\"foo\"]", $env];
// is defined test
$node = new ContextVariable('foo', 1);
$node->setAttribute('is_defined_test', true);
yield 'is_defined_test_strict' => [$node, "// line 1\narray_key_exists(\"foo\", \$context)", $envStrict];
yield 'is_defined_test_non_strict' => [$node, "// line 1\narray_key_exists(\"foo\", \$context)", $env];
// is defined test // always defined
$node = new ContextVariable('foo', 1);
$node->setAttribute('is_defined_test', true);
$node->setAttribute('always_defined', true);
yield 'is_defined_test_always_defined_strict' => [$node, "// line 1\ntrue", $envStrict];
yield 'is_defined_test_always_defined_non_strict' => [$node, "// line 1\ntrue", $env];
}
}