c433c6ae0b
Merge branch '2.x' into 3.x
...
* 2.x:
Fix tests
2019-11-28 15:03:28 +01:00
41b651736c
Merge branch '1.x' into 2.x
...
* 1.x:
Fix tests
2019-11-28 15:02:56 +01:00
8a6010f695
Fix tests
2019-11-28 14:58:09 +01:00
b845ed969e
Twig 2 is compatible with PHP 7.0
2019-09-20 15:13:40 +02:00
ac0f512553
[3.0] remove the most blocking return types
2019-09-20 15:04:28 +02:00
6e3fa76d71
fixed bad merge
2019-08-10 11:56:26 +02:00
41ab8b9699
Merge branch '2.x' into 3.x
...
* 2.x:
moved the HTML extension to an external Composer package
2019-08-10 07:48:25 +02:00
59bb9d1033
moved the HTML extension to an external Composer package
2019-08-08 18:10:45 +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
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
2b6ad5bca6
allowed Symfony 5
2019-08-08 01:34:31 +02:00
be7f9c5b3e
Merge branch '2.x' into 3.x
...
* 2.x:
bumped some deps
2019-08-08 01:34:20 +02:00
0ab30d5c54
Merge branch '1.x' into 2.x
...
* 1.x:
bumped some deps
2019-08-08 01:33:46 +02:00
9270385cd2
bumped some deps
2019-08-08 01:33:12 +02:00
80a7e3e538
fixed composer.json
2019-08-08 00:48:20 +02:00
074e46ae33
Upgrade minimal version of php
2019-08-08 00:31:49 +02:00
97971ce57d
fixed composer.json
2019-08-07 17:09:57 +02:00
52c633a7be
Merge branch '2.x' into 3.x
...
* 2.x:
fixed the "empty" test on Traversable instances
avoid confusion between .. and ..
fixed phpdocs
fixed CHANGELOG
moved css_class function to html_classes filter
Added support for `css_class` function
added missing docs
fixed wrong registration
added the data_uri filter
bumped version
Update CoreExtension.php
2019-08-07 17:09:29 +02:00
220e75065a
added the data_uri filter
2019-08-07 14:42:44 +02:00
87391f5692
bumped version
2019-08-07 14:00:00 +02:00
74411e6aad
fixed tests
2019-06-30 15:51:21 +02:00
9ab104be86
Merge branch '2.x' into 3.x
...
* 2.x:
moved test under tests/
moved tests under tests/
2019-06-30 14:55:01 +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
4066b07a8f
Merge branch '2.x' into 3.x
...
* 2.x:
fixed typo
2019-06-30 14:42:00 +02:00
e933f00091
Merge branch '1.x' into 2.x
...
* 1.x:
fixed typo
2019-06-30 14:41:53 +02:00
08513fe422
fixed typo
2019-06-30 14:41:41 +02:00
f79ce15af2
Merge branch '2.X' into 3.x
...
* 2.X:
moved tests to a namespace structure
2019-06-30 13:01:55 +02:00
ccf27274ea
Merge branch '1.x' into 2.x
...
* 1.x:
moved tests to a namespace structure
2019-06-30 12:58:40 +02:00
2119e60cf7
moved tests to a namespace structure
2019-06-30 12:39:00 +02:00
84a463403d
prepared the 2.11.2 release
2019-06-05 13:17:07 +02:00
09c6116938
bumped version to 2.12
2019-06-05 05:13:06 +02:00
2baaec823c
Merge branch '2.x' into 3.x
...
* 2.x:
added more tests
fixed macro inheritance
moved a test
added some tests
bumped version to 2.11.1-DEV
prepared the 2.11.0 release
bumped version to 1.42.1-DEV
prepared the 1.42.0 release
Use v5.0 of the phpunit bridge
2019-06-03 11:23:44 +02:00
537c05039e
Merge branch '1.x' into 2.x
...
* 1.x:
added some tests
bumped version to 1.42.1-DEV
prepared the 1.42.0 release
Use v5.0 of the phpunit bridge
2019-06-03 10:38:34 +02:00
2e6f74af57
Use v5.0 of the phpunit bridge
2019-05-28 16:57:04 +02:00
3d1e5f6493
bumped version to 2.11
2019-05-17 08:23:38 +02:00
0f5a056968
bumped version to 1.42
2019-05-17 08:22:23 +02:00
cf733f4f96
bumped version to 2.10
2019-05-03 10:33:50 +02:00
a795acd1da
bumped version to 1.41
2019-05-03 10:32:27 +02:00
1047421df5
bumped version to 2.9
2019-04-24 16:59:53 +02:00
a6ec023c09
bumped version to 1.40
2019-04-24 15:19:52 +02:00
273b666a71
removed the obsolete lib/ directory, removed PSR-0 class aliases
2019-04-23 16:34:05 +02:00
50763ac22e
bumped version to 3.0
2019-04-23 16:33:38 +02:00
9acd647214
bumped version to 2.8
2019-04-03 15:57:27 +02:00
10cb211d93
bumped version to 1.39
2019-04-03 10:28:54 +02:00
eae31defba
Merge branch '1.x' into 2.x
...
* 1.x:
removed support forum in composer.json
2019-02-22 01:48:55 +01:00
3757418b88
removed support forum in composer.json
2019-02-22 01:48:47 +01:00
66b708bde8
bumped version to 1.38
2019-02-15 08:28:49 +01:00
85972a040e
deprecated Parser::isReservedMacroName()
2019-02-15 03:39:46 +01:00
Fabien Potencier
Nicolas Grekas
Jérémy Derussé