Merge remote-tracking branch 'upstream/develop' into 4.5

Author: kenjis

.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

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

composer.json

@@ -21,7 +21,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.46.0",
         "kint-php/kint": "^5.0.4",
         "mikey179/vfsstream": "^1.6",
         "nexusphp/cs-config": "^3.6",
@@ -32,7 +32,7 @@
         "phpunit/phpcov": "^8.2",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1 || ^2.0",
-        "rector/rector": "0.18.13",
+        "rector/rector": "0.19.0",
         "vimeo/psalm": "^5.0"
     },
     "replace": {
@@ -90,8 +90,7 @@
     },
     "scripts": {
         "post-update-cmd": [
-            "CodeIgniter\\ComposerScripts::postUpdate",
-            "bash -c \"if [ -f admin/setup.sh ]; then bash admin/setup.sh; fi\""
+            "CodeIgniter\\ComposerScripts::postUpdate"
         ],
         "analyze": [
             "Composer\\Config::disableProcessTimeout",

rector.php

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

utils/Rector/PassStrictParameterToFunctionParameterRector.php

@@ -18,7 +18,7 @@
 use PhpParser\Node\Expr\ConstFetch;
 use PhpParser\Node\Expr\FuncCall;
 use PhpParser\Node\Name;
-use Rector\Core\Rector\AbstractRector;
+use Rector\Rector\AbstractRector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 

utils/Rector/RemoveErrorSuppressInTryCatchStmtsRector.php

@@ -19,7 +19,7 @@
 use PhpParser\Node\Stmt\Function_;
 use PhpParser\Node\Stmt\TryCatch;
 use PhpParser\NodeTraverser;
-use Rector\Core\Rector\AbstractRector;
+use Rector\Rector\AbstractRector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 

utils/Rector/UnderscoreToCamelCaseVariableNameRector.php

@@ -22,9 +22,9 @@
 use PhpParser\Node\Stmt\Function_;
 use PhpParser\Node\Stmt\Namespace_;
 use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
-use Rector\Core\Php\ReservedKeywordAnalyzer;
-use Rector\Core\PhpParser\Node\CustomNode\FileWithoutNamespace;
-use Rector\Core\Rector\AbstractRector;
+use Rector\Php\ReservedKeywordAnalyzer;
+use Rector\PhpParser\Node\CustomNode\FileWithoutNamespace;
+use Rector\Rector\AbstractRector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;