6beff61db4
Merge branch '3.x' into 4.x
...
* 3.x:
Improve the way one can deprecate a Twig callable
Bump version
Prepare the 3.14.0 release
Fix a security issue when an included sandboxed template has been loaded before without the sandbox context
Fix test
fix the version mergeGlobals() is deprecated since
Tweak code
Fix CS
Add more tests
Remove unused private methods
Bump version
2024-09-09 21:19:33 +02:00
11f68e2aeb
Fix a security issue when an included sandboxed template has been loaded before without the sandbox context
2024-09-09 19:04:10 +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
2ae0c0d38c
Fix CS
2024-09-06 12:33:38 +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
35bb20ebac
Merge branch '3.x' into 4.x
...
* 3.x:
Adjust `cycle` implementation
Fix CS
2024-08-30 20:44:20 +02:00
7c3c16154e
Adjust cycle implementation
2024-08-30 20:43:06 +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
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
13e57cb3fe
Remove usage of ReturnTypeWillChange
2023-12-24 11:22:05 +01:00
54d34b969b
Move functions for CoreExtension
2023-12-10 20:13:10 +01:00
5193653ecb
Fix CS
2023-10-08 09:05:22 +02: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
fcbaa669ab
Fix CS
2021-05-12 09:47:40 +02:00
9d115f6831
[3.x] Fix twig_compare w.r.t. whitespace trimming
2020-07-05 15:21:52 +02:00
d6822aebcf
Fix twig_compare float-string trailing whitespace + refactor
2020-06-08 12:43:14 +02:00
0d81c6e5a2
Fix twig compare
2019-11-07 22:06:46 +01:00
879fb0adcc
Merge branch '2.x' into 3.x
...
* 2.x:
removed usage of getmockBuilder() when not needed
removed usage of getmockBuilder() when not needed
2019-08-08 13:35:34 +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
5861a539e4
removed usage of getmockBuilder() when not needed
2019-08-08 11:59:51 +02:00
5e3ede955b
Merge branch '2.x' into 3.x
...
* 2.x:
Fix PHPUnit deprecations
Update to PhpUnitBridge and fix deprecations
2019-08-08 11:05:13 +02:00
5ebcecf24b
Fix PHPUnit deprecations
2019-08-08 11:03:05 +02:00
c829dafd75
Merge branch '1.x' into 2.x
...
* 1.x:
Update to PhpUnitBridge and fix deprecations
2019-08-08 10:19:01 +02:00
b776e41f5a
Update to PhpUnitBridge and fix deprecations
2019-08-08 09:39:49 +02:00
6823b64cad
moved test under tests/
2019-06-30 14:56:12 +02:00
1e3bb75010
moved test under tests/
2019-06-30 14:51:54 +02:00
22a1317249
moved tests under tests/
2019-06-30 14:48:27 +02:00
Fabien Potencier
Alexander M. Turek
Simon André
Nicolas Grekas
Alex Pott
Guilliam Xavier
Diogo Pinheiro
Jérémy Derussé