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

Conflicts:
	composer.json
	rector.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.15.0",
+        "rector/rector": "0.15.1",
         "vimeo/psalm": "^5.0"
     },
     "suggest": {

rector.php

@@ -48,7 +48,6 @@
 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;

tests/system/ControllerTest.php

@@ -39,11 +39,7 @@
 final class ControllerTest extends CIUnitTestCase
 {
     private App $config;
-
-    /**
-     * @var Controller|null
-     */
-    private $controller;
+    private ?Controller $controller = null;
 
     /**
      * Current request.

tests/system/View/DecoratorsTest.php

@@ -28,7 +28,7 @@ final class DecoratorsTest extends CIUnitTestCase
 {
     private FileLocator $loader;
     private string $viewsDir;
-    private $config;
+    private ?\Config\View $config = null;
 
     protected function setUp(): void
     {