From 841f648695c8af2271e15e04a08f09769e4d660b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Bundyra?= <contact@webimpress.com>
Date: Sat, 8 Feb 2020 14:45:59 +0000
Subject: [PATCH 1/2] Feature: PHPUnit 9 support

---
 .gitignore    |  6 +++---
 .travis.yml   | 12 ++++++++++--
 composer.json |  4 ++--
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1816ab1..9c9d0d9 100644
--- 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
index 5f7285b..e4c6b1d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,7 @@ 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 +29,7 @@ env:
   - PHPUNIT_VERSION=~6.0.0
 
 php:
-  - 7.4snapshot
+  - 7.4
   - 7.3
   - 7.2
   - 7.1
@@ -37,8 +38,14 @@ php:
 matrix:
   fast_finish: true
   exclude:
+    - 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
@@ -53,6 +60,8 @@ matrix:
       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 +87,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
index cfc2c6a..406f8cb 100644
--- 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"]

From bb852702e8f6a937a0966e2f310ce4fd7601e3fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Bundyra?= <contact@webimpress.com>
Date: Sat, 8 Feb 2020 15:15:29 +0000
Subject: [PATCH 2/2] Exclude tests on PHP 7.4 for not supported PHPUnit
 versions (<= 8.1)

---
 .travis.yml | 30 ++++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e4c6b1d..3557d94 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,5 @@
 language: php
 
-sudo: false
-
 cache:
   directories:
     - $HOME/.composer/cache
@@ -38,6 +36,33 @@ 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
@@ -58,6 +83,7 @@ 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