fisharebest / webtrees

app/DB/Column.php

Spacing +3 added lines, -3 removed lines

@@ -37,9 +37,9 @@ 
         private readonly bool $unsigned = false,
         private readonly bool $fixed = false,
         private readonly bool $nullable = false,
-        private readonly float|int|string|null $default = null,
+        private readonly float | int | string | null $default = null,
         private readonly bool $autoincrement = false,
-        private readonly string|null $collation = null,
+        private readonly string | null $collation = null,
     ) {
     }
 
@@ -60,7 +60,7 @@ 
         );
     }
 
-    public function default(float|int|string $default): self
+    public function default(float | int | string $default): self
     {
         return new self(
             name: $this->name,

app/DB/Query.php

Spacing +1 added lines, -1 removed lines

@@ -107,7 +107,7 @@
         return (object) [];
     }
 
-    public function first(): string|int|float|null
+    public function first(): string | int | float | null
     {
         return 0;
     }

app/Statistics/Repository/EventRepository.php

Spacing +1 added lines, -1 removed lines

@@ -232,7 +232,7 @@
             ->orderBy('d_type')
             ->limit(1)
             ->get()
-            ->map(static fn (object $row): object => (object) [
+            ->map(static fn (object $row) : object => (object) [
                 'id'   => $row->id,
                 'year' => (int) $row->year,
                 'fact' => $row->fact,

app/Services/SearchService.php

Spacing +1 added lines, -1 removed lines

@@ -1070,7 +1070,7 @@
      * @param Expression|string $column
      * @param array<string>     $search_terms
      */
-    private function whereSearch(Builder $query, Expression|string $column, array $search_terms): void
+    private function whereSearch(Builder $query, Expression | string $column, array $search_terms): void
     {
         foreach ($search_terms as $search_term) {
             $query->where($column, $this->iLike(), '%' . addcslashes($search_term, '\\%_') . '%');

app/Module/IndividualListModule.php

Braces +3 added lines, -1 removed lines

@@ -290,7 +290,8 @@ 
                     <li class="wt-initials-list-item d-flex">
                         <?php if ($count > 0) : ?>
                             <a href="<?= e($this->listUrl($tree, ['alpha' => $letter, 'show_marnm' => $show_marnm, '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 ?>
@@ -345,6 +346,7 @@ 
                 switch ($alpha) {
                     case '@':
                         $filter = static fn(string $x): bool => $x === Individual::NOMEN_NESCIO;
+}
                         break;
                     case ',':
                         $filter = static fn(string $x): bool => $x === '';

Spacing +2 added lines, -2 removed lines

@@ -216,7 +216,7 @@ 
         $surname_initials = $this->surnameInitials($surname_data);
 
         // We've requested a surname that doesn't currently exist.
-        if ($surname !== ''  && !array_key_exists($surname, $all_surns)) {
+        if ($surname !== '' && !array_key_exists($surname, $all_surns)) {
             $message = I18N::translate('There are no individuals with the surname “%s“', e($surname));
             FlashMessages::addMessage($message);
 
@@ -604,7 +604,7 @@ 
             ->groupBy([$this->binaryColumn('n_givn')]);
 
         foreach ($query->get() as $row) {
-            $initial            = I18N::strtoupper(I18N::language()->initialLetter($row->n_givn));
+            $initial = I18N::strtoupper(I18N::language()->initialLetter($row->n_givn));
             $initials[$initial] ??= 0;
             $initials[$initial] += (int) $row->count;
         }

app/Validator.php

Spacing +9 added lines, -9 removed lines

@@ -125,7 +125,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;
             }
@@ -143,7 +143,7 @@ 
      */
     public function isInArray(array $values): self
     {
-        $this->rules[] = static fn (int|string|null $value): int|string|null => in_array($value, $values, true) ? $value : null;
+        $this->rules[] = static fn (int | string | null $value): int | string | null => in_array($value, $values, true) ? $value : null;
 
         return $this;
     }
@@ -163,7 +163,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;
     }
@@ -175,7 +175,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);
@@ -279,7 +279,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) ?? [];
     }
@@ -300,7 +300,7 @@ 
             $value = null;
         }
 
-        $callback = static fn (?float $value, Closure $rule): ?float => $rule($value);
+        $callback = static fn (?float $value, Closure $rule) : ?float => $rule($value);
 
         $value = array_reduce($this->rules, $callback, $value) ?? $default;
 
@@ -333,7 +333,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;
 
@@ -374,9 +374,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/SessionDatabaseHandler.php

Spacing +1 added lines, -1 removed lines

@@ -114,7 +114,7 @@
 
             // Only update session once a minute to reduce contention on the session table.
             if ($now->subtractMinutes(1)->timestamp() > Registry::timestampFactory()->fromString($this->row->session_time)->timestamp()) {
-                $updates['session_time'] =  $now->toDateTimeString();
+                $updates['session_time'] = $now->toDateTimeString();
             }
 
             if ($updates !== []) {