Introduce accept provider for content negotiator

src/Middleware/AcceptProvider/AcceptProviderInterface.php

@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\DataResponse\Middleware\AcceptProvider;
+
+use Psr\Http\Message\ServerRequestInterface;
+
+interface AcceptProviderInterface
+{
+    /**
+     * @param ServerRequestInterface $request The request instance.
+     * @return string[] The array of acceptable content types in order of preference.
+     */
+    public function get(ServerRequestInterface $request): array;
+}

src/Middleware/AcceptProvider/HeaderAcceptProvider.php

@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\DataResponse\Middleware\AcceptProvider;
+
+use Psr\Http\Message\ServerRequestInterface;
+use Yiisoft\Http\Header;
+
+final class HeaderAcceptProvider implements AcceptProviderInterface
+{
+    public function get(ServerRequestInterface $request): array
+    {
+        $values = [];
+        foreach ($request->getHeader(Header::ACCEPT) as $headerValue) {
+            $values[] = array_filter(
+                array_map(
+                    trim(...),
+                    explode(',', $headerValue),
+                ),
+                static fn(string $value) => $value !== '',
+            );
+        }
+        return array_merge(...$values);
+    }
+}

src/Middleware/AcceptProvider/RequestParameterAcceptProvider.php

@@ -0,0 +1,63 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\DataResponse\Middleware\AcceptProvider;
+
+use Psr\Http\Message\ServerRequestInterface;
+use Yiisoft\Http\Method;
+
+use function is_array;
+use function is_string;
+
+final class RequestParameterAcceptProvider implements AcceptProviderInterface
+{
+    public function __construct(
+        public string $name = 'format',
+    ) {
+    }
+
+    public function get(ServerRequestInterface $request): array
+    {
+        return $request->getMethod() === Method::GET
+            ? $this->fromQueryParams($request)
+            : [...$this->fromParsedBody($request), ...$this->fromQueryParams($request)];
+    }
+
+    /**
+     * @return string[]
+     */
+    public function fromQueryParams(ServerRequestInterface $request): array
+    {
+        return $this->prepareValue($request->getQueryParams()[$this->name] ?? null);
+    }
+
+    /**
+     * @return string[]
+     */
+    private function fromParsedBody(ServerRequestInterface $request): array
+    {
+        $body = $request->getParsedBody();
+        return is_array($body)
+            ? $this->prepareValue($body[$this->name] ?? null)
+            : [];
+    }
+
+    /**
+     * @return string[]
+     */
+    private function prepareValue(mixed $value): array
+    {
+        if (!is_string($value)) {
+            return [];
+        }
+
+        return array_filter(
+            array_map(
+                trim(...),
+                explode(',', $value),
+            ),
+            static fn(string $accept) => $accept !== '',
+        );
+    }
+}

src/Middleware/ContentNegotiator.php

@@ -11,7 +11,8 @@
 use RuntimeException;
 use Yiisoft\DataResponse\DataResponse;
 use Yiisoft\DataResponse\DataResponseFormatterInterface;
-use Yiisoft\Http\Header;
+use Yiisoft\DataResponse\Middleware\AcceptProvider\AcceptProviderInterface;
+use Yiisoft\DataResponse\Middleware\AcceptProvider\HeaderAcceptProvider;
 
 use function gettype;
 use function is_string;
@@ -35,8 +36,10 @@ final class ContentNegotiator implements MiddlewareInterface
      *
      * @psalm-param array<string, DataResponseFormatterInterface> $contentFormatters
      */
-    public function __construct(array $contentFormatters)
-    {
+    public function __construct(
+        array $contentFormatters,
+        private readonly AcceptProviderInterface $acceptProvider = new HeaderAcceptProvider(),
+    ) {
         $this->checkFormatters($contentFormatters);
         $this->contentFormatters = $contentFormatters;
     }
@@ -61,13 +64,9 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
     {
         $response = $handler->handle($request);
         if ($response instanceof DataResponse && !$response->hasResponseFormatter()) {
-            $accepted = $request->getHeader(Header::ACCEPT);
-
-            foreach ($accepted as $accept) {
-                foreach ($this->contentFormatters as $contentType => $formatter) {
-                    if (str_contains($accept, $contentType)) {
-                        return $response->withResponseFormatter($formatter);
-                    }
+            foreach ($this->acceptProvider->get($request) as $accept) {
+                if (isset($this->contentFormatters[$accept])) {
+                    return $response->withResponseFormatter($this->contentFormatters[$accept]);
                 }
             }
         }