Support of printf with dynamic precision (and improved support of dyn…

…amic width)
fluffycondor · Jul 24, 2023 · 91c8b5f · 91c8b5f
1 parent 655e028
commit 91c8b5f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/Rules/Functions/PrintfParametersRule.php b/src/Rules/Functions/PrintfParametersRule.php
@@ -116,7 +116,7 @@ private function getPlaceholdersCount(string $functionName, string $format): int
 
 		$specifiers = sprintf($specifiers, $addSpecifier);
 
-		$pattern = '~(?<before>%*)%(?:(?<position>\d+)\$)?[-+]?(?:(?:[ 0]|(?:\'[^%]))(?<width>\*)?)?-?\d*(?:\.\d*)?' . $specifiers . '~';
+		$pattern = '~(?<before>%*)%(?:(?<position>\d+)\$)?[-+]?(?:[ 0]|(?:\'[^%]))?(?<width>\*)?-?\d*(?:\.(?:\d+|(?<precision>\*))?)?' . $specifiers . '~';
 
 		$matches = Strings::matchAll($format, $pattern, PREG_SET_ORDER);
 
@@ -133,7 +133,11 @@ private function getPlaceholdersCount(string $functionName, string $format): int
 		$maxPositionedNumber = 0;
 		$maxOrdinaryNumber = 0;
 		foreach ($placeholders as $placeholder) {
-			if (isset($placeholder['width'])) {
+			if (isset($placeholder['width']) && $placeholder['width'] !== '') {
+				$maxOrdinaryNumber++;
+			}
+
+			if (isset($placeholder['precision']) && $placeholder['precision'] !== '') {
 				$maxOrdinaryNumber++;
 			}
 

diff --git a/tests/PHPStan/Rules/Functions/data/printf.php b/tests/PHPStan/Rules/Functions/data/printf.php
@@ -69,3 +69,8 @@
 printf('%0*d', 5, 1); // ok
 printf("%'x*d", 5, 1); // ok
 printf("%0*d %'x*d", 5, 1, 4, 3); // ok
+
+printf('%6.*f', 2, 1); // ok
+printf('%0*.*f', 6, 2, 1); // ok
+printf('%*.*f', 6, 2, 1); // ok
+printf('%*.*f %*.*f', 6, 2, 1, 5, 3, 2); // ok