Dumper: dumps Closure as PHP code

nette · Jul 5, 2021 · 59bb35e · 59bb35e
1 parent 2ea0c5f
commit 59bb35e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/PhpGenerator/Dumper.php b/src/PhpGenerator/Dumper.php
@@ -37,10 +37,7 @@ public function dump($var, int $column = 0): string
 
 	private function dumpVar(&$var, array $parents = [], int $level = 0, int $column = 0): string
 	{
-		if ($var instanceof Literal) {
-			return ltrim(Nette\Utils\Strings::indent(trim((string) $var), $level), "\t");
-
-		} elseif ($var === null) {
+		if ($var === null) {
 			return 'null';
 
 		} elseif (is_string($var)) {
@@ -50,6 +47,9 @@ private function dumpVar(&$var, array $parents = [], int $level = 0, int $column
 			return $this->dumpArray($var, $parents, $level, $column);
 
 		} elseif (is_object($var)) {
+			if ($var instanceof Literal || $var instanceof Closure) {
+				return ltrim(Nette\Utils\Strings::indent(trim((string) $var), $level), "\t");
+			}
 			return $this->dumpObject($var, $parents, $level);
 
 		} elseif (is_resource($var)) {

diff --git a/tests/PhpGenerator/Dumper.dump().phpt b/tests/PhpGenerator/Dumper.dump().phpt
@@ -40,7 +40,13 @@ Assert::same("'He\\llo'", $dumper->dump('He\llo'));
 Assert::same('\'He\ll\\\\\o \\\'wor\\\\\\\'ld\\\\\'', $dumper->dump('He\ll\\\o \'wor\\\'ld\\'));
 Assert::same('[]', $dumper->dump([]));
 
+// internal classes
 Assert::same('[$s]', $dumper->dump([new PhpLiteral('$s')]));
+same('[
+	function () {
+		return 1;
+	},
+]', $dumper->dump([(new Nette\PhpGenerator\Closure)->setBody('return 1;')]));
 
 Assert::same('[1, 2, 3]', $dumper->dump([1, 2, 3]));
 Assert::same("['a']", $dumper->dump(['a']));