tidy up

Author: TomasVotruba

src/Testing/TestingParser/TestingParser.php

@@ -27,17 +27,7 @@ public function __construct(
 
     public function parseFilePathToFile(string $filePath): File
     {
-        // needed for PHPStan reflection, as it caches the last processed file
-        $this->dynamicSourceLocatorProvider->setFilePath($filePath);
-
-        $fileContent = FileSystem::read($filePath);
-        $file = new File($filePath, $fileContent);
-        $stmts = $this->rectorParser->parseString($fileContent);
-
-        $stmts = $this->nodeScopeAndMetadataDecorator->decorateNodesFromFile($filePath, $stmts);
-
-        $file->hydrateStmtsAndTokens($stmts, $stmts, []);
-        $this->currentFileProvider->setFile($file);
+        [$file, $stmts] = $this->parseToFileAndStmts($filePath);
 
         return $file;
     }
@@ -46,19 +36,29 @@ public function parseFilePathToFile(string $filePath): File
      * @return Node[]
      */
     public function parseFileToDecoratedNodes(string $filePath): array
+    {
+        [$file, $stmts] = $this->parseToFileAndStmts($filePath);
+
+        return $stmts;
+    }
+
+    /**
+     * @return array{0: File, 1: Node[]}
+     */
+    private function parseToFileAndStmts(string $filePath): array
     {
         // 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);
 
+        $stmts = $this->rectorParser->parseString($fileContent);
         $stmts = $this->nodeScopeAndMetadataDecorator->decorateNodesFromFile($filePath, $stmts);
-        $file->hydrateStmtsAndTokens($stmts, $stmts, []);
 
+        $file->hydrateStmtsAndTokens($stmts, $stmts, []);
         $this->currentFileProvider->setFile($file);
 
-        return $stmts;
+        return [$file, $stmts];
     }
 }

tests/Comments/CommentRemover/Fixture/another_comment.php.inc

@@ -2,7 +2,7 @@
 
 namespace Rector\Tests\Comments\CommentRemover\Fixture;
 
-$values = new class
+final class AnotherComment
 {
     public function run($value)
     {
@@ -13,13 +13,13 @@ $values = new class
                 return 'https://some_very_long_link.cz';  /* here too */
         }
     }
-};
+}
 
 ?>
 -----
 namespace Rector\Tests\Comments\CommentRemover\Fixture;
 
-$values = new class
+final class AnotherComment
 {
     public function run($value)
     {
@@ -28,4 +28,4 @@ $values = new class
                 return 'https://some_very_long_link.cz';
         }
     }
-};
+}

tests/Issues/AnnotationToAttributeRenameAutoImport/config/configured_rule.php

@@ -8,6 +8,7 @@
 use Rector\Renaming\Rector\Name\RenameClassRector;
 
 return static function (RectorConfig $rectorConfig): void {
+    /** triggers @see \Rector\NodeTypeResolver\PhpDocNodeVisitor\NameImportingPhpDocNodeVisitor */
     $rectorConfig->importNames();
 
     $rectorConfig->ruleWithConfiguration(AnnotationToAttributeRector::class, [

tests/Issues/AutoImport/config/configured_rule.php

@@ -12,17 +12,23 @@
 use Rector\Symfony\Symfony44\Rector\ClassMethod\ConsoleExecuteReturnIntRector;
 
 return static function (RectorConfig $rectorConfig): void {
+    /** enables @see \Rector\PostRector\Rector\NameImportingPostRector */
     $rectorConfig->importNames();
+
     $rectorConfig->ruleWithConfiguration(RenameClassRector::class, [
         'Some\Exception' => 'Some\Target\Exception',
         'DateTime' => 'DateTimeInterface',
         'Phalcon\Logger' => 'Phalcon\Logger\Logger',
     ]);
+
     $rectorConfig->rule(TernaryToNullCoalescingRector::class);
+
     $rectorConfig->ruleWithConfiguration(AnnotationToAttributeRector::class, [
         new AnnotationToAttribute('Doctrine\ORM\Mapping\Entity'),
     ]);
+
     $rectorConfig->rules([ConsoleExecuteReturnIntRector::class, RemoveUnusedPrivatePropertyRector::class]);
+
     $rectorConfig->ruleWithConfiguration(RenameFunctionRector::class, [
         'split' => 'explode',
     ]);