[ci-review] Rector Rectify

Author: actions-user

utils/phpstan/src/Rule/NoScopeFetchBeforeCheapGuardRule.php

@@ -4,6 +4,9 @@
 
 namespace Rector\Utils\PHPStan\Rule;
 
+use PhpParser\Node\Name;
+use PhpParser\Node\Identifier;
+use PhpParser\Node\Expr\ConstFetch;
 use PhpParser\Node;
 use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\Assign;
@@ -102,15 +105,15 @@ private function matchScopeFetchVariableName(Stmt $stmt): ?string
         }
 
         $staticCall = $assign->expr;
-        if (! $staticCall->class instanceof Node\Name) {
+        if (! $staticCall->class instanceof Name) {
             return null;
         }
 
         if ($staticCall->class->toString() !== ScopeFetcher::class) {
             return null;
         }
 
-        if (! $staticCall->name instanceof Node\Identifier || $staticCall->name->toString() !== 'fetch') {
+        if (! $staticCall->name instanceof Identifier || $staticCall->name->toString() !== 'fetch') {
             return null;
         }
 
@@ -128,17 +131,17 @@ private function isReturnNullGuard(If_ $if): bool
             return false;
         }
 
-        return $onlyStmt->expr === null || $this->isNullConstant($onlyStmt->expr);
+        return !$onlyStmt->expr instanceof Expr || $this->isNullConstant($onlyStmt->expr);
     }
 
     private function isNullConstant(Expr $expr): bool
     {
-        return $expr instanceof Node\Expr\ConstFetch && $expr->name->toLowerString() === 'null';
+        return $expr instanceof ConstFetch && $expr->name->toLowerString() === 'null';
     }
 
     private function usesVariable(Expr $expr, string $variableName): bool
     {
-        $foundVariable = (new NodeFinder())->findFirst(
+        $foundVariable = new NodeFinder()->findFirst(
             [$expr],
             static fn (Node $subNode): bool => $subNode instanceof Variable && $subNode->name === $variableName
         );