rector: skip false positive return type

rectorphp · Mar 19, 2021 · b38f56f · b38f56f
1 parent 4a7b8b1
commit b38f56f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/packages/BetterPhpDocParser/Printer/PhpDocInfoPrinter.php b/packages/BetterPhpDocParser/Printer/PhpDocInfoPrinter.php
@@ -349,7 +349,9 @@ private function printAttributeWithAsterisk(Node $node): string
      */
     private function getRemovedNodesPositions(): array
     {
-        $removedNodePositions = [];
+        if ($this->removedNodePositions !== []) {
+            return $this->removedNodePositions;
+        }
 
         $removedNodes = array_diff(
             $this->phpDocInfo->getOriginalPhpDocNode()
@@ -381,10 +383,13 @@ private function getRemovedNodesPositions(): array
 
             $lastEndPosition = $removedPhpDocNodeInfo->getEnd();
 
-            $removedNodePositions[] = new StartAndEnd(max(0, $seekPosition - 1), $removedPhpDocNodeInfo->getEnd());
+            $this->removedNodePositions[] = new StartAndEnd(max(
+                0,
+                $seekPosition - 1
+            ), $removedPhpDocNodeInfo->getEnd());
         }
 
-        return $removedNodePositions;
+        return $this->removedNodePositions;
     }
 
     /**

diff --git a/rector.php b/rector.php
@@ -14,6 +14,7 @@
 use Rector\Restoration\Rector\ClassMethod\InferParamFromClassMethodReturnRector;
 use Rector\Restoration\ValueObject\InferParamFromClassMethodReturn;
 use Rector\Set\ValueObject\SetList;
+use Rector\TypeDeclaration\Rector\FunctionLike\ReturnTypeDeclarationRector;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 use Symplify\SymfonyPhpConfig\ValueObjectInliner;
 
@@ -74,6 +75,11 @@
 
         PrivatizeLocalPropertyToPrivatePropertyRector::class => [__DIR__ . '/src/Rector/AbstractRector.php'],
 
+        ReturnTypeDeclarationRector::class => [
+            __DIR__ . '/packages/PHPStanStaticTypeMapper/TypeMapper/ArrayTypeMapper.php',
+            __DIR__ . '/packages/PHPStanStaticTypeMapper/TypeMapper/ObjectTypeMapper.php',
+        ],
+
         // test paths
         '*/Fixture/*',
         '*/Fixture/*',