ForbidVariableTypeOverwriting: fix int-range and enum-case issues (#100)

shipmonk-rnd · Apr 5, 2023 · e07867c · e07867c
1 parent 7d51a4e
commit e07867c
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 4 deletions.
diff --git a/src/Rule/ForbidVariableTypeOverwritingRule.php b/src/Rule/ForbidVariableTypeOverwritingRule.php
@@ -9,7 +9,9 @@
 use PHPStan\Analyser\Scope;
 use PHPStan\Rules\Rule;
 use PHPStan\Type\Accessory\AccessoryType;
+use PHPStan\Type\Enum\EnumCaseObjectType;
 use PHPStan\Type\GeneralizePrecision;
+use PHPStan\Type\IntegerRangeType;
 use PHPStan\Type\IntersectionType;
 use PHPStan\Type\MixedType;
 use PHPStan\Type\SubtractableType;
@@ -75,7 +77,11 @@ private function generalizeDeeply(Type $type): Type
 
     private function generalize(Type $type): Type
     {
-        if ($type->isConstantValue()->yes()) {
+        if (
+            $type->isConstantValue()->yes()
+            || $type instanceof IntegerRangeType
+            || $type instanceof EnumCaseObjectType // @phpstan-ignore-line ignore instanceof warning
+        ) {
             $type = $type->generalize(GeneralizePrecision::lessSpecific());
         }
 

diff --git a/tests/Rule/data/ForbidVariableTypeOverwritingRule/code.php b/tests/Rule/data/ForbidVariableTypeOverwritingRule/code.php
@@ -22,6 +22,11 @@ class AnotherClassWithInterface implements SomeInterface {
 
 }
 
+enum FooEnum {
+    case One;
+    case Two;
+}
+
 function testGeneralizationAndNarrowing(
     object $object,
     SomeInterface $interface,
@@ -60,12 +65,12 @@ function testBasics(
     array $map,
     array $intList = [1],
 ): void {
-    $intList = ['string']; // error: Overwriting variable $intList while changing its type from array<int<0, max>, int> to array<int<0, max>, string>
+    $intList = ['string']; // error: Overwriting variable $intList while changing its type from array<int, int> to array<int, string>
     $array = 1; // error: Overwriting variable $array while changing its type from array to int
     $string = 1; // error: Overwriting variable $string while changing its type from string to int
-    $objectList = ['foo']; // error: Overwriting variable $objectList while changing its type from array<int<0, max>, ForbidVariableTypeOverwritingRule\ParentClass> to array<int<0, max>, string>
+    $objectList = ['foo']; // error: Overwriting variable $objectList while changing its type from array<int, ForbidVariableTypeOverwritingRule\ParentClass> to array<int, string>
     $class = new \stdClass(); // error: Overwriting variable $class while changing its type from ForbidVariableTypeOverwritingRule\ParentClass to stdClass
-    $map = [1]; // error: Overwriting variable $map while changing its type from array<string, string> to array<int<0, max>, int>
+    $map = [1]; // error: Overwriting variable $map while changing its type from array<string, string> to array<int, int>
 }
 
 function testIgnoredTypes(
@@ -131,3 +136,18 @@ function testSubtractedTypeNotKept(ParentClass $someClass, array $strings) {
     unset($strings[0]);
     $strings = array_values($strings);
 }
+
+function testEnumCaseChange() {
+    $case1 = FooEnum::One;
+    $case1 = FooEnum::Two;
+}
+
+/**
+ * @param positive-int $positive
+ * @param negative-int $negative
+ *
+ * @return void
+ */
+function testIntToInt(int $positive, int $negative) {
+    $positive = $negative;
+}