diff --git a/rules/CodeQuality/Rector/ClassConstFetch/ConvertStaticPrivateConstantToSelfRector.php b/rules/CodeQuality/Rector/ClassConstFetch/ConvertStaticPrivateConstantToSelfRector.php
index 79c4453bae6..781587db8f3 100644
--- a/rules/CodeQuality/Rector/ClassConstFetch/ConvertStaticPrivateConstantToSelfRector.php
+++ b/rules/CodeQuality/Rector/ClassConstFetch/ConvertStaticPrivateConstantToSelfRector.php
@@ -7,6 +7,7 @@
 use PhpParser\Node;
 use PhpParser\Node\Stmt\Class_;
 use Rector\CodeQuality\Rector\Class_\ConvertStaticToSelfRector;
+use Rector\Exception\ShouldNotHappenException;
 use Rector\Rector\AbstractRector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
@@ -16,11 +17,6 @@
  */
 final class ConvertStaticPrivateConstantToSelfRector extends AbstractRector
 {
-    public function __construct(
-        private readonly ConvertStaticToSelfRector $convertStaticToSelfRector
-    ) {
-    }
-
     public function getRuleDefinition(): RuleDefinition
     {
         return new RuleDefinition(
@@ -72,6 +68,10 @@ public function getNodeTypes(): array
      */
     public function refactor(Node $node): ?Class_
     {
-        return $this->convertStaticToSelfRector->refactor($node);
+        throw new ShouldNotHappenException(sprintf(
+            'The %s rule is deprecated. Use %s instead',
+            self::class,
+            ConvertStaticToSelfRector::class,
+        ));
     }
 }
diff --git a/rules/CodeQuality/Rector/Class_/ConvertStaticToSelfRector.php b/rules/CodeQuality/Rector/Class_/ConvertStaticToSelfRector.php
index 57ac9b1ad89..01af812c262 100644
--- a/rules/CodeQuality/Rector/Class_/ConvertStaticToSelfRector.php
+++ b/rules/CodeQuality/Rector/Class_/ConvertStaticToSelfRector.php
@@ -6,7 +6,6 @@
 
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\ClassConstantReflection;
-use PHPStan\TrinaryLogic;
 use PhpParser\Node;
 use PhpParser\Node\Expr\ClassConstFetch;
 use PhpParser\Node\Expr\StaticCall;
diff --git a/rules/CodeQuality/Rector/Class_/StaticToSelfStaticMethodCallOnFinalClassRector.php b/rules/CodeQuality/Rector/Class_/StaticToSelfStaticMethodCallOnFinalClassRector.php
index 3ddc1df0b35..560a6e7b42a 100644
--- a/rules/CodeQuality/Rector/Class_/StaticToSelfStaticMethodCallOnFinalClassRector.php
+++ b/rules/CodeQuality/Rector/Class_/StaticToSelfStaticMethodCallOnFinalClassRector.php
@@ -6,6 +6,7 @@
 
 use PhpParser\Node;
 use PhpParser\Node\Stmt\Class_;
+use Rector\Exception\ShouldNotHappenException;
 use Rector\Rector\AbstractRector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
@@ -15,11 +16,6 @@
  */
 final class StaticToSelfStaticMethodCallOnFinalClassRector extends AbstractRector
 {
-    public function __construct(
-        private readonly ConvertStaticToSelfRector $convertStaticToSelfRector
-    ) {
-    }
-
     public function getRuleDefinition(): RuleDefinition
     {
         return new RuleDefinition('Change `static::methodCall()` to `self::methodCall()` on final class', [
@@ -70,6 +66,10 @@ public function getNodeTypes(): array
      */
     public function refactor(Node $node): ?Class_
     {
-        return $this->convertStaticToSelfRector->refactor($node);
+        throw new ShouldNotHappenException(sprintf(
+            'The %s rule is deprecated. Use %s instead',
+            self::class,
+            ConvertStaticToSelfRector::class,
+        ));
     }
 }
diff --git a/rules/TypeDeclaration/Rector/ClassMethod/AddReturnDocblockForScalarArrayFromAssignsRector.php b/rules/TypeDeclaration/Rector/ClassMethod/AddReturnDocblockForScalarArrayFromAssignsRector.php
index 35eb4803c8a..86d7438c6f0 100644
--- a/rules/TypeDeclaration/Rector/ClassMethod/AddReturnDocblockForScalarArrayFromAssignsRector.php
+++ b/rules/TypeDeclaration/Rector/ClassMethod/AddReturnDocblockForScalarArrayFromAssignsRector.php
@@ -134,8 +134,8 @@ public function refactor(Node $node): ?Node
         }
 
         $scalarArrayTypes = [];
-        foreach ($returnedVariableNames as $variableName) {
-            $scalarType = $this->resolveScalarArrayTypeForVariable($node, $variableName);
+        foreach ($returnedVariableNames as $returnedVariableName) {
+            $scalarType = $this->resolveScalarArrayTypeForVariable($node, $returnedVariableName);
             if ($scalarType instanceof Type) {
                 $scalarArrayTypes[] = $scalarType;
             } else {
@@ -191,11 +191,9 @@ private function resolveScalarArrayTypeForVariable(ClassMethod|Function_ $node,
         $arrayHasDimAssigns = false;
 
         foreach ($assigns as $assign) {
-            if ($assign->var instanceof Variable && $this->isName($assign->var, $variableName)) {
-                if ($assign->expr instanceof Array_ && $assign->expr->items === []) {
-                    $arrayHasInitialized = true;
-                    continue;
-                }
+            if ($assign->var instanceof Variable && $this->isName($assign->var, $variableName) && ($assign->expr instanceof Array_ && $assign->expr->items === [])) {
+                $arrayHasInitialized = true;
+                continue;
             }
 
             if (! $assign->var instanceof ArrayDimFetch) {