keep false type

rectorphp · Dec 30, 2021 · f33329c · f33329c
1 parent cae363b
commit f33329c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/packages/NodeTypeResolver/PHPStan/Type/TypeFactory.php b/packages/NodeTypeResolver/PHPStan/Type/TypeFactory.php
@@ -42,10 +42,10 @@ public function createMixedPassedOrUnionTypeAndKeepConstant(array $types): Type
     /**
      * @param Type[] $types
      */
-    public function createMixedPassedOrUnionType(array $types): Type
+    public function createMixedPassedOrUnionType(array $types, bool $keepConstantTypes = false): Type
     {
         $types = $this->unwrapUnionedTypes($types);
-        $types = $this->uniquateTypes($types);
+        $types = $this->uniquateTypes($types,  $keepConstantTypes);
 
         return $this->createUnionOrSingleType($types);
     }

diff --git a/packages/StaticTypeMapper/PhpParser/UnionTypeNodeMapper.php b/packages/StaticTypeMapper/PhpParser/UnionTypeNodeMapper.php
@@ -45,6 +45,6 @@ public function mapToPHPStan(Node $node): Type
             $types[] = $this->phpParserNodeMapper->mapToPHPStanType($unionedType);
         }
 
-        return $this->typeFactory->createMixedPassedOrUnionType($types);
+        return $this->typeFactory->createMixedPassedOrUnionType($types, true);
     }
 }
diff --git a/...ty/Rector/Class_/CompleteDynamicPropertiesRector/FixtureUnionTypes/multiple_types.php.inc b/...ty/Rector/Class_/CompleteDynamicPropertiesRector/FixtureUnionTypes/multiple_types.php.inc
@@ -22,7 +22,7 @@ namespace Rector\Tests\CodeQuality\Rector\Class_\CompleteDynamicPropertiesRector
 
 class MultipleTypes
 {
-    public bool|int|string $value;
+    public int|string|bool $value;
     public function set()
     {
         $this->value = 5;

diff --git a/...rationRector/FixtureForPhp81/do_not_crash_on_numeric_string_no_return_declaration.php.inc b/...rationRector/FixtureForPhp81/do_not_crash_on_numeric_string_no_return_declaration.php.inc
@@ -34,4 +34,4 @@ class DoNotCrashOnNumericStringNoReturnDeclaration
     }
 }
 
-?>
+?>
-Original file line number
+Diff line change
@@ Expand Up / @@ -34,4 +34,4 @@ class DoNotCrashOnNumericStringNoReturnDeclaration @@
         }
     }
-    ?>
+    ?>