fisharebest / webtrees

app/Contracts/SurnameTraditionFactoryInterface.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
     public const POLISH      = 'polish';
     public const LITHUANIAN  = 'lithuanian';
     public const ICELANDIC   = 'icelandic';
-    public const DEFAULT     = '';
+    public const default     = '';
 
     /**
      * A list of supported surname traditions and their names.

app/Factories/SurnameTraditionFactory.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
         $this->register(self::POLISH, new PolishSurnameTradition());
         $this->register(self::LITHUANIAN, new LithuanianSurnameTradition());
         $this->register(self::ICELANDIC, new IcelandicSurnameTradition());
-        $this->register(self::DEFAULT, new DefaultSurnameTradition());
+        $this->register(self::default, new DefaultSurnameTradition());
     }
 
     /**

app/Note.php

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -99,8 +99,8 @@
         }
 
         // Take the first line
-        $html   = strtr($html, ["</p>\n<p>" => MarkdownFactory::BREAK . MarkdownFactory::BREAK]);
-        [$html] = explode(MarkdownFactory::BREAK, strip_tags(trim($html), ['br']));
+        $html   = strtr($html, ["</p>\n<p>" => MarkdownFactory::break . MarkdownFactory::break]);
+        [$html] = explode(MarkdownFactory::break, strip_tags(trim($html), ['br']));
 
         if ($html !== '') {
             $html = htmlspecialchars_decode($html, ENT_QUOTES);

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';
         }