Merge pull request #8069 from kenjis/update-phpunit-10

refactor: update PHPUnit to 10
codeigniter4 · Apr 7, 2024 · 5c45ef1 · 5c45ef1
2 parents 77cbf2c + 9e009e9
commit 5c45ef1
Show file tree

Hide file tree

Showing 46 changed files with 316 additions and 235 deletions.
diff --git a/.gitignore b/.gitignore
@@ -126,5 +126,6 @@ nb-configuration.xml
 /results/
 /phpunit*.xml
 /.phpunit.*.cache
+/.phpunit.cache
 
 /.php-cs-fixer.php
diff --git a/admin/framework/composer.json b/admin/framework/composer.json
@@ -23,7 +23,7 @@
         "kint-php/kint": "^5.0.4",
         "mikey179/vfsstream": "^1.6",
         "nexusphp/cs-config": "^3.6",
-        "phpunit/phpunit": "^9.1",
+        "phpunit/phpunit": "^10.5.16",
         "predis/predis": "^1.1 || ^2.0"
     },
     "suggest": {

diff --git a/admin/framework/phpunit.xml.dist b/admin/framework/phpunit.xml.dist
@@ -1,57 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		bootstrap="system/Test/bootstrap.php"
-		backupGlobals="false"
-		colors="true"
-		convertErrorsToExceptions="true"
-		convertNoticesToExceptions="true"
-		convertWarningsToExceptions="true"
-		stopOnError="false"
-		stopOnFailure="false"
-		stopOnIncomplete="false"
-		stopOnSkipped="false"
-		xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
-	<coverage includeUncoveredFiles="true" processUncoveredFiles="true">
-		<include>
-			<directory suffix=".php">./app</directory>
-		</include>
-		<exclude>
-			<directory suffix=".php">./app/Views</directory>
-			<file>./app/Config/Routes.php</file>
-		</exclude>
-		<report>
-			<clover outputFile="build/logs/clover.xml"/>
-			<html outputDirectory="build/logs/html"/>
-			<php outputFile="build/logs/coverage.serialized"/>
-			<text outputFile="php://stdout" showUncoveredFiles="false"/>
-		</report>
-	</coverage>
-	<testsuites>
-		<testsuite name="App">
-			<directory>./tests</directory>
-		</testsuite>
-	</testsuites>
-	<logging>
-		<testdoxHtml outputFile="build/logs/testdox.html"/>
-		<testdoxText outputFile="build/logs/testdox.txt"/>
-		<junit outputFile="build/logs/logfile.xml"/>
-	</logging>
-	<php>
-		<server name="app.baseURL" value="http://example.com/"/>
-		<!-- Directory containing phpunit.xml -->
-		<const name="HOMEPATH" value="./"/>
-		<!-- Directory containing the Paths config file -->
-		<const name="CONFIGPATH" value="./app/Config/"/>
-		<!-- Directory containing the front controller (index.php) -->
-		<const name="PUBLICPATH" value="./public/"/>
-		<!-- Database configuration -->
-		<!-- Uncomment to provide your own database for testing
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="system/Test/bootstrap.php" backupGlobals="false" colors="true" stopOnError="false" stopOnFailure="false" stopOnIncomplete="false" stopOnSkipped="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" cacheDirectory=".phpunit.cache">
+  <coverage includeUncoveredFiles="true">
+    <report>
+      <clover outputFile="build/logs/clover.xml"/>
+      <html outputDirectory="build/logs/html"/>
+      <php outputFile="build/logs/coverage.serialized"/>
+      <text outputFile="php://stdout" showUncoveredFiles="false"/>
+    </report>
+  </coverage>
+  <testsuites>
+    <testsuite name="App">
+      <directory>./tests</directory>
+    </testsuite>
+  </testsuites>
+  <logging>
+    <testdoxHtml outputFile="build/logs/testdox.html"/>
+    <testdoxText outputFile="build/logs/testdox.txt"/>
+    <junit outputFile="build/logs/logfile.xml"/>
+  </logging>
+  <php>
+    <server name="app.baseURL" value="http://example.com/"/>
+    <!-- Directory containing phpunit.xml -->
+    <const name="HOMEPATH" value="./"/>
+    <!-- Directory containing the Paths config file -->
+    <const name="CONFIGPATH" value="./app/Config/"/>
+    <!-- Directory containing the front controller (index.php) -->
+    <const name="PUBLICPATH" value="./public/"/>
+    <!-- Database configuration -->
+    <!-- Uncomment to provide your own database for testing
 		<env name="database.tests.hostname" value="localhost"/>
 		<env name="database.tests.database" value="tests"/>
 		<env name="database.tests.username" value="tests_user"/>
 		<env name="database.tests.password" value=""/>
 		<env name="database.tests.DBDriver" value="MySQLi"/>
 		<env name="database.tests.DBPrefix" value="tests_"/>
 		-->
-	</php>
+  </php>
+  <source>
+    <include>
+      <directory suffix=".php">./app</directory>
+    </include>
+    <exclude>
+      <directory suffix=".php">./app/Views</directory>
+      <file>./app/Config/Routes.php</file>
+    </exclude>
+  </source>
 </phpunit>
diff --git a/admin/starter/composer.json b/admin/starter/composer.json
@@ -16,7 +16,7 @@
     "require-dev": {
         "fakerphp/faker": "^1.9",
         "mikey179/vfsstream": "^1.6",
-        "phpunit/phpunit": "^9.1"
+        "phpunit/phpunit": "^10.5.16"
     },
     "autoload": {
         "psr-4": {

diff --git a/admin/starter/phpunit.xml.dist b/admin/starter/phpunit.xml.dist
@@ -1,57 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        bootstrap="vendor/codeigniter4/framework/system/Test/bootstrap.php"
-        backupGlobals="false"
-        colors="true"
-        convertErrorsToExceptions="true"
-        convertNoticesToExceptions="true"
-        convertWarningsToExceptions="true"
-        stopOnError="false"
-        stopOnFailure="false"
-        stopOnIncomplete="false"
-        stopOnSkipped="false"
-        xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
-    <coverage includeUncoveredFiles="true" processUncoveredFiles="true">
-        <include>
-            <directory suffix=".php">./app</directory>
-        </include>
-        <exclude>
-            <directory suffix=".php">./app/Views</directory>
-            <file>./app/Config/Routes.php</file>
-        </exclude>
-        <report>
-            <clover outputFile="build/logs/clover.xml"/>
-            <html outputDirectory="build/logs/html"/>
-            <php outputFile="build/logs/coverage.serialized"/>
-            <text outputFile="php://stdout" showUncoveredFiles="false"/>
-        </report>
-    </coverage>
-    <testsuites>
-        <testsuite name="App">
-            <directory>./tests</directory>
-        </testsuite>
-    </testsuites>
-    <logging>
-        <testdoxHtml outputFile="build/logs/testdox.html"/>
-        <testdoxText outputFile="build/logs/testdox.txt"/>
-        <junit outputFile="build/logs/logfile.xml"/>
-    </logging>
-    <php>
-        <server name="app.baseURL" value="http://example.com/"/>
-        <!-- Directory containing phpunit.xml -->
-        <const name="HOMEPATH" value="./"/>
-        <!-- Directory containing the Paths config file -->
-        <const name="CONFIGPATH" value="./app/Config/"/>
-        <!-- Directory containing the front controller (index.php) -->
-        <const name="PUBLICPATH" value="./public/"/>
-        <!-- Database configuration -->
-        <!-- Uncomment to provide your own database for testing
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/codeigniter4/framework/system/Test/bootstrap.php" backupGlobals="false" colors="true" stopOnError="false" stopOnFailure="false" stopOnIncomplete="false" stopOnSkipped="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" cacheDirectory=".phpunit.cache">
+  <coverage includeUncoveredFiles="true">
+    <report>
+      <clover outputFile="build/logs/clover.xml"/>
+      <html outputDirectory="build/logs/html"/>
+      <php outputFile="build/logs/coverage.serialized"/>
+      <text outputFile="php://stdout" showUncoveredFiles="false"/>
+    </report>
+  </coverage>
+  <testsuites>
+    <testsuite name="App">
+      <directory>./tests</directory>
+    </testsuite>
+  </testsuites>
+  <logging>
+    <testdoxHtml outputFile="build/logs/testdox.html"/>
+    <testdoxText outputFile="build/logs/testdox.txt"/>
+    <junit outputFile="build/logs/logfile.xml"/>
+  </logging>
+  <php>
+    <server name="app.baseURL" value="http://example.com/"/>
+    <!-- Directory containing phpunit.xml -->
+    <const name="HOMEPATH" value="./"/>
+    <!-- Directory containing the Paths config file -->
+    <const name="CONFIGPATH" value="./app/Config/"/>
+    <!-- Directory containing the front controller (index.php) -->
+    <const name="PUBLICPATH" value="./public/"/>
+    <!-- Database configuration -->
+    <!-- Uncomment to provide your own database for testing
         <env name="database.tests.hostname" value="localhost"/>
         <env name="database.tests.database" value="tests"/>
         <env name="database.tests.username" value="tests_user"/>
         <env name="database.tests.password" value=""/>
         <env name="database.tests.DBDriver" value="MySQLi"/>
         <env name="database.tests.DBPrefix" value="tests_"/>
         -->
-    </php>
+  </php>
+  <source>
+    <include>
+      <directory suffix=".php">./app</directory>
+    </include>
+    <exclude>
+      <directory suffix=".php">./app/Views</directory>
+      <file>./app/Config/Routes.php</file>
+    </exclude>
+  </source>
 </phpunit>
diff --git a/composer.json b/composer.json
@@ -25,12 +25,12 @@
         "kint-php/kint": "^5.0.4",
         "mikey179/vfsstream": "^1.6",
         "nexusphp/cs-config": "^3.6",
-        "nexusphp/tachycardia": "^1.0",
+        "nexusphp/tachycardia": "^2.0",
         "phpstan/extension-installer": "^1.3",
         "phpstan/phpstan": "^1.10.2",
         "phpstan/phpstan-strict-rules": "^1.5",
-        "phpunit/phpcov": "^8.2",
-        "phpunit/phpunit": "^9.1",
+        "phpunit/phpcov": "^9.0.2",
+        "phpunit/phpunit": "^10.5.16",
         "predis/predis": "^1.1 || ^2.0",
         "rector/rector": "1.0.4",
         "vimeo/psalm": "^5.0"

diff --git a/phpstan-baseline.php b/phpstan-baseline.php
@@ -11196,26 +11196,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/tests/system/Cache/FactoriesCacheFileVarExportHandlerTest.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Property CodeIgniter\\\\Cache\\\\Handlers\\\\AbstractHandlerTest\\:\\:\\$dummy has no type specified\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/tests/system/Cache/Handlers/AbstractHandlerTest.php',
-];
-$ignoreErrors[] = [
-	'message' => '#^Property CodeIgniter\\\\Cache\\\\Handlers\\\\AbstractHandlerTest\\:\\:\\$key1 has no type specified\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/tests/system/Cache/Handlers/AbstractHandlerTest.php',
-];
-$ignoreErrors[] = [
-	'message' => '#^Property CodeIgniter\\\\Cache\\\\Handlers\\\\AbstractHandlerTest\\:\\:\\$key2 has no type specified\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/tests/system/Cache/Handlers/AbstractHandlerTest.php',
-];
-$ignoreErrors[] = [
-	'message' => '#^Property CodeIgniter\\\\Cache\\\\Handlers\\\\AbstractHandlerTest\\:\\:\\$key3 has no type specified\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/tests/system/Cache/Handlers/AbstractHandlerTest.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Method CodeIgniter\\\\Cache\\\\Handlers\\\\BaseHandlerTest\\:\\:provideValidateKeyInvalidType\\(\\) return type has no value type specified in iterable type iterable\\.$#',
 	'count' => 1,
@@ -12461,31 +12441,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/tests/system/Database/DatabaseTestCaseTest.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Method CodeIgniter\\\\Database\\\\Live\\\\AbstractGetFieldDataTest\\:\\:assertSameFieldData\\(\\) has no return type specified\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/tests/system/Database/Live/AbstractGetFieldDataTest.php',
-];
-$ignoreErrors[] = [
-	'message' => '#^Method CodeIgniter\\\\Database\\\\Live\\\\AbstractGetFieldDataTest\\:\\:assertSameFieldData\\(\\) has parameter \\$actual with no value type specified in iterable type array\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/tests/system/Database/Live/AbstractGetFieldDataTest.php',
-];
-$ignoreErrors[] = [
-	'message' => '#^Method CodeIgniter\\\\Database\\\\Live\\\\AbstractGetFieldDataTest\\:\\:assertSameFieldData\\(\\) has parameter \\$expected with no value type specified in iterable type array\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/tests/system/Database/Live/AbstractGetFieldDataTest.php',
-];
-$ignoreErrors[] = [
-	'message' => '#^Method CodeIgniter\\\\Database\\\\Live\\\\AbstractGetFieldDataTest\\:\\:createTableForDefault\\(\\) has no return type specified\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/tests/system/Database/Live/AbstractGetFieldDataTest.php',
-];
-$ignoreErrors[] = [
-	'message' => '#^Method CodeIgniter\\\\Database\\\\Live\\\\AbstractGetFieldDataTest\\:\\:createTableForType\\(\\) has no return type specified\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/tests/system/Database/Live/AbstractGetFieldDataTest.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Property CodeIgniter\\\\Database\\\\Live\\\\ConnectTest\\:\\:\\$group1 has no type specified\\.$#',
 	'count' => 1,
@@ -12656,11 +12611,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/tests/system/Database/Live/SQLite3/AlterTableTest.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Method CodeIgniter\\\\Database\\\\Live\\\\SQLite3\\\\GetFieldDataTest\\:\\:createTableCompositePrimaryKey\\(\\) has no return type specified\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/tests/system/Database/Live/SQLite3/GetFieldDataTest.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^PHPDoc type CodeIgniter\\\\Database\\\\SQLite3\\\\Connection of property CodeIgniter\\\\Database\\\\Live\\\\SQLite3\\\\GetIndexDataTest\\:\\:\\$db is not the same as PHPDoc type CodeIgniter\\\\Database\\\\BaseConnection of overridden property CodeIgniter\\\\Test\\\\CIUnitTestCase\\:\\:\\$db\\.$#',
 	'count' => 1,
@@ -13071,11 +13021,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/tests/system/Events/EventsTest.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Property class@anonymous/tests/system/Events/EventsTest\\.php\\:285\\:\\:\\$logged has no type specified\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/tests/system/Events/EventsTest.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Property CodeIgniter\\\\Filters\\\\CSRFTest\\:\\:\\$response \\(CodeIgniter\\\\HTTP\\\\Response\\|null\\) does not accept CodeIgniter\\\\HTTP\\\\ResponseInterface\\.$#',
 	'count' => 2,