Merge pull request #179 from phil-davis/phpunit9

Use phpunit 9 where possible
sabre-io · Feb 10, 2020 · 03a31ca · 03a31ca
2 parents 10fa155 + 12bb9f5
commit 03a31ca
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git 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
diff --git 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": [