From 7c24d15d382a1ec58c5ca15466bd2b99d38de5bb Mon Sep 17 00:00:00 2001
From: Simon Podlipsky <simon@podlipsky.net>
Date: Sat, 30 Sep 2023 12:33:04 +0200
Subject: [PATCH] ci(phpunit): migrate config

---
 composer.json               |  2 +-
 phpunit.xml.dist            | 24 +++++++++++++-----------
 tests/Common/ConfigTest.php |  2 +-
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/composer.json b/composer.json
index e3db86f..0edaf44 100644
--- a/composer.json
+++ b/composer.json
@@ -32,7 +32,7 @@
         "phpstan/phpstan": "1.10.11",
         "phpstan/phpstan-phpunit": "1.3.11",
         "phpstan/phpstan-strict-rules": "1.5.1",
-        "phpunit/phpunit": "^10.0",
+        "phpunit/phpunit": "^10.3",
         "psalm/plugin-phpunit": "^0.18.0",
         "roave/infection-static-analysis-plugin": "^1.7",
         "thecodingmachine/phpstan-safe-rule": "^1.0",
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 9247927..94da338 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,21 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
-         beStrictAboutChangesToGlobalState="true"
-         beStrictAboutOutputDuringTests="true"
-         beStrictAboutTodoAnnotatedTests="true"
-         executionOrder="random"
-         colors="true"
-         bootstrap="tests/bootstrap.php"
+<phpunit
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+    beStrictAboutChangesToGlobalState="true"
+    beStrictAboutOutputDuringTests="true"
+    beStrictAboutTodoAnnotatedTests="true"
+    executionOrder="random"
+    colors="true"
+    bootstrap="tests/bootstrap.php"
 >
     <testsuites>
         <testsuite name="Test Suite">
             <directory>tests</directory>
         </testsuite>
     </testsuites>
-    <coverage>
+    <coverage />
+    <source>
         <include>
-            <directory suffix=".php">src</directory>
+            <directory>src</directory>
         </include>
-    </coverage>
+    </source>
 </phpunit>
diff --git a/tests/Common/ConfigTest.php b/tests/Common/ConfigTest.php
index 7b2b6f5..52f6a59 100644
--- a/tests/Common/ConfigTest.php
+++ b/tests/Common/ConfigTest.php
@@ -20,7 +20,7 @@ public function testSet(bool|int|string $value, string $expected): void
     }
 
     /** @return Generator<array{mixed, string}> */
-    public function providerSet(): Generator
+    public static function providerSet(): Generator
     {
         yield [true, 'true'];
         yield [false, 'false'];