diff --git a/src/PhpGenerator/Helpers.php b/src/PhpGenerator/Helpers.php index 0040fdc4..3fcfd0ca 100644 --- a/src/PhpGenerator/Helpers.php +++ b/src/PhpGenerator/Helpers.php @@ -19,6 +19,7 @@ class Helpers const PHP_IDENT = '[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*'; const MAX_DEPTH = 50; + const WRAP_LENGTH = 70; /** @@ -92,7 +93,7 @@ private static function _dump(& $var, $level = 0) } unset($var[$marker]); } - return '[' . (strpos($out, "\n") === FALSE && strlen($out) < 40 ? $out : $outAlt) . ']'; + return '[' . (strpos($out, "\n") === FALSE && strlen($out) < self::WRAP_LENGTH ? $out : $outAlt) . ']'; } elseif ($var instanceof \Serializable) { $var = serialize($var); @@ -176,7 +177,7 @@ public static function formatArgs($statement, array $args) $sep = ''; foreach ($arg as $tmp) { $s .= $sep . self::dump($tmp); - $sep = strlen($s) - strrpos($s, "\n") > 100 ? ",\n\t" : ', '; + $sep = strlen($s) - strrpos($s, "\n") > self::WRAP_LENGTH ? ",\n\t" : ', '; } $statement = $s . substr($statement, $a + 2); $a = strlen($s); diff --git a/tests/PhpGenerator/Helpers.dump().phpt b/tests/PhpGenerator/Helpers.dump().phpt index 29907867..057d9072 100644 --- a/tests/PhpGenerator/Helpers.dump().phpt +++ b/tests/PhpGenerator/Helpers.dump().phpt @@ -37,7 +37,7 @@ Assert::same("[\$s]", Helpers::dump([new PhpLiteral('$s')])); Assert::same('[1, 2, 3]', Helpers::dump([1, 2, 3])); Assert::same("['a', 7 => 'b', 'c', '9a' => 'd', 'e']", Helpers::dump(['a', 7 => 'b', 'c', '9a' => 'd', 9 => 'e'])); -Assert::same("[\n\t[\n\t\t'a',\n\t\t'loooooooooooooooooooooooooooooooooong',\n\t],\n]", Helpers::dump([['a', 'loooooooooooooooooooooooooooooooooong']])); +Assert::same("[\n\t[\n\t\t'a',\n\t\t'loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong',\n\t],\n]", Helpers::dump([['a', 'loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong']])); Assert::same("['a' => 1, [\"\\r\" => \"\\r\", 2], 3]", Helpers::dump(['a' => 1, ["\r" => "\r", 2], 3])); Assert::same("(object) [\n\t'a' => 1,\n\t'b' => 2,\n]", Helpers::dump((object) ['a' => 1, 'b' => 2])); diff --git a/tests/PhpGenerator/Helpers.format.phpt b/tests/PhpGenerator/Helpers.format.phpt index 0b662e21..3382cd7f 100644 --- a/tests/PhpGenerator/Helpers.format.phpt +++ b/tests/PhpGenerator/Helpers.format.phpt @@ -19,7 +19,7 @@ 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(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)", + "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)", Helpers::formatArgs('func(?*)', [range(10, 40)]) );