From 1413a82913b3fad1ec892145c8f491372e5a4983 Mon Sep 17 00:00:00 2001
From: Sam Reed <reedy@wikimedia.org>
Date: Thu, 2 Jan 2025 00:27:04 +0000
Subject: [PATCH 1/2] composer.json: Update phpunit to ~9.6

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 3011615..feeb38c 100644
--- a/composer.json
+++ b/composer.json
@@ -27,7 +27,7 @@
 		"php": ">=7.4"
 	},
 	"require-dev": {
-		"phpunit/phpunit": "~8.5.0",
+		"phpunit/phpunit": "~9.6.0",
 		"ockcyp/covers-validator": "~1.0",
 		"mediawiki/mediawiki-codesniffer": "^45"
 	},

From 69139c05c23ea127c6ac71a66e0f2170dd34d0f7 Mon Sep 17 00:00:00 2001
From: Sam Reed <reedy@wikimedia.org>
Date: Thu, 2 Jan 2025 00:30:31 +0000
Subject: [PATCH 2/2] phpunit.xml.dist: Upgrade to newer schema

---
 phpunit.xml.dist | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 189f53b..7352585 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,7 +1,9 @@
-<phpunit backupGlobals="false"
+<?xml version="1.0"?>
+<phpunit
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         backupGlobals="false"
          backupStaticAttributes="false"
          bootstrap="tests/bootstrap.php"
-         cacheTokens="false"
          colors="true"
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"
@@ -10,15 +12,16 @@
          stopOnFailure="false"
          stopOnIncomplete="false"
          stopOnSkipped="false"
-         verbose="true">
+         verbose="true"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+    <coverage includeUncoveredFiles="true">
+        <include>
+            <directory suffix=".php">src</directory>
+        </include>
+    </coverage>
     <testsuites>
         <testsuite name="Diff">
             <directory>tests</directory>
         </testsuite>
     </testsuites>
-    <filter>
-        <whitelist addUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">src</directory>
-        </whitelist>
-    </filter>
 </phpunit>