Helpers::formatArgs() chops ?* parameters when are longer than WRAP_LENGTH

Author: dg

src/PhpGenerator/Helpers.php

@@ -186,11 +186,14 @@ public static function formatArgs($statement, array $args)
 				if (!is_array($arg)) {
 					throw new Nette\InvalidArgumentException('Argument must be an array.');
 				}
-				$sep = '';
+				$items = [];
 				foreach ($arg as $tmp) {
-					$res .= $sep . self::dump($tmp);
-					$sep = strlen($res) - strrpos($res, "\n") > self::WRAP_LENGTH ? ",\n\t" : ', ';
+					$items[] = self::dump($tmp);
 				}
+				$res .= strlen($tmp = implode(', ', $items)) > self::WRAP_LENGTH && count($items) > 1
+					? "\n" . Nette\Utils\Strings::indent(implode(",\n", $items), 1) . "\n"
+					: $tmp;
+
 			} else { // $  ->  ::
 				$res .= substr($token, 0, -1) . self::formatMember(array_shift($args));
 			}

tests/PhpGenerator/Helpers.format.phpt

@@ -21,9 +21,36 @@ 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::match(
-	'func(10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
-	35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50)',
-	Helpers::formatArgs('func(?*)', [range(10, 50)])
+'func(
+	10,
+	11,
+	12,
+	13,
+	14,
+	15,
+	16,
+	17,
+	18,
+	19,
+	20,
+	21,
+	22,
+	23,
+	24,
+	25,
+	26,
+	27,
+	28,
+	29,
+	30,
+	31,
+	32,
+	33,
+	34,
+	35,
+	36
+)',
+	Helpers::formatArgs('func(?*)', [range(10, 36)])
 );
 
 Assert::exception(function () {