From abb0ad3a6a1f49035d4991d5198b216413595609 Mon Sep 17 00:00:00 2001 From: Dave Mc Nicoll Date: Wed, 1 Feb 2023 18:51:47 +0000 Subject: [PATCH] - Fixed Whoops error messages not showing --- src/Dump.php | 2 +- src/DumpMiddleware.php | 15 +++++---------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/Dump.php b/src/Dump.php index c13b0ba..828f371 100644 --- a/src/Dump.php +++ b/src/Dump.php @@ -38,7 +38,7 @@ class Dump { $this->trace['line'] ??= "?"; return << +
 
[ file: {$this->trace['file']}:{$this->trace['line']} ]

 $data
diff --git a/src/DumpMiddleware.php b/src/DumpMiddleware.php index c35469e..43ee7a7 100644 --- a/src/DumpMiddleware.php +++ b/src/DumpMiddleware.php @@ -28,20 +28,17 @@ namespace Dump { { $response = $handler->handle($request); - /*if ( empty(static::$dump_stack) ) { - return $response; - }*/ - $stream = new class("php://memory", "rw") extends Stream { public function append_resource($resource) { stream_copy_to_stream($resource, $this->resource); } }; + $body = $response->getBody(); + $body->rewind(); + switch (true) { case $response instanceof TextResponse: - $body = $response->getBody(); - foreach(static::$dump_stack as $item) { $stream->write($item->renderText()); } @@ -54,19 +51,17 @@ namespace Dump { $dump[] = $item->renderArray(); } - $stream->write(json_encode(array_merge([ "_dump" => $dump ?? [] ], json_decode($response->getBody()->getContents() ?? "{}", true)), JsonResponse::DEFAULT_JSON_FLAGS)); + $stream->write(json_encode(array_merge([ "_dump" => $dump ?? [] ], json_decode($body->getContents() ?? "{}", true)), JsonResponse::DEFAULT_JSON_FLAGS)); break; case $response instanceof HtmlResponse: $stream->write(<<env: DEV + env: DEV HTML); # no break; default: case $response instanceof Response: - $body = $response->getBody(); - foreach(static::$dump_stack as $item) { $stream->write($item->renderHtml()); }