Merge branch 'hotfix/269' into develop

Forward port #269
zendframework · Sep 13, 2017 · d6529dd · d6529dd
2 parents 0d5eb1f + 3877049
commit d6529dd
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -20,7 +20,6 @@ matrix:
     - php: 5.6
       env:
         - DEPS=locked
-        - TEST_COVERAGE=true
     - php: 5.6
       env:
         - DEPS=latest
@@ -31,6 +30,7 @@ matrix:
       env:
         - DEPS=locked
         - CHECK_CS=true
+        - TEST_COVERAGE=true
     - php: 7
       env:
         - DEPS=latest
@@ -49,16 +49,15 @@ matrix:
     - php: 7.2
       env:
         - DEPS=locked
-        - TEST_COVERAGE=true
     - php: 7.2
       env:
         - DEPS=latest
   allow_failures:
     - php: 7.2
 
 before_install:
+  - if [[ $TEST_COVERAGE != 'true' && "$(php --version | grep xdebug -ci)" -ge 1 ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
   - travis_retry composer self-update
-  - if [[ $TEST_COVERAGE != 'true' && "$(php --version | grep xdebug -ci)" -ge 1 ]]; then phpenv config-rm xdebug.ini ; fi
 
 install:
   - travis_retry composer install $COMPOSER_ARGS --ignore-platform-reqs