remove rest of instanceof checks

Author: TomasVotruba

phpstan.neon

@@ -34,8 +34,8 @@ parameters:
     scanDirectories:
         - stubs
 
-    scanFiles:
-        - src/Contract/PhpParser/Node/StmtsAwareInterface.php
+#    scanFiles:
+#        - src/Contract/PhpParser/Node/StmtsAwareInterface.php
 
     excludePaths:
         - '*tests/*/Fixture/*'
@@ -211,7 +211,7 @@ parameters:
             message: '#Function "(class_exists|interface_exists)\(\)" cannot be used/left in the code\: use ReflectionProvider\->has\*\(\) instead#'
             path: src/Skipper/SkipCriteriaResolver/SkippedClassResolver.php
 
-        - '#(.*?)\\Contract\\PhpParser\\Node\\StmtsAwareInterface\:\:\$stmts#'
+#        - '#(.*?)\\Contract\\PhpParser\\Node\\StmtsAwareInterface\:\:\$stmts#'
 
         # dev rule
         - '#Class "Rector\\Utils\\Rector\\MoveAbstractRectorToChildrenRector" is missing @see annotation with test case class reference#'
@@ -384,4 +384,3 @@ parameters:
             message: '#Method (.*?)refactor\(\) (never returns|should return) (.*?)#'
             paths:
                 - rules/Php70/Rector/If_/IfToSpaceshipRector.php
-                - rules/CodingStyle/Rector/Stmt/NewlineAfterStatementRector.php

preload.php

@@ -26,6 +26,7 @@ function isPHPStanTestPreloaded(): bool
 }
 
 require_once __DIR__ . '/vendor/nikic/php-parser/lib/PhpParser/Node.php';
+// @todo to be deprecated
 require_once __DIR__ . '/src/Contract/PhpParser/Node/StmtsAwareInterface.php';
 require_once __DIR__ . '/vendor/nikic/php-parser/lib/PhpParser/NodeAbstract.php';
 require_once __DIR__ . '/vendor/nikic/php-parser/lib/PhpParser/Node/Expr.php';

rules/DeadCode/Rector/Assign/RemoveUnusedVariableAssignRector.php

@@ -19,11 +19,11 @@
 use PhpParser\Node\Stmt\Expression;
 use PhpParser\Node\Stmt\Function_;
 use PhpParser\NodeVisitor;
-use Rector\Contract\PhpParser\Node\StmtsAwareInterface;
 use Rector\DeadCode\SideEffect\SideEffectNodeDetector;
 use Rector\NodeAnalyzer\VariableAnalyzer;
 use Rector\NodeManipulator\StmtsManipulator;
 use Rector\Php\ReservedKeywordAnalyzer;
+use Rector\PhpParser\Enum\NodeGroup;
 use Rector\PhpParser\Node\BetterNodeFinder;
 use Rector\Rector\AbstractRector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
@@ -164,20 +164,17 @@ private function shouldSkip(array $stmts): bool
      */
     private function collectAssignRefVariableNames(Stmt $stmt, array &$refVariableNames): void
     {
-        if (! $stmt instanceof StmtsAwareInterface) {
+        if (! NodeGroup::isStmtAwareNode($stmt)) {
             return;
         }
 
-        $this->traverseNodesWithCallable(
-            $stmt,
-            function (Node $subNode) use (&$refVariableNames): Node {
-                if ($subNode instanceof AssignRef && $subNode->var instanceof Variable) {
-                    $refVariableNames[] = (string) $this->getName($subNode->var);
-                }
-
-                return $subNode;
+        $this->traverseNodesWithCallable($stmt, function (Node $subNode) use (&$refVariableNames): Node {
+            if ($subNode instanceof AssignRef && $subNode->var instanceof Variable) {
+                $refVariableNames[] = (string) $this->getName($subNode->var);
             }
-        );
+
+            return $subNode;
+        });
     }
 
     /**

src/Application/NodeAttributeReIndexer.php

@@ -21,7 +21,8 @@
 use PhpParser\Node\Stmt\If_;
 use PhpParser\Node\Stmt\Switch_;
 use PhpParser\Node\Stmt\TryCatch;
-use Rector\Contract\PhpParser\Node\StmtsAwareInterface;
+use Rector\PhpParser\Enum\NodeGroup;
+use Webmozart\Assert\Assert;
 
 final class NodeAttributeReIndexer
 {
@@ -66,10 +67,13 @@ public static function reIndexNodeAttributes(Node $node): ?Node
 
     private static function reIndexStmtsKeys(Node $node): ?Node
     {
-        if (! $node instanceof StmtsAwareInterface && ! $node instanceof ClassLike && ! $node instanceof Declare_ && ! $node instanceof Block) {
+        if (! NodeGroup::isStmtAwareNode(
+            $node
+        ) && ! $node instanceof ClassLike && ! $node instanceof Declare_ && ! $node instanceof Block) {
             return null;
         }
 
+        Assert::propertyExists($node, 'stmts');
         if ($node->stmts === null) {
             return null;
         }

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

@@ -13,9 +13,10 @@
 use PhpParser\NodeVisitor;
 use PhpParser\NodeVisitorAbstract;
 use Rector\Contract\PhpParser\DecoratingNodeVisitorInterface;
-use Rector\Contract\PhpParser\Node\StmtsAwareInterface;
 use Rector\NodeTypeResolver\Node\AttributeKey;
 use Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser;
+use Rector\PhpParser\Enum\NodeGroup;
+use Webmozart\Assert\Assert;
 
 final class GlobalVariableNodeVisitor extends NodeVisitorAbstract implements DecoratingNodeVisitorInterface
 {
@@ -26,10 +27,11 @@ public function __construct(
 
     public function enterNode(Node $node): ?Node
     {
-        if (! $node instanceof StmtsAwareInterface) {
+        if (! NodeGroup::isStmtAwareNode($node)) {
             return null;
         }
 
+        Assert::propertyExists($node, 'stmts');
         if ($node->stmts === null) {
             return null;
         }

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

@@ -13,9 +13,10 @@
 use PhpParser\NodeVisitor;
 use PhpParser\NodeVisitorAbstract;
 use Rector\Contract\PhpParser\DecoratingNodeVisitorInterface;
-use Rector\Contract\PhpParser\Node\StmtsAwareInterface;
 use Rector\NodeTypeResolver\Node\AttributeKey;
 use Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser;
+use Rector\PhpParser\Enum\NodeGroup;
+use Webmozart\Assert\Assert;
 
 final class StaticVariableNodeVisitor extends NodeVisitorAbstract implements DecoratingNodeVisitorInterface
 {
@@ -26,10 +27,11 @@ public function __construct(
 
     public function enterNode(Node $node): ?Node
     {
-        if (! $node instanceof StmtsAwareInterface) {
+        if (! NodeGroup::isStmtAwareNode($node)) {
             return null;
         }
 
+        Assert::propertyExists($node, 'stmts');
         if ($node->stmts === null) {
             return null;
         }

src/PhpParser/Enum/NodeGroup.php

@@ -75,4 +75,15 @@ final class NodeGroup
         Interface_::class,
         Switch_::class,
     ];
+
+    public static function isStmtAwareNode(Node $node): bool
+    {
+        foreach (self::STMTS_AWARE as $stmtAwareClass) {
+            if (is_a($node, $stmtAwareClass, true)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
 }

tests/BetterPhpDocParser/PhpDoc/ArrayItemNode/ArrayItemNodeTest.php

@@ -10,10 +10,11 @@
 use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
 use Rector\BetterPhpDocParser\Printer\PhpDocInfoPrinter;
 use Rector\Comments\NodeDocBlock\DocBlockUpdater;
-use Rector\Contract\PhpParser\Node\StmtsAwareInterface;
 use Rector\NodeTypeResolver\NodeScopeAndMetadataDecorator;
+use Rector\PhpParser\Enum\NodeGroup;
 use Rector\PhpParser\Parser\RectorParser;
 use Rector\Testing\PHPUnit\AbstractLazyTestCase;
+use Webmozart\Assert\Assert;
 
 final class ArrayItemNodeTest extends AbstractLazyTestCase
 {
@@ -51,10 +52,11 @@ public function testUpdateNestedClassAnnotation(): void
         $classDocComment = null;
 
         foreach ($newStmts as $newStmt) {
-            if (! $newStmt instanceof StmtsAwareInterface) {
+            if (! NodeGroup::isStmtAwareNode($newStmt)) {
                 continue;
             }
 
+            Assert::propertyExists($newStmt, 'stmts');
             if ($newStmt->stmts === null) {
                 continue;
             }