Dumper: added $indentation

Author: dg

src/PhpGenerator/Dumper.php

@@ -25,6 +25,9 @@ final class Dumper
 	/** @var int */
 	public $wrapLength = 120;
 
+	/** @var string */
+	public $indentation = "\t";
+
 
 	/**
 	 * Returns a PHP representation of a variable.
@@ -92,7 +95,7 @@ private function dumpArray(array &$var, array $parents, int $level, int $column)
 			throw new Nette\InvalidArgumentException('Nesting level too deep or recursive dependency.');
 		}
 
-		$space = str_repeat("\t", $level);
+		$space = str_repeat($this->indentation, $level);
 		$outInline = '';
 		$outWrapped = "\n$space";
 		$parents[] = $var;
@@ -106,7 +109,7 @@ private function dumpArray(array &$var, array $parents, int $level, int $column)
 			$counter = is_int($k) ? max($k + 1, $counter) : $counter;
 			$outInline .= ($outInline === '' ? '' : ', ') . $keyPart;
 			$outInline .= $this->dumpVar($v, $parents, 0, $column + strlen($outInline));
-			$outWrapped .= "\t"
+			$outWrapped .= $this->indentation
 				. $keyPart
 				. $this->dumpVar($v, $parents, $level + 1, strlen($keyPart))
 				. ",\n$space";
@@ -145,7 +148,7 @@ private function dumpObject(&$var, array $parents, int $level): string
 		}
 
 		$arr = (array) $var;
-		$space = str_repeat("\t", $level);
+		$space = str_repeat($this->indentation, $level);
 
 		if ($level > $this->maxDepth || in_array($var, $parents ?? [], true)) {
 			throw new Nette\InvalidArgumentException('Nesting level too deep or recursive dependency.');
@@ -161,7 +164,7 @@ private function dumpObject(&$var, array $parents, int $level): string
 
 		foreach ($arr as $k => &$v) {
 			if (!isset($props) || isset($props[$k])) {
-				$out .= "$space\t"
+				$out .= $space . $this->indentation
 					. ($keyPart = $this->dumpVar($k) . ' => ')
 					. $this->dumpVar($v, $parents, $level + 1, strlen($keyPart))
 					. ",\n";
@@ -178,8 +181,8 @@ private function dumpObject(&$var, array $parents, int $level): string
 
 	private function dumpLiteral(Literal $var, int $level): string
 	{
-		$s = Nette\Utils\Strings::indent(trim((string) $var), $level, "\t");
-		return ltrim($s, "\t");
+		$s = Nette\Utils\Strings::indent(trim((string) $var), $level, $this->indentation);
+		return ltrim($s, $this->indentation);
 	}
 
 
@@ -229,7 +232,8 @@ private function dumpArguments(array &$var, int $column, bool $named): string
 			$k = !$named || is_int($k) ? '' : $k . ': ';
 			$outInline .= $outInline === '' ? '' : ', ';
 			$outInline .= $k . $this->dumpVar($v, [$var], 0, $column + strlen($outInline));
-			$outWrapped .= ($outWrapped === '' ? '' : ',') . "\n\t" . $k . $this->dumpVar($v, [$var], 1);
+			$outWrapped .= ($outWrapped === '' ? '' : ',') . "\n"
+				. $this->indentation . $k . $this->dumpVar($v, [$var], 1);
 		}
 
 		return count($var) > 1 && (strpos($outInline, "\n") !== false || $column + strlen($outInline) > $this->wrapLength)

src/PhpGenerator/Printer.php

@@ -279,6 +279,7 @@ protected function indent(string $s): string
 
 	protected function dump($var, int $column = 0): string
 	{
+		$this->dumper->indentation = $this->indentation;
 		return $this->dumper->dump($var, $column);
 	}
 
@@ -369,6 +370,7 @@ private function printAttributes(array $attrs, bool $inline = false): string
 		if (!$attrs) {
 			return '';
 		}
+		$this->dumper->indentation = $this->indentation;
 		$items = [];
 		foreach ($attrs as $attr) {
 			$args = $this->dumper->format('...?:', $attr->getArguments());

tests/PhpGenerator/Dumper.dump().indent.phpt

@@ -7,6 +7,7 @@
 declare(strict_types=1);
 
 use Nette\PhpGenerator\Dumper;
+use Nette\PhpGenerator\Literal;
 use Tester\Assert;
 
 
@@ -38,3 +39,21 @@ same('[
 	2,
 	3,
 ]', $dumper->dump([8 => 1, 2, 3], $dumper->wrapLength - 13));
+
+
+$dumper = new Dumper;
+$dumper->indentation = '  ';
+same('[
+  1,
+  2,
+  3,
+]', $dumper->dump([1, 2, 3], $dumper->wrapLength - 8));
+
+same(
+	"[
+  'multi' => [
+  1,
+  ],
+]",
+	$dumper->dump(['multi' => new Literal("[\n1,\n]\n")])
+);