avoid type casting against stmts aware interface, as no node has it

Author: TomasVotruba

config/phpstan/parser.neon

@@ -25,9 +25,3 @@ services:
         arguments:
             parser: @currentPhpVersionPhpParser
         autowired: no
-
-    # use StmtsAwareNode
-#    -
-#        class: Rector\PHPStan\NodeVisitor\StmtsAwareWrappingNodeVisitor
-#        tags:
-#            - phpstan.parser.richParserNodeVisitor

phpstan.neon

@@ -381,7 +381,7 @@ parameters:
         -
             path: src/PhpParser/NodeTraverser/RectorNodeTraverser.php
             identifier: symplify.forbiddenFuncCall
-        - '#Parameter 1 should use "Rector\\Contract\\PhpParser\\Node\\StmtsAwareInterface" type as the only type passed to this method#'
+        - '#Parameter \d should use "Rector\\Contract\\PhpParser\\Node\\StmtsAwareInterface" type as the only type passed to this method#'
         - '#Parameter \#1 \$stmtsAware of method (.*?) expects Rector\\Contract\\PhpParser\\Node\\StmtsAwareInterface#'
 
         - '#Method (.*?) should return Rector\\Contract\\PhpParser\\Node\\StmtsAwareInterface\|null but returns (.*?)\|null#'

rules/DeadCode/Rector/Assign/RemoveUnusedVariableAssignRector.php

@@ -25,9 +25,11 @@
 use Rector\NodeManipulator\StmtsManipulator;
 use Rector\Php\ReservedKeywordAnalyzer;
 use Rector\PhpParser\Node\BetterNodeFinder;
+use Rector\PhpParser\NodeGroups;
 use Rector\Rector\AbstractRector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
+use Webmozart\Assert\Assert;
 
 /**
  * @see \Rector\Tests\DeadCode\Rector\Assign\RemoveUnusedVariableAssignRector\RemoveUnusedVariableAssignRectorTest
@@ -164,10 +166,12 @@ private function shouldSkip(array $stmts): bool
      */
     private function collectAssignRefVariableNames(Stmt $stmt, array &$refVariableNames): void
     {
-        if (! $stmt instanceof StmtsAwareInterface) {
+        if (! NodeGroups::matchesStmtsAware($stmt)) {
             return;
         }
 
+        Assert::propertyExists($stmt, 'stmts');
+
         $this->traverseNodesWithCallable(
             $stmt,
             function (Node $subNode) use (&$refVariableNames): Node {

rules/DeadCode/Rector/For_/RemoveDeadIfForeachForRector.php

@@ -113,7 +113,10 @@ public function refactor(Node $node): Node|null
         return null;
     }
 
-    private function processIf(If_ $if, int $key, StmtsAwareInterface $stmtsAware): void
+    /**
+     * @param StmtsAwareInterface $stmtsAware
+     */
+    private function processIf(If_ $if, int $key, \PhpParser\Node $stmtsAware): void
     {
         if ($if->elseifs !== []) {
             return;
@@ -137,7 +140,10 @@ private function processIf(If_ $if, int $key, StmtsAwareInterface $stmtsAware):
         $this->hasChanged = true;
     }
 
-    private function processForForeach(For_|Foreach_ $for, int $key, StmtsAwareInterface $stmtsAware): void
+    /**
+     * @param StmtsAwareInterface $stmtsAware
+     */
+    private function processForForeach(For_|Foreach_ $for, int $key, \PhpParser\Node $stmtsAware): void
     {
         if ($for instanceof For_) {
             $variables = $this->betterNodeFinder->findInstanceOf(

rules/DeadCode/Rector/If_/RemoveUnusedNonEmptyArrayBeforeForeachRector.php

@@ -25,6 +25,7 @@
 use Rector\Rector\AbstractRector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
+use Webmozart\Assert\Assert;
 
 /**
  * @see \Rector\Tests\DeadCode\Rector\If_\RemoveUnusedNonEmptyArrayBeforeForeachRector\RemoveUnusedNonEmptyArrayBeforeForeachRectorTest
@@ -151,8 +152,13 @@ private function isUselessBooleanAnd(BooleanAnd $booleanAnd, Expr $foreachExpr):
         return $this->countManipulator->isCounterHigherThanOne($booleanAnd->right, $foreachExpr);
     }
 
-    private function refactorStmtsAware(StmtsAwareInterface $stmtsAware): ?StmtsAwareInterface
+    /**
+     * @param StmtsAwareInterface $stmtsAware
+     */
+    private function refactorStmtsAware(\PhpParser\Node $stmtsAware): ?StmtsAwareInterface
     {
+        Assert::propertyExists($stmtsAware, 'stmts');
+
         if ($stmtsAware->stmts === null) {
             return null;
         }

rules/EarlyReturn/Rector/Return_/PreparedValueToEarlyReturnRector.php

@@ -183,9 +183,11 @@ public function refactor(Node $node): ?StmtsAwareInterface
 
     /**
      * @param If_[] $ifs
+     * @param StmtsAwareInterface $stmtsAware
+     *
      * @return BareSingleAssignIf[]
      */
-    private function getMatchingBareSingleAssignIfs(array $ifs, StmtsAwareInterface $stmtsAware): array
+    private function getMatchingBareSingleAssignIfs(array $ifs, \PhpParser\Node $stmtsAware): array
     {
         $bareSingleAssignIfs = [];
         foreach ($ifs as $key => $if) {
@@ -233,7 +235,10 @@ private function isVariableSharedInAssignIfsAndReturn(
         return true;
     }
 
-    private function matchBareSingleAssignIf(Stmt $stmt, int $key, StmtsAwareInterface $stmtsAware): ?BareSingleAssignIf
+    /**
+     * @param StmtsAwareInterface $stmtsAware
+     */
+    private function matchBareSingleAssignIf(Stmt $stmt, int $key, \PhpParser\Node $stmtsAware): ?BareSingleAssignIf
     {
         if (! $stmt instanceof If_) {
             return null;

rules/Php84/Rector/Foreach_/ForeachToArrayAllRector.php

@@ -25,6 +25,7 @@
 use Rector\VersionBonding\Contract\MinPhpVersionInterface;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
+use Webmozart\Assert\Assert;
 
 /**
  * @see \Rector\Tests\Php84\Rector\Foreach_\ForeachToArrayAllRector\ForeachToArrayAllRectorTest
@@ -102,8 +103,13 @@ public function provideMinPhpVersion(): int
         return PhpVersionFeature::ARRAY_ALL;
     }
 
-    private function refactorBooleanAssignmentPattern(StmtsAwareInterface $stmtsAware): ?Node
+    /**
+     * @param StmtsAwareInterface $stmtsAware
+     */
+    private function refactorBooleanAssignmentPattern(\PhpParser\Node $stmtsAware): ?Node
     {
+        Assert::propertyExists($stmtsAware, 'stmts');
+
         foreach ($stmtsAware->stmts as $key => $stmt) {
             if (! $stmt instanceof Foreach_) {
                 continue;
@@ -185,8 +191,13 @@ private function refactorBooleanAssignmentPattern(StmtsAwareInterface $stmtsAwar
         return null;
     }
 
-    private function refactorEarlyReturnPattern(StmtsAwareInterface $stmtsAware): ?Node
+    /**
+     * @param StmtsAwareInterface $stmtsAware
+     */
+    private function refactorEarlyReturnPattern(\PhpParser\Node $stmtsAware): ?Node
     {
+        Assert::propertyExists($stmtsAware, 'stmts');
+
         foreach ($stmtsAware->stmts as $key => $stmt) {
             if (! $stmt instanceof Foreach_) {
                 continue;

rules/Php84/Rector/Foreach_/ForeachToArrayAnyRector.php

@@ -24,6 +24,7 @@
 use Rector\VersionBonding\Contract\MinPhpVersionInterface;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
+use Webmozart\Assert\Assert;
 
 /**
  * @see \Rector\Tests\Php84\Rector\Foreach_\ForeachToArrayAnyRector\ForeachToArrayAnyRectorTest
@@ -101,8 +102,13 @@ public function provideMinPhpVersion(): int
         return PhpVersionFeature::ARRAY_ANY;
     }
 
-    private function refactorBooleanAssignmentPattern(StmtsAwareInterface $stmtsAware): ?Node
+    /**
+     * @param StmtsAwareInterface $stmtsAware
+     */
+    private function refactorBooleanAssignmentPattern(\PhpParser\Node $stmtsAware): ?Node
     {
+        Assert::propertyExists($stmtsAware, 'stmts');
+
         foreach ($stmtsAware->stmts as $key => $stmt) {
             if (! $stmt instanceof Foreach_) {
                 continue;
@@ -182,8 +188,13 @@ private function refactorBooleanAssignmentPattern(StmtsAwareInterface $stmtsAwar
         return null;
     }
 
-    private function refactorEarlyReturnPattern(StmtsAwareInterface $stmtsAware): ?Node
+    /**
+     * @param StmtsAwareInterface $stmtsAware
+     */
+    private function refactorEarlyReturnPattern(\PhpParser\Node $stmtsAware): ?Node
     {
+        Assert::propertyExists($stmtsAware, 'stmts');
+
         foreach ($stmtsAware->stmts as $key => $stmt) {
             if (! $stmt instanceof Foreach_) {
                 continue;