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

Fix composer again

Browse Source
This commit is contained in:
William DURAND 2013-11-14 17:01:17 +01:00
parent fb75ceb318
commit 4ff018b111
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -19,7 +19,7 @@ before_script:
- composer self-update - composer self-update
- composer require symfony/framework-bundle:${SYMFONY_VERSION} --no-update - composer require symfony/framework-bundle:${SYMFONY_VERSION} --no-update
- composer require symfony/twig-bundle:${SYMFONY_VERSION} --no-update - composer require symfony/twig-bundle:${SYMFONY_VERSION} --no-update
- composer require symfony/validator:${SYMFONY_VERSION} --no-update - composer require symfony/validator:${SYMFONY_VERSION} --dev --no-update
- composer update - composer update
script: phpunit --coverage-text script: phpunit --coverage-text

3
composer.json
View File

@ -18,8 +18,7 @@
"symfony/framework-bundle": "~2.1", "symfony/framework-bundle": "~2.1",
"symfony/twig-bundle": "~2.1", "symfony/twig-bundle": "~2.1",
"symfony/console": "~2.1", "symfony/console": "~2.1",
"dflydev/markdown": "1.0.*", "dflydev/markdown": "1.0.*"
"symfony/validator": "~2.1"
}, },
"conflict": { "conflict": {
"jms/serializer": "<0.12", "jms/serializer": "<0.12",