From 5fd1ea3919cd45756b87018e1a3635ee0855131a Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Mon, 10 Feb 2020 08:51:41 +0545 Subject: [PATCH 1/2] Use phpunit 9 where possible --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 4950530..40abe14 100644 --- a/composer.json +++ b/composer.json @@ -46,7 +46,7 @@ "require-dev": { "friendsofphp/php-cs-fixer": "~2.16.1", "phpstan/phpstan": "^0.12", - "phpunit/phpunit" : "^7.5 || ^8.5" + "phpunit/phpunit" : "^7.5 || ^8.5 || ^9.0" }, "scripts": { "phpstan": [ From 12bb9f502e01988afc1fc9680ace3ae306ce03cd Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Mon, 10 Feb 2020 11:24:25 +0545 Subject: [PATCH 2/2] Only upload coverage when it has been collected --- .travis.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 027a6a8..ebca5e8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,14 +10,16 @@ env: global: - RUN_PHPSTAN="FALSE" matrix: - - PREFER_LOWEST="" WITH_COVERAGE="--coverage-clover=coverage.xml" - - PREFER_LOWEST="--prefer-lowest" $WITH_COVERAGE="" + - PREFER_LOWEST="" REPORT_COVERAGE="TRUE" WITH_COVERAGE="--coverage-clover=coverage.xml" + - PREFER_LOWEST="--prefer-lowest" REPORT_COVERAGE="FALSE" WITH_COVERAGE="" matrix: include: - name: 'PHPStan' php: 7.4 - env: RUN_PHPSTAN="TRUE" + env: + - RUN_PHPSTAN="TRUE" + - REPORT_COVERAGE="FALSE" fast_finish: true cache: @@ -33,4 +35,4 @@ script: - if [ $RUN_PHPSTAN == "TRUE" ]; then composer phpstan; fi after_success: - - bash <(curl -s https://codecov.io/bash) + - if [ $REPORT_COVERAGE == "TRUE" ]; then bash <(curl -s https://codecov.io/bash); fi