fixes

Author: TomasVotruba

composer.json

@@ -118,23 +118,6 @@
         "patches": {
             "illuminate/container": [
                 "https://raw.githubusercontent.com/rectorphp/vendor-patches/main/patches/illuminate-container-container-php.patch"
-            ],
-            "nikic/php-parser": [
-                "https://raw.githubusercontent.com/rectorphp/vendor-patches/main/patches/nikic-php-parser-lib-phpparser-node-expr-closure-php.patch",
-                "https://raw.githubusercontent.com/rectorphp/vendor-patches/main/patches/nikic-php-parser-lib-phpparser-node-stmt-finally-php.patch",
-                "https://raw.githubusercontent.com/rectorphp/vendor-patches/main/patches/nikic-php-parser-lib-phpparser-node-stmt-function-php.patch",
-                "https://raw.githubusercontent.com/rectorphp/vendor-patches/main/patches/nikic-php-parser-lib-phpparser-node-stmt-do-php.patch",
-                "https://raw.githubusercontent.com/rectorphp/vendor-patches/main/patches/nikic-php-parser-lib-phpparser-node-stmt-catch-php.patch",
-                "https://raw.githubusercontent.com/rectorphp/vendor-patches/main/patches/nikic-php-parser-lib-phpparser-node-stmt-trycatch-php.patch",
-                "https://raw.githubusercontent.com/rectorphp/vendor-patches/main/patches/nikic-php-parser-lib-phpparser-node-stmt-for-php.patch",
-                "https://raw.githubusercontent.com/rectorphp/vendor-patches/main/patches/nikic-php-parser-lib-phpparser-node-stmt-classmethod-php.patch",
-                "https://raw.githubusercontent.com/rectorphp/vendor-patches/main/patches/nikic-php-parser-lib-phpparser-node-stmt-else-php.patch",
-                "https://raw.githubusercontent.com/rectorphp/vendor-patches/main/patches/nikic-php-parser-lib-phpparser-node-stmt-while-php.patch",
-                "https://raw.githubusercontent.com/rectorphp/vendor-patches/main/patches/nikic-php-parser-lib-phpparser-node-stmt-foreach-php.patch",
-                "https://raw.githubusercontent.com/rectorphp/vendor-patches/main/patches/nikic-php-parser-lib-phpparser-node-stmt-if-php.patch",
-                "https://raw.githubusercontent.com/rectorphp/vendor-patches/main/patches/nikic-php-parser-lib-phpparser-node-stmt-case-php.patch",
-                "https://raw.githubusercontent.com/rectorphp/vendor-patches/main/patches/nikic-php-parser-lib-phpparser-node-stmt-elseif-php.patch",
-                "https://raw.githubusercontent.com/rectorphp/vendor-patches/main/patches/nikic-php-parser-lib-phpparser-node-stmt-namespace-php.patch"
             ]
         },
         "composer-exit-on-patch-failure": true,

rules/CodeQuality/Rector/FunctionLike/SimplifyUselessVariableRector.php

@@ -8,6 +8,7 @@
 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;
@@ -151,12 +152,16 @@ public function refactor(Node $node): ?Node
         return null;
     }
 
+    /**
+     * @param StmtsAwareInterface $stmtsAware
+     * @return StmtsAwareInterface
+     */
     private function processSimplifyUselessVariable(
-        StmtsAwareInterface $stmtsAware,
+        Stmt|Closure $stmtsAware,
         Return_ $return,
         Assign|AssignOp $assign,
         int $key
-    ): ?StmtsAwareInterface {
+    ): Stmt|Closure|null {
         if (! $assign instanceof Assign) {
             $binaryClass = $this->assignAndBinaryMap->getAlternative($assign);
             if ($binaryClass === null) {

rules/CodeQuality/Rector/If_/SimplifyIfNotNullReturnRector.php

@@ -6,6 +6,7 @@
 
 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_;
@@ -62,7 +63,7 @@ public function getNodeTypes(): array
     /**
      * @param StmtsAwareInterface $node
      */
-    public function refactor(Node $node): ?StmtsAwareInterface
+    public function refactor(Node $node): ?Stmt
     {
         foreach ((array) $node->stmts as $key => $stmt) {
             if (! $stmt instanceof If_) {

rules/Php70/Rector/ClassMethod/Php4ConstructorRector.php

@@ -121,7 +121,8 @@ public function refactor(Node $node): Class_|null
         }
 
         $parentClassName = $classReflection->getParentClass() instanceof ClassReflection
-            ? $classReflection->getParentClass()->getName() : '';
+            ? $classReflection->getParentClass()
+                ->getName() : '';
 
         foreach ($classMethodStmts as $classMethodStmt) {
             if (! $classMethodStmt instanceof Expression) {

src/NodeManipulator/StmtsManipulator.php

@@ -6,6 +6,7 @@
 
 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;
@@ -73,11 +74,11 @@ function (Node $node) use (&$stmts): null {
         return $stmts;
     }
 
-    public function isVariableUsedInNextStmt(
-        StmtsAwareInterface $stmtsAware,
-        int $jumpToKey,
-        string $variableName
-    ): bool {
+    /**
+     * @param StmtsAwareInterface $stmtsAware
+     */
+    public function isVariableUsedInNextStmt(Stmt|Closure $stmtsAware, int $jumpToKey, string $variableName): bool
+    {
         if ($stmtsAware->stmts === null) {
             return false;
         }

src/PHPStan/NodeVisitor/StmtsAwareWrappingNodeVisitor.php

@@ -37,7 +37,6 @@
 use Rector\NodeAnalyzer\ExprAnalyzer;
 use Rector\NodeTypeResolver\Node\AttributeKey;
 use Rector\PhpParser\Node\CustomNode\FileWithoutNamespace;
-use Rector\PhpParser\Node\CustomNode\StmtsAwareNode;
 use Rector\Util\NewLineSplitter;
 use Rector\Util\Reflection\PrivatesAccessor;
 use Rector\Util\StringUtils;
@@ -274,19 +273,6 @@ protected function pArray(
         // reindex positions for printer
         $nodes = array_values($nodes);
 
-        // unwrap StmtsAwareNode to make their printing work
-        foreach ($nodes as $key => $node) {
-            if ($node instanceof StmtsAwareNode) {
-                $nodes[$key] = $node->getOriginalNode();
-            }
-        }
-
-        foreach ($origNodes as $key => $origNode) {
-            if ($origNode instanceof StmtsAwareNode) {
-                $origNodes[$key] = $origNode->getOriginalNode();
-            }
-        }
-
         $content = parent::pArray($nodes, $origNodes, $pos, $indentAdjustment, $parentNodeClass, $subNodeName, $fixup);
         if ($content === null) {
             return $content;