Add ExceptionHandler::acceptJson method

Author: natanfelles

src/ExceptionHandler.php

@@ -169,7 +169,7 @@ public function exceptionHandler(Throwable $exception) : void
         if (!\headers_sent()) {
             $this->sendHeaders();
         }
-        if ($this->isJson()) {
+        if ($this->isJson() || $this->acceptJson()) {
             $this->sendJson($exception);
             return;
         }
@@ -193,6 +193,12 @@ protected function isJson() : bool
             && \str_starts_with($_SERVER['HTTP_CONTENT_TYPE'], 'application/json');
     }
 
+    protected function acceptJson() : bool
+    {
+        return isset($_SERVER['HTTP_ACCEPT'])
+            && \str_contains($_SERVER['HTTP_ACCEPT'], 'application/json');
+    }
+
     protected function sendJson(Throwable $exception) : void
     {
         $data = $this->getEnvironment() === static::DEVELOPMENT
@@ -218,7 +224,7 @@ protected function sendJson(Throwable $exception) : void
     protected function sendHeaders() : void
     {
         $contentType = 'text/html';
-        if ($this->isJson()) {
+        if ($this->isJson() || $this->acceptJson()) {
             $contentType = 'application/json';
         }
         \header('Content-Type: ' . $contentType . '; charset=UTF-8');

tests/ExceptionHandlerTest.php

@@ -79,11 +79,13 @@ public function testCliException() : void
     }
 
     /**
+     * @dataProvider jsonHeadersProvider
+     *
      * @runInSeparateProcess
      */
-    public function testJsonExceptionOnProduction() : void
+    public function testJsonExceptionOnProduction(string $header, string $value) : void
     {
-        $_SERVER['HTTP_CONTENT_TYPE'] = 'application/json ';
+        $_SERVER[$header] = $value;
         $exceptions = new ExceptionHandlerMock();
         $exceptions->cli = false;
         \ob_start();
@@ -106,11 +108,13 @@ public function testJsonExceptionOnProduction() : void
     }
 
     /**
+     * @dataProvider jsonHeadersProvider
+     *
      * @runInSeparateProcess
      */
-    public function testJsonExceptionOnDevelopment() : void
+    public function testJsonExceptionOnDevelopment(string $header, string $value) : void
     {
-        $_SERVER['HTTP_CONTENT_TYPE'] = 'application/json ';
+        $_SERVER[$header] = $value;
         $exceptions = new ExceptionHandlerMock(ExceptionHandler::DEVELOPMENT);
         $exceptions->cli = false;
         \ob_start();
@@ -237,4 +241,15 @@ public static function errorProvider() : array
             [\E_USER_NOTICE, 'User Notice'],
         ];
     }
+
+    /**
+     * @return array<array<string>>
+     */
+    public static function jsonHeadersProvider() : array
+    {
+        return [
+            ['HTTP_ACCEPT', 'text/html; application/json'],
+            ['HTTP_CONTENT_TYPE', 'application/json; charset=UTF-8'],
+        ];
+    }
 }