From c125937f053055f348f07dd3e27d7b2aee0abd19 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sun, 9 Dec 2018 16:24:24 +0100 Subject: [PATCH] Simplify output --- Message/Http/Response.php | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/Message/Http/Response.php b/Message/Http/Response.php index cdce20582..b9b8ead17 100644 --- a/Message/Http/Response.php +++ b/Message/Http/Response.php @@ -20,6 +20,7 @@ use phpOMS\Message\ResponseAbstract; use phpOMS\System\MimeType; use phpOMS\Views\View; use phpOMS\Log\FileLogger; +use phpOMS\Utils\StringUtils; /** * Response class. @@ -128,15 +129,7 @@ final class Response extends ResponseAbstract implements RenderableInterface $render = ''; foreach ($this->response as $key => $response) { - if ($response instanceOf \Serializable) { - $render .= $response->serialize(); - } elseif (\is_string($response) || \is_numeric($response)) { - $render .= $response; - } elseif (\is_array($response)) { - $render .= \json_encode($response); - } else { - throw new \Exception('Wrong response type'); - } + $render .= StringUtils::stringify($response); } return $this->removeWhitespaceAndLineBreak($render); @@ -163,6 +156,7 @@ final class Response extends ResponseAbstract implements RenderableInterface /** * {@inheritdoc} + * @todo: this whole workflow with json got improved a little bit but this part looks bad. do i really need so much code or could i simplify it */ public function toArray() : array {