range() with float step should return an array of floats

phpstan · Sep 19, 2024 · 7a6a0fa · 7a6a0fa
1 parent 988f058
commit 7a6a0fa
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 1 deletion.
diff --git a/src/Type/Php/RangeFunctionReturnTypeExtension.php b/src/Type/Php/RangeFunctionReturnTypeExtension.php
@@ -79,12 +79,17 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
 					}
 
 					if (count($rangeValues) > self::RANGE_LENGTH_THRESHOLD) {
-						if ($startConstant instanceof ConstantIntegerType && $endConstant instanceof ConstantIntegerType) {
+						if (
+							$startConstant instanceof ConstantIntegerType
+							&& $endConstant instanceof ConstantIntegerType
+							&& $stepConstant instanceof ConstantIntegerType
+						) {
 							if ($startConstant->getValue() > $endConstant->getValue()) {
 								$tmp = $startConstant;
 								$startConstant = $endConstant;
 								$endConstant = $tmp;
 							}
+
 							return AccessoryArrayListType::intersectWith(TypeCombinator::intersect(
 								new ArrayType(
 									new IntegerType(),
@@ -94,12 +99,23 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
 							));
 						}
 
+						if ($stepType->isFloat()->yes()) {
+							return AccessoryArrayListType::intersectWith(TypeCombinator::intersect(
+								new ArrayType(
+									new IntegerType(),
+									new FloatType(),
+								),
+								new NonEmptyArrayType(),
+							));
+						}
+
 						return AccessoryArrayListType::intersectWith(TypeCombinator::intersect(
 							new ArrayType(
 								new IntegerType(),
 								TypeCombinator::union(
 									$startConstant->generalize(GeneralizePrecision::moreSpecific()),
 									$endConstant->generalize(GeneralizePrecision::moreSpecific()),
+									$stepType->generalize(GeneralizePrecision::moreSpecific()),
 								),
 							),
 							new NonEmptyArrayType(),

diff --git a/tests/PHPStan/Analyser/nsrt/bug-11692.php b/tests/PHPStan/Analyser/nsrt/bug-11692.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Bug11692;
+
+use function PHPStan\Testing\assertType;
+
+/** @param int|float $floatOrInt */
+function doFoo(int $i, float $f, $floatOrInt): void {
+	assertType('non-empty-list<float>', range(1, 9, .01));
+	assertType('array{1, 4, 7}', range(1, 9, 3));
+
+	assertType('non-empty-list<float>', range(1, 9999, .01));
+	assertType('non-empty-list<int<1, 9999>>', range(1, 9999, 3));
+
+	assertType('list<float|int>', range(1, 9999, $floatOrInt));
+	assertType('list<float|int>', range(1, 9999, $floatOrInt));
+
+	assertType('list<int>', range(1, 3, $i));
+	assertType('list<float|int>', range(1, 3, $f));
+
+	assertType('list<int>', range(1, 9999, $i));
+	assertType('list<float|int>', range(1, 9999, $f));
+}
+