Fabien Potencier
cb88e0a68c
Merge branch '2.x' into 3.x
...
* 2.x:
Move things around
2021-01-01 15:58:18 +01:00
Fabien Potencier
1868918724
Move things around
2021-01-01 15:53:48 +01:00
Fabien Potencier
b0afeb512e
Merge branch '2.x' into 3.x
...
* 2.x:
Move Extra Bundle config from XML to PHP
bump license year
2021-01-01 15:33:39 +01:00
abdounikarim
bed8f31b96
bump license year
2021-01-01 10:21:03 +01:00
Fabien Potencier
351a97ed15
Fix Composer version
2021-01-01 10:05:00 +01:00
Fabien Potencier
dae3868f04
Fix Composer version
2021-01-01 10:02:52 +01:00
Nicolas Grekas
3aa40a42b3
Merge branch '2.x' into 3.x
...
* 2.x:
Try running all tests on nightly
Minor fixes
Fix Travis config
2020-05-21 11:56:39 +02:00
Nicolas Grekas
4e0008cd82
Try running all tests on nightly
2020-05-21 11:54:27 +02:00
Fabien Potencier
090a7d86a7
Merge branch '2.x' into 3.x
...
* 2.x:
Fix extra package deps
2020-05-21 08:01:55 +02:00
Fabien Potencier
74f3ffe4b6
Fix extra package deps
2020-05-21 08:01:43 +02:00
Fabien Potencier
d57e50d778
Merge branch '2.x' into 3.x
...
* 2.x:
Allow dev versions
Allow PHP 8 for extra packages
Fix Travis
Bump version to 2.13
Fix integration tests
Fix PHP 8 compat
Install the phpunit-bridge with PHP 7.4 when testing nightly
Add PHP 8 / nightly in Travis matrix
Drop support for PHP 7.0
2020-05-19 15:23:33 +02:00
Fabien Potencier
9270d3e0e0
Allow dev versions
2020-05-19 15:17:30 +02:00
Fabien Potencier
2d58a54b4a
Allow PHP 8 for extra packages
2020-05-19 15:12:25 +02:00
Fabien Potencier
050fdf54b8
Merge branch '2.x' into 3.x
...
* 2.x:
Update api.rst
Fix typo
Fix typos
Fix CI on PHP5
2020-04-24 08:31:57 +02:00
Pierre Grimaud
0273057622
Fix typos
2020-04-24 08:22:30 +02:00
Fabien Potencier
2a740e6268
Merge branch '2.x' into 3.x
...
* 2.x:
Bump license year
Bump license year
2020-01-01 18:11:09 +01:00
Fabien Potencier
6aae22ecde
Bump license year
2020-01-01 18:10:47 +01:00
Fabien Potencier
e5ae15e7de
Merge branch '2.x' into 3.x
...
* 2.x:
support Sf5
Fix constraints
Update doc with new escaping behavior
Remove obsolete page
language typo
Add missing suggestions in Twig Extra Bundle
2019-12-28 08:09:27 +01:00
Fabien Potencier
7f75a23f85
minor #3230 Fix constraints (fabpot)
...
This PR was merged into the 2.x branch.
Discussion
----------
Fix constraints
Commits
-------
966fa451 Fix constraints
2019-12-27 08:37:45 +01:00
Axel Guckelsberger
d735a43e4e
support Sf5
2019-12-27 08:36:07 +01:00
Fabien Potencier
966fa45126
Fix constraints
2019-12-27 08:33:44 +01:00
Fabien Potencier
9e0b90b27b
Merge branch '2.x' into 3.x
...
* 2.x:
Add .gitattributes
Add missing .gitattributes for string-extra
Update .gitattributes to remove tests from \"dist\"
Fix CS
doc: number_format add math calculation hint
2019-10-17 09:30:08 +02:00
Barry vd. Heuvel
5cde1f50bb
Update .gitattributes to remove tests from \"dist\"
2019-10-17 09:27:07 +02:00
Fabien Potencier
e5b29ee1f7
Merge branch '2.x' into 3.x
...
* 2.x:
cleaned up the code
Fix intl-extra docs and links
removed unneeded condition
moved mime to req
2019-08-12 09:27:28 +02:00
Fabien Potencier
163f6a0979
minor #3126 Clean up the code (fabpot)
...
This PR was merged into the 2.x branch.
Discussion
----------
Clean up the code
Commits
-------
ba8f7a5e cleaned up the code
2019-08-12 09:26:54 +02:00
Fabien Potencier
ba8f7a5e4c
cleaned up the code
2019-08-12 09:23:06 +02:00
Fabien Potencier
cf444dde71
removed unneeded condition
2019-08-12 08:43:14 +02:00
Fabien Potencier
9dc85f5e0c
moved mime to req
2019-08-11 19:49:57 +02:00
Fabien Potencier
4d34327368
fixed versions of extra exts
2019-08-10 16:56:24 +02:00
Fabien Potencier
32ef272559
Merge branch '2.x' into 3.x
...
* 2.x:
fixed package name
2019-08-10 11:25:12 +02:00
Fabien Potencier
f8c0c76f46
fixed package name
2019-08-10 11:23:15 +02:00
Fabien Potencier
6d14d9c9db
Merge branch '2.x' into 3.x
...
* 2.x:
fixed HTML extension
2019-08-10 11:13:02 +02:00
Fabien Potencier
5cc40a06f1
fixed HTML extension
2019-08-10 11:07:38 +02:00