From d16c55d0f855f439ecb669cd9ad023b0caf982b0 Mon Sep 17 00:00:00 2001
From: Dave Mc Nicoll <info@mcnd.ca>
Date: Mon, 21 Aug 2023 18:47:44 +0000
Subject: [PATCH] - Added renderText() again

---
 src/Dump.php           | 11 +++++++++++
 src/DumpMiddleware.php | 11 ++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/Dump.php b/src/Dump.php
index 828f371..0ff5fea 100644
--- a/src/Dump.php
+++ b/src/Dump.php
@@ -45,6 +45,17 @@ $data
 HTML;
     }
 
+    public function renderText() {
+        $data = $this->getDumpContent();
+
+        $this->trace['file'] ??= "?";
+        $this->trace['line'] ??= "?";
+
+        $header = "File: {$this->trace['file']} | line : {$this->trace['line']}";
+
+        return str_repeat('-', strlen($header)) . PHP_EOL . $header . PHP_EOL . str_repeat('-', strlen($header)) . PHP_EOL . $data . PHP_EOL;
+    }
+
     protected function getDumpContent() {
         ob_start();
         var_dump(...($this->content !== [] ? $this->content : [null]));
diff --git a/src/DumpMiddleware.php b/src/DumpMiddleware.php
index 11f873e..705f31f 100644
--- a/src/DumpMiddleware.php
+++ b/src/DumpMiddleware.php
@@ -43,15 +43,22 @@ namespace Dump {
                         $stream->write($item->renderText());
                     }
 
+
                     $stream->append_resource($body->detach());
                     break;
 
                 case $response instanceof JsonResponse:
+
                     foreach(static::$dump_stack as $item) {
                         $dump[] = $item->renderArray();
                     }
 
-                    $stream->write(json_encode(array_merge([ "_dump" => $dump ?? [] ], json_decode($body->getContents() ?? "{}", true)), JsonResponse::DEFAULT_JSON_FLAGS));
+                    if (! empty($dump)) {
+                        $stream->write(json_encode(array_merge([ "_dump" => $dump ?? [] ], (array) json_decode($body->getContents() ?? "{}", true)), JsonResponse::DEFAULT_JSON_FLAGS));
+                    }
+                    else {
+                        $stream = $body;
+                    }
                     break;
 
                 case $response instanceof HtmlResponse:
@@ -70,6 +77,8 @@ namespace Dump {
                     break;
             }
 
+            $stream->rewind();
+
             return $response->withBody($stream);
         }