Merge branch '2.2' into 3.0

orchestral · Feb 28, 2015 · 2699706 · 2699706
2 parents 4397c09 + 87ebe1d
commit 2699706
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,18 +4,20 @@ php:
   - 5.4
   - 5.5
   - 5.6
+  - 7.0
   - hhvm
 
 before_script:
   - travis_retry composer self-update
-  - travis_retry composer require satooshi/php-coveralls:~0.6 --prefer-source --no-interaction --dev
+  - if [[ "$TRAVIS_PHP_VERSION" == *5.6* ]]; then travis_retry composer require "satooshi/php-coveralls:~0.6.1" "symfony/yaml=~2.0" --prefer-source --no-interaction --dev; else travis_retry composer install --prefer-source --no-interaction; fi
 
 script: phpunit -c phpunit.xml --coverage-text
 
 after_script:
-  - if [[ "$TRAVIS_PHP_VERSION" != *hhvm* ]]; then php vendor/bin/coveralls -v; fi
+  - if [[ "$TRAVIS_PHP_VERSION" == *5.6* ]]; then php vendor/bin/coveralls -v; fi
 
 matrix:
   allow_failures:
+    - php: 7.0
     - php: hhvm
-  fash_finish: true
+  fast_finish: true