Refactor JSON-API error formatter

framework/core/src/Foundation/ErrorHandling/HandledError.php

@@ -71,4 +71,9 @@ class HandledError
     {
         return $this->details;
     }
+
+    public function hasDetails(): bool
+    {
+        return ! empty($this->details);
+    }
 }

framework/core/src/Foundation/ErrorHandling/JsonApiFormatter.php

@@ -27,23 +27,37 @@ class JsonApiFormatter implements HttpFormatter
     {
         $document = new Document;
 
-        $data = [
+        if ($error->hasDetails()) {
-            'status' => (string) $error->getStatusCode(),
+            $document->setErrors($this->withDetails($error));
-            'code' => $error->getType(),
-        ];
-        $details = $error->getDetails();
-
-        if (empty($details)) {
-            $document->setErrors([$data]);
         } else {
-            $document->setErrors(array_map(
+            $document->setErrors($this->simple($error));
-                function ($row) use ($data) {
-                    return array_merge($data, $row);
-                },
-                $details
-            ));
         }
 
         return new JsonApiResponse($document, $error->getStatusCode());
     }
+
+    private function simple(HandledError $error): array
+    {
+        return [
+            [
+                'status' => (string) $error->getStatusCode(),
+                'code' => $error->getType(),
+            ]
+        ];
+    }
+
+    private function withDetails(HandledError $error): array
+    {
+        $data = [
+            'status' => (string) $error->getStatusCode(),
+            'code' => $error->getType(),
+        ];
+
+        return array_map(
+            function ($row) use ($data) {
+                return array_merge($data, $row);
+            },
+            $error->getDetails()
+        );
+    }
 }