From 68685ecb07f2530f5ad45c90c1336847cf53a266 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Tamarelle?= <jerome@tamarelle.net>
Date: Mon, 11 Sep 2023 10:59:34 +0200
Subject: [PATCH] Upgrade PHPUnit 10.3

---
 .gitignore               |  1 -
 composer.json            |  3 +--
 phpunit.xml.dist         | 24 +++++++++++++++++-------
 tests/ConnectionTest.php |  2 +-
 4 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4a03159de..3dd9edec0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,5 +8,4 @@
 /vendor
 composer.lock
 composer.phar
-phpunit.phar
 phpunit.xml
diff --git a/composer.json b/composer.json
index cf8e5509f..33a797d46 100644
--- a/composer.json
+++ b/composer.json
@@ -31,7 +31,7 @@
         "mongodb/mongodb": "^1.15"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.5.10",
+        "phpunit/phpunit": "^10.3",
         "orchestra/testbench": "^8.0",
         "mockery/mockery": "^1.4.4",
         "doctrine/coding-standard": "12.0.x-dev"
@@ -60,7 +60,6 @@
             ]
         }
     },
-    "minimum-stability": "dev",
     "config": {
         "platform": {
             "php": "8.1"
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 120898c08..cd883f311 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,10 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.4/phpunit.xsd"
+         backupGlobals="false"
+         bootstrap="vendor/autoload.php"
+         colors="true"
+         processIsolation="false"
+         stopOnFailure="false"
+         cacheDirectory=".phpunit.cache"
+         backupStaticProperties="false"
+>
+    <coverage/>
     <testsuites>
         <testsuite name="all">
             <directory>tests/</directory>
@@ -38,7 +43,7 @@
         </testsuite>
     </testsuites>
     <php>
-        <env name="MONGODB_URI" value="mongodb://mongodb/" />
+        <env name="MONGODB_URI" value="mongodb://mongodb/"/>
         <env name="MONGODB_DATABASE" value="unittest"/>
         <env name="MYSQL_HOST" value="mysql"/>
         <env name="MYSQL_PORT" value="3306"/>
@@ -46,4 +51,9 @@
         <env name="MYSQL_USERNAME" value="root"/>
         <env name="QUEUE_CONNECTION" value="database"/>
     </php>
+    <source>
+        <include>
+            <directory suffix=".php">./src</directory>
+        </include>
+    </source>
 </phpunit>
diff --git a/tests/ConnectionTest.php b/tests/ConnectionTest.php
index 51a463c56..b46168df8 100644
--- a/tests/ConnectionTest.php
+++ b/tests/ConnectionTest.php
@@ -43,7 +43,7 @@ public function testDb()
         $this->assertInstanceOf(Client::class, $connection->getMongoClient());
     }
 
-    public function dataConnectionConfig(): Generator
+    public static function dataConnectionConfig(): Generator
     {
         yield 'Single host' => [
             'expectedUri' => 'mongodb://some-host',