Skip to content

Commit

Permalink
Merge pull request #30 from mjanser/fix-symfony-requirements
Browse files Browse the repository at this point in the history
Fix Symfony requirements for tests
  • Loading branch information
fabdsp authored Aug 22, 2016
2 parents 2537f0d + 11aabb5 commit d8eb290
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 7 deletions.
22 changes: 16 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,27 @@
language: php


php:
- 5.5
- 5.6
- 7.0

before_script:
sudo: false

matrix:
include:
- php: 5.5
env: COMPOSER_FLAGS="--prefer-lowest"
- php: 7.0
env: COMPOSER_FLAGS="--prefer-stable" SYMFONY_VERSION=2.7.*
fast_finish: true

before_install:
- phpenv config-rm xdebug.ini
#- bash travis/$TRAVIS_PHP_VERSION.sh
- bash travis/install_amqp.sh
- wget http://getcomposer.org/composer.phar
- php composer.phar install
- composer self-update
- if [ "$SYMFONY_VERSION" != "" ]; then composer require symfony/symfony:${SYMFONY_VERSION} --no-update; fi

install: composer update --prefer-dist $COMPOSER_FLAGS

script:
- bin/atoum
script: bin/atoum
6 changes: 5 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,11 @@
"atoum/atoum-bundle" : "dev-master",
"m6web/coke" : "~1.2",
"m6web/symfony2-coding-standard" : "~1.1",
"symfony/yaml" : "~2.7.5"
"symfony/framework-bundle" : "^2.7",
"symfony/yaml": "^2.7.5"
},
"conflict": {
"symfony/yaml": "<2.7.5"
},
"suggest": {
"ocramius/proxy-manager": "Required for lazy connections"
Expand Down

0 comments on commit d8eb290

Please sign in to comment.