Merge branch refs/heads/1.11.x into 1.12.x

src/Rules/Functions/PrintfArrayParametersRule.php

@@ -11,6 +11,7 @@
 use PHPStan\ShouldNotHappenException;
 use PHPStan\Type\Constant\ConstantIntegerType;
 use PHPStan\Type\IntegerRangeType;
+use PHPStan\Type\IntegerType;
 use PHPStan\Type\TypeCombinator;
 use function count;
 use function in_array;
@@ -87,13 +88,12 @@ public function processNode(Node $node, Scope $scope): array
 			$formatArgsType = $scope->getType($args[1]->value);
 
 			$constantArrays = $formatArgsType->getConstantArrays();
+			if ($constantArrays === []) {
+				$formatArgsCounts[] = new IntegerType();
+			}
 			foreach ($constantArrays as $constantArray) {
 				$formatArgsCounts[] = $constantArray->getArraySize();
 			}
-
-			if ($constantArrays === []) {
-				$formatArgsCounts[] = $formatArgsType->getArraySize();
-			}
 		}
 
 		if ($formatArgsCounts === []) {

tests/PHPStan/Rules/Functions/PrintfArrayParametersRuleTest.php

@@ -68,10 +68,6 @@ public function testFile(): void
 				'Call to vprintf contains 2 placeholders, 1 value given.',
 				34,
 			],
-			[
-				'Call to vsprintf contains 1-2 placeholders, 0 or more values given.',
-				53,
-			],
 		]);
 	}
 

tests/PHPStan/Rules/Functions/data/vprintf.php

@@ -50,7 +50,7 @@ function doFoo($message, array $arr) {
 	} else {
 		$format = '%s%s';
 	}
-	vsprintf($format, $arr); // need at least non-empty-array
+	vsprintf($format, $arr); // do not report on general array, annoying in practice
 
 	if (rand(0,1)) {
 		$format = '%s';