From 20ee9a4c9dea690dd13250e6a969761b604dfdf0 Mon Sep 17 00:00:00 2001
From: Phil Davis <phil@jankaritech.com>
Date: Mon, 10 Feb 2020 06:57:13 +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 fb22e94494..f0fbf7af76 100644
--- a/composer.json
+++ b/composer.json
@@ -35,7 +35,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",
         "evert/phpdoc-md" : "~0.1.0",
         "monolog/monolog": "^1.18"
     },

From 9d1d66a75b8cad3ca333d188d7bce97826989155 Mon Sep 17 00:00:00 2001
From: Phil Davis <phil@jankaritech.com>
Date: Mon, 10 Feb 2020 09:56:27 +0545
Subject: [PATCH 2/2] Only upload coverage when it has been collected

---
 .travis.yml | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bd37cf34bc..03d18de2f8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,17 +18,21 @@ env:
     - SABRE_MYSQLDSN="mysql:host=127.0.0.1;dbname=sabredav_test"
     - RUN_PHPSTAN="FALSE"
   matrix:
-    - PREFER_LOWEST="" TEST_DEPS="" WITH_COVERAGE="--coverage-clover=coverage.xml"
-    - PREFER_LOWEST="--prefer-lowest" TEST_DEPS="tests/Sabre/" $WITH_COVERAGE=""
+    - PREFER_LOWEST="" TEST_DEPS="" REPORT_COVERAGE="TRUE" WITH_COVERAGE="--coverage-clover=coverage.xml"
+    - PREFER_LOWEST="--prefer-lowest" TEST_DEPS="tests/Sabre/" REPORT_COVERAGE="FALSE" WITH_COVERAGE=""
 
 matrix:
   include:
     - name: 'PHPStan'
       php: 7.4
-      env: RUN_PHPSTAN="TRUE"
+      env:
+        - RUN_PHPSTAN="TRUE"
+        - REPORT_COVERAGE="FALSE"
     - name: 'Test with streaming propfind'
       php: 7.2
-      env: RUN_TEST_WITH_STREAMING_PROPFIND="TRUE"
+      env:
+        - RUN_TEST_WITH_STREAMING_PROPFIND="TRUE"
+        - REPORT_COVERAGE="FALSE"
   fast_finish: true
 
 services:
@@ -51,7 +55,7 @@ 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
 
 cache:
   directories: