Helpers::formatArgs() ...? is substitution for ?*

Author: dg

src/PhpGenerator/Helpers.php

@@ -165,7 +165,7 @@ public static function format($statement, ...$args)
 	 */
 	public static function formatArgs($statement, array $args)
 	{
-		$tokens = preg_split('#(\$\?|->\?|::\?|\?\*|\?)#', $statement, -1, PREG_SPLIT_DELIM_CAPTURE);
+		$tokens = preg_split('#(\.\.\.\?|\$\?|->\?|::\?|\?\*|\?)#', $statement, -1, PREG_SPLIT_DELIM_CAPTURE);
 		$res = '';
 		foreach ($tokens as $n => $token) {
 			if ($n % 2 === 0) {
@@ -174,7 +174,7 @@ public static function formatArgs($statement, array $args)
 				throw new Nette\InvalidArgumentException('Insufficient number of arguments.');
 			} elseif ($token === '?') {
 				$res .= self::dump(array_shift($args));
-			} elseif ($token === '?*') {
+			} elseif ($token === '...?' || $token === '?*') {
 				$arg = array_shift($args);
 				if (!is_array($arg)) {
 					throw new Nette\InvalidArgumentException('Argument must be an array.');

tests/PhpGenerator/Helpers.format.phpt

@@ -17,14 +17,15 @@ 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, 2])', Helpers::formatArgs('func(?)', [[1, 2]]));
-Assert::same('func(1, 2)', Helpers::formatArgs('func(?*)', [[1, 2]]));
+Assert::same('func(1, 2)', Helpers::formatArgs('func(...?)', [[1, 2]]));
+Assert::same('func(1, 2)', Helpers::formatArgs('func(?*)', [[1, 2]])); // old way
 Assert::same(
 	"func(10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,\n\t27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44,\n\t45, 46, 47, 48, 49, 50)",
 	Helpers::formatArgs('func(?*)', [range(10, 50)])
 );
 
 Assert::exception(function () {
-	Helpers::formatArgs('func(?*)', [1, 2]);
+	Helpers::formatArgs('func(...?)', [1, 2]);
 }, Nette\InvalidArgumentException::class, 'Argument must be an array.');
 
 Assert::exception(function () {