Improved sprintf() inference

Author: staabm

src/Type/Php/SprintfFunctionDynamicReturnTypeExtension.php

@@ -81,8 +81,8 @@ public function getTypeFromFunctionCall(
 				// of stringy type, then the return value will be of the same type
 				$checkArgType = $scope->getType($args[$checkArg]->value);
 
-				if ($matches[2] === 's' && $checkArgType->isString()->yes()) {
-					$singlePlaceholderEarlyReturn = $checkArgType;
+				if ($matches[2] === 's' && $checkArgType->isScalar()->yes()) {
+					$singlePlaceholderEarlyReturn = $checkArgType->toString();
 				} elseif ($matches[2] !== 's') {
 					$singlePlaceholderEarlyReturn = new IntersectionType([
 						new StringType(),

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

@@ -23,7 +23,7 @@ public function inputTypes(int $i, float $f, string $s) {
 
 	public function specifiers(int $i) {
 		// https://3v4l.org/fmVIg
-		assertType('non-falsy-string', sprintf('%14s', $i));
+		assertType('numeric-string', sprintf('%14s', $i));
 
 		assertType('numeric-string', sprintf('%d', $i));
 
@@ -45,9 +45,15 @@ public function specifiers(int $i) {
 
 	}
 
-	public function positionalArgs($mixed, int $i, float $f, string $s) {
+	/**
+	 * @param positive-int $posInt
+	 * @param negative-int $negInt
+	 */
+	public function positionalArgs($mixed, int $i, float $f, string $s, int $posInt, int $negInt) {
 		// https://3v4l.org/vVL0c
-		assertType('non-falsy-string', sprintf('%2$14s', $mixed, $i));
+		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('numeric-string', sprintf('%2$.14F', $mixed, $i));
 		assertType('numeric-string', sprintf('%2$.14F', $mixed, $f));