Fabien Potencier
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
Fabien Potencier
9c6d76b61c
Add void return type hint even in tests
2026-07-12 13:43:08 +02:00
Fabien Potencier
8a4b77920a
Add PHPUnit attributes alongside annotations to silence doc-comment metadata deprecations on PHPUnit 11
2026-06-03 18:26:39 +02:00
Fabien Potencier
0facb551b0
Merge branch '3.x' into 4.x
...
* 3.x:
Fix CS
2026-02-07 09:12:05 +01:00
Fabien Potencier
861215c507
Fix CS
2026-02-07 09:07:38 +01:00
Nicolas Grekas
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
Nicolas Grekas
85a4817128
CS fixes
2025-07-29 10:07:07 +02:00
Fabien Potencier
76062c8d51
Fix CS
2025-01-19 16:54:05 +01:00
Fabien Potencier
196c9dcf85
minor #4472 [Twig 4] Add PHPUnit as dev dependency (ruudk)
...
This PR was squashed before being merged into the 4.x branch.
Discussion
----------
[Twig 4] Add PHPUnit as dev dependency
This makes it easier to run the tests locally.
I understand we didn't do this previously (Twig 3) because of `symfony/simple-phpunit`. But that is now removed in Twig 4, so maybe we can do this as well?
Commits
-------
c352a8d283 [Twig 4] Add PHPUnit as dev dependency
2024-12-01 10:29:11 +01:00
Ruud Kamphuis
c352a8d283
[Twig 4] Add PHPUnit as dev dependency
2024-12-01 10:29:08 +01:00
Fabien Potencier
82cde4edcb
Fix CS
2024-11-30 09:45:07 +01:00
Fabien Potencier
34ae0311d9
Improve the way one can deprecate a Twig callable
2024-09-09 21:14:40 +02:00