Merge branch 'codeigniter4:develop' into csp

.github/PULL_REQUEST_TEMPLATE.md

@@ -2,10 +2,11 @@
 
 Each pull request should address a single issue and have a meaningful title.
 
+- PR title must include the type (feat, fix, chore, docs, perf, refactor, style, test) of the commit per Conventional Commits specification. See https://www.conventionalcommits.org/en/v1.0.0/ for the discussion.
 - Pull requests must be in English.
 - If a pull request fixes an issue, reference the issue with a suitable keyword (e.g., Fixes <issue number>).
 - All bug fixes should be sent to the __"develop"__ branch, this is where the next bug fix version will be developed.
-- PRs with any enhancement should be sent to the next minor version branch, e.g. __"4.3"__
+- PRs with any enhancement should be sent to the next minor version branch, e.g. __"4.5"__
 
 -->
 **Description**

admin/framework/composer.json

@@ -20,7 +20,7 @@
     "require-dev": {
         "codeigniter/coding-standard": "^1.7",
         "fakerphp/faker": "^1.9",
-        "friendsofphp/php-cs-fixer": "^3.43",
+        "friendsofphp/php-cs-fixer": "^3.47.1",
         "kint-php/kint": "^5.0.4",
         "mikey179/vfsstream": "^1.6",
         "nexusphp/cs-config": "^3.6",

composer.json

@@ -22,7 +22,7 @@
         "codeigniter/phpstan-codeigniter": "^1.4",
         "ergebnis/composer-normalize": "^2.28",
         "fakerphp/faker": "^1.9",
-        "friendsofphp/php-cs-fixer": "^3.43",
+        "friendsofphp/php-cs-fixer": "^3.47.1",
         "kint-php/kint": "^5.0.4",
         "mikey179/vfsstream": "^1.6",
         "nexusphp/cs-config": "^3.6",
@@ -34,7 +34,7 @@
         "phpunit/phpcov": "^8.2",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1 || ^2.0",
-        "rector/rector": "0.19.0",
+        "rector/rector": "0.19.2",
         "vimeo/psalm": "^5.0"
     },
     "replace": {

phpstan-baseline.php

@@ -1451,11 +1451,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/Database/Postgre/Forge.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Return type \\(array\\|bool\\|string\\) of method CodeIgniter\\\\Database\\\\Postgre\\\\Forge\\:\\:_alterTable\\(\\) should be covariant with return type \\(array\\<string\\>\\|string\\|false\\) of method CodeIgniter\\\\Database\\\\Forge\\:\\:_alterTable\\(\\)$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Database/Postgre/Forge.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
 	'count' => 1,
@@ -1656,21 +1651,11 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/Database/SQLite3/Forge.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Return type \\(array\\|string\\|null\\) of method CodeIgniter\\\\Database\\\\SQLite3\\\\Forge\\:\\:_alterTable\\(\\) should be covariant with return type \\(array\\<string\\>\\|string\\|false\\) of method CodeIgniter\\\\Database\\\\Forge\\:\\:_alterTable\\(\\)$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Database/SQLite3/Forge.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Return type \\(SQLite3Result\\|false\\) of method CodeIgniter\\\\Database\\\\SQLite3\\\\PreparedQuery\\:\\:_getResult\\(\\) should be covariant with return type \\(object\\|resource\\|null\\) of method CodeIgniter\\\\Database\\\\BasePreparedQuery\\<SQLite3,SQLite3Stmt,SQLite3Result\\>\\:\\:_getResult\\(\\)$#',
 	'count' => 1,
 	'path' => __DIR__ . '/system/Database/SQLite3/PreparedQuery.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Class stdClass referenced with incorrect case\\: stdclass\\.$#',
-	'count' => 2,
-	'path' => __DIR__ . '/system/Database/SQLite3/Table.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
 	'count' => 2,
@@ -1846,11 +1831,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/Exceptions/PageNotFoundException.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Call to method SplFileInfo\\:\\:getBasename\\(\\) with incorrect case\\: getBaseName$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Files/File.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
 	'count' => 1,

rector.php

@@ -59,7 +59,7 @@
         PHPUnitSetList::PHPUNIT_100,
     ]);
 
-    $rectorConfig->parallel(120);
+    $rectorConfig->parallel(120, 8, 15);
 
     // paths to refactor; solid alternative to CLI arguments
     $rectorConfig->paths([__DIR__ . '/app', __DIR__ . '/system', __DIR__ . '/tests', __DIR__ . '/utils']);