Skip to content

Commit 691e7c5

Browse files
committed
Merge pull request #1362 from FriendsOfSymfony/CONFLICT
Forbid SensioFrameworkExtraBundle >= 3.0.13
2 parents dedd3a9 + 31d8044 commit 691e7c5

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

composer.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
},
3232

3333
"require-dev": {
34-
"sensio/framework-extra-bundle": "~2.0|~3.0",
34+
"sensio/framework-extra-bundle": "~2.0|~3.0,<3.0.13",
3535
"symfony/form": "~2.3|~3.0",
3636
"symfony/validator": "~2.3|~3.0",
3737
"symfony/serializer": "~2.3|~3.0",
@@ -47,16 +47,17 @@
4747
},
4848

4949
"suggest": {
50-
"sensio/framework-extra-bundle": "Add support for route annotations and the view response listener, requires ~3.0",
51-
"jms/serializer-bundle": "Add support for advanced serialization capabilities, recommended, requires ~0.12||~1.0",
50+
"sensio/framework-extra-bundle": "Add support for route annotations and the view response listener, requires ~2.0|~3.0",
51+
"jms/serializer-bundle": "Add support for advanced serialization capabilities, recommended, requires ~0.12|~1.0",
5252
"symfony/serializer": "Add support for basic serialization capabilities and xml decoding, requires ~2.3",
5353
"symfony/validator": "Add support for validation capabilities in the ParamFetcher, requires ~2.3"
5454
},
5555

5656
"conflict": {
5757
"symfony/validator": ">=2.5.0,<2.5.5",
5858
"jms/serializer": "<0.13",
59-
"jms/serializer-bundle": "<0.11"
59+
"jms/serializer-bundle": "<0.11",
60+
"sensio/framework-extra-bundle": ">=3.0.13"
6061
},
6162

6263
"autoload": {

0 commit comments

Comments
 (0)