throw new Twig_Error_Syntax('The "attribute" function takes at least two arguments (the variable and the attributes)', $line, $this->parser->getFilename());
throw new Twig_Error_Syntax('The "attribute" function takes at least two arguments (the variable and the attributes)', $line, $this->parser->getFilename());
}
}
return new Twig_Node_Expression_GetAttr($args->getNode(0), $args->getNode(1), count($args) > 2 ? $args->getNode(2) : new Twig_Node_Expression_Array(array(), $line), Twig_TemplateInterface::ANY_CALL, $line);
return new Twig_Node_Expression_GetAttr($args->getNode(0), $args->getNode(1), count($args) > 2 ? $args->getNode(2) : new Twig_Node_Expression_Array(array(), $line), Twig_Template::ANY_CALL, $line);
default:
default:
if (null !== $alias = $this->parser->getImportedSymbol('function', $name)) {
$args = $this->parseArguments(true);
$arguments = new Twig_Node_Expression_Array(array(), $line);
if (null !== $alias = $this->parser->getImportedSymbol('macro', $name)) {
foreach ($this->parseArguments() as $n) {
return new Twig_Node_Expression_MacroCall($alias['node'], $alias['name'], $this->createArrayFromArguments($args), $line);
$arguments->addElement($n);
}
}
$node = new Twig_Node_Expression_MethodCall($alias['node'], $alias['name'], $arguments, $line);
$arg = new Twig_Node_Expression_Constant($token->getValue(), $lineno);
$arg = new Twig_Node_Expression_Constant($token->getValue(), $lineno);
if ($stream->test(Twig_Token::PUNCTUATION_TYPE, '(')) {
$type = Twig_TemplateInterface::METHOD_CALL;
foreach ($this->parseArguments() as $n) {
$arguments->addElement($n);
}
}
} else {
} else {
throw new Twig_Error_Syntax('Expected name or number', $lineno, $this->parser->getFilename());
throw new Twig_Error_Syntax('Expected name or number', $lineno, $this->parser->getFilename());
}
}
@ -370,13 +363,17 @@ class Twig_ExpressionParser
throw new Twig_Error_Syntax(sprintf('Dynamic macro names are not supported (called on "%s")', $node->getAttribute('name')), $token->getLine(), $this->parser->getFilename());
throw new Twig_Error_Syntax(sprintf('Dynamic macro names are not supported (called on "%s")', $node->getAttribute('name')), $token->getLine(), $this->parser->getFilename());
}
}
$node = new Twig_Node_Expression_MethodCall($node, 'get'.$arg->getAttribute('value'), $arguments, $lineno);
* @param Boolean $namedArguments Whether to allow named arguments or not
* @param Boolean $namedArguments Whether to allow named arguments or not
* @param Boolean $definition Whether we are parsing arguments for a function definition
* @param Boolean $definition Whether we are parsing arguments for a function definition
*
* @return Twig_Node
*/
*/
public function parseArguments($namedArguments = false, $definition = false)
public function parseArguments($namedArguments = false, $definition = false)
{
{
@ -483,25 +482,26 @@ class Twig_ExpressionParser
$value = $this->parsePrimaryExpression();
$value = $this->parsePrimaryExpression();
if (!$this->checkConstantExpression($value)) {
if (!$this->checkConstantExpression($value)) {
throw new Twig_Error_Syntax(sprintf('A default value for an argument must be a constant (a boolean, a string, a number, or an array).'), $token->getLine(), $this->parser->getFilename());
throw new Twig_Error_Syntax('A default value for an argument must be a constant (a boolean, a string, a number, or an array).', $token->getLine(), $this->parser->getFilename());
}
}
} else {
} else {
$value = $this->parseExpression();
$value = $this->parseExpression();
}
}
}
}
if ($definition) {
if ($definition && null === $name) {
if (null === $name) {
$name = $value->getAttribute('name');
$name = $value->getAttribute('name');
$value = new Twig_Node_Expression_Constant(null, $this->parser->getCurrentToken()->getLine());
$value = new Twig_Node_Expression_Constant(null, $this->parser->getCurrentToken()->getLine());
}
}
$args[$name] = $value;
if (null === $name) {
$args[] = $value;
} else {
} else {
if (null === $name) {
if ($definition && isset($args[$name])) {
$args[] = $value;
throw new Twig_Error_Syntax(sprintf('Arguments cannot contain the same argument name more than once ("%s" is defined twice).', $name), $token->getLine(), $this->parser->getFilename());
} else {
$args[$name] = $value;
}
}
$args[$name] = $value;
}
}
}
}
$stream->expect(Twig_Token::PUNCTUATION_TYPE, ')', 'A list of arguments must be closed by a parenthesis');
$stream->expect(Twig_Token::PUNCTUATION_TYPE, ')', 'A list of arguments must be closed by a parenthesis');
@ -597,4 +597,15 @@ class Twig_ExpressionParser
return true;
return true;
}
}
private function createArrayFromArguments(Twig_Node $arguments, $line = null)
foreach ($this->getNode('arguments')->getKeyValuePairs() as $pair) {
$name = $pair['key']->getAttribute('value');
if (!is_int($name)) {
$namedCount++;
$namedNames[$name] = 1;
} elseif ($namedCount > 0) {
throw new Twig_Error_Syntax(sprintf('Positional arguments cannot be used after named arguments for macro "%s".', $this->getAttribute('name')), $this->lineno);