Helpers::formatArgs() checks for insufficient number of placeholders (BC break)

Author: dg

src/PhpGenerator/Helpers.php

@@ -194,6 +194,9 @@ public static function formatArgs($statement, array $args)
 			}
 			$a = strpos($statement, '?', $a);
 		}
+		if ($args) {
+			throw new Nette\InvalidArgumentException('Insufficient number of placeholders.');
+		}
 		return $statement;
 	}
 

tests/PhpGenerator/Helpers.format.phpt

@@ -14,10 +14,9 @@ require __DIR__ . '/../bootstrap.php';
 
 
 Assert::same('func', Helpers::format('func'));
-Assert::same('func(1)', Helpers::format('func(?)', 1, 2));
-
-Assert::same('func', Helpers::formatArgs('func', [1, 2]));
-Assert::same('func(1)', Helpers::formatArgs('func(?)', [1, 2]));
+Assert::same('func(1)', Helpers::format('func(?)', 1));
+Assert::same('func', Helpers::formatArgs('func', []));
+Assert::same('func(1)', Helpers::formatArgs('func(?)', [1]));
 Assert::same('func([1, 2])', Helpers::formatArgs('func(?)', [[1, 2]]));
 Assert::same('func(1, 2)', Helpers::formatArgs('func(?*)', [[1, 2]]));
 Assert::same(
@@ -29,6 +28,10 @@ Assert::exception(function () {
 	Helpers::formatArgs('func(?*)', [1, 2]);
 }, Nette\InvalidArgumentException::class, 'Argument must be an array.');
 
+Assert::exception(function () {
+	Helpers::format('func(?)', 1, 2);
+}, Nette\InvalidArgumentException::class, 'Insufficient number of placeholders.');
+
 Assert::exception(function () {
 	Helpers::formatArgs('func(?, ?, ?)', [1, 2]);
 }, Nette\InvalidArgumentException::class, 'Insufficient number of arguments.');