skip narrow bool|false|<OtherTypeHere>

samsonasik · samsonasik · commit b3ac267a29ba · 2023-04-24T23:56:48.000+07:00
diff --git a/packages/PHPStanStaticTypeMapper/TypeAnalyzer/BoolUnionTypeAnalyzer.php b/packages/PHPStanStaticTypeMapper/TypeAnalyzer/BoolUnionTypeAnalyzer.php
@@ -20,17 +20,6 @@ public function isBoolUnionType(UnionType $unionType): bool
         return true;
     }
 
-    public function hasBoolType(UnionType $unionType): bool
-    {
-        foreach ($unionType->getTypes() as $unionedType) {
-            if ($unionedType->isBoolean()->yes()) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
     public function isNullableBoolUnionType(UnionType $unionType): bool
     {
         $hasNullable = false;
diff --git a/packages/PHPStanStaticTypeMapper/TypeMapper/UnionTypeMapper.php b/packages/PHPStanStaticTypeMapper/TypeMapper/UnionTypeMapper.php
@@ -518,10 +518,6 @@ private function narrowBoolType(
             return $phpParserUnionType;
         }
 
-        if ($this->boolUnionTypeAnalyzer->hasBoolType($unionType)) {
-            return $this->phpStanStaticTypeMapper->mapToPhpParserNode($unionType, $typeKind);
-        }
-
         return null;
     }
 }
diff --git a/rules-tests/Php80/Rector/FunctionLike/UnionTypesRector/Fixture/skip_narrow_bool_false_another_type.php.inc b/rules-tests/Php80/Rector/FunctionLike/UnionTypesRector/Fixture/skip_narrow_bool_false_another_type.php.inc
@@ -2,7 +2,7 @@
 
 namespace Rector\Tests\Php80\Rector\FunctionLike\UnionTypesRector\Fixture;
 
-class NarrowBoolFalse2
+class SkipNarrowBoolFalseAnotherType
 {
     /**
      * @param bool|int|false $param
@@ -17,23 +17,3 @@ class NarrowBoolFalse2
         return 1;
     }
 }
-
-?>
------
-<?php
-
-namespace Rector\Tests\Php80\Rector\FunctionLike\UnionTypesRector\Fixture;
-
-class NarrowBoolFalse2
-{
-    public function go(bool|int $param): bool|int
-    {
-        if (rand(0, 1)) {
-            return rand(0, 1) ? true : false;
-        }
-
-        return 1;
-    }
-}
-
-?>

Original file line number	Diff line number	Diff line change
`@@ -518,10 +518,6 @@ private function narrowBoolType(`
`518`	`518`	`return $phpParserUnionType;`
`519`	`519`	`}`
`520`	`520`
`521`		`- if ($this->boolUnionTypeAnalyzer->hasBoolType($unionType)) {`
`522`		`- return $this->phpStanStaticTypeMapper->mapToPhpParserNode($unionType, $typeKind);`
`523`		`- }`
`524`		`-`
`525`	`521`	`return null;`
`526`	`522`	`}`
`527`	`523`	`}`