Dumper::dumpArray(), dumpArguments() optimization

Author: dg

src/PhpGenerator/Dumper.php

@@ -110,26 +110,37 @@ private function dumpArray(array $var, array $parents, int $level, int $column):
 			throw new Nette\InvalidStateException('Nesting level too deep or recursive dependency.');
 		}
 
-		$space = str_repeat($this->indentation, $level);
-		$outInline = '';
-		$outWrapped = "\n$space";
 		$parents[] = $var;
 		$hideKeys = is_int(($keys = array_keys($var))[0]) && $keys === range($keys[0], $keys[0] + count($var) - 1);
+		$res = '';
 
 		foreach ($var as $k => $v) {
 			$keyPart = $hideKeys && ($k !== $keys[0] || $k === 0)
 				? ''
 				: $this->dumpVar($k) . ' => ';
-			$outInline .= ($k === $keys[0] ? '' : ', ') . $keyPart;
-			$outInline .= $this->dumpVar($v, $parents, 0, $column + strlen($outInline));
-			$outWrapped .= $this->indentation
-				. $keyPart
-				. $this->dumpVar($v, $parents, $level + 1, strlen($keyPart))
-				. ",\n$space";
+			$res .= ($k === $keys[0] ? '' : ', ') . $keyPart;
+			$res .= $this->dumpVar($v, $parents, $level + 1, $column + strlen($res));
+
+			if (
+				str_contains($res, "\n")
+				|| $level * self::IndentLength + $column + strlen($res) + 3 > $this->wrapLength // 3 = [],
+			) { // wrap
+				$space = str_repeat($this->indentation, $level);
+				$res = "\n$space";
+				foreach ($var as $k => $v) {
+					$keyPart = $hideKeys && ($k !== $keys[0] || $k === 0)
+						? ''
+						: $this->dumpVar($k) . ' => ';
+					$res .= $this->indentation
+						. $keyPart
+						. $this->dumpVar($v, $parents, $level + 1, strlen($keyPart))
+						. ",\n$space";
+				}
+				break;
+			}
 		}
 
-		$wrap = str_contains($outInline, "\n") || $level * self::IndentLength + $column + strlen($outInline) + 3 > $this->wrapLength; // 3 = [],
-		return '[' . ($wrap ? $outWrapped : $outInline) . ']';
+		return '[' . $res . ']';
 	}
 
 
@@ -265,18 +276,25 @@ public function format(string $statement, mixed ...$args): string
 	/** @param  mixed[]  $var */
 	private function dumpArguments(array $var, int $column, bool $named): string
 	{
-		$outInline = $outWrapped = '';
-
+		$res = '';
 		foreach ($var as $k => $v) {
-			$k = !$named || is_int($k) ? '' : $k . ': ';
-			$outInline .= $outInline === '' ? '' : ', ';
-			$outInline .= $k . $this->dumpVar($v, [$var], 0, $column + strlen($outInline));
-			$outWrapped .= "\n" . $this->indentation . $k . $this->dumpVar($v, [$var], 1) . ',';
+			$namePart = $named && !is_int($k) ? $k . ': ' : '';
+			$res .= ($res === '' ? '' : ', ') . $namePart;
+			$res .= $this->dumpVar($v, [$var], 0, $column + strlen($res));
+
+			if (count($var) > 1 && (str_contains($res, "\n") || $column + strlen($res) > $this->wrapLength)) { // wrap
+				$res = '';
+				foreach ($var as $k => $v) {
+					$namePart = $named && !is_int($k) ? $k . ': ' : '';
+					$res .= "\n" . $this->indentation
+						. $namePart
+						. $this->dumpVar($v, [$var], 1, strlen($namePart)) . ',';
+				}
+				return $res . "\n";
+			}
 		}
 
-		return count($var) > 1 && (str_contains($outInline, "\n") || $column + strlen($outInline) > $this->wrapLength)
-			? $outWrapped . "\n"
-			: $outInline;
+		return $res;
 	}