cleanup phpstan errors

Author: TomasVotruba

UPGRADING.md

@@ -1,3 +1,9 @@
+# Upgrading from Rector 2.2.11 to 2.2.12
+
+
+@todo
+
+
 # Upgrading from Rector 1.x to 2.0
 
 ## PHP version requirements

phpstan.neon

@@ -279,7 +279,6 @@ parameters:
                 - src/Configuration/RectorConfigBuilder.php
                 - src/Reporting/DeprecatedRulesReporter.php
             identifier: classConstant.deprecatedInterface
-        - '#Class Rector\\PhpParser\\Node\\CustomNode\\FileWithoutNamespace implements deprecated interface Rector\\Contract\\PhpParser\\Node\\StmtsAwareInterface#'
 
         # allowed internally only
         -
@@ -386,12 +385,6 @@ parameters:
             paths:
                 - rules/Php70/Rector/If_/IfToSpaceshipRector.php
 
-        # handles full file
-        -
-            paths:
-                - rules/TypeDeclaration/Rector/StmtsAwareInterface/IncreaseDeclareStrictTypesRector.php
-            identifier: rector.noOnlyNullReturnInRefactor
-
         -
             identifier: rector.noIntegerRefactorReturn
             paths:
@@ -403,13 +396,3 @@ parameters:
 
         # condition check, just to be sure
         - '#Method Rector\\Rector\\AbstractRector\:\:enterNode\(\) never returns 3 so it can be removed from the return type#'
-
-        # special case, working on a file-level
-        -
-            identifier: rector.noOnlyNullReturnInRefactor
-            path: rules/TypeDeclaration/Rector/StmtsAwareInterface/DeclareStrictTypesRector.php
-
-        # handle next with FileNode
-        -
-            identifier: method.parentMethodFinalByPhpDoc
-            path: rules/TypeDeclaration/Rector/StmtsAwareInterface/DeclareStrictTypesRector.php

rules/TypeDeclaration/Rector/StmtsAwareInterface/DeclareStrictTypesRector.php

@@ -98,16 +98,6 @@ public function getNodeTypes(): array
     {
         return [FileNode::class];
     }
-    //
-    //    /**
-    //     * @param StmtsAware $node
-    //     */
-    //    public function refactor(Node $node): null
-    //    {
-    //        // workaround, as Rector now only hooks to specific nodes, not arrays
-    //        // avoid traversing, as we already handled in beforeTraverse()
-    //        return null;
-    //    }
 
     public function provideMinPhpVersion(): int
     {

src/NodeAnalyzer/TerminatedNodeAnalyzer.php

@@ -25,7 +25,6 @@
 use PhpParser\Node\Stmt\Return_;
 use PhpParser\Node\Stmt\Switch_;
 use PhpParser\Node\Stmt\TryCatch;
-use Rector\PhpParser\Node\CustomNode\FileWithoutNamespace;
 use Rector\PhpParser\Node\FileNode;
 
 final class TerminatedNodeAnalyzer

src/PhpParser/Enum/NodeGroup.php

@@ -27,7 +27,6 @@
 use PhpParser\Node\Stmt\Trait_;
 use PhpParser\Node\Stmt\TryCatch;
 use PhpParser\Node\Stmt\While_;
-use Rector\PhpParser\Node\CustomNode\FileWithoutNamespace;
 use Rector\PhpParser\Node\FileNode;
 
 final class NodeGroup

src/PhpParser/Printer/BetterStandardPrinter.php

@@ -21,7 +21,6 @@
 use PhpParser\Node\Expr\MethodCall;
 use PhpParser\Node\Expr\Ternary;
 use PhpParser\Node\Expr\Yield_;
-use PhpParser\Node\InterpolatedStringPart;
 use PhpParser\Node\Scalar\InterpolatedString;
 use PhpParser\Node\Scalar\String_;
 use PhpParser\Node\Stmt\Declare_;
@@ -34,7 +33,6 @@
 use Rector\Configuration\Parameter\SimpleParameterProvider;
 use Rector\NodeAnalyzer\ExprAnalyzer;
 use Rector\NodeTypeResolver\Node\AttributeKey;
-use Rector\PhpParser\Node\CustomNode\FileWithoutNamespace;
 use Rector\PhpParser\Node\FileNode;
 use Rector\Util\NewLineSplitter;
 use Rector\Util\Reflection\PrivatesAccessor;
@@ -84,6 +82,7 @@ public function printFormatPreserving(array $stmts, array $origStmts, array $ori
      */
     public function print(Node | array | null $node): string
     {
+
         if ($node === null) {
             $node = [];
         }
@@ -92,34 +91,9 @@ public function print(Node | array | null $node): string
             $node = [$node];
         }
 
-        return $this->prettyPrint($node);
-    }
-
-    /**
-     * @param Node[] $stmts
-     */
-    public function prettyPrintFile(array $stmts): string
-    {
-        // to keep indexes from 0
-        $stmts = array_values($stmts);
+        $node = $this->unwrapFileNode($node);
 
-        return parent::prettyPrintFile($stmts) . PHP_EOL;
-    }
-
-    //    /**
-    //     * @api magic method in parent
-    //     */
-    //    public function pFileWithoutNamespace(FileWithoutNamespace $fileWithoutNamespace): string
-    //    {
-    //        return $this->pStmts($fileWithoutNamespace->stmts);
-    //    }
-
-    /**
-     * @api magic method in parent
-     */
-    public function pInterpolatedStringPart(InterpolatedStringPart $interpolatedStringPart): string
-    {
-        return $interpolatedStringPart->value;
+        return $this->prettyPrint($node);
     }
 
     protected function p(

src/PostRector/Rector/ClassRenamingPostRector.php

@@ -5,13 +5,10 @@
 namespace Rector\PostRector\Rector;
 
 use PhpParser\Node;
-use PhpParser\Node\Stmt;
 use PhpParser\Node\Stmt\Namespace_;
 use PhpParser\NodeTraverser;
 use PhpParser\NodeVisitor;
 use Rector\CodingStyle\Application\UseImportsRemover;
-use Rector\Configuration\Option;
-use Rector\Configuration\Parameter\SimpleParameterProvider;
 use Rector\Configuration\RenamedClassesDataCollector;
 use Rector\PhpParser\Node\FileNode;
 use Rector\PostRector\Guard\AddUseStatementGuard;
@@ -32,30 +29,6 @@ public function __construct(
     ) {
     }
 
-    //    /**
-    //     * @param Stmt[] $node
-    //     * @return Stmt[]
-    //     */
-    //    public function beforeTraverse(array $nodes): array
-    //    {
-    //        if (! SimpleParameterProvider::provideBoolParameter(Option::AUTO_IMPORT_NAMES)) {
-    //            return $nodes;
-    //        }
-    //
-    //        if ($nodes[0] instanceof FileNode) {
-    //            $rootNode = $nodes[0];
-    //        }
-    //
-    //        foreach ($nodes as $node) {
-    //            if ($node instanceof FileNode || $node instanceof Namespace_) {
-    //                break;
-    //            }
-    //        }
-    //
-    //        $this->renamedNameCollector->reset();
-    //        return $nodes;
-    //    }
-
     public function enterNode(Node $node): Namespace_|FileNode|int|null
     {
         if ($node instanceof FileNode) {

src/Testing/TestingParser/TestingParser.php

@@ -28,6 +28,7 @@ public function __construct(
 
     public function parseFilePathToFile(string $filePath): File
     {
+<<<<<<< HEAD
 <<<<<<< HEAD
         [$file, $stmts] = $this->parseToFileAndStmts($filePath);
 =======
@@ -46,6 +47,9 @@ public function parseFilePathToFile(string $filePath): File
         $file->hydrateStmtsAndTokens($stmts, $stmts, []);
         $this->currentFileProvider->setFile($file);
 >>>>>>> 2751658832 (introduce FileNode to handle file-level changes; deprecate IncreaseDeclareStrictTypesRector)
+=======
+        [$file, $stmts] = $this->parseToFileAndStmts($filePath);
+>>>>>>> 8e51776f69 (cleanup phpstan errors)
 
         return $file;
     }
@@ -58,10 +62,34 @@ public function parseFileToDecoratedNodes(string $filePath): array
         [$file, $stmts] = $this->parseToFileAndStmts($filePath);
 
         return $stmts;
+<<<<<<< HEAD
     }
 
     /**
      * @return array{0: File, 1: Node[]}
+=======
+        //
+        //        // needed for PHPStan reflection, as it caches the last processed file
+        //        $this->dynamicSourceLocatorProvider->setFilePath($filePath);
+        //
+        //        $fileContent = FileSystem::read($filePath);
+        //        $stmts = $this->rectorParser->parseString($fileContent);
+        //        $file = new File($filePath, $fileContent);
+        //
+        //        // wrap in FileNode to enable file-level rules
+        //        $stmts = [new FileNode($stmts)];
+        //
+        //        $stmts = $this->nodeScopeAndMetadataDecorator->decorateNodesFromFile($filePath, $stmts);
+        //        $file->hydrateStmtsAndTokens($stmts, $stmts, []);
+        //
+        //        $this->currentFileProvider->setFile($file);
+        //
+        //        return $stmts;
+    }
+
+    /**
+     * @return array{0: File, 1: Node\Stmt[]}
+>>>>>>> 8e51776f69 (cleanup phpstan errors)
      */
     private function parseToFileAndStmts(string $filePath): array
     {
@@ -70,6 +98,7 @@ private function parseToFileAndStmts(string $filePath): array
 
         $fileContent = FileSystem::read($filePath);
         $file = new File($filePath, $fileContent);
+        $stmts = $this->rectorParser->parseString($fileContent);
 
 <<<<<<< HEAD
         $stmts = $this->rectorParser->parseString($fileContent);

tests/Comments/CommentRemover/CommentRemoverTest.php

@@ -29,6 +29,7 @@ protected function setUp(): void
 
         $this->commentRemover = $this->make(CommentRemover::class);
         $this->testingParser = $this->make(TestingParser::class);
+
         $this->betterStandardPrinter = $this->make(BetterStandardPrinter::class);
     }
 
@@ -44,11 +45,11 @@ public function test(string $filePath): void
 
         $nodesWithoutComments = $this->commentRemover->removeFromNode($nodes);
 
-        $fileContent = $this->betterStandardPrinter->print($nodesWithoutComments);
-        $fileContent = trim($fileContent);
+        $printedFileContent = $this->betterStandardPrinter->print($nodesWithoutComments);
+        $printedFileContent = trim($printedFileContent);
 
         $expectedContent = trim($expectedOutputContents);
-        $this->assertSame($fileContent, $expectedContent);
+        $this->assertSame($printedFileContent, $expectedContent);
 
         // original nodes are not touched
         $originalContent = $this->betterStandardPrinter->print($nodes);