static fixes

Author: TomasVotruba

phpstan.neon

@@ -376,3 +376,12 @@ parameters:
         -
             message: '#Property Rector\\PhpParser\\NodeTraverser\\AbstractImmutableNodeTraverser\:\:\$visitors \(list<PhpParser\\NodeVisitor>\) does not accept array<int\|string, PhpParser\\NodeVisitor>#'
             path: src/PhpParser/NodeTraverser/AbstractImmutableNodeTraverser.php
+
+        # special check for stmts aware virtual interface
+        -
+            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 \#1 \$stmtsAware of method (.*?) expects Rector\\Contract\\PhpParser\\Node\\StmtsAwareInterface#'
+
+        - '#Method (.*?) should return Rector\\Contract\\PhpParser\\Node\\StmtsAwareInterface\|null but returns (.*?)\|null#'

rules/CodeQuality/Rector/FunctionLike/SimplifyUselessVariableRector.php

@@ -25,6 +25,7 @@
 use Rector\Rector\AbstractRector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
+use Webmozart\Assert\Assert;
 
 /**
  * @see \Rector\Tests\CodeQuality\Rector\FunctionLike\SimplifyUselessVariableRector\SimplifyUselessVariableRectorTest
@@ -157,11 +158,13 @@ public function refactor(Node $node): ?Node
      * @return StmtsAwareInterface
      */
     private function processSimplifyUselessVariable(
-        Stmt|Closure $stmtsAware,
+        \PhpParser\Node $stmtsAware,
         Return_ $return,
         Assign|AssignOp $assign,
         int $key
-    ): Stmt|Closure|null {
+    ): \PhpParser\Node|null {
+        Assert::propertyExists($stmtsAware, 'stmts');
+
         if (! $assign instanceof Assign) {
             $binaryClass = $this->assignAndBinaryMap->getAlternative($assign);
             if ($binaryClass === null) {

rules/CodeQuality/Rector/If_/SimplifyIfNotNullReturnRector.php

@@ -63,7 +63,7 @@ public function getNodeTypes(): array
     /**
      * @param StmtsAwareInterface $node
      */
-    public function refactor(Node $node): ?Stmt
+    public function refactor(Node $node): ?\PhpParser\Node
     {
         foreach ((array) $node->stmts as $key => $stmt) {
             if (! $stmt instanceof If_) {

src/NodeManipulator/StmtsManipulator.php

@@ -19,6 +19,7 @@
 use Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser;
 use Rector\PhpParser\Comparing\NodeComparator;
 use Rector\PhpParser\Node\BetterNodeFinder;
+use Webmozart\Assert\Assert;
 
 final readonly class StmtsManipulator
 {
@@ -77,8 +78,10 @@ function (Node $node) use (&$stmts): null {
     /**
      * @param StmtsAwareInterface $stmtsAware
      */
-    public function isVariableUsedInNextStmt(Stmt|Closure $stmtsAware, int $jumpToKey, string $variableName): bool
+    public function isVariableUsedInNextStmt(Node $stmtsAware, int $jumpToKey, string $variableName): bool
     {
+        Assert::propertyExists($stmtsAware, 'stmts');
+
         if ($stmtsAware->stmts === null) {
             return false;
         }