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

Fix merge conflict resolution

Browse Source
This commit is contained in:
Fabien Potencier
2026-07-30 14:04:07 +02:00
parent 986a765019
commit efd847f456
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Node/MacrosNode.php
+1 -1
View File
@@ -38,7 +38,7 @@ final class MacrosNode extends Node
parent::__construct($macros);
}
public function setNode(string $name, Node $node): void
public function setNode(string|int $name, Node $node): void
{
if (!$node instanceof MacroNode) {
throw new \LogicException(\sprintf('A "%s" can only contain "%s" nodes; replacing the macro "%s" with a "%s" node is not supported.', static::class, MacroNode::class, $name, get_debug_type($node)));
tests/ParserTest.php
+1 -1
View File
@@ -148,7 +148,7 @@ EOF, 'index')));
$twig = new Environment(new ArrayLoader());
$this->expectException(SyntaxError::class);
$this->expectExceptionMessage('Omitting parentheses when calling a macro is not allowed; add parentheses after the macro name.');
$this->expectExceptionMessage('Omitting parentheses when calling a macro is not allowed; add parentheses after the macro name in "index" at line 1.');
$twig->parse($twig->tokenize(new Source("{% import _self as macros %}{{ $expression }}", 'index')));
}