Merge df7fd39 into 01a9115

cakephp · Aug 14, 2020 · 711710b · 711710b
2 parents 01a9115 + df7fd39
commit 711710b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,6 +9,7 @@ cache:
 php:
   - 7.2
   - 7.4
+  - 'nightly'
 
 env:
   global:
@@ -26,7 +27,7 @@ matrix:
   fast_finish: true
 
 before_install:
-  - phpenv config-rm xdebug.ini
+  - if [[ $TRAVIS_PHP_VERSION != 'nightly' ]]; then phpenv config-rm xdebug.ini; fi
 
   - |
       if [[ $COVERAGE == 1 ]]; then

diff --git a/composer.json b/composer.json
@@ -29,7 +29,7 @@
         "php": ">=7.2"
     },
     "require-dev": {
-        "phpunit/phpunit": "^8.0",
+        "phpunit/phpunit": "^8.0 || ^9.0",
         "cakephp/cakephp-codesniffer": "^4.0",
         "phpbench/phpbench": "^1.0@dev"
     },