Skip to content

Commit

Permalink
Merge pull request #22 from Fruitware/hotfix/travis
Browse files Browse the repository at this point in the history
Update .travis
  • Loading branch information
dunglas authored Sep 7, 2016
2 parents ca2a44c + 3b0daa6 commit 44c2ffe
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 6 deletions.
33 changes: 29 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,36 @@
language: php

php:
- 7.0
- 5.6
- 5.3
- 5.4
- 5.5
- hhvm

sudo: false

cache:
directories:
- ~/.composer/cache/files

matrix:
fast_finish: true
include:
- php: 5.3
env: COMPOSER_FLAGS="--prefer-lowest"
- php: 5.6
env: SONATA_MEDIA=~2.3
allow_failures:
- php: hhvm

before_install:
- if [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]]; then phpenv config-rm xdebug.ini; fi;
- if [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]]; then echo "memory_limit=4096M" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi;

before_script:
- composer install --dev --prefer-source
- composer self-update
- composer global require "hirak/prestissimo:^0.3"
- if [ "$SONATA_MEDIA" != "" ]; then composer require "sonata-project/media-bundle:${SONATA_MEDIA}" --dev --no-update; fi;
- if [ "$COMPOSER_FLAGS" != "" ]; then composer update --prefer-dist --no-interaction --no-scripts $COMPOSER_FLAGS; fi;
- composer install --prefer-dist --no-interaction --no-scripts

script: phpunit
script: vendor/bin/phpunit
8 changes: 6 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,14 @@
}
],
"require": {
"sonata-project/media-bundle": "~2.3"
"sonata-project/media-bundle": "~2.3|~3.0"
},
"require-dev": {
"symfony/phpunit-bridge": "~2.7|~3.0",
"phpunit/phpunit": "~4.8|~5.0"
},
"suggest": {
"egeloen/ckeditor-bundle": "for easy Symfony integration"
"egeloen/ckeditor-bundle": "for easy Symfony integration"
},
"autoload": {
"psr-0": { "CoopTilleuls\\Bundle\\CKEditorSonataMediaBundle": "" }
Expand Down

0 comments on commit 44c2ffe

Please sign in to comment.