Merge pull request doctrine#6065 from morozov/phpunit-10

Update PHPUnit to 10
derrabus · Jun 16, 2023 · d069d3d · d069d3d
2 parents c2ec5e1 + c23f2ac
commit d069d3d
Show file tree

Hide file tree

Showing 33 changed files with 196 additions and 105 deletions.
diff --git a/ci/appveyor/mssql.sql2017.pdo_sqlsrv.appveyor.xml b/ci/appveyor/mssql.sql2017.pdo_sqlsrv.appveyor.xml
@@ -21,9 +21,9 @@
         </testsuite>
     </testsuites>
 
-    <coverage>
+    <source>
         <include>
-            <directory suffix=".php">../../src</directory>
+            <directory>../../src</directory>
         </include>
-    </coverage>
+    </source>
 </phpunit>
diff --git a/ci/appveyor/mssql.sql2017.sqlsrv.appveyor.xml b/ci/appveyor/mssql.sql2017.sqlsrv.appveyor.xml
@@ -21,9 +21,9 @@
         </testsuite>
     </testsuites>
 
-    <coverage>
+    <source>
         <include>
-            <directory suffix=".php">../../src</directory>
+            <directory>../../src</directory>
         </include>
-    </coverage>
+    </source>
 </phpunit>
diff --git a/ci/github/phpunit/ibm_db2.xml b/ci/github/phpunit/ibm_db2.xml
@@ -6,7 +6,6 @@
          beStrictAboutTodoAnnotatedTests="true"
          failOnRisky="true"
          failOnWarning="true"
-         convertDeprecationsToExceptions="true"
 >
     <php>
         <ini name="error_reporting" value="-1" />
@@ -30,9 +29,9 @@
         </testsuite>
     </testsuites>
 
-    <coverage>
+    <source>
         <include>
-            <directory suffix=".php">../../../src</directory>
+            <directory>../../../src</directory>
         </include>
-    </coverage>
+    </source>
 </phpunit>
diff --git a/ci/github/phpunit/mysqli-tls.xml b/ci/github/phpunit/mysqli-tls.xml
@@ -6,7 +6,6 @@
          beStrictAboutTodoAnnotatedTests="true"
          failOnRisky="true"
          failOnWarning="true"
-         convertDeprecationsToExceptions="true"
 >
     <php>
         <ini name="error_reporting" value="-1" />
@@ -33,9 +32,9 @@
         </testsuite>
     </testsuites>
 
-    <coverage>
+    <source>
         <include>
-            <directory suffix=".php">../../../src</directory>
+            <directory>../../../src</directory>
         </include>
-    </coverage>
+    </source>
 </phpunit>
diff --git a/ci/github/phpunit/mysqli.xml b/ci/github/phpunit/mysqli.xml
@@ -6,7 +6,6 @@
          beStrictAboutTodoAnnotatedTests="true"
          failOnRisky="true"
          failOnWarning="true"
-         convertDeprecationsToExceptions="true"
 >
     <php>
         <ini name="error_reporting" value="-1" />
@@ -25,9 +24,9 @@
         </testsuite>
     </testsuites>
 
-    <coverage>
+    <source>
         <include>
-            <directory suffix=".php">../../../src</directory>
+            <directory>../../../src</directory>
         </include>
-    </coverage>
+    </source>
 </phpunit>
diff --git a/ci/github/phpunit/oci8.xml b/ci/github/phpunit/oci8.xml
@@ -6,7 +6,6 @@
          beStrictAboutTodoAnnotatedTests="true"
          failOnRisky="true"
          failOnWarning="true"
-         convertDeprecationsToExceptions="true"
 >
     <php>
         <ini name="error_reporting" value="-1" />
@@ -31,9 +30,9 @@
         </testsuite>
     </testsuites>
 
-    <coverage>
+    <source>
         <include>
-            <directory suffix=".php">../../../src</directory>
+            <directory>../../../src</directory>
         </include>
-    </coverage>
+    </source>
 </phpunit>
diff --git a/ci/github/phpunit/pdo_mysql.xml b/ci/github/phpunit/pdo_mysql.xml
@@ -6,7 +6,6 @@
          beStrictAboutTodoAnnotatedTests="true"
          failOnRisky="true"
          failOnWarning="true"
-         convertDeprecationsToExceptions="true"
 >
     <php>
         <ini name="error_reporting" value="-1" />
@@ -25,9 +24,9 @@
         </testsuite>
     </testsuites>
 
-    <coverage>
+    <source>
         <include>
-            <directory suffix=".php">../../../src</directory>
+            <directory>../../../src</directory>
         </include>
-    </coverage>
+    </source>
 </phpunit>
diff --git a/ci/github/phpunit/pdo_oci.xml b/ci/github/phpunit/pdo_oci.xml
@@ -6,7 +6,6 @@
          beStrictAboutTodoAnnotatedTests="true"
          failOnRisky="true"
          failOnWarning="true"
-         convertDeprecationsToExceptions="true"
 >
     <php>
         <ini name="error_reporting" value="-1" />
@@ -31,9 +30,9 @@
         </testsuite>
     </testsuites>
 
-    <coverage>
+    <source>
         <include>
-            <directory suffix=".php">../../../src</directory>
+            <directory>../../../src</directory>
         </include>
-    </coverage>
+    </source>
 </phpunit>
diff --git a/ci/github/phpunit/pdo_pgsql.xml b/ci/github/phpunit/pdo_pgsql.xml
@@ -6,7 +6,6 @@
          beStrictAboutTodoAnnotatedTests="true"
          failOnRisky="true"
          failOnWarning="true"
-         convertDeprecationsToExceptions="true"
 >
     <php>
         <ini name="error_reporting" value="-1" />
@@ -24,9 +23,9 @@
         </testsuite>
     </testsuites>
 
-    <coverage>
+    <source>
         <include>
-            <directory suffix=".php">../../../src</directory>
+            <directory>../../../src</directory>
         </include>
-    </coverage>
+    </source>
 </phpunit>
diff --git a/ci/github/phpunit/pdo_sqlite.xml b/ci/github/phpunit/pdo_sqlite.xml
@@ -6,7 +6,6 @@
          beStrictAboutTodoAnnotatedTests="true"
          failOnRisky="true"
          failOnWarning="true"
-         convertDeprecationsToExceptions="true"
 >
     <php>
         <ini name="error_reporting" value="-1" />
@@ -21,9 +20,9 @@
         </testsuite>
     </testsuites>
 
-    <coverage>
+    <source>
         <include>
-            <directory suffix=".php">../../../src</directory>
+            <directory>../../../src</directory>
         </include>
-    </coverage>
+    </source>
 </phpunit>
diff --git a/ci/github/phpunit/pdo_sqlsrv.xml b/ci/github/phpunit/pdo_sqlsrv.xml
@@ -6,7 +6,6 @@
          beStrictAboutTodoAnnotatedTests="true"
          failOnRisky="true"
          failOnWarning="true"
-         convertDeprecationsToExceptions="true"
 >
     <php>
         <ini name="error_reporting" value="-1" />
@@ -24,9 +23,9 @@
         </testsuite>
     </testsuites>
 
-    <coverage>
+    <source>
         <include>
-            <directory suffix=".php">../../../src</directory>
+            <directory>../../../src</directory>
         </include>
-    </coverage>
+    </source>
 </phpunit>
diff --git a/ci/github/phpunit/pgsql.xml b/ci/github/phpunit/pgsql.xml
@@ -6,7 +6,6 @@
          beStrictAboutTodoAnnotatedTests="true"
          failOnRisky="true"
          failOnWarning="true"
-         convertDeprecationsToExceptions="true"
 >
     <php>
         <ini name="error_reporting" value="-1" />
@@ -24,9 +23,9 @@
         </testsuite>
     </testsuites>
 
-    <coverage>
+    <source>
         <include>
-            <directory suffix=".php">../../../src</directory>
+            <directory>../../../src</directory>
         </include>
-    </coverage>
+    </source>
 </phpunit>
diff --git a/ci/github/phpunit/sqlite3.xml b/ci/github/phpunit/sqlite3.xml
@@ -6,7 +6,6 @@
          beStrictAboutTodoAnnotatedTests="true"
          failOnRisky="true"
          failOnWarning="true"
-         convertDeprecationsToExceptions="true"
 >
     <php>
         <ini name="error_reporting" value="-1" />
@@ -21,9 +20,9 @@
         </testsuite>
     </testsuites>
 
-    <coverage>
+    <source>
         <include>
-            <directory suffix=".php">../../../src</directory>
+            <directory>../../../src</directory>
         </include>
-    </coverage>
+    </source>
 </phpunit>
diff --git a/ci/github/phpunit/sqlsrv.xml b/ci/github/phpunit/sqlsrv.xml
@@ -6,7 +6,6 @@
          beStrictAboutTodoAnnotatedTests="true"
          failOnRisky="true"
          failOnWarning="true"
-         convertDeprecationsToExceptions="true"
 >
     <php>
         <ini name="error_reporting" value="-1" />
@@ -24,9 +23,9 @@
         </testsuite>
     </testsuites>
 
-    <coverage>
+    <source>
         <include>
-            <directory suffix=".php">../../../src</directory>
+            <directory>../../../src</directory>
         </include>
-    </coverage>
+    </source>
 </phpunit>
diff --git a/composer.json b/composer.json
@@ -44,7 +44,7 @@
         "phpstan/phpstan": "1.10.14",
         "phpstan/phpstan-phpunit": "1.3.11",
         "phpstan/phpstan-strict-rules": "^1.5",
-        "phpunit/phpunit": "9.6.7",
+        "phpunit/phpunit": "10.2.2",
         "psalm/plugin-phpunit": "0.18.4",
         "squizlabs/php_codesniffer": "3.7.2",
         "symfony/cache": "^5.4|^6.0",

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -48,9 +48,9 @@
         </testsuite>
     </testsuites>
 
-    <coverage>
+    <source>
         <include>
-            <directory suffix=".php">src</directory>
+            <directory>src</directory>
         </include>
-    </coverage>
+    </source>
 </phpunit>
diff --git a/tests/Driver/IBMDB2/DriverTest.php b/tests/Driver/IBMDB2/DriverTest.php
@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\DBAL\Tests\Driver\IBMDB2;
+
+use Doctrine\DBAL\Driver as DriverInterface;
+use Doctrine\DBAL\Driver\IBMDB2\Driver;
+use Doctrine\DBAL\Tests\Driver\AbstractDB2DriverTestCase;
+
+class DriverTest extends AbstractDB2DriverTestCase
+{
+    protected function createDriver(): DriverInterface
+    {
+        return new Driver();
+    }
+}
diff --git a/tests/Driver/Mysqli/DriverTest.php b/tests/Driver/Mysqli/DriverTest.php
@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\DBAL\Tests\Driver\Mysqli;
+
+use Doctrine\DBAL\Driver as DriverInterface;
+use Doctrine\DBAL\Driver\Mysqli\Driver;
+use Doctrine\DBAL\Tests\Driver\AbstractMySQLDriverTestCase;
+
+class DriverTest extends AbstractMySQLDriverTestCase
+{
+    protected function createDriver(): DriverInterface
+    {
+        return new Driver();
+    }
+}
diff --git a/tests/Driver/OCI8/DriverTest.php b/tests/Driver/OCI8/DriverTest.php
@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\DBAL\Tests\Driver\OCI8;
+
+use Doctrine\DBAL\Driver as DriverInterface;
+use Doctrine\DBAL\Driver\OCI8\Driver;
+use Doctrine\DBAL\Tests\Driver\AbstractOracleDriverTestCase;
+
+class DriverTest extends AbstractOracleDriverTestCase
+{
+    protected function createDriver(): DriverInterface
+    {
+        return new Driver();
+    }
+}
diff --git a/tests/Driver/PDO/MySQL/DriverTest.php b/tests/Driver/PDO/MySQL/DriverTest.php
@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\DBAL\Tests\Driver\PDO\MySQL;
+
+use Doctrine\DBAL\Driver as DriverInterface;
+use Doctrine\DBAL\Driver\PDO\MySQL\Driver;
+use Doctrine\DBAL\Tests\Driver\AbstractMySQLDriverTestCase;
+
+class DriverTest extends AbstractMySQLDriverTestCase
+{
+    protected function createDriver(): DriverInterface
+    {
+        return new Driver();
+    }
+}
diff --git a/tests/Driver/PDO/OCI/DriverTest.php b/tests/Driver/PDO/OCI/DriverTest.php
@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\DBAL\Tests\Driver\PDO\OCI;
+
+use Doctrine\DBAL\Driver as DriverInterface;
+use Doctrine\DBAL\Driver\PDO\OCI\Driver;
+use Doctrine\DBAL\Tests\Driver\AbstractOracleDriverTestCase;
+
+class DriverTest extends AbstractOracleDriverTestCase
+{
+    protected function createDriver(): DriverInterface
+    {
+        return new Driver();
+    }
+}