From: Fabien Potencier Date: Sat, 3 Aug 2013 16:36:32 +0000 (+0200) Subject: renamed an internal variable X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=a176fadc042bbfa09b0f304bef9ec89850f6e06f;p=web%2Fkonrad%2Ftwig.git renamed an internal variable --- diff --git a/lib/Twig/Node/Module.php b/lib/Twig/Node/Module.php index 551458a..224410a 100644 --- a/lib/Twig/Node/Module.php +++ b/lib/Twig/Node/Module.php @@ -249,7 +249,7 @@ class Twig_Node_Module extends Twig_Node ->addIndentation()->repr($name)->raw(" => array(\n") ->indent() ->write("'method' => ")->repr($node->getAttribute('method'))->raw(",\n") - ->write("'default_argument_values' => array(\n") + ->write("'arguments' => array(\n") ->indent() ; foreach ($node->getNode('arguments') as $argument => $value) { @@ -257,7 +257,7 @@ class Twig_Node_Module extends Twig_Node } $compiler ->outdent() - ->write(")\n") + ->write("),\n") ->outdent() ->write("),\n") ; diff --git a/lib/Twig/Template.php b/lib/Twig/Template.php index afa5b96..22a7e58 100644 --- a/lib/Twig/Template.php +++ b/lib/Twig/Template.php @@ -479,7 +479,7 @@ abstract class Twig_Template implements Twig_TemplateInterface $i = 0; $args = array(); - foreach ($template->macros[$macro]['default_argument_values'] as $name => $value) { + foreach ($template->macros[$macro]['arguments'] as $name => $value) { if (isset($namedNames[$name])) { if ($i < $positionalCount) { throw new Twig_Error_Runtime(sprintf('Argument "%s" is defined twice for macro "%s" defined in the template "%s".', $name, $macro, $template->getTemplateName())); @@ -499,7 +499,8 @@ abstract class Twig_Template implements Twig_TemplateInterface } if ($namedCount > 0) { - $parameters = array_keys(array_diff_key($namedNames, $template->macros[$macro]['default_argument_values'])); + $parameters = array_keys(array_diff_key($namedNames, $template->macros[$macro]['arguments'])); + throw new Twig_Error_Runtime(sprintf('Unknown argument%s "%s" for macro "%s" defined in the template "%s".', count($parameters) > 1 ? 's' : '' , implode('", "', $parameters), $macro, $template->getTemplateName())); }