improve

Author: vjik

src/Modern/DataStream/DataStream.php

@@ -129,7 +129,7 @@ public function getMetadata(?string $key = null)
     /**
      * Gets or creates the inner stream by formatting the data.
      */
-    private function getFormatted(): StreamInterface
+    public function getFormatted(): StreamInterface
     {
         if ($this->formatted !== null) {
             return $this->formatted;

src/Modern/Middleware/AbstractDataResponseMiddleware.php

@@ -18,10 +18,13 @@ abstract class AbstractDataResponseMiddleware implements MiddlewareInterface
     public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
         $response = $handler->handle($request);
+
         $body = $response->getBody();
         if ($body instanceof DataStream) {
             $body->changeFormatter($this->formatter);
+            return $this->formatter->formatResponse($response);
         }
-        return $this->formatter->formatResponse($response);
+
+        return $response;
     }
 }

src/Modern/ResponseFactory/HtmlResponseFactory.php

@@ -23,7 +23,7 @@ public function createResponse(
         int $code = Status::OK,
         string $reasonPhrase = '',
     ): ResponseInterface {
-        $body = new DataStream($data, $this->formatter);
+        $body = (new DataStream($data, $this->formatter))->getFormatted();
         $response = $this->responseFactory
             ->createResponse($code, $reasonPhrase)
             ->withBody($body);

src/Modern/ResponseFactory/JsonResponseFactory.php

@@ -22,7 +22,7 @@ public function createResponse(
         int $code = Status::OK,
         string $reasonPhrase = '',
     ): ResponseInterface {
-        $body = new DataStream($data, $this->formatter);
+        $body = (new DataStream($data, $this->formatter))->getFormatted();
         $response = $this->responseFactory
             ->createResponse($code, $reasonPhrase)
             ->withBody($body);

src/Modern/ResponseFactory/PlainTextResponseFactory.php

@@ -23,7 +23,7 @@ public function createResponse(
         int $code = Status::OK,
         string $reasonPhrase = '',
     ): ResponseInterface {
-        $body = new DataStream($data, $this->formatter);
+        $body = (new DataStream($data, $this->formatter))->getFormatted();
         $response = $this->responseFactory
             ->createResponse($code, $reasonPhrase)
             ->withBody($body);

src/Modern/ResponseFactory/XmlResponseFactory.php

@@ -22,7 +22,7 @@ public function createResponse(
         int $code = Status::OK,
         string $reasonPhrase = '',
     ): ResponseInterface {
-        $body = new DataStream($data, $this->formatter);
+        $body = (new DataStream($data, $this->formatter))->getFormatted();
         $response = $this->responseFactory
             ->createResponse($code, $reasonPhrase)
             ->withBody($body);