From abac6c1cebae887f21303d8d4f397f0dac471eac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arne=20J=C3=B8rgensen?= <arne@arnested.dk>
Date: Mon, 25 Nov 2024 08:48:21 +0100
Subject: [PATCH 1/2] Migrate phpunit configuration to new format

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

diff --git a/phpunit.xml b/phpunit.xml
index 9c40bf4..56ac34a 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -1,21 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         bootstrap="vendor/autoload.php"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false">
-    <testsuites>
-        <testsuite name="Suite">
-            <directory suffix="Test.php">./tests</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">./src</directory>
-        </whitelist>
-    </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" backupStaticAttributes="false" bootstrap="vendor/autoload.php" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage processUncoveredFiles="true">
+    <include>
+      <directory suffix=".php">./src</directory>
+    </include>
+  </coverage>
+  <testsuites>
+    <testsuite name="Suite">
+      <directory suffix="Test.php">./tests</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>

From 8464e98f1414dde82dc0667d4b921524aefeba63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arne=20J=C3=B8rgensen?= <arne@arnested.dk>
Date: Mon, 25 Nov 2024 08:51:50 +0100
Subject: [PATCH 2/2] Make phpunit dataprovider a static function

---
 tests/DrupalOrg/VersionGroupTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/DrupalOrg/VersionGroupTest.php b/tests/DrupalOrg/VersionGroupTest.php
index 43431be..395f3e1 100644
--- a/tests/DrupalOrg/VersionGroupTest.php
+++ b/tests/DrupalOrg/VersionGroupTest.php
@@ -10,7 +10,7 @@ class VersionGroupTest extends TestCase
     /**
      * @return array[]
      */
-    public function versionGroups(): array
+    public static function versionGroups(): array
     {
         return [
             'Semver versions including given version' => [