Fix composer again

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

View File

@ -19,7 +19,7 @@ before_script:
- composer self-update
- composer require symfony/framework-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
script: phpunit --coverage-text

View File

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