76dcc75982
Merge branch '3.x' into 4.x
...
* 3.x:
Replace template loader mocks by ArrayLoader
[Doc] Fix javascript code-block
2024-07-24 09:53:24 +02:00
e4e95f5b86
Replace template loader mocks by ArrayLoader
2024-07-24 08:27:23 +02:00
67cb9a06fe
Merge branch '3.x' into 4.x
...
* 3.x:
Update PHPUnit config
Optimize sprintf() calls for PHP 8.4
2024-06-21 08:27:27 +02:00
b63bde3063
Optimize sprintf() calls for PHP 8.4
2024-06-21 08:16:55 +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
e5431b1361
Modernize code
2024-05-04 18:35:53 +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
3d99ed8bdb
Merge branch '3.x' into 4.x
...
* 3.x:
Move some static extension methods to non-static
Add needs_charset option for filters and functions
Fix method call
Rename some internal methods
2024-05-01 13:58:23 +02:00
c63f695e8a
Add needs_charset option for filters and functions
2024-05-01 13:12:48 +02:00
16acdf69fe
Rename some internal methods
2024-05-01 10:19:22 +02:00
5b0a843db7
Remove deprecated methods
2024-05-01 09:45:20 +02:00
8bebf01858
Merge branch '3.x' into 4.x
...
* 3.x:
-
Fix capturing output from extensions that still use echo
Add missing @deprecated tags
Add more information about migrating away from twig_escape_filter()
Fix compat with older versions of PHP
Extract the escaping logic to a runtime
2024-05-01 09:18:31 +02:00
5fdb1ee11a
Merge branch '3.x' into 4.x
...
* 3.x:
Fix a @return type hint
Fix CS
Fix a test
Fix type
Simplify sandbox code
Get rid of weird code
[html-extra] filter classes
Fix some inconsistencies
2024-04-30 15:46:54 +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
9a11ee1c64
Merge branch '3.x' into 4.x
...
* 3.x:
Bump version to 3.9.4-DEV
Fix a warning
Use ::class everywhere
Auto-close PRs on subtree-splits
Bump version
Prepare the 3.9.3 release
Update CHANGELOG
Ensure Lexer:: is always initialized
fix : #4033 add missing unwrap call when a TemplateWrapper instance can be present
change extended DI extension class
fix : #4029 when use_yield is true CaptureNode use iterator_to_array preserveKeys argument to false
2024-04-24 08:25:00 +02:00
a71ae1923e
Use ::class everywhere
2024-04-19 10:26:00 -04:00
13e57cb3fe
Remove usage of ReturnTypeWillChange
2023-12-24 11:22:05 +01:00
87953c0d08
Merge branch '3.x' into 4.x
...
* 3.x:
Fix bad merge
Fix test without any assertions
Simplify tests
2023-12-20 20:37:25 +01:00
e6a98a000f
Fix test without any assertions
2023-12-20 20:34:04 +01:00
fca89954f1
Simplify tests
2023-12-20 20:34:04 +01:00
d27c50850d
Merge branch '3.x' into 4.x
...
* 3.x:
Add SourcePolicyInterface to selectively enable the Sandbox based on a template's Source
add docs & links
2023-12-19 08:20:44 +01:00
204cd6f412
Merge branch '2.x' into 3.x
...
* 2.x:
Add SourcePolicyInterface to selectively enable the Sandbox based on a template's Source
2023-12-19 08:19:15 +01:00
a18da1614a
Add SourcePolicyInterface to selectively enable the Sandbox based on a template's Source
2023-12-19 08:18:35 +01:00
f84c2172bf
Remove deprecated code
2023-12-10 21:02:11 +01:00
54d34b969b
Move functions for CoreExtension
2023-12-10 20:13:10 +01:00
72071e8ece
Move functions for EscaperExtension
2023-12-10 11:49:57 +01:00
196e91dd72
Move functions for StringLoaderExtension
2023-12-10 11:38:36 +01:00
d4d016034c
Move functions for DebugExtension
2023-12-10 11:35:00 +01:00
2f73ee35ca
minor #3900 Minor rename of Sandbox test: functions->methods (YSaxon)
...
This PR was merged into the 3.x branch.
Discussion
----------
Minor rename of Sandbox test: functions->methods
Commits
-------
62732646
2023-11-21 17:18:42 +01:00
62732646c8
Minor rename of SandboxTest functions->methods
2023-10-27 12:15:56 -04:00
248855b34b
Merge branch '2.x' into 3.x
...
* 2.x:
Fix premature loop exit in Security Policy lookup of allowed methods/properties
2023-10-26 17:38:13 -07:00
5e1838dbca
Fix premature loop exit in Security Policy lookup of allowed methods/properties
2023-10-26 17:37:13 -07:00
5193653ecb
Fix CS
2023-10-08 09:05:22 +02:00
d6f9a4e7a2
Merge branch '2.x' into 3.x
...
* 2.x:
Fix custom escapers when using multiple Twig environments
Rename variable
2022-03-25 09:06:57 +01:00
9c03ef0d21
Fix custom escapers when using multiple Twig environments
2022-03-25 08:56:44 +01:00
9e5ca747b6
Merge branch '2.x' into 3.x
...
* 2.x:
Disallow non closures in `sort` filter when the sanbox mode is enabled
2022-02-04 07:56:23 +01:00
2eb3308055
Disallow non closures in sort filter when the sanbox mode is enabled
2022-02-04 07:52:21 +01:00
464842c41f
Merge branch '2.x' into 3.x
...
* 2.x:
Add explicit `@return` type next to `#[ReturnTypeWillChange]`
2021-08-11 09:52:24 +02:00
1d0bab9d63
Add explicit @return type next to #[ReturnTypeWillChange]
2021-08-10 18:49:26 +02:00
d9ac797190
Merge branch '2.x' into 3.x
...
* 2.x:
Twig2 PHP 8.1 beta compatibility
2021-07-29 09:09:30 +02:00
98c2233e47
Twig2 PHP 8.1 beta compatibility
2021-07-28 09:49:43 +01:00
5f20d4a362
Merge branch '2.x' into 3.x
...
* 2.x:
Explicitly specify the encoding for mb_ord in JS escaper
2021-07-08 13:01:29 +02: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
fcbaa669ab
Fix CS
2021-05-12 09:47:40 +02:00
13e360972a
Merge branch '2.x' into 3.x
...
* 2.x:
Fix CS
Fix CS
Migrate to the new PHP CS Fixer config file
Fixing links
2021-05-12 09:45:40 +02:00
157fa56829
Merge branch '1.x' into 2.x
...
* 1.x:
Fix CS
Migrate to the new PHP CS Fixer config file
2021-05-12 09:27:30 +02:00
59f3e8e5dc
Fix CS
2021-05-12 09:19:37 +02:00
Fabien Potencier
Yaakov Saxon
Nicolas Grekas
Alex Pott