Merge branch 'feature/phpunit-9'

php-mock · Feb 8, 2020 · 2877a0e · 2877a0e
2 parents 4873a8c + bb85270
commit 2877a0e
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,3 @@
-.phpunit.result.cache
-vendor/
-composer.lock
+/.phpunit.result.cache
+/composer.lock
+/vendor/
diff --git a/.travis.yml b/.travis.yml
@@ -1,13 +1,12 @@
 language: php
 
-sudo: false
-
 cache:
   directories:
     - $HOME/.composer/cache
 
 env:
   - PHPUNIT_VERSION=dev-master
+  - PHPUNIT_VERSION=~9.0.0
   - PHPUNIT_VERSION=~8.5.0
   - PHPUNIT_VERSION=~8.4.0
   - PHPUNIT_VERSION=~8.3.0
@@ -28,7 +27,7 @@ env:
   - PHPUNIT_VERSION=~6.0.0
 
 php:
-  - 7.4snapshot
+  - 7.4
   - 7.3
   - 7.2
   - 7.1
@@ -37,8 +36,41 @@ php:
 matrix:
   fast_finish: true
   exclude:
+    - php: 7.4
+      env: PHPUNIT_VERSION=~8.1.0
+    - php: 7.4
+      env: PHPUNIT_VERSION=~8.0.0
+    - php: 7.4
+      env: PHPUNIT_VERSION=~7.4.0
+    - php: 7.4
+      env: PHPUNIT_VERSION=~7.3.0
+    - php: 7.4
+      env: PHPUNIT_VERSION=~7.2.0
+    - php: 7.4
+      env: PHPUNIT_VERSION=~7.1.0
+    - php: 7.4
+      env: PHPUNIT_VERSION=~7.0.0
+    - php: 7.4
+      env: PHPUNIT_VERSION=~6.5.0
+    - php: 7.4
+      env: PHPUNIT_VERSION=~6.4.0
+    - php: 7.4
+      env: PHPUNIT_VERSION=~6.3.0
+    - php: 7.4
+      env: PHPUNIT_VERSION=~6.2.0
+    - php: 7.4
+      env: PHPUNIT_VERSION=~6.1.0
+    - php: 7.4
+      env: PHPUNIT_VERSION=~6.0.0
+
+    - php: 7.2
+      env: PHPUNIT_VERSION=dev-master
+    - php: 7.2
+      env: PHPUNIT_VERSION=~9.0.0
     - php: 7.1
       env: PHPUNIT_VERSION=dev-master
+    - php: 7.1
+      env: PHPUNIT_VERSION=~9.0.0
     - php: 7.1
       env: PHPUNIT_VERSION=~8.5.0
     - php: 7.1
@@ -51,8 +83,11 @@ matrix:
       env: PHPUNIT_VERSION=~8.1.0
     - php: 7.1
       env: PHPUNIT_VERSION=~8.0.0
+
     - php: 7
       env: PHPUNIT_VERSION=dev-master
+    - php: 7
+      env: PHPUNIT_VERSION=~9.0.0
     - php: 7
       env: PHPUNIT_VERSION=~8.5.0
     - php: 7
@@ -78,7 +113,6 @@ matrix:
     - php: 7
       env: PHPUNIT_VERSION=~7.0.0
   allow_failures:
-    - php: 7.4snapshot
     - env: PHPUNIT_VERSION=dev-master
 
 install:

diff --git a/composer.json b/composer.json
@@ -19,8 +19,8 @@
     },
     "require": {
         "php": ">=7",
-        "phpunit/phpunit": "^6 || ^7 || ^8",
-        "php-mock/php-mock-integration": "^2"
+        "phpunit/phpunit": "^6 || ^7 || ^8 || ^9",
+        "php-mock/php-mock-integration": "^2.1"
     },
     "archive": {
         "exclude": ["/tests"]