fixup! fixup! fixup! fixup! fixing import rectors

rectorphp · Sep 11, 2019 · 6cc691e · 6cc691e
1 parent 2933325
commit 6cc691e
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 6 deletions.
diff --git a/packages/NodeTypeResolver/src/PhpDoc/NodeAnalyzer/DocBlockManipulator.php b/packages/NodeTypeResolver/src/PhpDoc/NodeAnalyzer/DocBlockManipulator.php
@@ -564,6 +564,9 @@ public function getParamTypeByName(FunctionLike $functionLike, string $paramName
     private function addTypeSpecificTag(Node $node, string $name, Type $type): void
     {
         $docStringType = $this->staticTypeMapper->mapPHPStanTypeToDocString($type);
+        if ($docStringType === '') {
+            return;
+        }
 
         // there might be no phpdoc at all
         if ($node->getDocComment() !== null) {

diff --git a/packages/NodeTypeResolver/src/StaticTypeMapper.php b/packages/NodeTypeResolver/src/StaticTypeMapper.php
@@ -157,7 +157,6 @@ public function mapPHPStanTypeToPhpParserNode(Type $phpStanType, ?string $kind =
             return null;
         }
 
-
         if ($phpStanType instanceof SelfObjectType) {
             return new Identifier('self');
         }
@@ -252,8 +251,6 @@ public function mapPHPStanTypeToPhpParserNode(Type $phpStanType, ?string $kind =
         }
 
         if ($phpStanType instanceof UnionType) {
-
-
             // match array types
             $arrayNode = $this->matchArrayTypes($phpStanType);
             if ($arrayNode) {

diff --git a/packages/TypeDeclaration/src/TypeInferer/ReturnTypeInferer.php b/packages/TypeDeclaration/src/TypeInferer/ReturnTypeInferer.php
@@ -3,9 +3,13 @@
 namespace Rector\TypeDeclaration\TypeInferer;
 
 use PhpParser\Node\FunctionLike;
+use PHPStan\Type\ArrayType;
 use PHPStan\Type\MixedType;
+use PHPStan\Type\NeverType;
 use PHPStan\Type\Type;
+use PHPStan\Type\UnionType;
 use Rector\Exception\ShouldNotHappenException;
+use Rector\NodeTypeResolver\PHPStan\Type\TypeFactory;
 use Rector\TypeDeclaration\Contract\TypeInferer\ReturnTypeInfererInterface;
 
 final class ReturnTypeInferer extends AbstractPriorityAwareTypeInferer
@@ -15,12 +19,18 @@ final class ReturnTypeInferer extends AbstractPriorityAwareTypeInferer
      */
     private $returnTypeInferers = [];
 
+    /**
+     * @var TypeFactory
+     */
+    private $typeFactory;
+
     /**
      * @param ReturnTypeInfererInterface[] $returnTypeInferers
      */
-    public function __construct(array $returnTypeInferers)
+    public function __construct(TypeFactory $typeFactory, array $returnTypeInferers)
     {
         $this->returnTypeInferers = $this->sortTypeInferersByPriority($returnTypeInferers);
+        $this->typeFactory = $typeFactory;
     }
 
     public function inferFunctionLike(FunctionLike $functionLike): Type
@@ -39,6 +49,8 @@ public function inferFunctionLikeWithExcludedInferers(FunctionLike $functionLike
             }
 
             $type = $returnTypeInferer->inferFunctionLike($functionLike);
+            $type = $this->normalizeArrayTypeAndArrayNever($type);
+
             if (! $type instanceof MixedType) {
                 return $type;
             }
@@ -73,4 +85,29 @@ private function ensureIsTypeInferer(string $excludedInferer): void
 
         throw new ShouldNotHappenException();
     }
+
+    /**
+     * From "string[]|mixed[]" based on empty array to to "string[]"
+     */
+    private function normalizeArrayTypeAndArrayNever(Type $type): Type
+    {
+        if (! $type instanceof UnionType) {
+            return $type;
+        }
+
+        $nonNeverTypes = [];
+        foreach ($type->getTypes() as $unionedType) {
+            if (! $unionedType instanceof ArrayType) {
+                return $type;
+            }
+
+            if ($unionedType->getItemType() instanceof NeverType) {
+                continue;
+            }
+
+            $nonNeverTypes[] = $unionedType;
+        }
+
+        return $this->typeFactory->createMixedPassedOrUnionType($nonNeverTypes);
+    }
 }
diff --git a/.../tests/Rector/ClassMethod/AddArrayReturnDocTypeRector/AddArrayReturnDocTypeRectorTest.php b/.../tests/Rector/ClassMethod/AddArrayReturnDocTypeRector/AddArrayReturnDocTypeRectorTest.php
@@ -10,10 +10,9 @@ final class AddArrayReturnDocTypeRectorTest extends AbstractRectorTestCase
     public function test(): void
     {
         $this->doTestFiles([
-            // fix these 2
+            __DIR__ . '/Fixture/setter_based.php.inc',
             __DIR__ . '/Fixture/simple_array.php.inc',
             __DIR__ . '/Fixture/fixture.php.inc',
-            __DIR__ . '/Fixture/setter_based.php.inc',
             __DIR__ . '/Fixture/fully_qualified_name.php.inc',
             __DIR__ . '/Fixture/fully_qualified_name_nested_array.php.inc',
             __DIR__ . '/Fixture/yield_strings.php.inc',