Skip to content

Commit 7ac33eb

Browse files
committed
Merge pull request #1019 from xabbuh/update-travis-config
update Travis CI configuration
2 parents 6e5789a + d8cfbeb commit 7ac33eb

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

.travis.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@ branches:
1515
- /^\d+\.\d+$/
1616

1717
matrix:
18+
fast_finish: true
1819
include:
20+
- php: 5.3
21+
env: deps="low"
1922
- php: 5.5
2023
env: SYMFONY_VERSION='2.3.* symfony/expression-language:2.4.*'
2124
- php: 5.5
@@ -30,8 +33,9 @@ matrix:
3033

3134
before_script:
3235
- composer self-update
33-
- sh -c 'if [ "$SYMFONY_VERSION" != "" ]; then composer require --dev --no-update symfony/symfony=$SYMFONY_VERSION; fi;'
34-
- composer update --prefer-source
36+
- if [ "$SYMFONY_VERSION" != "" ]; then composer require --dev --no-update symfony/symfony=$SYMFONY_VERSION; fi
37+
- if [ "$deps" = "low" ]; then composer update --prefer-lowest; fi
38+
- if [ "$deps" != "low" ]; then composer update --prefer-source; fi
3539

3640
script: phpunit --coverage-clover=coverage.clover
3741

composer.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
"php": ">=5.3.9",
2525
"psr/log": "~1.0",
2626
"symfony/framework-bundle": "~2.3",
27+
"symfony/http-kernel": "~2.3,>=2.3.24",
2728
"doctrine/inflector": "~1.0",
2829
"willdurand/negotiation": "~1.2",
2930
"willdurand/jsonp-callback-validator": "~1.0"
@@ -37,6 +38,9 @@
3738
"symfony/yaml": "~2.3",
3839
"symfony/security": "~2.3",
3940
"symfony/browser-kit": "~2.3",
41+
"symfony/dependency-injection": "~2.3",
42+
"phpoption/phpoption": "~1.1.0",
43+
"jms/serializer": "~0.13",
4044
"jms/serializer-bundle": "~0.12"
4145
},
4246

0 commit comments

Comments
 (0)