fisharebest / webtrees

app/Note.php

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

@@ -114,24 +114,24 @@
     public static function firstLineOfTextFromHtml(string $html): string
     {
         $html = strtr($html, [
-            '</blockquote>' => MarkdownFactory::BREAK,
-            '</h1>'         => MarkdownFactory::BREAK,
-            '</h2>'         => MarkdownFactory::BREAK,
-            '</h3>'         => MarkdownFactory::BREAK,
-            '</h4>'         => MarkdownFactory::BREAK,
-            '</h5>'         => MarkdownFactory::BREAK,
-            '</h6>'         => MarkdownFactory::BREAK,
-            '</li>'         => MarkdownFactory::BREAK,
-            '</p>'          => MarkdownFactory::BREAK,
-            '</pre>'        => MarkdownFactory::BREAK,
+            '</blockquote>' => MarkdownFactory::break,
+            '</h1>'         => MarkdownFactory::break,
+            '</h2>'         => MarkdownFactory::break,
+            '</h3>'         => MarkdownFactory::break,
+            '</h4>'         => MarkdownFactory::break,
+            '</h5>'         => MarkdownFactory::break,
+            '</h6>'         => MarkdownFactory::break,
+            '</li>'         => MarkdownFactory::break,
+            '</p>'          => MarkdownFactory::break,
+            '</pre>'        => MarkdownFactory::break,
             '</td>'         => ' ',
             '</th>'         => ' ',
-            '<hr>'          => MarkdownFactory::BREAK,
+            '<hr>'          => MarkdownFactory::break,
         ]);
 
         $html = strip_tags($html, ['br']);
 
-        [$first] = explode(MarkdownFactory::BREAK, $html, 2);
+        [$first] = explode(MarkdownFactory::break, $html, 2);
 
         return htmlspecialchars_decode($first, ENT_QUOTES);
     }

app/Report/ReportParserGenerate.php

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

@@ -1090,7 +1090,7 @@
                     } else {
                         $value = strip_tags(Registry::markdownFactory()->autolink($value, $this->tree), ['br']);
                     }
-                    $value = strtr($value, [MarkdownFactory::BREAK => ' ']);
+                    $value = strtr($value, [MarkdownFactory::break => ' ']);
                 }
 
                 if (!empty($attrs['truncate'])) {

Spacing +1 added lines, -1 removed lines

@@ -1899,7 +1899,7 @@
                             ->groupBy(['xref']);
                     })
                     ->get()
-                    ->map(fn (object $row): GedcomRecord|null => Registry::gedcomRecordFactory()->make($row->xref, $this->tree, $row->new_gedcom ?: $row->old_gedcom))
+                    ->map(fn (object $row): GedcomRecord | null => Registry::gedcomRecordFactory()->make($row->xref, $this->tree, $row->new_gedcom ?: $row->old_gedcom))
                     ->filter()
                     ->all();
                 break;

app/Report/RightToLeftSupport.php

Spacing +10 added lines, -10 removed lines

@@ -199,7 +199,7 @@ 
                         $currentLen        = $endPos + 2;
                         $directive         = substr($workingText, 0, $currentLen);
                         $workingText       = substr($workingText, $currentLen);
-                        $result            .= self::$waitingText . $directive;
+                        $result .= self::$waitingText . $directive;
                         self::$waitingText = '';
                         break;
                     }
@@ -308,7 +308,7 @@ 
                             break;
                         }
                         self::$waitingText .= $currentLetter;
-                        $workingText       = substr($workingText, $currentLen);
+                        $workingText = substr($workingText, $currentLen);
                         if ($openParIndex !== false) {
                             // Opening parentheses always inherit the following directionality
                             while (true) {
@@ -318,13 +318,13 @@ 
                                 if (str_starts_with($workingText, ' ')) {
                                     // Spaces following this left parenthesis inherit the following directionality too
                                     self::$waitingText .= ' ';
-                                    $workingText       = substr($workingText, 1);
+                                    $workingText = substr($workingText, 1);
                                     continue;
                                 }
                                 if (str_starts_with($workingText, ' ')) {
                                     // Spaces following this left parenthesis inherit the following directionality too
                                     self::$waitingText .= ' ';
-                                    $workingText       = substr($workingText, 6);
+                                    $workingText = substr($workingText, 6);
                                     continue;
                                 }
                                 break;
@@ -341,7 +341,7 @@ 
                         // Exceptions to this rule will be handled later during final clean-up.
                         //
                         if (self::$currentState !== '') {
-                            $result            .= self::$waitingText;
+                            $result .= self::$waitingText;
                             self::$waitingText = '';
                         }
                         break 2; // double break because we're waiting for more information
@@ -470,7 +470,7 @@ 
                 }
                 if (substr($result . "\n", 0, self::LENGTH_START) !== self::START_LTR && substr($result . "\n", 0, self::LENGTH_START) !== self::START_RTL) {
                     $leadingText .= substr($result, 0, 1);
-                    $result      = substr($result, 1);
+                    $result = substr($result, 1);
                     continue;
                 }
                 $result = substr($result, 0, self::LENGTH_START) . $leadingText . substr($result, self::LENGTH_START);
@@ -612,11 +612,11 @@ 
     private static function breakCurrentSpan(string &$result): void
     {
         // Interrupt the current span, insert that <br>, and then continue the current span
-        $result            .= self::$waitingText;
+        $result .= self::$waitingText;
         self::$waitingText = '';
 
         $breakString = '<' . self::$currentState . 'br>';
-        $result      .= $breakString;
+        $result .= $breakString;
     }
 
     /**
@@ -673,7 +673,7 @@ 
                 break;
             } // No more numeric strings
 
-            $tempResult    .= substr($textSpan, 0, $posLRE + 3); // Copy everything preceding the numeric string
+            $tempResult .= substr($textSpan, 0, $posLRE + 3); // Copy everything preceding the numeric string
             $numericString = substr($textSpan, $posLRE + 3, $posPDF - $posLRE); // Separate the entire numeric string
             $textSpan      = substr($textSpan, $posPDF + 3);
             $posColon      = strpos($numericString, ':');
@@ -1140,7 +1140,7 @@ 
 
             // We're done: finish the span
             $textSpan = self::starredName($textSpan, 'RTL'); // Wrap starred name in <u> and </u> tags
-            $result   .= $textSpan . self::END_RTL;
+            $result .= $textSpan . self::END_RTL;
         }
 
         if (self::$currentState !== 'LTR' && self::$currentState !== 'RTL') {

app/Contracts/ResponseFactoryInterface.php

Spacing +2 added lines, -2 removed lines

@@ -53,7 +53,7 @@ 
      *
      * @return ResponseInterface
      */
-    public function redirectUrl(UriInterface|string $url, int $code = StatusCodeInterface::STATUS_FOUND): ResponseInterface;
+    public function redirectUrl(UriInterface | string $url, int $code = StatusCodeInterface::STATUS_FOUND): ResponseInterface;
 
     /**
      * @param string|array<mixed>|object $content
@@ -62,7 +62,7 @@ 
      *
      * @return ResponseInterface
      */
-    public function response(string|array|object $content = '', int $code = StatusCodeInterface::STATUS_OK, array $headers = []): ResponseInterface;
+    public function response(string | array | object $content = '', int $code = StatusCodeInterface::STATUS_OK, array $headers = []): ResponseInterface;
 
     /**
      * Create and render a view, and embed it in an HTML page.

app/Factories/ResponseFactory.php

Spacing +3 added lines, -3 removed lines

@@ -85,7 +85,7 @@ 
      *
      * @return ResponseInterface
      */
-    public function redirectUrl(UriInterface|string $url, int $code = StatusCodeInterface::STATUS_FOUND): ResponseInterface
+    public function redirectUrl(UriInterface | string $url, int $code = StatusCodeInterface::STATUS_FOUND): ResponseInterface
     {
         return $this->response_factory
             ->createResponse($code)
@@ -99,7 +99,7 @@ 
      *
      * @return ResponseInterface
      */
-    public function response(string|array|object $content = '', int $code = StatusCodeInterface::STATUS_OK, array $headers = []): ResponseInterface
+    public function response(string | array | object $content = '', int $code = StatusCodeInterface::STATUS_OK, array $headers = []): ResponseInterface
     {
         if ($content === '' && $code === StatusCodeInterface::STATUS_OK) {
             $code = StatusCodeInterface::STATUS_NO_CONTENT;
@@ -108,7 +108,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';
         }
 

app/Services/GedcomEditService.php

Spacing +2 added lines, -2 removed lines

@@ -157,7 +157,7 @@ 
                 }
             }
 
-            if ($values[$i] !== '' || $children_with_values  && !$element instanceof AbstractXrefElement) {
+            if ($values[$i] !== '' || $children_with_values && !$element instanceof AbstractXrefElement) {
                 if ($values[$i] === '') {
                     $gedcom_lines[] = $levels[$i] . ' ' . $tags[$i];
                 } else {
@@ -231,7 +231,7 @@ 
      *
      * @return array<string>
      */
-    public function factsToAdd(Family|Individual $record, bool $include_hidden): array
+    public function factsToAdd(Family | Individual $record, bool $include_hidden): array
     {
         $subtags = Registry::elementFactory()->make($record->tag())->subtags();
 

app/Helpers/functions.php

Spacing +1 added lines, -1 removed lines

@@ -114,7 +114,7 @@
  *
  * @return ResponseInterface
  */
-function response(array|object|string $content = '', int $code = StatusCodeInterface::STATUS_OK, array $headers = []): ResponseInterface
+function response(array | object | string $content = '', int $code = StatusCodeInterface::STATUS_OK, array $headers = []): ResponseInterface
 {
     return Registry::responseFactory()->response($content, $code, $headers);
 }

app/Services/UpgradeService.php

Spacing +1 added lines, -1 removed lines

@@ -301,7 +301,7 @@
     {
         $latest_version = $this->fetchLatestVersion(false);
 
-        [, , $url] = explode('|', $latest_version . '||');
+        [,, $url] = explode('|', $latest_version . '||');
 
         return $url;
     }

app/Factories/MarkdownFactory.php

Spacing +2 added lines, -2 removed lines

@@ -83,7 +83,7 @@ 
      *
      * @return string
      */
-    public function autolink(string $markdown, Tree|null $tree = null): string
+    public function autolink(string $markdown, Tree | null $tree = null): string
     {
         // Create a minimal commonmark processor - just add support for auto-links.
         $environment = new Environment(static::CONFIG_AUTOLINK);
@@ -117,7 +117,7 @@ 
      *
      * @return string
      */
-    public function markdown(string $markdown, Tree|null $tree = null): string
+    public function markdown(string $markdown, Tree | null $tree = null): string
     {
         $environment = new Environment(static::CONFIG_MARKDOWN);
         $environment->addExtension(new CommonMarkCoreExtension());

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

@@ -50,13 +50,13 @@ 
 class MarkdownFactory implements MarkdownFactoryInterface
 {
     // Commonmark uses the self-closing form of this tag, so we do the same for consistency.
-    public const string BREAK = '<br />';
+    public const string break = '<br />';
 
     protected const array CONFIG_AUTOLINK = [
         'allow_unsafe_links' => false,
         'html_input'         => HtmlFilter::ESCAPE,
         'renderer'           => [
-            'soft_break' => self::BREAK,
+            'soft_break' => self::break,
         ],
     ];
 
@@ -64,7 +64,7 @@ 
         'allow_unsafe_links' => false,
         'html_input'         => HtmlFilter::ESCAPE,
         'renderer'           => [
-            'soft_break' => self::BREAK,
+            'soft_break' => self::break,
         ],
         'table'              => [
             'wrap' => [