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

optimized performance when accessing extensions in templates

Browse Source
This commit is contained in:
Fabien Potencier
2018-03-02 10:18:24 -08:00
parent 14b4e5e1d5
commit 279993b24d
7 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Twig/Node/CheckSecurity.php
+1 -1
View File
@@ -46,7 +46,7 @@ class Twig_Node_CheckSecurity extends Twig_Node
->write('$functions = ')->repr(array_filter($functions))->raw(";\n\n")
->write("try {\n")
->indent()
->write("\$this->env->getExtension('Twig_Extension_Sandbox')->checkSecurity(\n")
->write("\$this->extensions['Twig_Extension_Sandbox']->checkSecurity(\n")
->indent()
->write(!$tags ? "array(),\n" : "array('".implode("', '", array_keys($tags))."'),\n")
->write(!$filters ? "array(),\n" : "array('".implode("', '", array_keys($filters))."'),\n")
lib/Twig/Node/Sandbox.php
+1 -1
View File
@@ -25,7 +25,7 @@ class Twig_Node_Sandbox extends Twig_Node
{
$compiler
->addDebugInfo($this)
->write("\$sandbox = \$this->env->getExtension('Twig_Extension_Sandbox');\n")
->write("\$sandbox = \$this->extensions['Twig_Extension_Sandbox'];\n")
->write("if (!\$alreadySandboxed = \$sandbox->isSandboxed()) {\n")
->indent()
->write("\$sandbox->enableSandbox();\n")
lib/Twig/Node/SandboxedPrint.php
+1 -1
View File
@@ -25,7 +25,7 @@ class Twig_Node_SandboxedPrint extends Twig_Node_Print
{
$compiler
->addDebugInfo($this)
->write('echo $this->env->getExtension(\'Twig_Extension_Sandbox\')->ensureToStringAllowed(')
->write('echo $this->extensions[\'Twig_Extension_Sandbox\']->ensureToStringAllowed(')
->subcompile($this->getNode('expr'))
->raw(");\n")
;
lib/Twig/Profiler/Node/EnterProfile.php
+2 -2
View File
@@ -24,9 +24,9 @@ class Twig_Profiler_Node_EnterProfile extends Twig_Node
public function compile(Twig_Compiler $compiler)
{
$compiler
->write(sprintf('$%s = $this->env->getExtension(', $this->getAttribute('var_name')))
->write(sprintf('$%s = $this->extensions[', $this->getAttribute('var_name')))
->repr($this->getAttribute('extension_name'))
->raw(");\n")
->raw("];\n")
->write(sprintf('$%s->enter($%s = new Twig_Profiler_Profile($this->getTemplateName(), ', $this->getAttribute('var_name'), $this->getAttribute('var_name').'_prof'))
->repr($this->getAttribute('type'))
->raw(', ')
lib/Twig/Template.php
+10
View File
@@ -38,9 +38,19 @@ abstract class Twig_Template
protected $blocks = array();
protected $traits = array();
/**
* @internal
*/
protected $extensions = array();
public function __construct(Twig_Environment $env)
{
$this->env = $env;
foreach ($env->getExtensions() as $extension) {
// For BC/FC with namespaced aliases
$class = (new ReflectionClass(get_class($extension)))->name;
$this->extensions[ltrim($class, '\\')] = $extension;
}
}
/**
test/Twig/Tests/Node/SandboxTest.php
+1 -1
View File
@@ -28,7 +28,7 @@ class Twig_Tests_Node_SandboxTest extends Twig_Test_NodeTestCase
$tests[] = array($node, <<<EOF
// line 1
\$sandbox = \$this->env->getExtension('Twig_Extension_Sandbox');
\$sandbox = \$this->extensions['Twig_Extension_Sandbox'];
if (!\$alreadySandboxed = \$sandbox->isSandboxed()) {
\$sandbox->enableSandbox();
}
test/Twig/Tests/Node/SandboxedPrintTest.php
+1 -1
View File
@@ -24,7 +24,7 @@ class Twig_Tests_Node_SandboxedPrintTest extends Twig_Test_NodeTestCase
$tests[] = array(new Twig_Node_SandboxedPrint(new Twig_Node_Expression_Constant('foo', 1), 1), <<<EOF
// line 1
echo \$this->env->getExtension('Twig_Extension_Sandbox')->ensureToStringAllowed("foo");
echo \$this->extensions['Twig_Extension_Sandbox']->ensureToStringAllowed("foo");
EOF
);