[rector] Rector fixes

Author: actions-user

rules/CodeQuality/NodeAnalyser/AssignedMocksCollector.php

@@ -38,10 +38,12 @@ public function collect(ClassMethod|Foreach_ $stmtsAware): array
 
         foreach ($stmtsAware->stmts as $stmt) {
             // find assign mock
-            if (! $stmt instanceof Expression || ! $stmt->expr instanceof Assign) {
+            if (! $stmt instanceof Expression) {
+                continue;
+            }
+            if (! $stmt->expr instanceof Assign) {
                 continue;
             }
-
             $assign = $stmt->expr;
 
             $firstArg = $this->matchCreateMockArgAssignedToVariable($assign);
@@ -59,9 +61,11 @@ public function collect(ClassMethod|Foreach_ $stmtsAware): array
             }
 
             $mockClassReflection = $this->reflectionProvider->getClass($mockedClass);
-
             // these cannot be instantiated
-            if ($mockClassReflection->isAbstract() || $mockClassReflection->isInterface()) {
+            if ($mockClassReflection->isAbstract()) {
+                continue;
+            }
+            if ($mockClassReflection->isInterface()) {
                 continue;
             }
 

rules/CodeQuality/NodeFinder/VariableFinder.php

@@ -4,6 +4,7 @@
 
 namespace Rector\PHPUnit\CodeQuality\NodeFinder;
 
+use PhpParser\Node;
 use PhpParser\Node\Expr\Variable;
 use Rector\NodeNameResolver\NodeNameResolver;
 use Rector\PhpParser\Node\BetterNodeFinder;
@@ -19,12 +20,10 @@ public function __construct(
     /**
      * @return Variable[]
      */
-    public function find(\PhpParser\Node $node, string $variableName): array
+    public function find(Node $node, string $variableName): array
     {
         $variables = $this->betterNodeFinder->findInstancesOfScoped([$node], Variable::class);
 
-        return array_filter($variables, function (Variable $variable) use ($variableName): bool {
-            return $this->nodeNameResolver->isName($variable, $variableName);
-        });
+        return array_filter($variables, fn(Variable $variable): bool => $this->nodeNameResolver->isName($variable, $variableName));
     }
 }

rules/CodeQuality/Rector/ClassMethod/BareCreateMockAssignToDirectUseRector.php

@@ -110,7 +110,7 @@ public function refactor(Node $node): ?Node
 
         $hasChanged = false;
 
-        foreach ($mockedClassesToVariableNames as $variableName => $mockedClass) {
+        foreach (array_keys($mockedClassesToVariableNames) as $variableName) {
             // variable cannot be part of any method call
             if ($this->isVariableUsedAsPartOfMethodCall($node, $variableName)) {
                 continue;
@@ -224,8 +224,6 @@ private function findCallLikes(ClassMethod|Foreach_|Stmt $node): array
             [MethodCall::class, StaticCall::class, New_::class]
         );
 
-        return array_filter($callLikes, function (CallLike $callLike): bool {
-            return ! $callLike->isFirstClassCallable();
-        });
+        return array_filter($callLikes, fn(CallLike $callLike): bool => ! $callLike->isFirstClassCallable());
     }
 }

rules/CodeQuality/Rector/ClassMethod/EntityDocumentCreateMockToDirectNewRector.php

@@ -4,6 +4,7 @@
 
 namespace Rector\PHPUnit\CodeQuality\Rector\ClassMethod;
 
+use PhpParser\Node\Expr\Assign;
 use PhpParser\Node;
 use PhpParser\Node\Arg;
 use PhpParser\Node\Expr;
@@ -239,7 +240,7 @@ private function replaceCreateMockWithDirectNew(ClassMethod $classMethod, array
                 continue;
             }
 
-            if (! $stmt->expr instanceof Expr\Assign) {
+            if (! $stmt->expr instanceof Assign) {
                 continue;
             }