Dumper: simplified list with negative keys

is supported since PHP 8.0 https://3v4l.org/dvYQj
nette · Feb 11, 2024 · d961149 · d961149
1 parent 37cbd9a
commit d961149
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/src/PhpGenerator/Dumper.php b/src/PhpGenerator/Dumper.php
@@ -114,15 +114,13 @@ private function dumpArray(array $var, array $parents, int $level, int $column):
 		$outInline = '';
 		$outWrapped = "\n$space";
 		$parents[] = $var;
-		$counter = 0;
-		$hideKeys = is_int(($tmp = array_keys($var))[0]) && $tmp === range($tmp[0], $tmp[0] + count($var) - 1);
+		$hideKeys = is_int(($keys = array_keys($var))[0]) && $keys === range($keys[0], $keys[0] + count($var) - 1);
 
 		foreach ($var as $k => $v) {
-			$keyPart = $hideKeys && $k === $counter
+			$keyPart = $hideKeys && ($k !== $keys[0] || $k === 0)
 				? ''
 				: $this->dumpVar($k) . ' => ';
-			$counter = is_int($k) ? max($k + 1, $counter) : $counter;
-			$outInline .= ($outInline === '' ? '' : ', ') . $keyPart;
+			$outInline .= ($k === $keys[0] ? '' : ', ') . $keyPart;
 			$outInline .= $this->dumpVar($v, $parents, 0, $column + strlen($outInline));
 			$outWrapped .= $this->indentation
 				. $keyPart

diff --git a/tests/PhpGenerator/Dumper.dump().phpt b/tests/PhpGenerator/Dumper.dump().phpt
@@ -63,7 +63,7 @@ Assert::same('[1, 2, 3]', $dumper->dump([1, 2, 3]));
 Assert::same("['a']", $dumper->dump(['a']));
 Assert::same("[2 => 'a']", $dumper->dump([2 => 'a']));
 Assert::same("[2 => 'a', 'b']", $dumper->dump([2 => 'a', 'b']));
-Assert::same("[-2 => 'a', -1 => 'b']", $dumper->dump([-2 => 'a', -1 => 'b']));
+Assert::same("[-2 => 'a', 'b']", $dumper->dump([-2 => 'a', -1 => 'b']));
 Assert::same("[-2 => 'a', 0 => 'b']", $dumper->dump([-2 => 'a', 0 => 'b']));
 Assert::same("[0 => 'a', -2 => 'b', 1 => 'c']", $dumper->dump(['a', -2 => 'b', 1 => 'c']));