Merge pull request #16 from niels-nijens/update-dependencies

Update Composer dependency constraints
accompli · Mar 21, 2016 · c83e8a5 · c83e8a5
2 parents 5467bfb + 8ddb375
commit c83e8a5
Show file tree

Hide file tree

Showing 4 changed files with 424 additions and 135 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -13,7 +13,9 @@ matrix:
     - php: nightly
   fast_finish: true
 
-before_install: composer self-update
+before_install:
+  - composer self-update
+  - if [[ $TRAVIS_PHP_VERSION = 5.4 ]]; then composer update; fi;
 
 install: composer install
 

diff --git a/composer.json b/composer.json
@@ -14,12 +14,12 @@
         }
     ],
     "require": {
-        "php": ">=5.4.0",
-        "symfony/process": "^2.7"
+        "php": "^5.4 || ^7.0",
+        "symfony/process": "^2.7 || ^3.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^4.4",
-        "satooshi/php-coveralls": "dev-master"
+        "satooshi/php-coveralls": "^1.0"
     },
     "autoload": {
         "psr-4": {