From 912e456bdedaa44fbaf97ffd69e4760470c24720 Mon Sep 17 00:00:00 2001 From: Dave M Date: Tue, 20 Oct 2020 19:37:25 +0000 Subject: [PATCH] - DumpMiddleware is now also dumping on simple Response() --- src/DumpMiddleware.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/DumpMiddleware.php b/src/DumpMiddleware.php index 7cd6201..5d1b0c1 100644 --- a/src/DumpMiddleware.php +++ b/src/DumpMiddleware.php @@ -42,7 +42,15 @@ namespace Dump { }; switch (true) { - case $response instanceof HtmlResponse: + case $response instanceof JsonResponse: + foreach(static::$dump_stack as $item) { + $dump[] = $item->renderArray(); + } + + $stream->write(json_encode(array_merge([ "_dump" => $dump ?? [] ], json_decode($response->getBody()->getContents() ?? "{}", true)), JsonResponse::DEFAULT_JSON_FLAGS)); + break; + + case $response instanceof Response: $body = $response->getBody(); foreach(static::$dump_stack as $item) { @@ -51,14 +59,6 @@ namespace Dump { $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($response->getBody()->getContents() ?? "{}", true)), JsonResponse::DEFAULT_JSON_FLAGS)); - break; } return $response->withBody($stream); @@ -75,7 +75,7 @@ namespace Dump { namespace { if (! function_exists('dump') ) { function dump(...$what) { - return \CSLSJ\Dump\DumpMiddleware::dump(...$what); + return \Dump\DumpMiddleware::dump(...$what); } } }