improve

Author: vjik

src/Renderer/HeaderRenderer.php

@@ -15,25 +15,40 @@
  */
 final class HeaderRenderer implements ThrowableRendererInterface
 {
-    private const CONTENT_TYPE = '*/*';
+    public function __construct(
+        private readonly ?string $contentType = null,
+    ) {
+    }
 
     public function render(Throwable $t, ?ServerRequestInterface $request = null): ErrorData
     {
-        return new ErrorData('', [
-            'X-Error-Message' => self::DEFAULT_ERROR_MESSAGE,
-            Header::CONTENT_TYPE => self::CONTENT_TYPE,
-        ]);
+        return new ErrorData(
+            '',
+            $this->addContentTypeHeader([
+                'X-Error-Message' => self::DEFAULT_ERROR_MESSAGE,
+            ]),
+        );
     }
 
     public function renderVerbose(Throwable $t, ?ServerRequestInterface $request = null): ErrorData
     {
-        return new ErrorData('', [
-            'X-Error-Type' => $t::class,
-            'X-Error-Message' => $t->getMessage(),
-            'X-Error-Code' => (string) $t->getCode(),
-            'X-Error-File' => $t->getFile(),
-            'X-Error-Line' => (string) $t->getLine(),
-            Header::CONTENT_TYPE => self::CONTENT_TYPE,
-        ]);
+        return new ErrorData(
+            '',
+            $this->addContentTypeHeader([
+                'X-Error-Type' => $t::class,
+                'X-Error-Message' => $t->getMessage(),
+                'X-Error-Code' => (string) $t->getCode(),
+                'X-Error-File' => $t->getFile(),
+                'X-Error-Line' => (string) $t->getLine(),
+            ]),
+        );
+    }
+
+    private function addContentTypeHeader(array $headers): array
+    {
+        if ($this->contentType !== null) {
+            $headers[Header::CONTENT_TYPE] = $this->contentType;
+        }
+        return $headers;
     }
 }

src/Renderer/PlainTextRenderer.php

@@ -17,21 +17,24 @@
  */
 final class PlainTextRenderer implements ThrowableRendererInterface
 {
-    private const CONTENT_TYPE = 'text/plain';
+    public function __construct(
+        private readonly string $contentType = 'text/plain',
+    ) {
+    }
 
     public function render(Throwable $t, ?ServerRequestInterface $request = null): ErrorData
     {
         return new ErrorData(
             self::DEFAULT_ERROR_MESSAGE,
-            [Header::CONTENT_TYPE => self::CONTENT_TYPE],
+            [Header::CONTENT_TYPE => $this->contentType],
         );
     }
 
     public function renderVerbose(Throwable $t, ?ServerRequestInterface $request = null): ErrorData
     {
         return new ErrorData(
             self::throwableToString($t),
-            [Header::CONTENT_TYPE => self::CONTENT_TYPE],
+            [Header::CONTENT_TYPE => $this->contentType],
         );
     }
 

src/RendererProvider/HeadRendererProvider.php

@@ -4,17 +4,38 @@
 
 namespace Yiisoft\ErrorHandler\RendererProvider;
 
+use InvalidArgumentException;
 use Psr\Http\Message\ServerRequestInterface;
 use Yiisoft\ErrorHandler\Renderer\HeaderRenderer;
 use Yiisoft\ErrorHandler\ThrowableRendererInterface;
+use Yiisoft\Http\Header;
+use Yiisoft\Http\HeaderValueHelper;
 use Yiisoft\Http\Method;
 
 final class HeadRendererProvider implements RendererProviderInterface
 {
     public function get(ServerRequestInterface $request): ?ThrowableRendererInterface
     {
-        return $request->getMethod() === Method::HEAD
-            ? new HeaderRenderer()
-            : null;
+        if ($request->getMethod() === Method::HEAD) {
+            return new HeaderRenderer(
+                $this->getAcceptContentType($request),
+            );
+        }
+
+        return null;
+    }
+
+    private function getAcceptContentType(ServerRequestInterface $request): ?string
+    {
+        $acceptHeader = $request->getHeader(Header::ACCEPT);
+
+        try {
+            $contentTypes = HeaderValueHelper::getSortedAcceptTypes($acceptHeader);
+        } catch (InvalidArgumentException) {
+            // The "Accept" header contains an invalid "q" factor.
+            return null;
+        }
+
+        return empty($contentTypes) ? null : reset($contentTypes);
     }
 }