fisharebest / webtrees

app/Factories/ResponseFactory.php

Spacing +3 added lines, -3 removed lines

@@ -99,8 +99,8 @@ 
      *
      * @return ResponseInterface
      */
-    public function response(string|array|object $content = '', int $code = StatusCodeInterface::STATUS_OK, array $headers = []): ResponseInterface
->>>>>>> 90fa61f704... PHP8.0 - Union types
+    public function response(string | array | object $content = '', int $code = StatusCodeInterface::STATUS_OK, array $headers = []): ResponseInterface
+>> >> >> > 90fa61f704... PHP8.0 - Union types
     {
         if ($content === '' && $code === StatusCodeInterface::STATUS_OK) {
             $code = StatusCodeInterface::STATUS_NO_CONTENT;
@@ -109,7 +109,7 @@ 
         if (is_string($content)) {
             $headers['content-type'] ??= 'text/html; charset=UTF-8';
         } else {
-            $content                 = json_encode($content, JSON_THROW_ON_ERROR | JSON_UNESCAPED_UNICODE);
+            $content = json_encode($content, JSON_THROW_ON_ERROR | JSON_UNESCAPED_UNICODE);
             $headers['content-type'] ??= 'application/json';
         }