better int range support

Author: staabm

src/Type/Php/SprintfFunctionDynamicReturnTypeExtension.php

@@ -81,10 +81,8 @@ public function getTypeFromFunctionCall(
 				// if the format string is just a placeholder and specified an argument
 				// of stringy type, then the return value will be of the same type
 				$checkArgType = $scope->getType($args[$checkArg]->value);
-
 				if ($matches[2] === 's'
-					&& $checkArgType->isScalar()->yes()
-					&& $checkArgType->getFiniteTypes() === [] // constant types will be handled in getConstantType()
+					&& ($checkArgType->isString()->yes() || $checkArgType->isInteger()->yes())
 				) {
 					$singlePlaceholderEarlyReturn = $checkArgType->toString();
 				} elseif ($matches[2] !== 's') {

tests/PHPStan/Analyser/nsrt/bug-7387.php

@@ -56,8 +56,8 @@ public function positionalArgs($mixed, int $i, float $f, string $s, int $posInt,
 		assertType('numeric-string', sprintf('%2$14s', $mixed, $i));
 		assertType('non-falsy-string&numeric-string', sprintf('%2$14s', $mixed, $posInt));
 		assertType('non-falsy-string&numeric-string', sprintf('%2$14s', $mixed, $negInt));
-		assertType('non-falsy-string', sprintf('%2$14s', $mixed, $intRange)); // could be numeric-string
-		assertType('non-falsy-string', sprintf('%2$14s', $mixed, $nonZeroIntRange)); // could be non-falsy-string&numeric-string
+		assertType('numeric-string', sprintf('%2$14s', $mixed, $intRange));
+		assertType('non-falsy-string&numeric-string', sprintf('%2$14s', $mixed, $nonZeroIntRange));
 
 		assertType('numeric-string', sprintf('%2$.14F', $mixed, $i));
 		assertType('numeric-string', sprintf('%2$.14F', $mixed, $f));