fisharebest / webtrees

app/Factories/SharedNoteFactory.php

Spacing +1 added lines, -1 removed lines

@@ -89,7 +89,7 @@
      *
      * @return SharedNote
      */
-    public function new(string $xref, string $gedcom, ?string $pending, Tree $tree): SharedNote
+    public function new(string $xref, string $gedcom, ?string $pending, Tree $tree) : SharedNote
     {
         return new SharedNote($xref, $gedcom, $pending, $tree);
     }

app/Contracts/SharedNoteFactoryInterface.php

Spacing +1 added lines, -1 removed lines

@@ -59,5 +59,5 @@
      *
      * @return SharedNote
      */
-    public function new(string $xref, string $gedcom, ?string $pending, Tree $tree): SharedNote;
+    public function new(string $xref, string $gedcom, ?string $pending, Tree $tree) : SharedNote;
 }

resources/lang/en-US/messages.php

Spacing +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-return array (
+return array(
   '%H:%i:%s' => '%g:%i:%s %a',
   '%j %F %Y' => '%F %j, %Y',
 );

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/Validator.php

Spacing +7 added lines, -7 removed lines

@@ -120,7 +120,7 @@ 
      */
     public function isBetween(int $minimum, int $maximum): self
     {
-        $this->rules[] = static function (?int $value) use ($minimum, $maximum): ?int {
+        $this->rules[] = static function (?int $value) use ($minimum, $maximum) : ?int {
             if (is_int($value) && $value >= $minimum && $value <= $maximum) {
                 return $value;
             }
@@ -158,7 +158,7 @@ 
      */
     public function isNotEmpty(): self
     {
-        $this->rules[] = static fn (?string $value): ?string => $value !== null && $value !== '' ? $value : null;
+        $this->rules[] = static fn (?string $value) : ?string => $value !== null && $value !== '' ? $value : null;
 
         return $this;
     }
@@ -170,7 +170,7 @@ 
     {
         $base_url = $this->request->getAttribute('base_url', '');
 
-        $this->rules[] = static function (?string $value) use ($base_url): ?string {
+        $this->rules[] = static function (?string $value) use ($base_url) : ?string {
             if ($value !== null) {
                 $value_info    = parse_url($value);
                 $base_url_info = parse_url($base_url);
@@ -268,7 +268,7 @@ 
             throw new HttpBadRequestException(I18N::translate('The parameter “%s” is missing.', $parameter));
         }
 
-        $callback = static fn (?array $value, Closure $rule): ?array => $rule($value);
+        $callback = static fn (?array $value, Closure $rule) : ?array => $rule($value);
 
         return array_reduce($this->rules, $callback, $value) ?? [];
     }
@@ -295,7 +295,7 @@ 
             $value = null;
         }
 
-        $callback = static fn (?int $value, Closure $rule): ?int => $rule($value);
+        $callback = static fn (?int $value, Closure $rule) : ?int => $rule($value);
 
         $value = array_reduce($this->rules, $callback, $value) ?? $default;
 
@@ -336,9 +336,9 @@ 
             $value = null;
         }
 
-        $callback = static fn (?string $value, Closure $rule): ?string => $rule($value);
+        $callback = static fn (?string $value, Closure $rule) : ?string => $rule($value);
 
-        $value =  array_reduce($this->rules, $callback, $value) ?? $default;
+        $value = array_reduce($this->rules, $callback, $value) ?? $default;
 
         if ($value === null) {
             throw new HttpBadRequestException(I18N::translate('The parameter “%s” is missing.', $parameter));

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