Skip to content

Commit

Permalink
Merge pull request #118 from liip/travis
Browse files Browse the repository at this point in the history
bump minimal version of 2.3, allow 3.0 and set an upper bound for php, remove symfony 2.4/2.5/2.6 from build matrix
  • Loading branch information
lsmith77 committed Oct 25, 2015
2 parents b5d17fa + 2238988 commit df7a6d6
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 19 deletions.
24 changes: 9 additions & 15 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
language: php

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

sudo: false

cache:
directories:
- $HOME/.composer/cache
- $HOME/.composer/cache/files

env:
- SYMFONY_VERSION=2.7.*
Expand All @@ -21,22 +21,16 @@ matrix:
include:
- php: 5.6
env: SYMFONY_VERSION=2.3.*
- php: 5.6
env: SYMFONY_VERSION=2.4.*
- php: 5.6
env: SYMFONY_VERSION=2.5.*
- php: 5.6
env: SYMFONY_VERSION=2.6.*
- php: 5.6
env: SYMFONY_VERSION=2.8.*@dev
- php: 5.6
env: SYMFONY_VERSION=3.0.*@dev
- php: 5.3
env: SYMFONY_VERSION=2.3.* COMPOSER_FLAGS="--prefer-lowest"
env: COMPOSER_FLAGS="--prefer-lowest"

before_install:
- composer self-update
- composer require symfony/symfony:${SYMFONY_VERSION} --no-update
- if [ "$SYMFONY_VERSION" != "" ]; then composer require "symfony/symfony:${SYMFONY_VERSION}" --no-update; fi;

install: composer update --prefer-source $COMPOSER_FLAGS

Expand Down
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@
}
],
"require": {
"php": ">=5.3.3",
"symfony/framework-bundle": "~2.3",
"zendframework/zenddiagnostics": "~1.0.2|~1.1"
"php": "^5.3.9|^7.0",
"symfony/framework-bundle": "~2.3|~3.0",
"zendframework/zenddiagnostics": "^1.0.2"
},
"require-dev": {
"matthiasnoback/symfony-dependency-injection-test": "^0.7.4",
"sensiolabs/security-checker": "~1.3",
"guzzle/guzzle": "~3.8",
"symfony/expression-language": "~2.3",
"symfony/expression-language": "~2.3|~3.0",
"swiftmailer/swiftmailer": "~5.4"
},
"suggest": {
Expand Down

0 comments on commit df7a6d6

Please sign in to comment.