Use cleaner hhvm testing in travis

Author: Riimu

.travis.yml

@@ -14,25 +14,22 @@ cache:
 
 before_install:
   - export XDEBUG="/home/travis/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini"
-  - if [[ -f "$XDEBUG" ]]; then mv "$XDEBUG" "$XDEBUG.disabled"; fi
+  - is_hhvm () { [[ $TRAVIS_PHP_VERSION =~ ^hhvm ]]; }
+  - is_hhvm || mv -v "$XDEBUG" "$XDEBUG.disabled"
 
 install:
   - travis_retry composer update -a --no-interaction
   - travis_retry wget https://scrutinizer-ci.com/ocular.phar
 
 before_script:
-  - if [[ $TRAVIS_PHP_VERSION =~ ^hhvm ]]; then echo 'xdebug.enable = On' >> /etc/hhvm/php.ini; fi
+  - if is_hhvm; then echo 'xdebug.enable = On' >> /etc/hhvm/php.ini; fi
 
 script:
-  - >
-    if [[ -f "$XDEBUG.disabled" ]]; then mv "$XDEBUG.disabled" "$XDEBUG"; fi &&
-    vendor/bin/phpunit --coverage-clover=coverage.clover --coverage-text &&
-    if [[ -f "$XDEBUG" ]]; then mv "$XDEBUG" "$XDEBUG.disabled"; fi
+  - is_hhvm || mv -v "$XDEBUG.disabled" "$XDEBUG"
+  - vendor/bin/phpunit --coverage-clover=coverage.clover --coverage-text
+  - is_hhvm || mv -v "$XDEBUG" "$XDEBUG.disabled"
   - vendor/bin/phpcs --standard=PSR2 src tests
   - vendor/bin/php-cs-fixer fix -v --dry-run --allow-risky=yes --using-cache=no
 
 after_script:
-  - >
-    if [[ ! $TRAVIS_PHP_VERSION =~ ^hhvm ]]; then
-      php ocular.phar code-coverage:upload --format=php-clover coverage.clover;
-    fi
+  - is_hhvm || php ocular.phar code-coverage:upload --format=php-clover coverage.clover