92c4287b81
Merge branch '2.x' into 3.x
...
* 2.x:
Twig 2 is compatible with PHP 7.0
2019-10-01 12:33:23 +02:00
4625774716
feature #3157 Twig 2 is compatible with PHP 7.0 (nicolas-grekas)
...
This PR was merged into the 2.x branch.
Discussion
----------
Twig 2 is compatible with PHP 7.0
7.1 was needed for #3102 , but this is not the case anymore since #3113
Commits
-------
b845ed96
2019-10-01 12:31:38 +02:00
b845ed969e
Twig 2 is compatible with PHP 7.0
2019-09-20 15:13:40 +02:00
ada0355047
Merge branch '2.x' into 3.x
...
* 2.x:
Optimize block('foo') ?? 'bar'
bumped version to 1.42.4-DEV
prepared the 1.42.3 release
updated ChANGELOG
2019-09-20 14:54:03 +02:00
c2fd9990fc
Merge branch '1.x' into 2.x
...
* 1.x:
Optimize block('foo') ?? 'bar'
bumped version to 1.42.4-DEV
prepared the 1.42.3 release
updated ChANGELOG
2019-09-20 14:53:54 +02:00
7a99a4e7e5
Optimize block('foo') ?? 'bar'
2019-09-20 12:40:56 +02:00
e78c489deb
Merge branch '2.x' into 3.x
...
* 2.x:
added the spaceship operator
added support for an "arrow" function on the "sort" filter
2019-08-20 10:38:25 +02:00
f5950a5b1f
added the spaceship operator
2019-08-20 10:30:06 +02:00
330024b67e
added support for an "arrow" function on the "sort" filter
2019-08-20 10:18:43 +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
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
c7b0a459ca
removed usage of getmockBuilder() when not needed
2019-08-08 13:34: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
5861a539e4
removed usage of getmockBuilder() when not needed
2019-08-08 11:59:51 +02:00
10edd832d2
code cleanup
2019-08-08 11:07:02 +02:00
f348f6ea64
Fix compatibility with PHPUnit 8
2019-08-08 11:06:58 +02:00
fec3fd859f
fixed PHPUnit deprecations
2019-08-08 11:06:15 +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
83e404ee35
Merge branch '2.x' into 3.x
...
* 2.x:
fixed docs
simplified .travis.yml
fixed CHANGELOG
Upgrade minimal version of php
Restore tests on PHP 5.4
fixed CS
2019-08-08 00:48:53 +02:00
074e46ae33
Upgrade minimal version of php
2019-08-08 00:31:49 +02:00
336d69c166
fixed CS
2019-08-07 20:54:50 +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
d0c0f7e3b0
Merge branch '1.x' into 2.x
...
* 1.x:
fixed the "empty" test on Traversable instances
avoid confusion between .. and ..
2019-08-07 17:07:59 +02:00
b202fe3809
fixed the "empty" test on Traversable instances
2019-08-07 17:02:01 +02:00
6ce9beb9fd
moved css_class function to html_classes filter
2019-08-07 16:09:15 +02:00
220e75065a
added the data_uri filter
2019-08-07 14:42:44 +02:00
60ab8f18e4
Merge branch '2.x' into 3.x
...
* 2.x:
updated CHANGELOG
updated CHANGELOG
tweaked code
Extend opcache check if it is enabled
Update include.rst
fixed using macros in arrow functions
2019-07-12 09:13:14 +03:00
95352743eb
fixed using macros in arrow functions
2019-07-03 20:17:43 +02:00
a73c4894ae
fixed PHPUnit compat
2019-06-30 15:54:20 +02:00
af6412effe
Merge branch '2.x' into 3.x
...
* 2.x:
fixed tests for PHP 7.4
2019-06-30 15:36:41 +02:00
f1b1b87912
Merge branch '1.x' into 2.x
...
* 1.x:
fixed tests for PHP 7.4
2019-06-30 15:36:34 +02:00
0947777bc6
fixed tests for PHP 7.4
2019-06-30 15:21:28 +02:00
8fb45863f7
Merge branch '2.x' into 3.x
...
* 2.x:
fixed typo
2019-06-30 15:12:01 +02:00
53d056c861
fixed typo
2019-06-30 15:11:45 +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
Nicolas Grekas
Jérémy Derussé