From c34ff3daa57dd7a0dad7e35d527201fd685a7d63 Mon Sep 17 00:00:00 2001 From: Dariusz Ruminski Date: Thu, 16 Jun 2016 00:07:24 +0200 Subject: [PATCH] Rely on own phpunit, not one from CI service --- .travis.yml | 5 ++++- composer.json | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4e538cdbcda..31983fc0826 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,13 +21,16 @@ cache: - $HOME/.composer/cache before_install: + - mv $HOME/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini $HOME/xdebug.ini || return 0 - 'if [ "$SYMFONY_VERSION" != "" ]; then sed -i "s/\"symfony\/\([^\"]*\)\": \"[^\"]*\"/\"symfony\/\1\": \"$SYMFONY_VERSION\"/g" composer.json; fi' install: + - travis_retry composer global require hirak/prestissimo - travis_retry composer update ${COMPOSER_FLAGS} --no-interaction script: - - phpunit --verbose --coverage-clover build/logs/clover.xml + - cp $HOME/xdebug.ini $HOME/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini || return 0 + - vendor/bin/phpunit --verbose --coverage-clover build/logs/clover.xml - phpenv config-rm xdebug.ini || return 0 - php php-cs-fixer --diff --dry-run -v fix diff --git a/composer.json b/composer.json index bf85ea07b6e..699cc8d1ae1 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,8 @@ "sebastian/diff": "~1.1" }, "require-dev": { - "satooshi/php-coveralls": "0.7.*@dev" + "phpunit/phpunit": "^4.5|^5", + "satooshi/php-coveralls": "^0.7.1" }, "autoload": { "psr-4": { "Symfony\\CS\\": "Symfony/CS/" }