Erroneous responses shouldn't have a body

Add the stream with the response only on valid requests

Author: usox

src/Endpoint.php

@@ -50,6 +50,7 @@ public function serve(
         ResponseInterface $response
     ): ResponseInterface {
         $statusCode = StatusCode::OK;
+        $responseData = null;
 
         try {
             // Process and build the response
@@ -73,25 +74,26 @@ public function serve(
 
             $this->log($e, $uuid, $e->getContext());
 
-            $responseData = '';
             $statusCode = StatusCode::INTERNAL_SERVER_ERROR;
         } catch (Throwable $e) {
             $uuid = $this->uuidFactory->uuid4();
 
             $this->log($e, $uuid);
 
-            $responseData = '';
             $statusCode = StatusCode::INTERNAL_SERVER_ERROR;
         }
 
-        return $response
-            ->withHeader('Content-Type', 'application/json')
-            ->withStatus($statusCode)
-            ->withBody(
+        if ($responseData !== null) {
+            $response = $response->withBody(
                 $this->streamFactory->createStream(
                     (string) json_encode($responseData)
                 )
             );
+        }
+
+        return $response
+            ->withHeader('Content-Type', 'application/json')
+            ->withStatus($statusCode);
     }
 
     /**

tests/EndpointTest.php

@@ -240,7 +240,7 @@ public function testServeCatchesGenericException(): void
 
         $this->createResponseExpectations(
             $response,
-            '',
+            null,
             StatusCode::INTERNAL_SERVER_ERROR
         );
 
@@ -287,7 +287,7 @@ public function testServeCatchesInternalException(): void
 
         $this->createResponseExpectations(
             $response,
-            '',
+            null,
             StatusCode::INTERNAL_SERVER_ERROR
         );
 
@@ -361,15 +361,22 @@ public function testProcessWorksWithMiddleware(): void
 
     private function createResponseExpectations(
         MockInterface $response,
-        string|array $responseData,
+        string|array|null $responseData,
         int $statusCode
     ): void {
-        $stream = Mockery::mock(StreamInterface::class);
+        if ($responseData !== null) {
+            $stream = Mockery::mock(StreamInterface::class);
 
-        $this->streamFactory->shouldReceive('createStream')
-            ->with(json_encode($responseData))
-            ->once()
-            ->andReturn($stream);
+            $this->streamFactory->shouldReceive('createStream')
+                ->with(json_encode($responseData))
+                ->once()
+                ->andReturn($stream);
+
+            $response->shouldReceive('withBody')
+                ->with($stream)
+                ->once()
+                ->andReturnSelf();
+        }
 
         $response->shouldReceive('withHeader')
             ->with('Content-Type', 'application/json')
@@ -379,9 +386,5 @@ private function createResponseExpectations(
             ->with($statusCode)
             ->once()
             ->andReturnSelf();
-        $response->shouldReceive('withBody')
-            ->with($stream)
-            ->once()
-            ->andReturnSelf();
     }
 }