Dumper: refactoring, added dumpCustomObject()

Author: dg

src/PhpGenerator/Dumper.php

@@ -49,10 +49,10 @@ private function dumpVar(mixed &$var, array $parents = [], int $level = 0, int $
 			return $this->dumpLiteral($var, $level);
 
 		} elseif (is_object($var)) {
-			return $this->dumpObject($var, $parents, $level);
+			return $this->dumpObject($var, $parents, $level, $column);
 
 		} elseif (is_resource($var)) {
-			throw new Nette\InvalidArgumentException('Cannot dump resource.');
+			throw new Nette\InvalidStateException('Cannot dump value of type resource.');
 
 		} else {
 			return var_export($var, return: true);
@@ -106,7 +106,7 @@ private function dumpArray(array &$var, array $parents, int $level, int $column)
 			return '[]';
 
 		} elseif ($level > $this->maxDepth || in_array($var, $parents, strict: true)) {
-			throw new Nette\InvalidArgumentException('Nesting level too deep or recursive dependency.');
+			throw new Nette\InvalidStateException('Nesting level too deep or recursive dependency.');
 		}
 
 		$space = str_repeat($this->indentation, $level);
@@ -136,12 +136,25 @@ private function dumpArray(array &$var, array $parents, int $level, int $column)
 
 
 	/** @param  array<mixed[]|object>  $parents */
-	private function dumpObject(object $var, array $parents, int $level): string
+	private function dumpObject(object $var, array $parents, int $level, int $column): string
 	{
+		if ($level > $this->maxDepth || in_array($var, $parents, strict: true)) {
+			throw new Nette\InvalidStateException('Nesting level too deep or recursive dependency.');
+		}
+
 		$class = $var::class;
+		$parents[] = $var;
 
-		if (in_array($class, [\DateTime::class, \DateTimeImmutable::class], strict: true)) {
-			return $this->format("new \\$class(?, new \\DateTimeZone(?))", $var->format('Y-m-d H:i:s.u'), $var->getTimeZone()->getName());
+		if ($class === \stdClass::class) {
+			$var = (array) $var;
+			return '(object) ' . $this->dumpArray($var, $parents, $level, $column + 10);
+
+		} elseif ($class === \DateTime::class || $class === \DateTimeImmutable::class) {
+			return $this->format(
+				"new \\$class(?, new \\DateTimeZone(?))",
+				$var->format('Y-m-d H:i:s.u'),
+				$var->getTimeZone()->getName(),
+			);
 
 		} elseif ($var instanceof \UnitEnum) {
 			return '\\' . $var::class . '::' . $var->name;
@@ -154,15 +167,25 @@ private function dumpObject(object $var, array $parents, int $level): string
 					: implode('::', (array) $inner) . '(...)';
 			}
 
-			throw new Nette\InvalidArgumentException('Cannot dump closure.');
+			throw new Nette\InvalidStateException('Cannot dump object of type Closure.');
+
+		} else {
+			return $this->dumpCustomObject($var, $parents, $level);
+		}
+	}
 
-		} elseif ((new \ReflectionObject($var))->isAnonymous()) {
-			throw new Nette\InvalidArgumentException('Cannot dump anonymous class.');
 
-		} elseif ($level > $this->maxDepth || in_array($var, $parents, strict: true)) {
-			throw new Nette\InvalidArgumentException('Nesting level too deep or recursive dependency.');
+	/** @param  array<mixed[]|object>  $parents */
+	private function dumpCustomObject(object $var, array $parents, int $level): string
+	{
+		if ((new \ReflectionObject($var))->isAnonymous()) {
+			throw new Nette\InvalidStateException('Cannot dump an instance of an anonymous class.');
 		}
 
+		$class = $var::class;
+		$space = str_repeat($this->indentation, $level);
+		$out = "\n";
+
 		if (method_exists($var, '__serialize')) {
 			$arr = $var->__serialize();
 		} else {
@@ -174,10 +197,6 @@ private function dumpObject(object $var, array $parents, int $level): string
 			}
 		}
 
-		$space = str_repeat($this->indentation, $level);
-		$out = "\n";
-		$parents[] = $var;
-
 		foreach ($arr as $k => &$v) {
 			if (!isset($props) || isset($props[$k])) {
 				$out .= $space . $this->indentation
@@ -187,11 +206,7 @@ private function dumpObject(object $var, array $parents, int $level): string
 			}
 		}
 
-		array_pop($parents);
-		$out .= $space;
-		return $class === \stdClass::class
-			? "(object) [$out]"
-			: '\\' . self::class . "::createObject(\\$class::class, [$out])";
+		return '\\' . self::class . "::createObject(\\$class::class, [$out$space])";
 	}
 
 

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

@@ -17,12 +17,12 @@ Assert::exception(function () {
 	$rec[] = &$rec;
 	$dumper = new Dumper;
 	$dumper->dump($rec);
-}, Nette\InvalidArgumentException::class, 'Nesting level too deep or recursive dependency.');
+}, Nette\InvalidStateException::class, 'Nesting level too deep or recursive dependency.');
 
 
 Assert::exception(function () {
 	$rec = new stdClass;
 	$rec->x = &$rec;
 	$dumper = new Dumper;
 	$dumper->dump($rec);
-}, Nette\InvalidArgumentException::class, 'Nesting level too deep or recursive dependency.');
+}, Nette\InvalidStateException::class, 'Nesting level too deep or recursive dependency.');

tests/PhpGenerator/Dumper.dump().phpt

@@ -70,12 +70,12 @@ Assert::same("[0 => 'a', -2 => 'b', 1 => 'c']", $dumper->dump(['a', -2 => 'b', 1
 
 // stdClass
 Assert::same(
-	"(object) [\n\t'a' => 1,\n\t'b' => 2,\n]",
+	"(object) ['a' => 1, 'b' => 2]",
 	$dumper->dump((object) ['a' => 1, 'b' => 2]),
 );
 
 Assert::same(
-	"(object) [\n\t'a' => (object) [\n\t\t'b' => 2,\n\t],\n]",
+	"(object) ['a' => (object) ['b' => 2]]",
 	$dumper->dump((object) ['a' => (object) ['b' => 2]]),
 );
 
@@ -128,7 +128,7 @@ Assert::exception(function () {
 	$dumper = new Dumper;
 	$dumper->dump(new class {
 	});
-}, Nette\InvalidArgumentException::class, 'Cannot dump anonymous class.');
+}, Nette\InvalidStateException::class, 'Cannot dump an instance of an anonymous class.');
 
 
 
@@ -150,7 +150,7 @@ Assert::same(
 Assert::exception(function () {
 	$dumper = new Dumper;
 	$dumper->dump(function () {});
-}, Nette\InvalidArgumentException::class, 'Cannot dump closure.');
+}, Nette\InvalidStateException::class, 'Cannot dump object of type Closure.');
 
 
 

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

@@ -13,7 +13,7 @@ require __DIR__ . '/../bootstrap.php';
 
 
 $dumper = new Dumper;
-$dumper->wrapLength = 21;
+$dumper->wrapLength = 28;
 same(
 	<<<'XX'
 		[