Merge pull request #28 from jeromegamez/feature/symfony3

Allow Symfony 3 dependencies
raulfraile · Dec 15, 2015 · 9ab33b9 · 9ab33b9
2 parents c1226e4 + 8cce567
commit 9ab33b9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -15,6 +15,9 @@ cache:
 
 language: php
 
+env:
+  - COMPOSER_FLAGS="--prefer-source"
+
 php:
   - 5.4
   - 5.5
@@ -24,12 +27,15 @@ php:
 
 matrix:
   fast_finish: true
+  include:
+    - php: 5.4
+      env: COMPOSER_FLAGS="--prefer-lowest"
 
 before_script:
   - sh -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then pecl install rar; fi;'
   - sh -c 'if [ "$TRAVIS_PHP_VERSION" = "hhvm" ]; then echo "phar.readonly = 0" > travis.hhvm.ini; fi;'
   - composer self-update
-  - composer install --prefer-source
+  - composer update $COMPOSER_FLAGS
 
 script:
   - if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then phpunit --verbose; else hhvm -c travis.hhvm.ini ~/.phpenv/versions/$(phpenv version-name)/bin/phpunit; fi
diff --git a/composer.json b/composer.json
@@ -22,13 +22,13 @@
     "require": {
         "php": ">=5.4.0",
         "pimple/pimple": "~3.0",
-        "symfony/filesystem": "~2.4",
-        "symfony/process": "~2.4"
+        "symfony/filesystem": "~2.4|^3.0",
+        "symfony/process": "~2.4|^3.0"
     },
     "require-dev": {
         "raulfraile/ladybug": "~1.0",
         "mockery/mockery": "0.9.1",
-        "symfony/finder": "~2.4"
+        "symfony/finder": "~2.4|^3.0"
     },
     "suggest": {
         "ext-zip": "Allows to uncompress zip files using ZipArchive",