Improve ArrayType::castToArrayKeyType() for booleans

phpstan · Mar 2, 2022 · 7ace968 · 7ace968
1 parent 265e181
commit 7ace968
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/src/Type/ArrayType.php b/src/Type/ArrayType.php
@@ -342,7 +342,11 @@ public static function castToArrayKeyType(Type $offsetType): Type
 				return $offsetType;
 			}
 
-			if ($offsetType instanceof FloatType || $offsetType instanceof BooleanType || $offsetType->isNumericString()->yes()) {
+			if ($offsetType instanceof BooleanType) {
+				return new UnionType([new ConstantIntegerType(0), new ConstantIntegerType(1)]);
+			}
+
+			if ($offsetType instanceof FloatType || $offsetType->isNumericString()->yes()) {
 				return new IntegerType();
 			}
 

diff --git a/tests/PHPStan/Analyser/data/constant-array-type-set.php b/tests/PHPStan/Analyser/data/constant-array-type-set.php
@@ -97,4 +97,21 @@ public function doBar5(int $offset): void
 		assertType('non-empty-array<int<0, 4>, bool>', $a);
 	}
 
+	public function doBar6(bool $offset): void
+	{
+		$a = [false, false, false];
+		$a[$offset] = true;
+		assertType('array{bool, bool, false}', $a);
+	}
+
+	/**
+	 * @param true $offset
+	 */
+	public function doBar7(bool $offset): void
+	{
+		$a = [false, false, false];
+		$a[$offset] = true;
+		assertType('array{false, true, false}', $a);
+	}
+
 }