Skip to content

Commit

Permalink
minor #87 Added Symfony Yaml 3.0 as a valid dep (fabpot)
Browse files Browse the repository at this point in the history
This PR was merged into the 2.1.x-dev branch.

Discussion
----------

Added Symfony Yaml 3.0 as a valid dep

Commits
-------

d52008b Added Symfony Yaml 3.0 as a valid dep
  • Loading branch information
stof committed Nov 10, 2015
2 parents f7b677a + d52008b commit 7af2db9
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 9 deletions.
21 changes: 13 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,20 @@ cache:
directories:
- $HOME/.composer/cache/files

php:
- 5.3
- 5.4
- 5.5
- 5.6
- 7.0
- hhvm
matrix:
include:
- php: 5.3
env: COMPOSER_FLAGS='--prefer-lowest --prefer-stable'
- php: 5.4
- php: 5.5
- php: 5.6
- php: 7.0
env: DEPENDENCIES=dev
- php: hhvm

install: composer install
before_script:
- if [ "$DEPENDENCIES" = "dev" ]; then perl -pi -e 's/^}$/,"minimum-stability":"dev"}/' composer.json; fi;
- composer update $COMPOSER_FLAGS

script: phpunit --coverage-text --coverage-clover=coverage.clover

Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
],
"require": {
"php": ">=5.3.3",
"symfony/yaml": "~2.0"
"symfony/yaml": "~2.3|~3.0"
},
"require-dev": {
"composer/composer": "1.0.*@dev",
Expand Down

0 comments on commit 7af2db9

Please sign in to comment.