fisharebest / webtrees

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

app/Module/IndividualListModule.php

Spacing +2 added lines, -2 removed lines

@@ -660,11 +660,11 @@
      */
     protected function surnameInitials(array $all_surnames): array
     {
-        $initials    = [];
+        $initials = [];
 
         // Ensure our own language comes before others.
         foreach (I18N::language()->alphabet() as $initial) {
-            $initials[$initial]    = 0;
+            $initials[$initial] = 0;
         }
 
         foreach ($all_surnames as $surn => $surnames) {

Braces +3 added lines, -1 removed lines

@@ -313,7 +313,8 @@ 
                     <li class="wt-initials-list-item d-flex">
                         <?php if ($count > 0) : ?>
                             <a href="<?= e($this->listUrl($tree, ['alpha' => $letter, 'tree' => $tree->name()])) ?>" class="wt-initial px-1<?= $letter === $alpha ? ' active' : '' ?> '" title="<?= I18N::number($count) ?>"><?= $this->displaySurnameInitial((string) $letter) ?></a>
-                        <?php else : ?>
+                        <?php else {
+    : ?>
                             <span class="wt-initial px-1 text-muted"><?= $this->displaySurnameInitial((string) $letter) ?></span>
 
                         <?php endif ?>
@@ -368,6 +369,7 @@ 
                 switch ($alpha) {
                     case '@':
                         $surns = array_filter($all_surnames, static fn (string $x): bool => $x === Individual::NOMEN_NESCIO, ARRAY_FILTER_USE_KEY);
+}
                         break;
                     case ',':
                         $surns = array_filter($all_surnames, static fn (string $x): bool => $x === '', ARRAY_FILTER_USE_KEY);