range() of numeric-strings can produce array of float|int

phpstan · Sep 12, 2021 · 3b6f0bf · 3b6f0bf
1 parent 9c19d6f
commit 3b6f0bf
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 1 deletion.
diff --git a/src/Type/Php/RangeFunctionReturnTypeExtension.php b/src/Type/Php/RangeFunctionReturnTypeExtension.php
@@ -105,7 +105,8 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
 
 		$numberType = new UnionType([new IntegerType(), new FloatType()]);
 		$isNumber = $numberType->isSuperTypeOf($argType)->yes();
-		if ($isNumber) {
+		$isNumericString = $argType->isNumericString()->yes();
+		if ($isNumber || $isNumericString) {
 			return new ArrayType(new IntegerType(), $numberType);
 		}
 

diff --git a/tests/PHPStan/Analyser/NodeScopeResolverTest.php b/tests/PHPStan/Analyser/NodeScopeResolverTest.php
@@ -503,6 +503,7 @@ public function dataFileAsserts(): iterable
 		yield from $this->gatherAssertTypes(__DIR__ . '/../Rules/Methods/data/bug-5562.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-5615.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/array_map_multiple.php');
+		yield from $this->gatherAssertTypes(__DIR__ . '/data/range-numeric-string.php');
 	}
 
 	/**

diff --git a/tests/PHPStan/Analyser/data/range-numeric-string.php b/tests/PHPStan/Analyser/data/range-numeric-string.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace RangeNumericString;
+
+use function PHPStan\Testing\assertType;
+
+class Foo
+{
+
+	/**
+	 * @param numeric-string $a
+	 * @param numeric-string $b
+	 */
+	public function doFoo(
+		string $a,
+		string $b
+	): void
+	{
+		assertType('array<int, float|int>', range($a, $b));
+	}
+
+}