rector: skip false positive return type

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

Hide file tree

Showing 4 changed files with 14 additions and 31 deletions.
diff --git a/packages/BetterPhpDocParser/PhpDocParser/BetterPhpDocParser.php b/packages/BetterPhpDocParser/PhpDocParser/BetterPhpDocParser.php
@@ -296,32 +296,6 @@ private function resolveTokenEnd(TokenIterator $tokenIterator): int
         return $this->adjustTokenEndToFitClassAnnotation($tokenIterator, $tokenEnd);
     }
 
-//    private function getOriginalContentFromTokenIterator(TokenIterator $tokenIterator): string
-//    {
-//        $originalTokens = $this->privatesAccessor->getPrivateProperty($tokenIterator, 'tokens');
-//        $originalContent = '';
-//
-//        foreach ($originalTokens as $originalToken) {
-//            // skip opening
-//            if ($originalToken[1] === Lexer::TOKEN_OPEN_PHPDOC) {
-//                continue;
-//            }
-//
-//            // skip closing
-//            if ($originalToken[1] === Lexer::TOKEN_CLOSE_PHPDOC) {
-//                continue;
-//            }
-//
-//            if ($originalToken[1] === Lexer::TOKEN_PHPDOC_EOL) {
-//                $originalToken[0] = PHP_EOL;
-//            }
-//
-//            $originalContent .= $originalToken[0];
-//        }
-//
-//        return trim($originalContent);
-//    }
-
     /**
      * @see https://github.com/rectorphp/rector/issues/2158
      *

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/packages/BetterPhpDocParser/Printer/WhitespaceDetector.php b/packages/BetterPhpDocParser/Printer/WhitespaceDetector.php
@@ -8,8 +8,6 @@
 use Nette\Utils\Strings;
 use PHPStan\PhpDocParser\Ast\Node;
 use PHPStan\PhpDocParser\Lexer\Lexer;
-//use Rector\BetterPhpDocParser\Contract\Doctrine\DoctrineTagNodeInterface;
-//use Rector\BetterPhpDocParser\Contract\PhpDocNode\ShortNameAwareTagInterface;
 use Rector\BetterPhpDocParser\ValueObject\StartAndEnd;
 
 final class WhitespaceDetector

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/*',