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

Merge branch '1.x' into 2.x

Browse Source 
* 1.x:
  added more tests
  added missing hints in some runtime exceptions
This commit is contained in:
Fabien Potencier
2019-04-12 12:08:49 +02:00
parent ed9f14db9b 9de6b325e9
commit 1c80fa7205
16 changed files with 114 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Node/MacroNode.php
+1 -1
View File
@@ -27,7 +27,7 @@ class MacroNode extends Node
{
foreach ($arguments as $argumentName => $argument) {
if (self::VARARGS_NAME === $argumentName) {
throw new SyntaxError(sprintf('The argument "%s" in macro "%s" cannot be defined because the variable "%s" is reserved for arbitrary arguments.', self::VARARGS_NAME, $name, self::VARARGS_NAME), $argument->getTemplateLine(), null, null, false);
throw new SyntaxError(sprintf('The argument "%s" in macro "%s" cannot be defined because the variable "%s" is reserved for arbitrary arguments.', self::VARARGS_NAME, $name, self::VARARGS_NAME), $argument->getTemplateLine(), $argument->getSourceContext());
}
}