From 0bc4210ade5160e767f20733ab6787c4cd858b29 Mon Sep 17 00:00:00 2001 From: webimpress Date: Wed, 6 Sep 2017 00:20:17 +0100 Subject: [PATCH 1/3] Run test coverage only on PHP 7 Previously it runs on PHP 5.6 and PHP 7.2 (probably by mistake) --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 20baa081..d1a2b169 100644 --- 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,7 +49,6 @@ matrix: - php: 7.2 env: - DEPS=locked - - TEST_COVERAGE=true - php: 7.2 env: - DEPS=latest From 85b3131767304b1a1673f42bf63794801dfdd425 Mon Sep 17 00:00:00 2001 From: webimpress Date: Wed, 6 Sep 2017 00:21:03 +0100 Subject: [PATCH 2/3] Simplified removing xdebug configuration --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d1a2b169..957188ab 100644 --- a/.travis.yml +++ b/.travis.yml @@ -56,8 +56,8 @@ matrix: - php: 7.2 before_install: + - if [[ $TEST_COVERAGE != 'true' ]]; 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 From 3877049debbe64049d8f3bcf35e6612ad50f6231 Mon Sep 17 00:00:00 2001 From: Matthew Weier O'Phinney Date: Wed, 13 Sep 2017 09:32:19 -0500 Subject: [PATCH 3/3] Check if xdebug is enabled before attempting to disable it. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 957188ab..74ddf0c0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -56,7 +56,7 @@ matrix: - php: 7.2 before_install: - - if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi + - 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 install: