apply rector

Author: TomasVotruba

rules/TypeDeclaration/Rector/FuncCall/AddArrowFunctionParamArrayWhereDimFetchRector.php

@@ -4,6 +4,8 @@
 
 namespace Rector\TypeDeclaration\Rector\FuncCall;
 
+use PhpParser\Node\Expr\Variable;
+use PhpParser\Node\Expr\Instanceof_;
 use PhpParser\Node;
 use PhpParser\Node\Expr\ArrayDimFetch;
 use PhpParser\Node\Expr\ArrowFunction;
@@ -24,7 +26,7 @@
 final class AddArrowFunctionParamArrayWhereDimFetchRector extends AbstractRector implements MinPhpVersionInterface
 {
     public function __construct(
-        private BetterNodeFinder $betterNodeFinder
+        private readonly BetterNodeFinder $betterNodeFinder
     ) {
     }
 
@@ -90,7 +92,7 @@ public function refactor(Node $node): ?Node
             $dimFetchVariableNames = $this->resolveDimFetchVariableNames($closureExpr);
 
             foreach ($closureExpr->getParams() as $closureParam) {
-                if ($closureParam->type instanceof \PhpParser\Node) {
+                if ($closureParam->type instanceof Node) {
                     // param is known already
                     continue;
                 }
@@ -126,19 +128,15 @@ public function provideMinPhpVersion(): int
      */
     private function resolveDimFetchVariableNames(Closure|ArrowFunction $closureExpr): array
     {
-        if ($closureExpr instanceof ArrowFunction) {
-            $closureNodes = [$closureExpr->expr];
-        } else {
-            $closureNodes = $closureExpr->stmts;
-        }
+        $closureNodes = $closureExpr instanceof ArrowFunction ? [$closureExpr->expr] : $closureExpr->stmts;
 
         /** @var ArrayDimFetch[] $arrayDimFetches */
         $arrayDimFetches = $this->betterNodeFinder->findInstancesOfScoped($closureNodes, ArrayDimFetch::class);
 
         $usedDimFetchVariableNames = [];
 
         foreach ($arrayDimFetches as $arrayDimFetch) {
-            if ($arrayDimFetch->var instanceof Node\Expr\Variable) {
+            if ($arrayDimFetch->var instanceof Variable) {
                 $usedDimFetchVariableNames[] = (string) $this->getName($arrayDimFetch->var);
             }
         }
@@ -151,11 +149,7 @@ private function resolveDimFetchVariableNames(Closure|ArrowFunction $closureExpr
      */
     private function resolveIsArrayVariables(Closure|ArrowFunction $closureExpr): array
     {
-        if ($closureExpr instanceof ArrowFunction) {
-            $closureNodes = [$closureExpr->expr];
-        } else {
-            $closureNodes = $closureExpr->stmts;
-        }
+        $closureNodes = $closureExpr instanceof ArrowFunction ? [$closureExpr->expr] : $closureExpr->stmts;
 
         /** @var FuncCall[] $funcCalls */
         $funcCalls = $this->betterNodeFinder->findInstancesOfScoped($closureNodes, FuncCall::class);
@@ -169,7 +163,7 @@ private function resolveIsArrayVariables(Closure|ArrowFunction $closureExpr): ar
 
             $firstArgExpr = $funcCall->getArgs()[0]
                 ->value;
-            if (! $firstArgExpr instanceof Node\Expr\Variable) {
+            if (! $firstArgExpr instanceof Variable) {
                 continue;
             }
 
@@ -184,19 +178,15 @@ private function resolveIsArrayVariables(Closure|ArrowFunction $closureExpr): ar
      */
     private function resolveInstanceofVariables(Closure|ArrowFunction $closureExpr): array
     {
-        if ($closureExpr instanceof ArrowFunction) {
-            $closureNodes = [$closureExpr->expr];
-        } else {
-            $closureNodes = $closureExpr->stmts;
-        }
+        $closureNodes = $closureExpr instanceof ArrowFunction ? [$closureExpr->expr] : $closureExpr->stmts;
 
-        /** @var Node\Expr\Instanceof_[] $instanceOfs */
-        $instanceOfs = $this->betterNodeFinder->findInstancesOfScoped($closureNodes, Node\Expr\Instanceof_::class);
+        /** @var Instanceof_[] $instanceOfs */
+        $instanceOfs = $this->betterNodeFinder->findInstancesOfScoped($closureNodes, Instanceof_::class);
 
         $variableNames = [];
 
         foreach ($instanceOfs as $instanceOf) {
-            if (! $instanceOf->expr instanceof Node\Expr\Variable) {
+            if (! $instanceOf->expr instanceof Variable) {
                 continue;
             }