Allow raw formatter returning complete PSR 7 response

src/BodyOnlyFormatter.php

@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Lcobucci\ContentNegotiation;
+
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\StreamFactoryInterface;
+use Psr\Http\Message\StreamInterface;
+
+abstract class BodyOnlyFormatter implements Formatter
+{
+    /**
+     * @throws ContentCouldNotBeFormatted
+     */
+    public function format(UnformattedResponse $response, StreamFactoryInterface $streamFactory): ResponseInterface
+    {
+        return $response->withBody($this->formatBody($response, $streamFactory));
+    }
+
+    abstract protected function formatBody(UnformattedResponse $response, StreamFactoryInterface $streamFactory): StreamInterface;
+}

src/ContentFormatter.php

@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Lcobucci\ContentNegotiation;
+
+use Psr\Http\Message\StreamFactoryInterface;
+use Psr\Http\Message\StreamInterface;
+
+abstract class ContentFormatter extends BodyOnlyFormatter
+{
+    protected function formatBody(UnformattedResponse $response, StreamFactoryInterface $streamFactory): StreamInterface
+    {
+        return $streamFactory->createStream(
+            $this->formatContent($response->getUnformattedContent(), $response->getAttributes())
+        );
+    }
+
+    abstract protected function formatContent($content, array $attributes = []): string;
+}

src/ContentTypeMiddleware.php

@@ -3,7 +3,6 @@
 
 namespace Lcobucci\ContentNegotiation;
 
-use Fig\Http\Message\StatusCodeInterface;
 use Middlewares\ContentType;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
@@ -18,6 +17,8 @@ final class ContentTypeMiddleware implements MiddlewareInterface
     private MiddlewareInterface $negotiator;
     private StreamFactoryInterface $streamFactory;
 
+    public const NOT_ACCEPTABLE = 'NOT ACCEPTABLE';
+
     /**
      * @var Formatter[]
      */
@@ -66,9 +67,9 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
         }
 
         $contentType = $this->extractContentType($response->getHeaderLine('Content-Type'));
-        $formatter   = $this->formatters[$contentType] ?? null;
+        $formatter   = $this->formatters[$contentType] ?? $this->getNotAcceptableFormatter();
 
-        return $this->formatResponse($response, $formatter);
+        return $formatter->format($response, $this->streamFactory);
     }
 
     private function extractContentType(string $contentType): string
@@ -82,20 +83,12 @@ private function extractContentType(string $contentType): string
         return substr($contentType, 0, $charsetSeparatorPosition);
     }
 
-    /**
-     * @throws ContentCouldNotBeFormatted
-     */
-    private function formatResponse(UnformattedResponse $response, ?Formatter $formatter): ResponseInterface
+    private function getNotAcceptableFormatter(): Formatter
     {
-        if ($formatter === null) {
-            return $response->withBody($this->streamFactory->createStream())
-                            ->withStatus(StatusCodeInterface::STATUS_NOT_ACCEPTABLE);
+        if (empty($this->formatters[self::NOT_ACCEPTABLE])) {
+            $this->formatters[self::NOT_ACCEPTABLE] = new NotAcceptableFormatter();
         }
 
-        return $response->withBody(
-            $this->streamFactory->createStream(
-                $formatter->format($response->getUnformattedContent(), $response->getAttributes())
-            )
-        );
+        return $this->formatters[self::NOT_ACCEPTABLE];
     }
 }

src/Formatter.php

@@ -3,13 +3,13 @@
 
 namespace Lcobucci\ContentNegotiation;
 
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\StreamFactoryInterface;
+
 interface Formatter
 {
     /**
-     * @param mixed   $content
-     * @param mixed[] $attributes
-     *
      * @throws ContentCouldNotBeFormatted
      */
-    public function format($content, array $attributes = []): string;
+    public function format(UnformattedResponse $response, StreamFactoryInterface $streamFactory): ResponseInterface;
 }

src/Formatter/JmsSerializer.php

@@ -5,11 +5,11 @@
 
 use JMS\Serializer\SerializerInterface;
 use Lcobucci\ContentNegotiation\ContentCouldNotBeFormatted;
-use Lcobucci\ContentNegotiation\Formatter;
+use Lcobucci\ContentNegotiation\ContentFormatter;
 use Throwable;
 use function sprintf;
 
-final class JmsSerializer implements Formatter
+final class JmsSerializer extends ContentFormatter
 {
     private SerializerInterface $serializer;
     private string $format;
@@ -23,7 +23,7 @@ public function __construct(SerializerInterface $serializer, string $format)
     /**
      * {@inheritdoc}
      */
-    public function format($content, array $attributes = []): string
+    public function formatContent($content, array $attributes = []): string
     {
         try {
             return $this->serializer->serialize($content, $this->format);

src/Formatter/Json.php

@@ -4,7 +4,7 @@
 namespace Lcobucci\ContentNegotiation\Formatter;
 
 use Lcobucci\ContentNegotiation\ContentCouldNotBeFormatted;
-use Lcobucci\ContentNegotiation\Formatter;
+use Lcobucci\ContentNegotiation\ContentFormatter;
 use Throwable;
 use function json_encode;
 use function sprintf;
@@ -15,7 +15,7 @@
 use const JSON_THROW_ON_ERROR;
 use const JSON_UNESCAPED_SLASHES;
 
-final class Json implements Formatter
+final class Json extends ContentFormatter
 {
     private const DEFAULT_FLAGS = JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_AMP | JSON_HEX_QUOT | JSON_UNESCAPED_SLASHES;
 
@@ -29,7 +29,7 @@ public function __construct(int $flags = self::DEFAULT_FLAGS)
     /**
      * {@inheritdoc}
      */
-    public function format($content, array $attributes = []): string
+    public function formatContent($content, array $attributes = []): string
     {
         try {
             return json_encode($content, $this->flags | JSON_THROW_ON_ERROR);

src/Formatter/Plates.php

@@ -4,11 +4,11 @@
 namespace Lcobucci\ContentNegotiation\Formatter;
 
 use Lcobucci\ContentNegotiation\ContentCouldNotBeFormatted;
-use Lcobucci\ContentNegotiation\Formatter;
+use Lcobucci\ContentNegotiation\ContentFormatter;
 use League\Plates\Engine;
 use Throwable;
 
-final class Plates implements Formatter
+final class Plates extends ContentFormatter
 {
     private const DEFAULT_ATTRIBUTE = 'template';
 
@@ -24,7 +24,7 @@ public function __construct(Engine $engine, string $attributeName = self::DEFAUL
     /**
      * {@inheritdoc}
      */
-    public function format($content, array $attributes = []): string
+    public function formatContent($content, array $attributes = []): string
     {
         try {
             return $this->render($content, $attributes);

src/Formatter/StringCast.php

@@ -4,16 +4,16 @@
 namespace Lcobucci\ContentNegotiation\Formatter;
 
 use Lcobucci\ContentNegotiation\ContentCouldNotBeFormatted;
-use Lcobucci\ContentNegotiation\Formatter;
+use Lcobucci\ContentNegotiation\ContentFormatter;
 use function is_object;
 use function method_exists;
 
-final class StringCast implements Formatter
+final class StringCast extends ContentFormatter
 {
     /**
      * {@inheritdoc}
      */
-    public function format($content, array $attributes = []): string
+    public function formatContent($content, array $attributes = []): string
     {
         if (is_object($content) && ! method_exists($content, '__toString')) {
             throw new ContentCouldNotBeFormatted('Given data could not be cast to string');

src/Formatter/Twig.php

@@ -4,11 +4,11 @@
 namespace Lcobucci\ContentNegotiation\Formatter;
 
 use Lcobucci\ContentNegotiation\ContentCouldNotBeFormatted;
-use Lcobucci\ContentNegotiation\Formatter;
+use Lcobucci\ContentNegotiation\ContentFormatter;
 use Throwable;
 use Twig\Environment;
 
-final class Twig implements Formatter
+final class Twig extends ContentFormatter
 {
     private const DEFAULT_ATTRIBUTE = 'template';
 
@@ -26,7 +26,7 @@ public function __construct(
     /**
      * {@inheritdoc}
      */
-    public function format($content, array $attributes = []): string
+    public function formatContent($content, array $attributes = []): string
     {
         try {
             return $this->render($content, $attributes);

src/NotAcceptableFormatter.php

@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Lcobucci\ContentNegotiation;
+
+use Fig\Http\Message\StatusCodeInterface;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\StreamFactoryInterface;
+
+class NotAcceptableFormatter implements Formatter
+{
+    public function format(UnformattedResponse $response, StreamFactoryInterface $streamFactory): ResponseInterface
+    {
+        return $response->withBody($streamFactory->createStream())
+                        ->withStatus(StatusCodeInterface::STATUS_NOT_ACCEPTABLE);
+    }
+}

tests/Formatter/JmsSerializerTest.php

@@ -4,8 +4,11 @@
 namespace Lcobucci\ContentNegotiation\Tests\Formatter;
 
 use JMS\Serializer\SerializerInterface;
+use Laminas\Diactoros\Response;
+use Laminas\Diactoros\StreamFactory;
 use Lcobucci\ContentNegotiation\ContentCouldNotBeFormatted;
 use Lcobucci\ContentNegotiation\Formatter\JmsSerializer;
+use Lcobucci\ContentNegotiation\UnformattedResponse;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use RuntimeException;
@@ -37,6 +40,7 @@ public function createSerializer(): void
     public function formatShouldSimplyForwardCallToSerializer(): void
     {
         $content = ['a' => 'test'];
+        $unformatted = new UnformattedResponse(new Response(), $content);
 
         $this->serializer->expects(self::once())
                          ->method('serialize')
@@ -45,7 +49,9 @@ public function formatShouldSimplyForwardCallToSerializer(): void
 
         $formatter = new JmsSerializer($this->serializer, 'json');
 
-        self::assertSame('{"a":"test"}', $formatter->format($content));
+        $response = $formatter->format($unformatted, new StreamFactory());
+
+        self::assertSame('{"a":"test"}', $response->getBody()->getContents());
     }
 
     /**
@@ -62,6 +68,7 @@ public function formatShouldConvertAnyRaisedException(): void
                          ->willThrowException(new RuntimeException());
 
         $formatter = new JmsSerializer($this->serializer, 'json');
-        $formatter->format(['a' => 'test']);
+        $unformatted = new UnformattedResponse(new Response(), ['a' => 'test']);
+        $formatter->format($unformatted, new StreamFactory());
     }
 }

tests/Formatter/NaiveTemplateEngine.php

@@ -3,7 +3,7 @@
 
 namespace Lcobucci\ContentNegotiation\Tests\Formatter;
 
-use Lcobucci\ContentNegotiation\Formatter;
+use Lcobucci\ContentNegotiation\ContentFormatter;
 use SplFileObject;
 use function array_keys;
 use function array_map;
@@ -12,15 +12,15 @@
 use function str_replace;
 use function trim;
 
-final class NaiveTemplateEngine implements Formatter
+final class NaiveTemplateEngine extends ContentFormatter
 {
     private const BASE_DIR  = __DIR__ . '/../../templates/naive/';
     private const EXTENSION = 'html';
 
     /**
      * {@inheritdoc}
      */
-    public function format($content, array $attributes = []): string
+    public function formatContent($content, array $attributes = []): string
     {
         $template = $this->getTemplateContent($attributes);