Fabien Potencier
|
93b00ee3c9
|
Merge branch '3.x' into 4.x
* 3.x:
Nested macro imports
# Conflicts:
# CHANGELOG
# src/MacroNamespace.php
# src/Node/MacrosNode.php
# src/Parser.php
# tests/Extension/SandboxStateChangeTest.php
# tests/Node/MacrosTest.php
|
2026-08-03 10:34:02 +02:00 |
|
Fabien Potencier
|
b53e100444
|
Nested macro imports
|
2026-08-03 10:30:32 +02:00 |
|
Fabien Potencier
|
ce013c063e
|
Remove deprecated code
|
2026-07-30 14:14:10 +02:00 |
|
Fabien Potencier
|
986a765019
|
Merge branch '3.x' into 4.x
* 3.x:
Redesign macro calls and argument handling
# Conflicts:
# CHANGELOG
# doc/deprecated.rst
# src/ExpressionParser/Infix/ArgumentsTrait.php
# src/ExpressionParser/Infix/DotExpressionParser.php
# src/ExpressionParser/Infix/FunctionExpressionParser.php
# src/Extension/CoreExtension.php
# src/Node/Expression/MacroReferenceExpression.php
# src/Node/Expression/MethodCallExpression.php
# src/Node/Expression/TempNameExpression.php
# src/Node/MacroNode.php
# src/Node/ModuleNode.php
# src/Template.php
# tests/Fixtures/macros/call_without_parentheses.legacy.test
# tests/Node/Expression/MacroReferenceTest.php
# tests/Node/MacroTest.php
|
2026-07-30 14:02:30 +02:00 |
|
Fabien Potencier
|
d7f8b4eb1c
|
Redesign macro calls and argument handling
|
2026-07-30 13:53:24 +02:00 |
|