Fabien Potencier
ac423430aa
Merge branch '3.x' into 4.x
...
* 3.x:
Fix CS
Move functions for CoreExtension
Move functions for EscaperExtension
Move functions for StringLoaderExtension
Move functions for DebugExtension
Move functions for MarkdownExtension
Move functions for InkyExtension
Move functions for CssInlinerExtension
Move functions for HtmlExtension
Deprecate internal extension functions in favor of methods on the extension classes
Tweak deprecated docs
2023-12-10 20:55:15 +01:00
Fabien Potencier
54d34b969b
Move functions for CoreExtension
2023-12-10 20:13:10 +01:00
Fabien Potencier
b9cf29d53d
Remove obsolete code
2023-12-09 14:56:21 +01:00
Fabien Potencier
5193653ecb
Fix CS
2023-10-08 09:05:22 +02:00
Fabien Potencier
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
Nicolas Grekas
1d0bab9d63
Add explicit @return type next to #[ReturnTypeWillChange]
2021-08-10 18:49:26 +02:00
Fabien Potencier
d9ac797190
Merge branch '2.x' into 3.x
...
* 2.x:
Twig2 PHP 8.1 beta compatibility
2021-07-29 09:09:30 +02:00
Alex Pott
98c2233e47
Twig2 PHP 8.1 beta compatibility
2021-07-28 09:49:43 +01:00
Fabien Potencier
ed29f0010f
Merge branch '2.x' into 3.x
...
* 2.x:
Add ReturnTypeWillChange to JsonSerializable implementation
Fix implicit flot to int casts
2021-06-06 18:31:44 +02:00
Fabien Potencier
7926399e0a
Merge branch '1.x' into 2.x
...
* 1.x:
Fix implicit flot to int casts
2021-06-06 18:31:25 +02:00
Alexander M. Turek
de9cd76d7c
Fix implicit flot to int casts
2021-06-06 00:32:22 +02:00
Fabien Potencier
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
Fabien Potencier
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
Fabien Potencier
5861a539e4
removed usage of getmockBuilder() when not needed
2019-08-08 11:59:51 +02:00
Fabien Potencier
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
Fabien Potencier
5ebcecf24b
Fix PHPUnit deprecations
2019-08-08 11:03:05 +02:00
Fabien Potencier
c829dafd75
Merge branch '1.x' into 2.x
...
* 1.x:
Update to PhpUnitBridge and fix deprecations
2019-08-08 10:19:01 +02:00
Jérémy Derussé
b776e41f5a
Update to PhpUnitBridge and fix deprecations
2019-08-08 09:39:49 +02:00
Fabien Potencier
af6412effe
Merge branch '2.x' into 3.x
...
* 2.x:
fixed tests for PHP 7.4
2019-06-30 15:36:41 +02:00
Fabien Potencier
f1b1b87912
Merge branch '1.x' into 2.x
...
* 1.x:
fixed tests for PHP 7.4
2019-06-30 15:36:34 +02:00
Fabien Potencier
0947777bc6
fixed tests for PHP 7.4
2019-06-30 15:21:28 +02:00
Fabien Potencier
6823b64cad
moved test under tests/
2019-06-30 14:56:12 +02:00
Fabien Potencier
1e3bb75010
moved test under tests/
2019-06-30 14:51:54 +02:00
Fabien Potencier
22a1317249
moved tests under tests/
2019-06-30 14:48:27 +02:00