5ca7debf6e
Fix merge conflict resolution
2026-07-12 15:08:38 +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
b73ab8cfd9
Lazy load EscaperRuntime in EscaperExtension
...
Previously, setEnvironment() called getRuntime(EscaperRuntime::class) eagerly,
which prevented overriding EscaperRuntime via a custom runtime loader since
Environment::__construct() calls setEnvironment() before any loader can be injected.
2026-04-30 13:43:11 +02: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
d8fe3bd1ec
Add LastModifiedExtensionInterface and implementation in AbstractExtension to track modification of runtime classes
2025-01-02 14:50:18 +01:00
6ddb76bb76
Make data providers static
2024-09-03 16:32:00 +02:00
e4e95f5b86
Replace template loader mocks by ArrayLoader
2024-07-24 08:27:23 +02:00
04b1ad3ced
Fix old escaper signature + add docs
2024-05-13 18:21:17 +02:00
1953f77844
Fix BC break on escaper extension
2024-05-11 21:02:20 +02:00
f2c9795b26
Fix EscaperExtension constructor to not change from previous releases (will be the same in 4.x as well)
2024-05-04 18:27:46 +02:00
59542c3caf
Fix wrong tests
2024-05-04 08:32:54 +02:00
5b0a843db7
Remove deprecated methods
2024-05-01 09:45:20 +02:00
84bff0643c
Extract the escaping logic to a runtime
2024-04-28 21:26:07 +02:00
5148d10515
Fix some inconsistencies
2024-04-28 13:15:26 +02:00
a71ae1923e
Use ::class everywhere
2024-04-19 10:26:00 -04:00
72071e8ece
Move functions for EscaperExtension
2023-12-10 11:49:57 +01:00
5193653ecb
Fix CS
2023-10-08 09:05:22 +02:00
9c03ef0d21
Fix custom escapers when using multiple Twig environments
2022-03-25 08:56:44 +01:00
feeaba3fea
Merge branch '1.x' into 2.x
...
* 1.x:
Explicitly specify the encoding for mb_ord in JS escaper
2021-07-08 13:01:04 +02:00
656c295ed9
Merge branch '1.x' into 2.x
...
* 1.x:
removed usage of getmockBuilder() when not needed
2019-08-08 13:33:07 +02:00
5ebcecf24b
Fix PHPUnit deprecations
2019-08-08 11:03:05 +02:00
1e3bb75010
moved test under tests/
2019-06-30 14:51:54 +02:00
Fabien Potencier
Jérôme Tamarelle
Nicolas Grekas
Alexander M. Turek