RetailCRM-Mirror/NelmioApiDocBundle
1
0
Fork 0
mirror of https://github.com/retailcrm/NelmioApiDocBundle.git synced 2025-02-02 15:51:48 +03:00
Code Issues Projects Releases Wiki Activity

Clarify dependencies to avoid using 2.1+ of this bundle with older jms serializer bundle

Browse Source
This commit is contained in:
Jordi Boggiano 2013-02-15 13:33:37 +01:00
parent b3d917c9f4
commit 9797a16b4c
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
composer.json
View File

@ -15,18 +15,21 @@
} }
], ],
"require": { "require": {
"symfony/framework-bundle": ">=2.1,<2.3-dev", "symfony/framework-bundle": "~2.1",
"symfony/twig-bundle": ">=2.1,<2.3-dev", "symfony/twig-bundle": "~2.1",
"symfony/form": ">=2.1,<2.3-dev", "symfony/form": "~2.1",
"dflydev/markdown": "1.0.*" "dflydev/markdown": "1.0.*"
}, },
"conflict": {
"jms/serializer-bundle": "<0.11"
},
"require-dev": { "require-dev": {
"symfony/css-selector": ">=2.1,<2.3-dev", "symfony/css-selector": ">=2.1,<2.3-dev",
"symfony/browser-kit": ">=2.1,<2.3-dev", "symfony/browser-kit": ">=2.1,<2.3-dev",
"symfony/validator": ">=2.1,<2.3-dev", "symfony/validator": ">=2.1,<2.3-dev",
"symfony/yaml": ">=2.1,<2.3-dev", "symfony/yaml": ">=2.1,<2.3-dev",
"friendsofsymfony/rest-bundle": "dev-master", "friendsofsymfony/rest-bundle": "dev-master",
"jms/serializer-bundle": "1.0.*" "jms/serializer-bundle": ">=0.11"
}, },
"minimum-stability": "dev", "minimum-stability": "dev",
"autoload": { "autoload": {
@ -35,7 +38,7 @@
"target-dir": "Nelmio/ApiDocBundle", "target-dir": "Nelmio/ApiDocBundle",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.0.x-dev" "dev-master": "2.1.x-dev"
} }
} }
} }