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

Author: kenjis

composer.json

@@ -24,7 +24,7 @@
         "phpstan/phpstan": "^1.7.1",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1 || ^2.0",
-        "rector/rector": "0.13.10"
+        "rector/rector": "0.14.0"
     },
     "suggest": {
         "ext-imagick": "If you use Image class ImageMagickHandler",

rector.php

@@ -29,7 +29,6 @@
 use Rector\CodingStyle\Rector\FuncCall\CountArrayToEmptyArrayComparisonRector;
 use Rector\Config\RectorConfig;
 use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPrivateMethodRector;
-use Rector\DeadCode\Rector\If_\RemoveAlwaysTrueIfConditionRector;
 use Rector\DeadCode\Rector\If_\UnwrapFutureCompatibleIfPhpVersionRector;
 use Rector\DeadCode\Rector\MethodCall\RemoveEmptyMethodCallRector;
 use Rector\EarlyReturn\Rector\Foreach_\ChangeNestedForeachIfsToEarlyContinueRector;
@@ -131,12 +130,6 @@
         GetMockBuilderGetMockToCreateMockRector::class => [
             __DIR__ . '/tests/system/Email/EmailTest.php',
         ],
-
-        // buggy on read based on @var on property on Trait
-        RemoveAlwaysTrueIfConditionRector::class => [
-            '**Trait.php',
-            __DIR__ . '/system/Test/ControllerTester.php',
-        ],
     ]);
 
     // auto import fully qualified class names