Helpers::dump() generates PHP 5.4 short array syntax

Author: dg

src/PhpGenerator/Helpers.php

@@ -89,7 +89,7 @@ private static function _dump(& $var, $level = 0)
 				}
 				unset($var[$marker]);
 			}
-			return 'array(' . (strpos($out, "\n") === FALSE && strlen($out) < 40 ? $out : $outAlt) . ')';
+			return '[' . (strpos($out, "\n") === FALSE && strlen($out) < 40 ? $out : $outAlt) . ']';
 
 		} elseif ($var instanceof \Serializable) {
 			$var = serialize($var);
@@ -121,8 +121,8 @@ private static function _dump(& $var, $level = 0)
 				$out .= $space;
 			}
 			return $class === 'stdClass'
-				? "(object) array($out)"
-				: __CLASS__ . "::createObject('$class', array($out))";
+				? "(object) [$out]"
+				: __CLASS__ . "::createObject('$class', [$out])";
 
 		} elseif (is_resource($var)) {
 			throw new Nette\InvalidArgumentException('Cannot dump resource.');

tests/PhpGenerator/ClassType.expect

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

tests/PhpGenerator/ClassType.from.expect

@@ -44,7 +44,7 @@ class Class2 extends Class1 implements Interface2
 	/** @var int */
 	protected $protected = 10;
 
-	private $private = array();
+	private $private = [];
 
 	public static $static;
 

tests/PhpGenerator/Helpers.dump().phpt

@@ -24,17 +24,17 @@ Assert::same( "'I\xc3\xb1t\xc3\xabrn\xc3\xa2ti\xc3\xb4n\xc3\xa0liz\xc3\xa6ti\xc3
 Assert::same( '"\rHello \$"', Helpers::dump("\rHello $") );
 Assert::same( "'He\\llo'", Helpers::dump('He\llo') );
 Assert::same( '\'He\ll\\\\\o \\\'wor\\\\\\\'ld\\\\\'', Helpers::dump('He\ll\\\o \'wor\\\'ld\\') );
-Assert::same( 'array()', Helpers::dump([]) );
+Assert::same( '[]', Helpers::dump([]) );
 
-Assert::same( "array(\$s)", Helpers::dump([new PhpLiteral('$s')]) );
+Assert::same( "[\$s]", Helpers::dump([new PhpLiteral('$s')]) );
 
-Assert::same( "array(1, 2, 3)", Helpers::dump([1,2,3]) );
-Assert::same( "array('a', 7 => 'b', 'c', '9a' => 'd', 'e')", Helpers::dump(['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([['a', 'loooooooooooooooooooooooooooooooooong']]) );
-Assert::same( "array('a' => 1, array(\"\\r\" => \"\\r\", 2), 3)", Helpers::dump(['a' => 1, ["\r" => "\r", 2], 3]) );
+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( "['a' => 1, [\"\\r\" => \"\\r\", 2], 3]", Helpers::dump(['a' => 1, ["\r" => "\r", 2], 3]) );
 
-Assert::same( "(object) array(\n\t'a' => 1,\n\t'b' => 2,\n)", Helpers::dump((object) ['a' => 1, 'b' => 2]) );
-Assert::same( "(object) array(\n\t'a' => (object) array(\n\t\t'b' => 2,\n\t),\n)" , Helpers::dump((object) ['a' => (object) ['b' => 2]]) );
+Assert::same( "(object) [\n\t'a' => 1,\n\t'b' => 2,\n]", Helpers::dump((object) ['a' => 1, 'b' => 2]) );
+Assert::same( "(object) [\n\t'a' => (object) [\n\t\t'b' => 2,\n\t],\n]" , Helpers::dump((object) ['a' => (object) ['b' => 2]]) );
 
 
 class Test
@@ -44,7 +44,7 @@ class Test
 	private $c = 3;
 }
 
-Assert::same( "Nette\\PhpGenerator\\Helpers::createObject('Test', array(\n\t'a' => 1,\n\t\"\\x00*\\x00b\" => 2,\n\t\"\\x00Test\\x00c\" => 3,\n))", Helpers::dump(new Test) );
+Assert::same( "Nette\\PhpGenerator\\Helpers::createObject('Test', [\n\t'a' => 1,\n\t\"\\x00*\\x00b\" => 2,\n\t\"\\x00Test\\x00c\" => 3,\n])", Helpers::dump(new Test) );
 Assert::equal( new Test, eval('return ' . Helpers::dump(new Test) . ';') );
 
 
@@ -63,7 +63,7 @@ class Test2 extends Test
 	}
 }
 
-Assert::same( "Nette\\PhpGenerator\\Helpers::createObject('Test2', array(\n\t\"\\x00Test2\\x00c\" => 4,\n\t'a' => 1,\n\t\"\\x00*\\x00b\" => 2,\n))", Helpers::dump(new Test2) );
+Assert::same( "Nette\\PhpGenerator\\Helpers::createObject('Test2', [\n\t\"\\x00Test2\\x00c\" => 4,\n\t'a' => 1,\n\t\"\\x00*\\x00b\" => 2,\n])", Helpers::dump(new Test2) );
 Assert::equal( new Test2, eval('return ' . Helpers::dump(new Test2) . ';') );
 
 

tests/PhpGenerator/Helpers.format.phpt

@@ -16,7 +16,7 @@ Assert::same( 'func(1)', Helpers::format('func(?)', 1, 2) );
 
 Assert::same( 'func', Helpers::formatArgs('func', [1, 2]) );
 Assert::same( 'func(1)', Helpers::formatArgs('func(?)', [1, 2]) );
-Assert::same( "func(array(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]]) );
 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)",