[ci-review] Rector Rectify

Author: actions-user

rules/DeadCode/NodeAnalyzer/ParentClassAnalyzer.php

@@ -4,13 +4,15 @@
 
 namespace Rector\DeadCode\NodeAnalyzer;
 
+use PhpParser\Node\Stmt\Expression;
+use PhpParser\Node\Expr\StaticCall;
 use PhpParser\Node\Stmt\ClassMethod;
 use Rector\NodeNameResolver\NodeNameResolver;
 
-final class ParentClassAnalyzer
+final readonly class ParentClassAnalyzer
 {
     public function __construct(
-        private readonly NodeNameResolver $nodeNameResolver,
+        private NodeNameResolver $nodeNameResolver,
     ) {
 
     }
@@ -28,12 +30,12 @@ public function hasParentCall(ClassMethod $classMethod): bool
         $classMethodName = $classMethod->name->name;
 
         foreach ($classMethod->stmts as $stmt) {
-            if (! $stmt instanceof \PhpParser\Node\Stmt\Expression) {
+            if (! $stmt instanceof Expression) {
                 continue;
             }
 
             $expr = $stmt->expr;
-            if (! $expr instanceof \PhpParser\Node\Expr\StaticCall) {
+            if (! $expr instanceof StaticCall) {
                 continue;
             }
 

rules/Php83/Rector/ClassMethod/AddOverrideAttributeToOverriddenMethodsRector.php

@@ -243,15 +243,8 @@ private function shouldSkipClassMethod(ClassMethod $classMethod): bool
         if ($this->phpAttributeAnalyzer->hasPhpAttribute($classMethod, self::OVERRIDE_CLASS)) {
             return true;
         }
-
         // skip test setup method override, as rather clutters the code than helps
-        if ($this->isName($classMethod, 'setUp')) {
-            if ($this->parentClassAnalyzer->hasParentCall($classMethod)) {
-                return true;
-            }
-        }
-
-        return false;
+        return $this->isName($classMethod, 'setUp') && $this->parentClassAnalyzer->hasParentCall($classMethod);
     }
 
     private function shouldSkipParentClassMethod(ClassReflection $parentClassReflection, ClassMethod $classMethod): bool