Skip to content

Commit

Permalink
Merge pull request #99 from vworldat/travis-fix
Browse files Browse the repository at this point in the history
Updated composer.json and .travis.yml to make 2.5.* tests work again
  • Loading branch information
Cédric Girard committed Oct 2, 2014
2 parents 087da2b + 6f5998d commit 07e4a6c
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
6 changes: 1 addition & 5 deletions .travis.yml
Expand Up @@ -17,18 +17,14 @@ services:
env:
- SYMFONY_VERSION=2.3.*
- SYMFONY_VERSION=2.4.*
- SYMFONY_VERSION=2.5.*
- SYMFONY_VERSION="~2.5.5"

before_script:
- phpenv config-add travis-php.ini
- composer require symfony/framework-bundle:${SYMFONY_VERSION} --no-update
- composer require symfony/validator:${SYMFONY_VERSION} --no-update
- composer require symfony/finder:${SYMFONY_VERSION} --no-update
- composer require symfony/doctrine-bridge:${SYMFONY_VERSION} --no-update
- composer require doctrine/orm:2.4.* --no-update
- composer require doctrine/data-fixtures:1.0.* --no-update
- composer require doctrine/mongodb-odm:dev-master --no-update
- composer require doctrine/mongodb-odm-bundle:dev-master --no-update
- composer update --dev

script: phpunit
8 changes: 6 additions & 2 deletions composer.json
Expand Up @@ -5,7 +5,7 @@
"keywords": ["Symfony2", "bundle", "translation", "i18n"],
"homepage": "https://github.com/lexik/LexikTranslationBundle",
"license": "MIT",
"minimum-stability": "dev",
"minimum-stability": "stable",
"prefer-stable": true,
"authors": [
{
Expand All @@ -22,10 +22,14 @@
"symfony/framework-bundle": "~2.3"
},
"require-dev": {
"doctrine/orm": "2.4.*",
"doctrine/data-fixtures": "1.0.*",
"doctrine/mongodb-odm": "dev-master",
"doctrine/mongodb-odm-bundle": "dev-master",
"propel/propel-bundle": "~1.2"
},
"suggest": {
"doctrine/orm": ">=2.1",
"doctrine/orm": ">=2.4",
"doctrine/mongodb-odm": "1.0.*@dev",
"propel/propel-bundle": "~1.2"
},
Expand Down

0 comments on commit 07e4a6c

Please sign in to comment.