From 8d2cfe076f5ab82c115d1d0d80dbf0613ad2854a Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Thu, 7 Apr 2022 12:00:31 +0200
Subject: [PATCH 1/2] Update master php testing versions

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 tests/phpunit.integration.xml | 2 +-
 tests/phpunit.xml             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/phpunit.integration.xml b/tests/phpunit.integration.xml
index 45d0b5081..aca233812 100644
--- a/tests/phpunit.integration.xml
+++ b/tests/phpunit.integration.xml
@@ -1,4 +1,4 @@
-<phpunit bootstrap="bootstrap.php" colors="true">
+<phpunit bootstrap="bootstrap.php" colors="true" convertDeprecationsToExceptions="true">
 	<testsuites>
 		<testsuite name="integration-database">
 			<directory>./integration/database</directory>
diff --git a/tests/phpunit.xml b/tests/phpunit.xml
index 4bb7dc40d..0c393fd9a 100644
--- a/tests/phpunit.xml
+++ b/tests/phpunit.xml
@@ -1,4 +1,4 @@
-<phpunit bootstrap="../../../tests/bootstrap.php" colors="true">
+<phpunit bootstrap="../../../tests/bootstrap.php" colors="true" convertDeprecationsToExceptions="true">
 	<testsuites>
 		<testsuite name="unit">
 			<directory>./unit</directory>

From ea498d485cfaafbe9bbbc8f904f4b79fe137b583 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Fri, 8 Apr 2022 15:37:44 +0200
Subject: [PATCH 2/2] Migrate phpunit configuration
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 tests/phpunit.integration.xml | 29 +++++++++++++++--------------
 tests/phpunit.xml             | 23 ++++++++++++-----------
 2 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/tests/phpunit.integration.xml b/tests/phpunit.integration.xml
index aca233812..f62881f9a 100644
--- a/tests/phpunit.integration.xml
+++ b/tests/phpunit.integration.xml
@@ -1,15 +1,16 @@
-<phpunit bootstrap="bootstrap.php" colors="true" convertDeprecationsToExceptions="true">
-	<testsuites>
-		<testsuite name="integration-database">
-			<directory>./integration/database</directory>
-		</testsuite>
-		<testsuite name="integration-app">
-			<directory>./integration/app</directory>
-		</testsuite>
-	</testsuites>
-	<filter>
-		<whitelist>
-			<directory suffix=".php">./../lib</directory>
-		</whitelist>
-	</filter>
+<?xml version="1.0"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="bootstrap.php" colors="true" convertDeprecationsToExceptions="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage>
+    <include>
+      <directory suffix=".php">./../lib</directory>
+    </include>
+  </coverage>
+  <testsuites>
+    <testsuite name="integration-database">
+      <directory>./integration/database</directory>
+    </testsuite>
+    <testsuite name="integration-app">
+      <directory>./integration/app</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>
diff --git a/tests/phpunit.xml b/tests/phpunit.xml
index 0c393fd9a..af2ea49bd 100644
--- a/tests/phpunit.xml
+++ b/tests/phpunit.xml
@@ -1,12 +1,13 @@
-<phpunit bootstrap="../../../tests/bootstrap.php" colors="true" convertDeprecationsToExceptions="true">
-	<testsuites>
-		<testsuite name="unit">
-			<directory>./unit</directory>
-		</testsuite>
-	</testsuites>
-	<filter>
-		<whitelist>
-			<directory suffix=".php">./../lib</directory>
-		</whitelist>
-	</filter>
+<?xml version="1.0"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="../../../tests/bootstrap.php" colors="true" convertDeprecationsToExceptions="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage>
+    <include>
+      <directory suffix=".php">./../lib</directory>
+    </include>
+  </coverage>
+  <testsuites>
+    <testsuite name="unit">
+      <directory>./unit</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>