Merge branch '1.3'

* 1.3: Disable xdebug on travis
fabpot · May 26, 2016 · b872d73 · b872d73
2 parents 2ed0ede + 305b84c
commit b872d73
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,6 +6,9 @@ cache:
     directories:
       - $HOME/.composer/cache
 
+before_install:
+    - if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then phpenv config-rm xdebug.ini; fi
+
 before_script:
     # symfony/*
     - sh -c "if [ '$TWIG_VERSION' != '2.0' ]; then sed -i 's/~1.8|~2.0/~1.8/g' composer.json; composer update; fi"