Skip to content

Commit

Permalink
udpated composer and travis
Browse files Browse the repository at this point in the history
  • Loading branch information
lsmith77 committed Jun 5, 2015
1 parent 2b945bc commit 64c46a6
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 6 deletions.
8 changes: 5 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,20 @@ php:
- hhvm

env:
- SYMFONY_VERSION=2.6.*
- SYMFONY_VERSION=2.7.*

matrix:
include:
- php: 5.3.3
- php: 5.3
env: SYMFONY_VERSION=2.3.* COMPOSER_FLAGS="--prefer-lowest"
- php: 5.5
env: SYMFONY_VERSION=2.3.*
- php: 5.5
env: SYMFONY_VERSION=2.6.*
- php: 5.5
env: SYMFONY_VERSION=2.7.* SYMFONY_DEPRECATIONS_HELPER=weak
env: SYMFONY_VERSION=2.7.*
- php: 5.5
env: SYMFONY_VERSION=2.8.* SYMFONY_DEPRECATIONS_HELPER=weak

before_install:
- composer self-update || true
Expand Down
7 changes: 4 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
"php": ">=5.3.9",
"symfony/framework-bundle": "~2.3",
"symfony-cmf/core-bundle": "1.2.*",
"symfony-cmf/content-bundle": "1.2.*",
"symfony-cmf/routing-auto-bundle": "1.0.*",
"symfony-cmf/content-bundle": "1.3.*",
"symfony-cmf/routing-auto-bundle": "1.1.*",
"sonata-project/doctrine-extensions": "~1.0,>=1.0.2",
"doctrine/phpcr-bundle": "~1.2",
"doctrine/phpcr-odm": "~1.2",
Expand All @@ -26,7 +26,8 @@
"require-dev": {
"symfony-cmf/testing": "~1.2",
"sonata-project/doctrine-phpcr-admin-bundle": "1.2.*",
"fzaninotto/faker": "1.4.*"
"fzaninotto/faker": "1.4.*",
"symfony/phpunit-bridge": "2.7.x@beta"
},
"suggest": {
"sonata-project/doctrine-phpcr-admin-bundle": "For sonata administration",
Expand Down

0 comments on commit 64c46a6

Please sign in to comment.