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
c8577f8b77
minor #3110 Fix PHPUnit deprecations (fabpot)
...
This PR was squashed before being merged into the 2.x branch (closes #3110 ).
Discussion
----------
Fix PHPUnit deprecations
#3103 followup for 2.x
Commits
-------
5ebcecf2
2019-08-08 11:03:14 +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
5aae9ba07a
minor #3103 Update PhpUnitBridge and fix deprecations (jderusse)
...
This PR was merged into the 1.x branch.
Discussion
----------
Update PhpUnitBridge and fix deprecations
This PR:
- update dev dependency to `phpunit-bridge` to `^4.4@dev` in order to get polyfill methods
- fix deprecated tests
- update cs-fixer rule
Commits
-------
b776e41f
2019-08-08 10:00:23 +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
568a163cd6
fixed typo hints
2019-08-08 01:04:29 +02:00
98c776b025
fixed bad merge
2019-08-08 00:57:13 +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
80a7e3e538
fixed composer.json
2019-08-08 00:48:20 +02:00
9975e7a8ed
fixed docs
2019-08-08 00:47:00 +02:00
9d30f39511
simplified .travis.yml
2019-08-08 00:46:21 +02:00
a36019c28e
Merge branch '1.x' into 2.x
...
* 1.x:
fixed CHANGELOG
Upgrade minimal version of php
Restore tests on PHP 5.4
2019-08-08 00:45:59 +02:00
d1927ade9a
fixed CHANGELOG
2019-08-08 00:44:22 +02:00
079e408357
feature #3107 Upgrade minimal version of php (jderusse)
...
This PR was merged into the 1.x branch.
Discussion
----------
Upgrade minimal version of php
Following this comment https://github.com/twigphp/Twig/pull/3103#issuecomment-519282356
Bump the minimal required version of PHP to 5.5
Commits
-------
074e46ae
2019-08-08 00:43:19 +02:00
074e46ae33
Upgrade minimal version of php
2019-08-08 00:31:49 +02:00
ee35a9129d
minor #3106 Restore tests on PHP 5.4 (jderusse)
...
This PR was merged into the 1.x branch.
Discussion
----------
Restore tests on PHP 5.4
Commits
-------
f8eda56c
2019-08-07 23:51:52 +02:00
f8eda56c69
Restore tests on PHP 5.4
2019-08-07 23:16:00 +02:00
336d69c166
fixed CS
2019-08-07 20:54:50 +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
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
c87fe47373
bug #3104 Fix the "empty" test on Traversable instances (fabpot)
...
This PR was merged into the 1.x branch.
Discussion
----------
Fix the "empty" test on Traversable instances
closes #3101
Commits
-------
b202fe38
2019-08-07 17:07:43 +02:00
b202fe3809
fixed the "empty" test on Traversable instances
2019-08-07 17:02:01 +02:00
20d60b5f25
avoid confusion between .. and ..
2019-08-07 16:28:20 +02:00
2a32f38be7
fixed phpdocs
2019-08-07 16:22:21 +02:00
472cb913fd
feature #3094 Add extra argument to filter column (DarkBee)
...
This PR was merged into the 2.x branch.
Discussion
----------
Add extra argument to filter column
Added optional argument to `twig_array_column`, `$index_key`, to reflect proper arguments for underlaying `PHP` function `column`
Commits
-------
7ca47f2e
2019-08-07 16:21:35 +02:00
ee153554bd
fixed CHANGELOG
2019-08-07 16:15:40 +02:00
ca821656cd
feature #2798 Added support for css_class function (lyrixx, fabpot)
...
This PR was merged into the 2.x branch.
Discussion
----------
Added support for `css_class` function
fixes #2797
Commits
-------
6ce9beb92200d837
2019-08-07 16:14:42 +02:00
6ce9beb9fd
moved css_class function to html_classes filter
2019-08-07 16:09:15 +02:00
2200d837ef
Added support for css_class function
2019-08-07 15:57:33 +02:00
ad2ddd68ef
added missing docs
2019-08-07 15:56:57 +02:00
debc5c3ca5
fixed wrong registration
2019-08-07 15:44:55 +02:00
a8f3be3a26
feature #3102 Add the data_uri filter (fabpot)
...
This PR was merged into the 2.x branch.
Discussion
----------
Add the data_uri filter
Implemented as a popular request here: closes https://github.com/twigphp/Twig-extensions/issues/54
Commits
-------
220e7506
2019-08-07 15:06:49 +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
bc79ad339b
Merge branch '2.x' into 3.x
...
* 2.x:
Fix using array_key_exists() on objects, it is deprecated in PHP 7.4
2019-08-02 10:10:24 +02:00
03dbdb9683
Merge branch '1.x' into 2.x
...
* 1.x:
Fix using array_key_exists() on objects, it is deprecated in PHP 7.4
2019-08-02 10:10:18 +02:00
18458930a5
bug #3097 Fix using array_key_exists() on objects, it is deprecated in PHP 7.4 (nicolas-grekas)
...
This PR was merged into the 1.x branch.
Discussion
----------
Fix using array_key_exists() on objects, it is deprecated in PHP 7.4
Found as part of https://github.com/symfony/symfony/issues/32844
Commits
-------
d0550b7a
2019-08-02 10:08:07 +02:00
d0550b7a68
Fix using array_key_exists() on objects, it is deprecated in PHP 7.4
2019-08-01 16:18:22 +02:00
7ca47f2edd
Update CoreExtension.php
...
Added optional argument to `twig_array_column`, `$index_key`, to reflect proper arguments for underlaying `PHP` function `column`
2019-07-24 14:07:14 +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
5bfe590de5
updated CHANGELOG
2019-07-12 09:13:06 +03:00
744af47848
Merge branch '1.x' into 2.x
...
* 1.x:
updated CHANGELOG
tweaked code
Extend opcache check if it is enabled
2019-07-12 09:12:46 +03:00
ef4ae447f9
updated CHANGELOG
2019-07-12 09:12:11 +03:00
Fabien Potencier
Jérémy Derussé
Grégoire Pineau
Nicolas Grekas
DarkBee