[PHPStanStaticTypeMapper] Remove BoolUnionTypeAnalyzer on UnionTypeMa…

…pper (#5141)
rectorphp · Oct 8, 2023 · e83c7ef · e83c7ef
1 parent c07a44f
commit e83c7ef
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 30 deletions.
diff --git a/packages/PHPStanStaticTypeMapper/TypeAnalyzer/BoolUnionTypeAnalyzer.php b/packages/PHPStanStaticTypeMapper/TypeAnalyzer/BoolUnionTypeAnalyzer.php
diff --git a/packages/PHPStanStaticTypeMapper/TypeMapper/UnionTypeMapper.php b/packages/PHPStanStaticTypeMapper/TypeMapper/UnionTypeMapper.php
@@ -34,7 +34,6 @@
 use Rector\PHPStanStaticTypeMapper\DoctrineTypeAnalyzer;
 use Rector\PHPStanStaticTypeMapper\Enum\TypeKind;
 use Rector\PHPStanStaticTypeMapper\PHPStanStaticTypeMapper;
-use Rector\PHPStanStaticTypeMapper\TypeAnalyzer\BoolUnionTypeAnalyzer;
 use Rector\PHPStanStaticTypeMapper\TypeAnalyzer\UnionTypeAnalyzer;
 use Rector\PHPStanStaticTypeMapper\TypeAnalyzer\UnionTypeCommonTypeNarrower;
 use Rector\PHPStanStaticTypeMapper\ValueObject\UnionTypeAnalysis;
@@ -52,7 +51,6 @@ public function __construct(
         private readonly DoctrineTypeAnalyzer $doctrineTypeAnalyzer,
         private readonly PhpVersionProvider $phpVersionProvider,
         private readonly UnionTypeAnalyzer $unionTypeAnalyzer,
-        private readonly BoolUnionTypeAnalyzer $boolUnionTypeAnalyzer,
         private readonly UnionTypeCommonTypeNarrower $unionTypeCommonTypeNarrower,
         private readonly NodeNameResolver $nodeNameResolver,
         private readonly TypeFactory $typeFactory
@@ -312,7 +310,7 @@ private function matchTypeForUnionedObjectTypes(UnionType $unionType, string $ty
         }
 
         if ($phpParserUnionType instanceof PhpParserUnionType) {
-            return $this->narrowBoolType($unionType, $phpParserUnionType, $typeKind);
+            return $this->resolveUnionTypeNode($unionType, $phpParserUnionType, $typeKind);
         }
 
         $compatibleObjectTypeNode = $this->processResolveCompatibleObjectCandidates($unionType);
@@ -491,16 +489,11 @@ private function narrowIntegerType(UnionType $unionType): ?Identifier
     /**
      * @param TypeKind::* $typeKind
      */
-    private function narrowBoolType(
+    private function resolveUnionTypeNode(
         UnionType $unionType,
         PhpParserUnionType $phpParserUnionType,
         string $typeKind
     ): PhpParserUnionType|null|Identifier|Name|ComplexType {
-        // maybe all one type
-        if ($this->boolUnionTypeAnalyzer->isBoolUnionType($unionType)) {
-            return new Identifier('bool');
-        }
-
         if (! $this->phpVersionProvider->isAtLeastPhpVersion(PhpVersionFeature::UNION_TYPES)) {
             return null;
         }

diff --git a/...laration/Rector/Class_/ReturnTypeFromStrictTernaryRector/Fixture/get_truthy_check.php.inc b/...laration/Rector/Class_/ReturnTypeFromStrictTernaryRector/Fixture/get_truthy_check.php.inc
@@ -0,0 +1,21 @@
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\Class_\ReturnTypeFromStrictTernaryRector\Fixture;
+
+function getThruthyCheck($number, $number2)
+{
+    return $number ? false : (bool) $number2;
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\Class_\ReturnTypeFromStrictTernaryRector\Fixture;
+
+function getThruthyCheck($number, $number2): bool
+{
+    return $number ? false : (bool) $number2;
+}
+
+?>