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

Conflicts:
	composer.json
	tests/system/CLI/CLITest.php
	tests/system/CLI/CommandRunnerTest.php
	tests/system/CLI/ConsoleTest.php
	tests/system/Commands/ClearCacheTest.php
	tests/system/Commands/ClearDebugbarTest.php
	tests/system/Commands/ClearLogsTest.php
	tests/system/Commands/CommandGeneratorTest.php
	tests/system/Commands/CommandTest.php
	tests/system/Commands/ConfigGeneratorTest.php
	tests/system/Commands/ConfigurableSortImportsTest.php
	tests/system/Commands/ControllerGeneratorTest.php
	tests/system/Commands/CreateDatabaseTest.php
	tests/system/Commands/Database/MigrateStatusTest.php
	tests/system/Commands/Database/ShowTableInfoTest.php
	tests/system/Commands/DatabaseCommandsTest.php
	tests/system/Commands/EntityGeneratorTest.php
	tests/system/Commands/EnvironmentCommandTest.php
	tests/system/Commands/FilterGeneratorTest.php
	tests/system/Commands/GenerateKeyTest.php
	tests/system/Commands/GeneratorsTest.php
	tests/system/Commands/HelpCommandTest.php
	tests/system/Commands/InfoCacheTest.php
	tests/system/Commands/MigrationGeneratorTest.php
	tests/system/Commands/MigrationIntegrationTest.php
	tests/system/Commands/ModelGeneratorTest.php
	tests/system/Commands/PublishCommandTest.php
	tests/system/Commands/RoutesTest.php
	tests/system/Commands/ScaffoldGeneratorTest.php
	tests/system/Commands/SeederGeneratorTest.php
	tests/system/Commands/ValidationGeneratorTest.php
	tests/system/Debug/Toolbar/Collectors/HistoryTest.php
	tests/system/Test/TestCaseTest.php

Author: kenjis

composer.json

@@ -25,7 +25,7 @@
         "phpunit/phpcov": "^8.2",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1 || ^2.0",
-        "rector/rector": "0.14.8",
+        "rector/rector": "0.15.0",
         "vimeo/psalm": "^5.0"
     },
     "suggest": {

rector.php

@@ -47,6 +47,7 @@
 use Rector\PSR4\Rector\FileWithoutNamespace\NormalizeNamespaceByPSR4ComposerAutoloadRector;
 use Rector\Set\ValueObject\LevelSetList;
 use Rector\Set\ValueObject\SetList;
+use Rector\TypeDeclaration\Rector\Property\TypedPropertyFromAssignsRector;
 use Utils\Rector\PassStrictParameterToFunctionParameterRector;
 use Utils\Rector\RemoveErrorSuppressInTryCatchStmtsRector;
 use Utils\Rector\RemoveVarTagFromClassConstantRector;
@@ -125,6 +126,9 @@
         GetMockBuilderGetMockToCreateMockRector::class => [
             __DIR__ . '/tests/system/Email/EmailTest.php',
         ],
+
+        // buggy on union mixed type, new class extends SomeClass marked as object in union, and false replaced with bool in Union
+        TypedPropertyFromAssignsRector::class,
     ]);
 
     // auto import fully qualified class names

tests/system/API/ResponseTraitTest.php

@@ -29,8 +29,16 @@
  */
 final class ResponseTraitTest extends CIUnitTestCase
 {
+    /**
+     * @var MockIncomingRequest|null
+     */
     private $request;
+
+    /**
+     * @var MockResponse|null
+     */
     private $response;
+
     private ?FormatterInterface $formatter = null;
 
     protected function setUp(): void

tests/system/Commands/BaseCommandTest.php

@@ -11,6 +11,7 @@
 
 namespace CodeIgniter\Commands;
 
+use CodeIgniter\Log\Logger;
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\Services;
 use Tests\Support\Commands\AppInfo;
@@ -22,7 +23,7 @@
  */
 final class BaseCommandTest extends CIUnitTestCase
 {
-    private $logger;
+    private Logger $logger;
 
     protected function setUp(): void
     {

tests/system/Commands/ClearDebugbarTest.php

@@ -23,7 +23,7 @@ final class ClearDebugbarTest extends CIUnitTestCase
 {
     use StreamFilterTrait;
 
-    private $time;
+    private int $time;
 
     protected function setUp(): void
     {

tests/system/Commands/ClearLogsTest.php

@@ -23,7 +23,7 @@ final class ClearLogsTest extends CIUnitTestCase
 {
     use StreamFilterTrait;
 
-    private $date;
+    private string $date;
 
     protected function setUp(): void
     {

tests/system/Commands/CommandTest.php

@@ -11,6 +11,8 @@
 
 namespace CodeIgniter\Commands;
 
+use CodeIgniter\CLI\Commands;
+use CodeIgniter\Log\Logger;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\StreamFilterTrait;
 use Config\Services;
@@ -25,8 +27,8 @@ final class CommandTest extends CIUnitTestCase
 {
     use StreamFilterTrait;
 
-    private $logger;
-    private $commands;
+    private Logger $logger;
+    private Commands $commands;
 
     protected function setUp(): void
     {

tests/system/Config/BaseConfigTest.php

@@ -26,7 +26,7 @@
  */
 final class BaseConfigTest extends CIUnitTestCase
 {
-    private $fixturesFolder;
+    private string $fixturesFolder;
 
     protected function setUp(): void
     {

tests/system/Config/DotEnvTest.php

@@ -26,7 +26,7 @@ final class DotEnvTest extends CIUnitTestCase
 {
     private ?vfsStreamDirectory $root;
     private string $path;
-    private $fixturesFolder;
+    private string $fixturesFolder;
 
     protected function setUp(): void
     {

tests/system/Config/ServicesTest.php

@@ -53,8 +53,8 @@
  */
 final class ServicesTest extends CIUnitTestCase
 {
-    private $config;
-    private $original;
+    private App $config;
+    private array $original;
 
     protected function setUp(): void
     {