Improve JsonValuePrinter

Author: SerafimArts

src/Runtime/Value/JsonValuePrinter.php

@@ -15,22 +15,117 @@ public function __construct(
         private readonly int $maxDepth = self::DEFAULT_MAX_DEPTH,
     ) {}
 
-    public function print(mixed $value, int $depth = 0): string
+    public function print(mixed $value): string
+    {
+        return $this->printMixed($value, 0);
+    }
+
+    /**
+     * @param int<0, max> $depth
+     * @return non-empty-string
+     */
+    private function printMixed(mixed $value, int $depth): string
     {
         return match (true) {
-            $value === true => 'true',
-            $value === false => 'false',
-            $value === null => 'null',
-            \is_string($value) => \sprintf('"%s"', \addcslashes($value, '"')),
+            $value === true => $this->printTrue(),
+            $value === false => $this->printFalse(),
+            $value === null => $this->printNull(),
+            \is_string($value) => $this->printString($value),
             \is_float($value) => $this->printFloat($value),
-            \is_scalar($value),
-            $value instanceof \Stringable => (string) $value,
+            \is_int($value) => $this->printInt($value),
+            \is_resource($value) => $this->printResource($value),
             \is_array($value) => $this->printArray($value, $depth),
+            $value instanceof \BackedEnum => $this->printBackedEnum($value, $depth),
+            $value instanceof \UnitEnum => $this->printUnitEnum($value),
             \is_object($value) => $this->printObject($value, $depth),
-            default => \get_debug_type($value),
+            default => $this->printOther($value),
         };
     }
 
+    /**
+     * @return non-empty-string
+     */
+    private function printInt(int $value): string
+    {
+        return (string) $value;
+    }
+
+    /**
+     * @return non-empty-string
+     */
+    private function printOther(mixed $value): string
+    {
+        /** @var non-empty-string */
+        return \get_debug_type($value);
+    }
+
+    /**
+     * @param resource $resource
+     * @return non-empty-string
+     */
+    private function printResource(mixed $resource): string
+    {
+        return (string) \get_resource_id($resource);
+    }
+
+    /**
+     * @return non-empty-string
+     */
+    private function printTrue(): string
+    {
+        return 'true';
+    }
+
+    /**
+     * @return non-empty-string
+     */
+    private function printFalse(): string
+    {
+        return 'false';
+    }
+
+    /**
+     * @return non-empty-string
+     */
+    private function printNull(): string
+    {
+        return 'null';
+    }
+
+    /**
+     * @return non-empty-string
+     */
+    private function printString(string $value): string
+    {
+        $formatted = \strtr($value, [
+            "\n" => '\n',
+            "\r" => '\r',
+            "\t" => '\t',
+        ]);
+
+        return \sprintf('"%s"', \addcslashes($formatted, '"'));
+    }
+
+    /**
+     * @return non-empty-string
+     */
+    private function printUnitEnum(\UnitEnum $case): string
+    {
+        return $this->printString($case->name);
+    }
+
+    /**
+     * @param int<0, max> $depth
+     * @return non-empty-string
+     */
+    private function printBackedEnum(\BackedEnum $case, int $depth): string
+    {
+        return $this->printMixed($case->value, $depth);
+    }
+
+    /**
+     * @return non-empty-string
+     */
     private function printFloat(float $value): string
     {
         return match (true) {
@@ -45,8 +140,21 @@ private function printFloat(float $value): string
         };
     }
 
-    private function printObject(object $object, int $depth = 0): string
+    /**
+     * @param int<0, max> $depth
+     *
+     * @return non-empty-string
+     */
+    private function printObject(object $object, int $depth): string
     {
+        if ($object instanceof \Stringable) {
+            $result = (string) $object;
+
+            if ($result === '') {
+                return '{}';
+            }
+        }
+
         if ($depth >= $this->maxDepth) {
             return '{...}';
         }
@@ -62,6 +170,7 @@ private function printObject(object $object, int $depth = 0): string
 
     /**
      * @param array<array-key, mixed> $values
+     * @param int<0, max> $depth
      *
      * @return non-empty-string
      */
@@ -85,6 +194,7 @@ private function printArray(array $values, int $depth): string
 
     /**
      * @param array<array-key, mixed> $values
+     * @param int<0, max> $depth
      *
      * @return list<string>
      */
@@ -95,8 +205,8 @@ private function computeKeyValValues(array $values, int $depth): array
 
         foreach ($values as $key => $value) {
             $result[] = \vsprintf('%s: %s', [
-                $this->print($key, $depth),
-                $this->print($value, $depth),
+                $this->printMixed($key, $depth),
+                $this->printMixed($value, $depth),
             ]);
 
             if (++$index >= $this->maxItemsCount) {
@@ -109,6 +219,7 @@ private function computeKeyValValues(array $values, int $depth): array
 
     /**
      * @param list<mixed> $values
+     * @param int<0, max> $depth
      *
      * @return non-empty-string
      */
@@ -128,6 +239,7 @@ private function printList(array $values, int $depth): string
 
     /**
      * @param list<mixed> $values
+     * @param int<0, max> $depth
      *
      * @return list<string>
      */
@@ -137,7 +249,7 @@ private function computeListValues(array $values, int $depth): array
         $index = 0;
 
         foreach ($values as $value) {
-            $result[] = $this->print($value, $depth);
+            $result[] = $this->printMixed($value, $depth);
 
             if (++$index >= $this->maxItemsCount) {
                 break;