Updated Travis scripts

s9e · Dec 2, 2014 · e2dbb20 · e2dbb20
1 parent a7ed14c
commit e2dbb20
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,13 +1,11 @@
 language: php
 php:
+  - 5.6
   - 5.5
   - 5.4
   - hhvm
 matrix:
   fast_finish: true
-  include:
-    - php: 5.6
-      env: COVERAGE=1
 before_script:
   - ./scripts/travis/setup.sh
   - sh -c "if [ '$TRAVIS_PHP_VERSION' != 'hhvm' ]; then php -i; fi"

diff --git a/scripts/travis/installComposer.sh b/scripts/travis/installComposer.sh
@@ -5,7 +5,7 @@ cd ../..
 
 composer install --dev --no-interaction
 
-if [ -n "$COVERAGE" ]
+if [ "$TRAVIS_PHP_VERSION" = "5.6" ]
 then
 	composer require --dev -q --no-interaction "satooshi/php-coveralls:*"
 fi
diff --git a/scripts/travis/run-tests.sh b/scripts/travis/run-tests.sh
@@ -3,7 +3,7 @@
 cd $(dirname "$0")
 cd ../..
 
-if [ -n "$COVERAGE" ]
+if [ "$TRAVIS_PHP_VERSION" = "5.6" ]
 then
 	phpunit --coverage-clover /tmp/clover.xml
 else

diff --git a/scripts/travis/setup.sh b/scripts/travis/setup.sh
@@ -5,7 +5,7 @@ cd $(dirname "$0")
 echo "Installing Composer"
 ./installComposer.sh
 
-if [ -n "$COVERAGE" ]
+if [ "$TRAVIS_PHP_VERSION" = "5.6" ]
 then
 	echo "Installing Scrutinizer"
 	./installScrutinizer.sh