8021c1a05c
Fix merge conflict resolution
2026-08-19 16:46:10 +02:00
d7fc3d6dc9
Merge branch '3.x' into 4.x
...
* 3.x:
Attach documentation comments to nodes
# Conflicts:
# CHANGELOG
# src/Lexer.php
# src/Node/Node.php
# src/Parser.php
# src/Token.php
2026-08-19 16:44:35 +02:00
6806e30474
Attach documentation comments to nodes
2026-08-19 16:41:17 +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
8a4b77920a
Add PHPUnit attributes alongside annotations to silence doc-comment metadata deprecations on PHPUnit 11
2026-06-03 18:26:39 +02:00
0facb551b0
Merge branch '3.x' into 4.x
...
* 3.x:
Fix CS
2026-02-07 09:12:05 +01:00
861215c507
Fix CS
2026-02-07 09:07:38 +01:00
c649c1658b
Merge branch '3.x' into 4.x
...
* 3.x:
CS fixes
Enable Fabbot as a GHA
2025-07-29 10:27:55 +02:00
85a4817128
CS fixes
2025-07-29 10:07:07 +02:00
ef7ade8ee3
Merge branch '3.x' into 4.x
...
* 3.x: (30 commits)
Make {} optional for the types tag
Remove the note about types mapping argument
Add a note on the types locality
Fix CS
Fix typos in the docs
Use spl_object_id() instead of spl_object_hash()
Add `LastModifiedExtensionInterface` and implementation in `AbstractExtension` to track modification of runtime classes
Bump version
Optimize NameExpression compilation
Fix typo in enum twig doc functions
Remove dead method in ModuleNode
Bump version
Prepare the 3.18.0 release
Add support for `Twig\Markup`
Fix unary operator precedence change
Replace Twigfiddle by the new Twig playground
Fix MacroNode $name argument can be overridden
Ignore exceptions from undefined handlers when using the guard tag
[Doc] Update the docs about attribute() function
Fix doc
...
2025-01-10 08:41:31 +01:00
dff6fdd675
Make {} optional for the types tag
2025-01-06 13:53:28 +01:00
b53c639f7d
Ignore exceptions from undefined handlers when using the guard tag
2024-12-19 15:10:50 +01:00
14b5de7e54
Fix getting nodes with int names
2024-10-05 09:38:51 +02:00
fa1c9f0bf9
Merge branch '3.x' into 4.x
...
* 3.x:
Remove obsolete code
Deprecate Environment::mergeGlobals()
Bump version
Prepare the 3.13.0 release
Fix wrong format of `Environment::VERSION_ID` constant
Fix minor things
Fix CS
Fix isset in ForLoopNode
Fix iterable return type
Improve exception expectations reliability
2024-09-07 17:03:10 +02:00
978f749b43
Fix minor things
2024-09-06 12:58:38 +02:00
2ae0c0d38c
Fix CS
2024-09-06 12:33:38 +02:00
f2053bbea0
PHPUnit 11
2024-09-04 12:11:51 +02:00
6ddb76bb76
Make data providers static
2024-09-03 16:32:00 +02:00
22abdfafae
Remove unneeded whitespace
2024-08-30 12:44:06 +02:00
67dabd8182
Add types tag
2024-08-29 19:26:49 +02:00
Fabien Potencier
Nicolas Grekas
Alexander M. Turek
Jeroen Versteeg