From 491ee3572a7a104049a04e406bb5dfdf177da816 Mon Sep 17 00:00:00 2001 From: Teye Heimans Date: Wed, 2 Aug 2017 12:34:33 +0200 Subject: [PATCH] Travis fix for 5.6 --- .travis.yml | 2 +- build/phpunit.xml | 14 -------------- composer.json | 3 +-- 3 files changed, 2 insertions(+), 17 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2f736e6..f989d16 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,8 +17,8 @@ install: - before_script: - - if [ "$TRAVIS_PHP_VERSION" = "5.6" ]; then travis_retry composer require satooshi/php-coveralls:~0.6@stable --update-no-dev ; fi - travis_retry composer config minimum-stability dev + - if [ "$TRAVIS_PHP_VERSION" = "5.6" ]; then travis_retry composer require satooshi/php-coveralls:~0.6@stable --update-no-dev ; fi - travis_retry composer require phpunit/phpunit "5.5.*" --update-no-dev - phpunit --version - travis_retry composer install --no-ansi --no-dev --no-interaction --no-progress --no-scripts --optimize-autoloader diff --git a/build/phpunit.xml b/build/phpunit.xml index 265cdfe..cf0a03b 100644 --- a/build/phpunit.xml +++ b/build/phpunit.xml @@ -10,20 +10,6 @@ ../tests/ - - - - - - 500 - - - 5 - - - - - ../src diff --git a/composer.json b/composer.json index b398589..f32570d 100644 --- a/composer.json +++ b/composer.json @@ -24,8 +24,7 @@ "phpdocumentor/phpdocumentor": "2.*", "phploc/phploc": "*", "pdepend/pdepend": "2.2.4", - "mayflower/php-codebrowser": "~1.1", - "johnkary/phpunit-speedtrap": "^1.0" + "mayflower/php-codebrowser": "~1.1" }, "require": { "php": ">=5.6.0",