Skip to content

Commit 9ab33b9

Browse files
committed
Merge pull request #28 from jeromegamez/feature/symfony3
Allow Symfony 3 dependencies
2 parents c1226e4 + 8cce567 commit 9ab33b9

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

.travis.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ cache:
1515

1616
language: php
1717

18+
env:
19+
- COMPOSER_FLAGS="--prefer-source"
20+
1821
php:
1922
- 5.4
2023
- 5.5
@@ -24,12 +27,15 @@ php:
2427

2528
matrix:
2629
fast_finish: true
30+
include:
31+
- php: 5.4
32+
env: COMPOSER_FLAGS="--prefer-lowest"
2733

2834
before_script:
2935
- sh -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then pecl install rar; fi;'
3036
- sh -c 'if [ "$TRAVIS_PHP_VERSION" = "hhvm" ]; then echo "phar.readonly = 0" > travis.hhvm.ini; fi;'
3137
- composer self-update
32-
- composer install --prefer-source
38+
- composer update $COMPOSER_FLAGS
3339

3440
script:
3541
- if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then phpunit --verbose; else hhvm -c travis.hhvm.ini ~/.phpenv/versions/$(phpenv version-name)/bin/phpunit; fi

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@
2222
"require": {
2323
"php": ">=5.4.0",
2424
"pimple/pimple": "~3.0",
25-
"symfony/filesystem": "~2.4",
26-
"symfony/process": "~2.4"
25+
"symfony/filesystem": "~2.4|^3.0",
26+
"symfony/process": "~2.4|^3.0"
2727
},
2828
"require-dev": {
2929
"raulfraile/ladybug": "~1.0",
3030
"mockery/mockery": "0.9.1",
31-
"symfony/finder": "~2.4"
31+
"symfony/finder": "~2.4|^3.0"
3232
},
3333
"suggest": {
3434
"ext-zip": "Allows to uncompress zip files using ZipArchive",

0 commit comments

Comments
 (0)