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

Do not use Node_Expression_Name for function names, just use strings for those

Browse Source
This commit is contained in:
nikic
2011-07-03 12:26:50 +02:00
parent 652ac774d6
commit da4d964047
5 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Twig/ExpressionParser.php
+15 -16
View File
@@ -134,7 +134,11 @@ class Twig_ExpressionParser
break;
default:
$node = new Twig_Node_Expression_Name($token->getValue(), $token->getLine());
if ('(' === $this->parser->getCurrentToken()->getValue()) {
$node = $this->getFunctionNode($token->getValue(), $token->getLine());
} else {
$node = new Twig_Node_Expression_Name($token->getValue(), $token->getLine());
}
}
break;
@@ -210,7 +214,6 @@ class Twig_ExpressionParser
public function parsePostfixExpression($node)
{
$firstPass = true;
while (true) {
$token = $this->parser->getCurrentToken();
if ($token->getType() == Twig_Token::PUNCTUATION_TYPE) {
@@ -218,46 +221,42 @@ class Twig_ExpressionParser
$node = $this->parseSubscriptExpression($node);
} elseif ('|' == $token->getValue()) {
$node = $this->parseFilterExpression($node);
} elseif ($firstPass && $node instanceof Twig_Node_Expression_Name && '(' == $token->getValue()) {
$node = $this->getFunctionNode($node);
} else {
break;
}
} else {
break;
}
$firstPass = false;
}
return $node;
}
public function getFunctionNode(Twig_Node_Expression_Name $node)
public function getFunctionNode($name, $line)
{
$args = $this->parseArguments();
if ('parent' === $node->getAttribute('name')) {
if ('parent' === $name) {
if (!count($this->parser->getBlockStack())) {
throw new Twig_Error_Syntax('Calling "parent" outside a block is forbidden', $node->getLine());
throw new Twig_Error_Syntax('Calling "parent" outside a block is forbidden', $line);
}
if (!$this->parser->getParent()) {
throw new Twig_Error_Syntax('Calling "parent" on a template that does not extend another one is forbidden', $node->getLine());
throw new Twig_Error_Syntax('Calling "parent" on a template that does not extend another one is forbidden', $line);
}
return new Twig_Node_Expression_Parent($this->parser->peekBlockStack(), $node->getLine());
return new Twig_Node_Expression_Parent($this->parser->peekBlockStack(), $line);
}
if ('block' === $node->getAttribute('name')) {
return new Twig_Node_Expression_BlockReference($args->getNode(0), false, $node->getLine());
if ('block' === $name) {
return new Twig_Node_Expression_BlockReference($args->getNode(0), false, $line);
}
if (null !== $alias = $this->parser->getImportedFunction($node->getAttribute('name'))) {
return new Twig_Node_Expression_GetAttr($alias['node'], new Twig_Node_Expression_Constant($alias['name'], $node->getLine()), $args, Twig_TemplateInterface::METHOD_CALL, $node->getLine());
if (null !== $alias = $this->parser->getImportedFunction($name)) {
return new Twig_Node_Expression_GetAttr($alias['node'], new Twig_Node_Expression_Constant($alias['name'], $line), $args, Twig_TemplateInterface::METHOD_CALL, $line);
}
return new Twig_Node_Expression_Function($node, $args, $node->getLine());
return new Twig_Node_Expression_Function($name, $args, $line);
}
public function parseSubscriptExpression($node)
lib/Twig/Node/Expression/Function.php
+4 -4
View File
@@ -10,16 +10,16 @@
*/
class Twig_Node_Expression_Function extends Twig_Node_Expression
{
public function __construct(Twig_Node_Expression_Name $name, Twig_NodeInterface $arguments, $lineno)
public function __construct($name, Twig_NodeInterface $arguments, $lineno)
{
parent::__construct(array('name' => $name, 'arguments' => $arguments), array(), $lineno);
parent::__construct(array('arguments' => $arguments), array('name' => $name), $lineno);
}
public function compile(Twig_Compiler $compiler)
{
$function = $compiler->getEnvironment()->getFunction($this->getNode('name')->getAttribute('name'));
$function = $compiler->getEnvironment()->getFunction($this->getAttribute('name'));
if (false === $function) {
throw new Twig_Error_Syntax(sprintf('The function "%s" does not exist', $this->getNode('name')->getAttribute('name')), $this->getLine());
throw new Twig_Error_Syntax(sprintf('The function "%s" does not exist', $this->getAttribute('name')), $this->getLine());
}
$compiler
lib/Twig/NodeVisitor/SafeAnalysis.php
+1 -1
View File
@@ -65,7 +65,7 @@ class Twig_NodeVisitor_SafeAnalysis implements Twig_NodeVisitorInterface
}
} elseif ($node instanceof Twig_Node_Expression_Function) {
// function expression is safe when the function is safe
$name = $node->getNode('name')->getAttribute('name');
$name = $node->getAttribute('name');
$args = $node->getNode('arguments');
$function = $env->getFunction($name);
if (false !== $function) {
lib/Twig/NodeVisitor/Sandbox.php
+1 -1
View File
@@ -52,7 +52,7 @@ class Twig_NodeVisitor_Sandbox implements Twig_NodeVisitorInterface
// look for functions
if ($node instanceof Twig_Node_Expression_Function) {
$this->functions[] = $node->getNode('name')->getAttribute('name');
$this->functions[] = $node->getAttribute('name');
}
// wrap print to check __toString() calls
test/Twig/Tests/Node/Expression/FunctionTest.php
+2 -3
View File
@@ -18,11 +18,11 @@ class Twig_Tests_Node_Expression_FunctionTest extends Twig_Tests_Node_TestCase
*/
public function testConstructor()
{
$name = new Twig_Node_Expression_Name('function', 0);
$name = 'function';
$args = new Twig_Node();
$node = new Twig_Node_Expression_Function($name, $args, 0);
$this->assertEquals($name, $node->getNode('name'));
$this->assertEquals($name, $node->getAttribute('name'));
$this->assertEquals($args, $node->getNode('arguments'));
}
@@ -85,7 +85,6 @@ class Twig_Tests_Node_Expression_FunctionTest extends Twig_Tests_Node_TestCase
protected function createFunction($name, array $arguments = array())
{
$name = new Twig_Node_Expression_Name($name, 0);
$arguments = new Twig_Node($arguments);
return new Twig_Node_Expression_Function($name, $arguments, 0);
}