[PHPStanStaticTypeMapper] Add UnionTypeAnalyzer::isNullable() (#987)

* [PHPStanStaticTypeMapper] Add UnionTypeAnalyzer isNullable * check 2 types * [ci-review] Rector Rectify * use in StaticTypeAnalyzer * [ci-review] Rector Rectify Co-authored-by: GitHub Action <action@github.com>
rectorphp · Oct 12, 2021 · 90c1d09 · 90c1d09
1 parent 5f915d8
commit 90c1d09
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 47 deletions.
diff --git a/packages/NodeTypeResolver/PHPStan/Type/StaticTypeAnalyzer.php b/packages/NodeTypeResolver/PHPStan/Type/StaticTypeAnalyzer.php
@@ -16,9 +16,15 @@
 use PHPStan\Type\StringType;
 use PHPStan\Type\Type;
 use PHPStan\Type\UnionType;
+use Rector\PHPStanStaticTypeMapper\TypeAnalyzer\UnionTypeAnalyzer;
 
 final class StaticTypeAnalyzer
 {
+    public function __construct(
+        private UnionTypeAnalyzer $unionTypeAnalyzer
+    ) {
+    }
+
     public function isAlwaysTruableType(Type $type): bool
     {
         if ($type instanceof MixedType) {
@@ -33,7 +39,7 @@ public function isAlwaysTruableType(Type $type): bool
             return $this->isAlwaysTruableArrayType($type);
         }
 
-        if ($this->isNullable($type)) {
+        if ($type instanceof UnionType && $this->unionTypeAnalyzer->isNullable($type)) {
             return false;
         }
 
@@ -53,21 +59,6 @@ public function isAlwaysTruableType(Type $type): bool
         return $this->isAlwaysTruableUnionType($type);
     }
 
-    private function isNullable(Type $type): bool
-    {
-        if (! $type instanceof UnionType) {
-            return false;
-        }
-
-        foreach ($type->getTypes() as $unionedType) {
-            if ($unionedType instanceof NullType) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
     private function isScalarType(Type $type): bool
     {
         if ($type instanceof NullType) {

diff --git a/packages/PHPStanStaticTypeMapper/TypeAnalyzer/UnionTypeAnalyzer.php b/packages/PHPStanStaticTypeMapper/TypeAnalyzer/UnionTypeAnalyzer.php
@@ -124,4 +124,21 @@ public function isScalar(UnionType $unionType): bool
 
         return true;
     }
+
+    public function isNullable(UnionType $unionType, bool $checkTwoTypes = false): bool
+    {
+        $types = $unionType->getTypes();
+
+        if ($checkTwoTypes && count($types) > 2) {
+            return false;
+        }
+
+        foreach ($types as $type) {
+            if ($type instanceof NullType) {
+                return true;
+            }
+        }
+
+        return false;
+    }
 }
diff --git a/packages/PHPStanStaticTypeMapper/TypeMapper/UnionTypeMapper.php b/packages/PHPStanStaticTypeMapper/TypeMapper/UnionTypeMapper.php
@@ -270,22 +270,11 @@ private function matchPhpParserUnionType(UnionType $unionType, TypeKind $typeKin
         return new PhpParserUnionType($phpParserUnionedTypes);
     }
 
-    private function isNullable(UnionType $unionType): bool
-    {
-        foreach ($unionType->getTypes() as $type) {
-            if ($type instanceof NullType) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
     private function resolveCompatibleObjectCandidate(UnionType $unionType): UnionType|TypeWithClassName|null
     {
         if ($this->doctrineTypeAnalyzer->isDoctrineCollectionWithIterableUnionType($unionType)) {
             $objectType = new ObjectType('Doctrine\Common\Collections\Collection');
-            return $this->isNullable($unionType)
+            return $this->unionTypeAnalyzer->isNullable($unionType)
                 ? new UnionType([new NullType(), $objectType])
                 : $objectType;
         }

diff --git a/rules/TypeDeclaration/TypeAnalyzer/GenericClassStringTypeNormalizer.php b/rules/TypeDeclaration/TypeAnalyzer/GenericClassStringTypeNormalizer.php
@@ -12,19 +12,20 @@
 use PHPStan\Type\Constant\ConstantStringType;
 use PHPStan\Type\Generic\GenericClassStringType;
 use PHPStan\Type\MixedType;
-use PHPStan\Type\NullType;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\StringType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeTraverser;
 use PHPStan\Type\UnionType;
+use Rector\PHPStanStaticTypeMapper\TypeAnalyzer\UnionTypeAnalyzer;
 use Rector\TypeDeclaration\NodeTypeAnalyzer\DetailedTypeAnalyzer;
 
 final class GenericClassStringTypeNormalizer
 {
     public function __construct(
         private ReflectionProvider $reflectionProvider,
-        private DetailedTypeAnalyzer $detailedTypeAnalyzer
+        private DetailedTypeAnalyzer $detailedTypeAnalyzer,
+        private UnionTypeAnalyzer $unionTypeAnalyzer
     ) {
     }
 
@@ -49,7 +50,7 @@ public function normalize(Type $type): ArrayType | UnionType | Type
             return $this->resolveStringType($value);
         });
 
-        if ($type instanceof UnionType && ! $this->isNullableType($type)) {
+        if ($type instanceof UnionType && ! $this->unionTypeAnalyzer->isNullable($type, true)) {
             return $this->resolveClassStringInUnionType($type);
         }
 
@@ -73,22 +74,6 @@ public function isAllGenericClassStringType(UnionType $unionType): bool
         return true;
     }
 
-    private function isNullableType(UnionType $unionType): bool
-    {
-        $types = $unionType->getTypes();
-        if (count($types) > 2) {
-            return false;
-        }
-
-        foreach ($types as $type) {
-            if ($type instanceof NullType) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
     private function resolveArrayTypeWithUnionKeyType(ArrayType $arrayType): ArrayType
     {
         $itemType = $arrayType->getItemType();