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
b53e100444
Nested macro imports
2026-08-03 10:30:32 +02:00
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
d7f8b4eb1c
Redesign macro calls and argument handling
2026-07-30 13:53:24 +02:00
b34f022583
Remove deprecated code
2026-07-30 13:52:37 +02:00
feffcb7df8
Fix merge conflict resolution
2026-07-30 13:32:38 +02:00
3197df7b5e
Merge branch '3.x' into 4.x
...
* 3.x:
Make the sandbox a first-class citizen with a dedicated Sandbox class
# Conflicts:
# CHANGELOG
# doc/deprecated.rst
# doc/tags/sandbox.rst
# phpstan-baseline.neon
# src/Extension/CoreExtension.php
# src/Extension/SandboxExtension.php
# src/Sandbox/SecurityPolicy.php
2026-07-30 13:04:50 +02:00
b762bc94b9
Make the sandbox a first-class citizen with a dedicated Sandbox class
2026-07-30 12:05:47 +02:00
5ca7debf6e
Fix merge conflict resolution
2026-07-12 15:08:38 +02:00
0b6e824ea8
Merge branch '3.x' into 4.x
...
* 3.x:
Add void return type hint even in tests
Run php-cs-fixer sequentially so the void_return src-only customiser is applied
Fix CHANGELOG
[Intl] Add format_list filter using PHP 8.5's IntlListFormatter
# Conflicts:
# .github/workflows/ci.yml
# CHANGELOG
# extra/cssinliner-extra/Tests/LegacyFunctionsTest.php
# extra/html-extra/Tests/CvaTest.php
# extra/html-extra/Tests/HtmlAttrMergeTest.php
# extra/html-extra/Tests/HtmlAttrTest.php
# extra/html-extra/Tests/LegacyFunctionsTest.php
# extra/inky-extra/Tests/LegacyFunctionsTest.php
# extra/markdown-extra/Tests/FunctionalTest.php
# extra/markdown-extra/Tests/LegacyFunctionsTest.php
# extra/twig-extra-bundle/DependencyInjection/Compiler/MissingExtensionSuggestorPass.php
# extra/twig-extra-bundle/DependencyInjection/TwigExtraExtension.php
# extra/twig-extra-bundle/TwigExtraBundle.php
# src/Extension/CoreExtension.php
# src/Extension/EscaperExtension.php
# src/Node/CheckSecurityCallNode.php
# src/Node/Expression/FunctionExpression.php
# src/Node/ModuleNode.php
# src/Node/Node.php
# src/Node/TypesNode.php
# src/Resources/core.php
# src/Resources/debug.php
# src/Test/IntegrationTestCase.php
# tests/CustomExtensionTest.php
# tests/EnvironmentTest.php
# tests/ExpressionParserTest.php
# tests/Extension/CoreTest.php
# tests/Extension/EscaperTest.php
# tests/Extension/LegacyDebugFunctionsTest.php
# tests/Extension/LegacyStringLoaderFunctionsTest.php
# tests/Extension/SandboxStateChangeTest.php
# tests/Extension/SandboxTest.php
# tests/LexerTest.php
# tests/Node/Expression/CallTest.php
# tests/Node/Expression/ConditionalTest.php
# tests/Node/NodeTest.php
# tests/Resources/LegacyCoreTest.php
# tests/TemplateTest.php
# tests/Util/CallableArgumentsExtractorTest.php
2026-07-12 13:55:37 +02:00
9c6d76b61c
Add void return type hint even in tests
2026-07-12 13:43:08 +02:00
04ace9dba0
Merge branch '3.x' into 4.x
...
* 3.x:
Handle single-node child template bodies in cleanup
Keep captured block definitions supported
Clarify captured block deprecation wording
Simplify correctness visitor checks
Move extends validation into correctness visitor
Fix correctness visitor regressions
Fix test assertions that did not verify the intended behavior
Address review: fix block-nesting checks in CorrectnessNodeVisitor
Move the extends-in-block and extends-in-macro errors into the CorrectnessNodeVisitor
Introduce a CorrectnessNodeVisitor to validate that templates are semantically correct
Mark Markup as final
Allow calling a macro with a dynamic name via the dot operator
Add an allow-list for tests to the sandbox security policy
Fix markdown_to_html mangling content that starts with a blank line
# Conflicts:
# CHANGELOG
# doc/deprecated.rst
# doc/sandbox.rst
# src/ExpressionParser/Infix/DotExpressionParser.php
# src/Extension/CoreExtension.php
# src/Markup.php
# src/Node/CheckSecurityNode.php
# src/Node/Expression/Filter/DefaultFilter.php
# src/Node/Expression/NullCoalesceExpression.php
# src/Node/IfNode.php
# src/NodeVisitor/SandboxNodeVisitor.php
# src/Parser.php
# src/Sandbox/SecurityPolicy.php
# tests/Extension/SandboxTest.php
# tests/ParserTest.php
2026-06-11 07:57:54 +02:00
416d07da1d
Add an allow-list for tests to the sandbox security policy
2026-06-06 11:08:56 +02:00
971dbcfe92
Fix merge conflict resolution
2026-06-03 19:55:20 +02:00
455be2c916
Merge branch '3.x' into 4.x
...
* 3.x:
Add PHPUnit attributes alongside annotations to silence doc-comment metadata deprecations on PHPUnit 11
Run the test suite against PHPUnit 11.3 in CI
Make IntegrationTestCase and NodeTestCase compatible with PHPUnit 11
# Conflicts:
# CHANGELOG
# src/Test/IntegrationTestCase.php
# src/Test/NodeTestCase.php
# tests/Cache/ChainTest.php
# tests/CustomExtensionTest.php
# tests/DeprecatedCallableInfoTest.php
# tests/EnvironmentTest.php
# tests/ErrorTest.php
# tests/ExpressionParserTest.php
# tests/Extension/AttributeExtensionTest.php
# tests/Extension/CoreTest.php
# tests/Extension/EscaperTest.php
# tests/Extension/LegacyDebugFunctionsTest.php
# tests/Extension/LegacyStringLoaderFunctionsTest.php
# tests/Extension/SandboxStateChangeTest.php
# tests/Extension/SandboxTest.php
# tests/FileExtensionEscapingStrategyTest.php
# tests/LexerTest.php
# tests/Loader/FilesystemTest.php
# tests/Node/Expression/CallTest.php
# tests/Node/Expression/ConditionalTest.php
# tests/Node/Expression/MacroReferenceTest.php
# tests/Node/Expression/NullCoalesceTest.php
# tests/Node/NodeTest.php
# tests/NodeVisitor/OptimizerTest.php
# tests/ParserTest.php
# tests/Resources/LegacyCoreTest.php
# tests/Runtime/EscaperRuntimeTest.php
# tests/TemplateTest.php
# tests/TokenParser/TypesTokenParserTest.php
# tests/Util/CallableArgumentsExtractorTest.php
# tests/Util/CallableParametersTest.php
2026-06-03 19:54:02 +02:00
8a4b77920a
Add PHPUnit attributes alongside annotations to silence doc-comment metadata deprecations on PHPUnit 11
2026-06-03 18:26:39 +02:00
a8e9d3b14a
Fix merge conflict resolution
2026-06-02 14:10:55 +02:00
4e58cb22e5
Fix CS
2026-06-01 09:00:03 +02:00
118938b191
Fix tests
2026-05-29 09:30:54 +02:00
23eb6eb126
Fix sandbox filter/tag/function allow-list bypass when sandbox state changes between renders
2026-05-27 14:59:42 +02:00
Fabien Potencier