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

Revert "added an exception when a macro re-uses the same argument name twice"

Browse Source 
This reverts commit b7a54b0101.
This commit is contained in:
Fabien Potencier
2013-10-02 21:46:45 +02:00
parent 524e4062b5
commit c3e05f3bac
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Twig/ExpressionParser.php
+1 -5
View File
@@ -482,7 +482,7 @@ class Twig_ExpressionParser
$value = $this->parsePrimaryExpression(); $value = $this->parsePrimaryExpression();
if (!$this->checkConstantExpression($value)) { if (!$this->checkConstantExpression($value)) {
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()); 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());
} }
} else { } else {
$value = $this->parseExpression(); $value = $this->parseExpression();
@@ -497,10 +497,6 @@ class Twig_ExpressionParser
if (null === $name) { if (null === $name) {
$args[] = $value; $args[] = $value;
} else { } else {
if ($definition && isset($args[$name])) {
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());
}
$args[$name] = $value; $args[$name] = $value;
} }
} }