PhpGenerator: short arrays are dumped in single line

Author: dg

src/PhpGenerator/Helpers.php

@@ -77,19 +77,21 @@ private static function _dump(&$var, $level = 0)
 				throw new Nette\InvalidArgumentException('Nesting level too deep or recursive dependency.');
 
 			} else {
-				$out = "\n";
+				$out = '';
+				$outAlt = "\n$space";
 				$var[$marker] = TRUE;
 				$counter = 0;
 				foreach ($var as $k => &$v) {
 					if ($k !== $marker) {
-						$out .= "$space\t" . ($k === $counter ? '' : self::_dump($k, $level + 1) . " => ") . self::_dump($v, $level + 1) . ",\n";
+						$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";
 					}
 				}
 				unset($var[$marker]);
-				$out .= $space;
 			}
-			return "array($out)";
+			return 'array(' . (strpos($out, "\n") === FALSE && strlen($out) < 40 ? $out : $outAlt) . ')';
 
 		} elseif (is_object($var)) {
 			$arr = (array) $var;

tests/PhpGenerator/ClassType.expect

@@ -20,9 +20,7 @@ abstract final class Example extends ParentClass implements IExample, IOne
 
 	public $order = RecursiveIteratorIterator::SELF_FIRST;
 
-	public static $sections = array(
-		'first' => TRUE,
-	);
+	public static $sections = array('first' => TRUE);
 
 
 	/**

tests/PhpGenerator/Helpers.dump().phpt

@@ -35,11 +35,12 @@ Assert::same( "'I\xc3\xb1t\xc3\xabrn\xc3\xa2ti\xc3\xb4n\xc3\xa0liz\xc3\xa6ti\xc3
 Assert::same( '"\rHello \$"', Helpers::dump("\rHello $") );
 Assert::same( 'array()', Helpers::dump(array()) );
 
-Assert::same( "array(\n\t\$s,\n)", Helpers::dump(array(new PhpLiteral('$s'))) );
+Assert::same( "array(\$s)", Helpers::dump(array(new PhpLiteral('$s'))) );
 
-Assert::same( "array(\n\t1,\n\t2,\n\t3,\n)", Helpers::dump(array(1,2,3)) );
-Assert::same( "array(\n\t'a',\n\t7 => 'b',\n\t'c',\n\t'9a' => 'd',\n\t'e',\n)", Helpers::dump(array('a', 7 => 'b', 'c', '9a' => 'd', 9 => 'e')) );
-Assert::same( "array(\n\t'a' => 1,\n\tarray(\n\t\t\"\\r\" => \"\\r\",\n\t\t2,\n\t),\n\t3,\n)", Helpers::dump(array('a' => 1, array("\r" => "\r", 2), 3)) );
+Assert::same( "array(1, 2, 3)", Helpers::dump(array(1,2,3)) );
+Assert::same( "array('a', 7 => 'b', 'c', '9a' => 'd', 'e')", Helpers::dump(array('a', 7 => 'b', 'c', '9a' => 'd', 9 => 'e')) );
+Assert::same( "array(\n\tarray(\n\t\t'a',\n\t\t'loooooooooooooooooooooooooooooooooong',\n\t),\n)", Helpers::dump(array(array('a', 'loooooooooooooooooooooooooooooooooong'))) );
+Assert::same( "array('a' => 1, array(\"\\r\" => \"\\r\", 2), 3)", Helpers::dump(array('a' => 1, array("\r" => "\r", 2), 3)) );
 
 Assert::same( "(object) array(\n\t'a' => 1,\n\t'b' => 2,\n)", Helpers::dump((object) array('a' => 1, 'b' => 2)) );
 Assert::same( "(object) array(\n\t'a' => (object) array(\n\t\t'b' => 2,\n\t),\n)" , Helpers::dump((object) array('a' => (object) array('b' => 2))) );

tests/PhpGenerator/Helpers.format.phpt

@@ -19,7 +19,7 @@ Assert::same( 'func(1)', Helpers::format('func(?)', 1, 2) );
 
 Assert::same( 'func', Helpers::formatArgs('func', array(1, 2)) );
 Assert::same( 'func(1)', Helpers::formatArgs('func(?)', array(1, 2)) );
-Assert::same( "func(array(\n\t1,\n\t2,\n))", Helpers::formatArgs('func(?)', array(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::exception(function() {