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
8a4b77920a
Add PHPUnit attributes alongside annotations to silence doc-comment metadata deprecations on PHPUnit 11
2026-06-03 18:26:39 +02:00
463ef4018d
Merge branch '3.x' into 4.x
...
* 3.x:
Update CHANGELOG
Add `html_attr_relaxed` escaping strategy
re-add mixed return type
Support short-circuiting in null-safe operator chains
Add support for renaming variables in object destructuring
Update .gitattributes to remove splitsh.json
Fix intro for operator precedence table ?
2026-02-09 12:29:34 +01:00
04aa3df49f
Add html_attr_relaxed escaping strategy
2026-02-08 18:59:07 +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
f2053bbea0
PHPUnit 11
2024-09-04 12:11:51 +02:00
a789eca738
Merge branch '3.x' into 4.x
...
* 3.x:
Validate the input of CoreExtension::map()
Rename AbstractTest to ProfilerTestCase
Make data providers static
Prepare IntegrationTestCase for static data providers
2024-09-03 22:20:28 +02:00
6ddb76bb76
Make data providers static
2024-09-03 16:32:00 +02:00
12b4cdcf5e
don't read current key and value when end of iterator is reached
2024-09-02 15:31:28 +02:00
7324404f27
Merge branch '3.x' into 4.x
...
* 3.x:
Fix various phpstan errors
Fix EscaperRuntime namespace
2024-07-31 09:34:53 +02:00
df4e66f420
Fix EscaperRuntime namespace
...
From `Twig\Tests` to `Twig\Tests\Runtime`
2024-07-30 00:36:02 +02:00
447c9cc17c
Merge branch '3.x' into 4.x
...
* 3.x:
Fix old escaper signature + add docs
Bump version
Prepare the 3.10.1 release
2024-05-14 06:50:29 +01:00
04b1ad3ced
Fix old escaper signature + add docs
2024-05-13 18:21:17 +02:00
e5431b1361
Modernize code
2024-05-04 18:35:53 +02:00
59542c3caf
Fix wrong tests
2024-05-04 08:32:54 +02:00
84bff0643c
Extract the escaping logic to a runtime
2024-04-28 21:26:07 +02:00
Fabien Potencier
Matthias Pigulla
Nicolas Grekas
Alexander M. Turek
Christian Flothmann
Simon André