Fix travis (#2)

overblog · Apr 26, 2016 · f69530b · f69530b
1 parent ba9634e
commit f69530b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -17,11 +17,11 @@ cache:
         - $HOME/.composer/cache
 
 before_install:
-    - phpenv config-rm xdebug.ini
+    - if [[ "$TRAVIS_PHP_VERSION" != "7.0" && "$TRAVIS_PHP_VERSION" != "hhvm" ]]; then phpenv config-rm xdebug.ini; fi
     - composer selfupdate
 
 install: composer update --prefer-dist --no-interaction
 
 script: ./bin/travis_phpunit
 after_script:
-    - if [ "$TRAVIS_PHP_VERSION" == "5.6" ]; then wget https://scrutinizer-ci.com/ocular.phar && php ocular.phar code-coverage:upload --format=php-clover coverage.clover; fi
+    - if [ "$TRAVIS_PHP_VERSION" == "7.0" ]; then wget https://scrutinizer-ci.com/ocular.phar && php ocular.phar code-coverage:upload --format=php-clover coverage.clover; fi
diff --git a/bin/travis_phpunit b/bin/travis_phpunit
@@ -6,10 +6,10 @@ EXCLUDE_GROUPS="--exclude-group cs"
 
 if [ "$TRAVIS_PHP_VERSION" == "7.0" ]
 then
-    $PHPUNIT -d xdebug.max_nesting_level=1000 --coverage-clover=coverage.clover $EXCLUDE_GROUPS
-elif [ "$TRAVIS_PHP_VERSION" == "5.6" ]
-then
-    $PHPUNIT
+    $PHPUNIT -d xdebug.max_nesting_level=200 --coverage-clover=coverage.clover $EXCLUDE_GROUPS
+#elif [ "$TRAVIS_PHP_VERSION" == "5.6" ]
+#then
+#    $PHPUNIT
 else
     $PHPUNIT $EXCLUDE_GROUPS
 fi