Helpers::formatArgs() splits long ?* into multiple lines

Author: dg

src/PhpGenerator/Helpers.php

@@ -160,15 +160,22 @@ public static function formatArgs($statement, array $args)
 				if (!is_array($arg)) {
 					throw new Nette\InvalidArgumentException('Argument must be an array.');
 				}
-				$arg = implode(', ', array_map(array(__CLASS__, 'dump'), $arg));
-				$statement = substr_replace($statement, $arg, $a, 2);
+				$s = substr($statement, 0, $a);
+				$sep = '';
+				foreach ($arg as $tmp) {
+					$s .= $sep . self::dump($tmp);
+					$sep = strlen($s) - strrpos($s, "\n") > 100 ? ",\n\t" : ', ';
+				}
+				$statement = $s . substr($statement, $a + 2);
+				$a = strlen($s);
 
 			} else {
 				$arg = substr($statement, $a - 1, 1) === '$' || in_array(substr($statement, $a - 2, 2), array('->', '::'), TRUE)
 					? self::formatMember($arg) : self::_dump($arg);
 				$statement = substr_replace($statement, $arg, $a, 1);
+				$a += strlen($arg);
 			}
-			$a = strpos($statement, '?', $a + strlen($arg));
+			$a = strpos($statement, '?', $a);
 		}
 		return $statement;
 	}

tests/PhpGenerator/Helpers.format.phpt

@@ -18,6 +18,10 @@ Assert::same( 'func', Helpers::formatArgs('func', array(1, 2)) );
 Assert::same( 'func(1)', Helpers::formatArgs('func(?)', array(1, 2)) );
 Assert::same( "func(array(1, 2))", Helpers::formatArgs('func(?)', array(array(1, 2))) );
 Assert::same( 'func(1, 2)', Helpers::formatArgs('func(?*)', array(array(1, 2))) );
+Assert::same(
+	"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,\n\t35, 36, 37, 38, 39, 40)",
+	Helpers::formatArgs('func(?*)', array(range(10, 40)))
+);
 
 Assert::exception(function() {
 	Helpers::formatArgs('func(?*)', array(1, 2));