Dumper: uses short array syntax []

Author: dg

src/Framework/Dumper.php

@@ -70,10 +70,10 @@ public static function toLine($var)
 					break;
 				}
 				$out .= ($k === $counter ? '' : self::toLine($k) . ' => ')
-					. (is_array($v) && $v ? 'array(...)' : self::toLine($v));
+					. (is_array($v) && $v ? '[...]' : self::toLine($v));
 				$counter = is_int($k) ? max($k + 1, $counter) : $counter;
 			}
-			return "array($out)";
+			return "[$out]";
 
 		} elseif ($var instanceof \Exception || $var instanceof \Throwable) {
 			return 'Exception ' . get_class($var) . ': ' . ($var->getCode() ? '#' . $var->getCode() . ' ' : '') . $var->getMessage();
@@ -190,7 +190,7 @@ private static function _toPhp(&$var, & $list = [], $level = 0, & $line = 1)
 					$out = $outShort;
 				}
 			}
-			return 'array(' . $out . ')';
+			return '[' . $out . ']';
 
 		} elseif ($var instanceof \Closure) {
 			$rc = new \ReflectionFunction($var);
@@ -229,8 +229,8 @@ private static function _toPhp(&$var, & $list = [], $level = 0, & $line = 1)
 			}
 			$hash = self::hash($var);
 			return $class === 'stdClass'
-				? "(object) /* $hash */ array($out)"
-				: "$class::__set_state(/* $hash */ array($out))";
+				? "(object) /* $hash */ [$out]"
+				: "$class::__set_state(/* $hash */ [$out])";
 
 		} elseif (is_resource($var)) {
 			return '/* resource ' . get_resource_type($var) . ' */';

src/Framework/TestCase.php

@@ -166,7 +166,7 @@ public function runTest($method, array $args = NULL)
 				}
 
 			} catch (AssertException $e) {
-				throw $e->setMessage("$e->origMessage in {$method->getName()}" . (substr(Dumper::toLine($params), 5)));
+				throw $e->setMessage("$e->origMessage in {$method->getName()}(" . (substr(Dumper::toLine($params), 1, -1)) . ')');
 			}
 		}
 	}

tests/Framework/Assert.type.phpt

@@ -25,7 +25,7 @@ $cases = [
 	['list', NULL, 'NULL should be list'],
 	['list', []],
 	['list', [1]],
-	['list', [4 => 1], 'array(4 => 1) should be list'],
+	['list', [4 => 1], '[4 => 1] should be list'],
 ];
 
 foreach ($cases as $case) {

tests/Framework/Dumper.dumpException.phpt

@@ -6,14 +6,14 @@ require __DIR__ . '/../bootstrap.php';
 
 
 $cases = [
-	'Failed: array(TRUE) should contain 1' => function () { Assert::contains(1, [TRUE]); },
-	"Failed: array('') should not contain ''" => function () { Assert::notContains('', ['']); },
+	'Failed: [TRUE] should contain 1' => function () { Assert::contains(1, [TRUE]); },
+	"Failed: [''] should not contain ''" => function () { Assert::notContains('', ['']); },
 	'Failed: 1.0 should be equal to 1' => function () { Assert::equal(1, 1.0); },
 	'Failed: 0.33%d% should not be equal to 0.33%d%' => function () { Assert::notEqual(1 / 3, 1 - 2 / 3); },
 	'Failed: NULL should be FALSE' => function () { Assert::false(NULL); },
 	'Failed: FALSE should be TRUE' => function () { Assert::true(FALSE); },
 	'Failed: 0 should be NULL' => function () { Assert::null(0); },
-	"Failed: array('b' => FALSE, 'a' => TRUE) should be falsey" => function () { Assert::falsey(['b' => FALSE, 'a' => TRUE]); },
+	"Failed: ['b' => FALSE, 'a' => TRUE] should be falsey" => function () { Assert::falsey(['b' => FALSE, 'a' => TRUE]); },
 	'Failed: SimpleXMLElement(#%a%) should be truthy' => function () { Assert::truthy(new SimpleXMLElement('<xml></xml>')); },
 	'Failed: stdClass(#%a%) should be stdClass(#%a%)' => function () { Assert::same(new stdClass, new stdClass); },
 	'Failed: NULL should not be NULL' => function () { Assert::notSame(NULL, NULL); },

tests/Framework/Dumper.toLine.phpt

@@ -31,8 +31,8 @@ if (PHP_VERSION_ID >= 50500) {
 	Assert::match('DateTimeImmutable(2014-02-13 12:34:56 +0300)(#%a%)', Dumper::toLine(new DateTimeImmutable('2014-02-13 12:34:56 +0300')));
 }
 
-Assert::match('array()', Dumper::toLine([]));
-Assert::match("array(1, 2, 3, 4, 'x')", Dumper::toLine([1, 2, 3, 4, 'x']));
-Assert::match('array(1 => 1, 2, 3)', Dumper::toLine([1 => 1, 2, 3]));
-Assert::match("array('a' => array(...))", Dumper::toLine(['a' => [1, 2]]));
-Assert::match("array('one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight', 'nine', ...)", Dumper::toLine(['one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight', 'nine', 'ten', 'eleven', 'twelve']));
+Assert::match('[]', Dumper::toLine([]));
+Assert::match("[1, 2, 3, 4, 'x']", Dumper::toLine([1, 2, 3, 4, 'x']));
+Assert::match('[1 => 1, 2, 3]', Dumper::toLine([1 => 1, 2, 3]));
+Assert::match("['a' => [...]]", Dumper::toLine(['a' => [1, 2]]));
+Assert::match("['one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight', 'nine', ...]", Dumper::toLine(['one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight', 'nine', 'ten', 'eleven', 'twelve']));

tests/Framework/Dumper.toPhp.phpt

@@ -29,24 +29,24 @@ Assert::match("'	'", Dumper::toPhp("\t"));
 Assert::match('"\\xff"', Dumper::toPhp("\xFF"));
 Assert::match('"multi\nline"', Dumper::toPhp("multi\nline"));
 Assert::match("'Iñtërnâtiônàlizætiøn'", Dumper::toPhp("I\xc3\xb1t\xc3\xabrn\xc3\xa2ti\xc3\xb4n\xc3\xa0liz\xc3\xa6ti\xc3\xb8n"));
-Assert::match('array(
+Assert::match('[
 	1,
 	\'hello\',
-	"\r" => array(),
-	array(1, 2),
-	array(1 => 1, 2, 3, 4, 5, 6, 7),
-)', Dumper::toPhp([1, 'hello', "\r" => [], [1, 2], [1 => 1, 2, 3, 4, 5, 6, 7]]));
+	"\r" => [],
+	[1, 2],
+	[1 => 1, 2, 3, 4, 5, 6, 7, \'abcdefgh\'],
+]', Dumper::toPhp([1, 'hello', "\r" => [], [1, 2], [1 => 1, 2, 3, 4, 5, 6, 7, 'abcdefgh']]));
 
 Assert::match('/* resource stream */', Dumper::toPhp(fopen(__FILE__, 'r')));
-Assert::match('(object) /* #%a% */ array()', Dumper::toPhp((object) NULL));
-Assert::match("(object) /* #%a% */ array(
+Assert::match('(object) /* #%a% */ []', Dumper::toPhp((object) NULL));
+Assert::match("(object) /* #%a% */ [
 	'a' => 'b',
-)", Dumper::toPhp((object) ['a' => 'b']));
+]", Dumper::toPhp((object) ['a' => 'b']));
 
-Assert::match("Test::__set_state(/* #%a% */ array(
-	'x' => array(10, NULL),
+Assert::match("Test::__set_state(/* #%a% */ [
+	'x' => [10, NULL],
 	'y' => 'hello',
 	'z' => 30.0,
-))", Dumper::toPhp(new Test));
+])", Dumper::toPhp(new Test));
 
 Assert::match('/* Closure defined in file %a% on line %d% */', Dumper::toPhp(function () {}));

tests/Framework/Dumper.toPhp.recursion.phpt

@@ -8,21 +8,21 @@ require __DIR__ . '/../bootstrap.php';
 
 $arr = [1, 2, 3];
 $arr[] = & $arr;
-Assert::match('array(
+Assert::match('[
 	1,
 	2,
 	3,
-	array(1, 2, 3, /* Nesting level too deep or recursive dependency */),
-)', Dumper::toPhp($arr));
+	[1, 2, 3, /* Nesting level too deep or recursive dependency */],
+]', Dumper::toPhp($arr));
 
 
 $obj = (object) ['x' => 1, 'y' => 2];
 $obj->z = & $obj;
-Assert::match("(object) /* #%a% */ array(
+Assert::match("(object) /* #%a% */ [
 	'x' => 1,
 	'y' => 2,
 	'z' => /* stdClass dumped on line 1 */,
-)", Dumper::toPhp($obj));
+]", Dumper::toPhp($obj));
 
 
 $var = [
@@ -32,19 +32,19 @@ $var = [
 	$empty,
 	$obj,
 ];
-Assert::match("array(
-	array(
+Assert::match("[
+	[
 		1,
 		2,
 		3,
-		array(1, 2, 3, /* Nesting level too deep or recursive dependency */),
-	),
-	(object) /* #%a% */ array(),
-	(object) /* #%a% */ array(
+		[1, 2, 3, /* Nesting level too deep or recursive dependency */],
+	],
+	(object) /* #%a% */ [],
+	(object) /* #%a% */ [
 		'x' => 1,
 		'y' => 2,
 		'z' => /* stdClass dumped on line 9 */,
-	),
-	(object) /* #%a% */ array(),
+	],
+	(object) /* #%a% */ [],
 	/* stdClass dumped on line 9 */,
-)", Dumper::toPhp($var));
+]", Dumper::toPhp($var));