update custom vistors

Author: TomasVotruba

rules/CodeQuality/Rector/FunctionLike/SimplifyUselessVariableRector.php

@@ -8,7 +8,6 @@
 use PhpParser\Node;
 use PhpParser\Node\Expr\Assign;
 use PhpParser\Node\Expr\AssignOp;
-use PhpParser\Node\Expr\Closure;
 use PhpParser\Node\Expr\Ternary;
 use PhpParser\Node\Expr\Variable;
 use PhpParser\Node\Stmt;

rules/CodeQuality/Rector/If_/SimplifyIfNotNullReturnRector.php

@@ -6,7 +6,6 @@
 
 use PhpParser\Node;
 use PhpParser\Node\Expr;
-use PhpParser\Node\Stmt;
 use PhpParser\Node\Stmt\Else_;
 use PhpParser\Node\Stmt\If_;
 use PhpParser\Node\Stmt\Return_;

src/NodeManipulator/StmtsManipulator.php

@@ -6,7 +6,6 @@
 
 use PhpParser\Node;
 use PhpParser\Node\Expr;
-use PhpParser\Node\Expr\Closure;
 use PhpParser\Node\Expr\Variable;
 use PhpParser\Node\Stmt;
 use PhpParser\Node\Stmt\ClassMethod;

src/NodeTypeResolver/PHPStan/Scope/NodeVisitor/GlobalVariableNodeVisitor.php

@@ -12,10 +12,11 @@
 use PhpParser\Node\Stmt\Global_;
 use PhpParser\NodeVisitor;
 use PhpParser\NodeVisitorAbstract;
-use Rector\Contract\PhpParser\Node\StmtsAwareInterface;
 use Rector\NodeTypeResolver\Node\AttributeKey;
 use Rector\NodeTypeResolver\PHPStan\Scope\Contract\NodeVisitor\ScopeResolverNodeVisitorInterface;
 use Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser;
+use Rector\PhpParser\NodeGroups;
+use Webmozart\Assert\Assert;
 
 final class GlobalVariableNodeVisitor extends NodeVisitorAbstract implements ScopeResolverNodeVisitorInterface
 {
@@ -26,10 +27,12 @@ public function __construct(
 
     public function enterNode(Node $node): ?Node
     {
-        if (! $node instanceof StmtsAwareInterface) {
+        if (! NodeGroups::matchesStmtsAware($node)) {
             return null;
         }
 
+        Assert::propertyExists($node, 'stmts');
+
         if ($node->stmts === null) {
             return null;
         }

src/NodeTypeResolver/PHPStan/Scope/NodeVisitor/StaticVariableNodeVisitor.php

@@ -12,10 +12,11 @@
 use PhpParser\Node\Stmt\Static_;
 use PhpParser\NodeVisitor;
 use PhpParser\NodeVisitorAbstract;
-use Rector\Contract\PhpParser\Node\StmtsAwareInterface;
 use Rector\NodeTypeResolver\Node\AttributeKey;
 use Rector\NodeTypeResolver\PHPStan\Scope\Contract\NodeVisitor\ScopeResolverNodeVisitorInterface;
 use Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser;
+use Rector\PhpParser\NodeGroups;
+use Webmozart\Assert\Assert;
 
 final class StaticVariableNodeVisitor extends NodeVisitorAbstract implements ScopeResolverNodeVisitorInterface
 {
@@ -26,10 +27,12 @@ public function __construct(
 
     public function enterNode(Node $node): ?Node
     {
-        if (! $node instanceof StmtsAwareInterface) {
+        if (! NodeGroups::matchesStmtsAware($node)) {
             return null;
         }
 
+        Assert::propertyExists($node, 'stmts');
+
         if ($node->stmts === null) {
             return null;
         }

src/PhpParser/NodeGroups.php

@@ -31,4 +31,15 @@ final class NodeGroups
         // custom Rector node
         FileWithoutNamespace::class,
     ];
+
+    public static function matchesStmtsAware(\PhpParser\Node $node): bool
+    {
+        foreach (self::STMTS_AWARE_NODES as $stmtAwareNodeClass) {
+            if (is_a($node, $stmtAwareNodeClass)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
 }