From 84e22e0e47cef46ff981c0b900005423e1118528 Mon Sep 17 00:00:00 2001
From: Simon Frings <simon@clue.engineering>
Date: Wed, 9 Sep 2020 12:45:08 +0200
Subject: [PATCH] Update PHPUnit configuration schema for PHPUnit 9.3

---
 .gitattributes     |  1 +
 .travis.yml        |  3 ++-
 composer.json      |  2 +-
 phpunit.xml.dist   | 18 +++++++++++-------
 phpunit.xml.legacy | 18 ++++++++++++++++++
 5 files changed, 33 insertions(+), 9 deletions(-)
 create mode 100644 phpunit.xml.legacy

diff --git a/.gitattributes b/.gitattributes
index e15a4094..ce7c8e68 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3,5 +3,6 @@
 /.travis.yml export-ignore
 /examples export-ignore
 /phpunit.xml.dist export-ignore
+/phpunit.xml.legacy export-ignore
 /tests export-ignore
 /travis-init.sh export-ignore
diff --git a/.travis.yml b/.travis.yml
index 4a99e2a1..e3ac120a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -85,4 +85,5 @@ install:
   - composer install
 
 script:
-  - ./vendor/bin/phpunit --coverage-text
+  - if [[ "$TRAVIS_PHP_VERSION" > "7.2" ]]; then vendor/bin/phpunit --coverage-text; fi
+  - if [[ "$TRAVIS_PHP_VERSION" < "7.3" ]]; then vendor/bin/phpunit --coverage-text -c phpunit.xml.legacy; fi
diff --git a/composer.json b/composer.json
index d4d50398..d9b032e1 100644
--- a/composer.json
+++ b/composer.json
@@ -29,7 +29,7 @@
         "php": ">=5.3.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.0 || ^5.7 || ^4.8.35"
+        "phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.35"
     },
     "suggest": {
         "ext-event": "~1.0 for ExtEventLoop",
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 0e947b87..bfdeecf6 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,15 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<phpunit bootstrap="vendor/autoload.php" colors="true">
+<!-- PHPUnit configuration file with new format for PHPUnit 9.3+ -->
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
+         bootstrap="vendor/autoload.php"
+         colors="true"
+         cacheResult="false">
     <testsuites>
-        <testsuite name="React Test Suite">
+        <testsuite name="React test suite">
             <directory>./tests/</directory>
         </testsuite>
     </testsuites>
-
-    <filter>
-        <whitelist>
+    <coverage>
+        <include>
             <directory>./src/</directory>
-        </whitelist>
-    </filter>
+        </include>
+    </coverage>
 </phpunit>
diff --git a/phpunit.xml.legacy b/phpunit.xml.legacy
new file mode 100644
index 00000000..632fccd1
--- /dev/null
+++ b/phpunit.xml.legacy
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- PHPUnit configuration file with old format for PHPUnit 9.2 or older -->
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/4.8/phpunit.xsd"
+         bootstrap="vendor/autoload.php"
+         colors="true">
+    <testsuites>
+        <testsuite name="React test suite">
+            <directory>./tests/</directory>
+        </testsuite>
+    </testsuites>
+    <filter>
+        <whitelist>
+            <directory>./src/</directory>
+        </whitelist>
+    </filter>
+</phpunit>