32ef272559
Merge branch '2.x' into 3.x
...
* 2.x:
fixed package name
2019-08-10 11:25:12 +02:00
f8c0c76f46
fixed package name
2019-08-10 11:23:15 +02:00
4b152df5a1
Merge branch '2.x' into 3.x
...
* 2.x:
fixed Travis
2019-08-10 11:21:39 +02:00
2e3aa4f7ec
fixed Travis
2019-08-10 11:21:33 +02:00
6d14d9c9db
Merge branch '2.x' into 3.x
...
* 2.x:
fixed HTML extension
2019-08-10 11:13:02 +02:00
be629b591b
bug #3116 Fix HTML extension (fabpot)
...
This PR was merged into the 2.x branch.
Discussion
----------
Fix HTML extension
Commits
-------
5cc40a06
2019-08-10 11:08:29 +02:00
5cc40a06f1
fixed HTML extension
2019-08-10 11:07:38 +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
40fa5ea8ab
feature #3113 move the HTML extension to an external Composer package (fabpot)
...
This PR was merged into the 2.x branch.
Discussion
----------
move the HTML extension to an external Composer package
Commits
-------
59bb9d10
2019-08-10 07:41:42 +02:00
59bb9d1033
moved the HTML extension to an external Composer package
2019-08-08 18:10:45 +02:00
5b300ea457
Merge branch '2.x' into 3.x
...
* 2.x:
added an entry to .gitignore
2019-08-08 18:07:37 +02:00
f07a7f388d
Merge branch '1.x' into 2.x
...
* 1.x:
added an entry to .gitignore
2019-08-08 18:07:29 +02:00
a8c77b85a7
added an entry to .gitignore
2019-08-08 18:07:23 +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
3ee934ef45
minor #3112 Remove usage of getmockBuilder() when not needed (fabpot)
...
This PR was merged into the 1.x branch.
Discussion
----------
Remove usage of getmockBuilder() when not needed
/cc @jderusse
Commits
-------
5861a539
2019-08-08 12:14:28 +02:00
5861a539e4
removed usage of getmockBuilder() when not needed
2019-08-08 11:59:51 +02:00
56f501c198
Merge branch '2.x' into 3.x
...
* 2.x:
Fix compatibility with PHPUnit 8
2019-08-08 11:13:46 +02:00
bd45dfa518
minor #3111 Fix compatibility with PHPUnit 8 (jderusse)
...
This PR was merged into the 2.x branch.
Discussion
----------
Fix compatibility with PHPUnit 8
adds `: void` return typehint on methods `setup` and `teardown`
Commits
-------
f348f6ea
2019-08-08 11:13:19 +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
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
Fabien Potencier
Jérémy Derussé