Helpers: changed WRAP_LENGTH to 100, added INDENT_LENGTH

Author: dg

src/PhpGenerator/Helpers.php

@@ -19,9 +19,11 @@ class Helpers
 
 	const PHP_IDENT = '[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*';
 
-	const MAX_DEPTH = 50;
+	const WRAP_LENGTH = 100;
+
+	const INDENT_LENGTH = 4;
 
-	const WRAP_LENGTH = 70;
+	const MAX_DEPTH = 50;
 
 
 	/**
@@ -82,20 +84,21 @@ private static function _dump(&$var, $level = 0)
 
 			} else {
 				$out = '';
-				$outAlt = "\n$space";
+				$outWrapped = "\n$space";
 				$var[$marker] = true;
 				$counter = 0;
 				foreach ($var as $k => &$v) {
 					if ($k !== $marker) {
 						$item = ($k === $counter ? '' : self::_dump($k, $level + 1) . ' => ') . self::_dump($v, $level + 1);
 						$counter = is_int($k) ? max($k + 1, $counter) : $counter;
 						$out .= ($out === '' ? '' : ', ') . $item;
-						$outAlt .= "\t$item,\n$space";
+						$outWrapped .= "\t$item,\n$space";
 					}
 				}
 				unset($var[$marker]);
 			}
-			return '[' . (strpos($out, "\n") === false && strlen($out) < self::WRAP_LENGTH ? $out : $outAlt) . ']';
+			$wrap = strpos($out, "\n") !== false || strlen($out) > self::WRAP_LENGTH - $level * self::INDENT_LENGTH;
+			return '[' . ($wrap ? $outWrapped : $out) . ']';
 
 		} elseif ($var instanceof \Serializable) {
 			$var = serialize($var);

tests/PhpGenerator/Helpers.dump().phpt

@@ -37,7 +37,12 @@ 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'loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong',\n\t],\n]", Helpers::dump([['a', 'loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong']]));
+Assert::match("[
+	[
+		'a',
+		'loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong',
+	],
+]", Helpers::dump([['a', 'loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong']]));
 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]));

tests/PhpGenerator/Helpers.format.phpt

@@ -20,8 +20,9 @@ Assert::same('func(1 ? 2 : 3)', Helpers::formatArgs('func(1 \? 2 : 3)', []));
 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)",
+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)])
 );