fisharebest / webtrees

app/Module/StatisticsChartModule.php

Spacing +2 added lines, -2 removed lines

@@ -846,7 +846,7 @@ 
      * @param array<int|string> $z_axis
      * @param array<array<int>> $ydata
      */
-    private function fillYData(int|string $x, int|string $z, int $value, array $x_axis, array $z_axis, array &$ydata): void
+    private function fillYData(int | string $x, int | string $z, int $value, array $x_axis, array $z_axis, array &$ydata): void
     {
         $x = $this->findAxisEntry($x, $x_axis);
         $z = $this->findAxisEntry($z, $z_axis);
@@ -862,7 +862,7 @@ 
      *
      * @param array<int|string > $axis
      */
-    private function findAxisEntry(int|string $value, array $axis): int|string
+    private function findAxisEntry(int | string $value, array $axis): int | string
     {
         if (is_numeric($value)) {
             $value = (int) $value;

app/Statistics.php

Spacing +15 added lines, -15 removed lines

@@ -513,7 +513,7 @@ 
     public function commonGiven(string $threshold = '1', string $limit = '10'): string
     {
         return $this->data->commonGivenNames('ALL', (int) $threshold, (int) $limit)
-            ->mapWithKeys(static fn (int $value, int|string $key): array => [
+            ->mapWithKeys(static fn (int $value, int | string $key): array => [
                 $key => '<bdi>' . e($key) . '</bdi>',
             ])
             ->implode(I18N::$list_separator);
@@ -522,7 +522,7 @@ 
     public function commonGivenFemale(string $threshold = '1', string $limit = '10'): string
     {
         return $this->data->commonGivenNames('F', (int) $threshold, (int) $limit)
-            ->mapWithKeys(static fn (int $value, int|string $key): array => [
+            ->mapWithKeys(static fn (int $value, int | string $key): array => [
                 $key => '<bdi>' . e($key) . '</bdi>',
             ])
             ->implode(I18N::$list_separator);
@@ -555,7 +555,7 @@ 
     public function commonGivenFemaleTotals(string $threshold = '1', string $limit = '10'): string
     {
         return $this->data->commonGivenNames('F', (int) $threshold, (int) $limit)
-            ->mapWithKeys(static fn (int $value, int|string $key): array => [
+            ->mapWithKeys(static fn (int $value, int | string $key): array => [
                 $key => '<bdi>' . e($key) . '</bdi> (' . I18N::number($value) . ')',
             ])
             ->implode(I18N::$list_separator);
@@ -580,7 +580,7 @@ 
     public function commonGivenMale(string $threshold = '1', string $limit = '10'): string
     {
         return $this->data->commonGivenNames('M', (int) $threshold, (int) $limit)
-            ->mapWithKeys(static fn (int $value, int|string $key): array => [
+            ->mapWithKeys(static fn (int $value, int | string $key): array => [
                 $key => '<bdi>' . e($key) . '</bdi>',
             ])
             ->implode(I18N::$list_separator);
@@ -613,7 +613,7 @@ 
     public function commonGivenMaleTotals(string $threshold = '1', string $limit = '10'): string
     {
         return $this->data->commonGivenNames('M', (int) $threshold, (int) $limit)
-            ->mapWithKeys(static fn (int $value, int|string $key): array => [
+            ->mapWithKeys(static fn (int $value, int | string $key): array => [
                 $key => '<bdi>' . e($key) . '</bdi> (' . I18N::number($value) . ')',
             ])
             ->implode(I18N::$list_separator);
@@ -622,7 +622,7 @@ 
     public function commonGivenOther(string $threshold = '1', string $limit = '10'): string
     {
         return $this->data->commonGivenNames('X', (int) $threshold, (int) $limit)
-            ->mapWithKeys(static fn (int $value, int|string $key): array => [
+            ->mapWithKeys(static fn (int $value, int | string $key): array => [
                 $key => '<bdi>' . e($key) . '</bdi>',
             ])
             ->implode(I18N::$list_separator);
@@ -655,7 +655,7 @@ 
     public function commonGivenOtherTotals(string $threshold = '1', string $limit = '10'): string
     {
         return $this->data->commonGivenNames('X', (int) $threshold, (int) $limit)
-            ->mapWithKeys(static fn (int $value, int|string $key): array => [
+            ->mapWithKeys(static fn (int $value, int | string $key): array => [
                 $key => '<bdi>' . e($key) . '</bdi> (' . I18N::number($value) . ')',
             ])
             ->implode(I18N::$list_separator);
@@ -672,7 +672,7 @@ 
     public function commonGivenTotals(string $threshold = '1', string $limit = '10'): string
     {
         return $this->data->commonGivenNames('ALL', (int) $threshold, (int) $limit)
-            ->mapWithKeys(static fn (int $value, int|string $key): array => [
+            ->mapWithKeys(static fn (int $value, int | string $key): array => [
                 $key => '<bdi>' . e($key) . '</bdi> (' . I18N::number($value) . ')',
             ])
             ->implode(I18N::$list_separator);
@@ -681,7 +681,7 @@ 
     public function commonGivenUnknown(string $threshold = '1', string $limit = '10'): string
     {
         return $this->data->commonGivenNames('U', (int) $threshold, (int) $limit)
-            ->mapWithKeys(static fn (int $value, int|string $key): array => [
+            ->mapWithKeys(static fn (int $value, int | string $key): array => [
                 $key => '<bdi>' . e($key) . '</bdi>',
             ])
             ->implode(I18N::$list_separator);
@@ -714,7 +714,7 @@ 
     public function commonGivenUnknownTotals(string $threshold = '1', string $limit = '10'): string
     {
         return $this->data->commonGivenNames('U', (int) $threshold, (int) $limit)
-            ->mapWithKeys(static fn (int $value, int|string $key): array => [
+            ->mapWithKeys(static fn (int $value, int | string $key): array => [
                 $key => '<bdi>' . e($key) . '</bdi> (' . I18N::number($value) . ')',
             ])
             ->implode(I18N::$list_separator);
@@ -1215,7 +1215,7 @@ 
         return (string) $user->id();
     }
 
-    public function latestUserLoggedin(string|null $yes = null, string|null $no = null): string
+    public function latestUserLoggedin(string | null $yes = null, string | null $no = null): string
     {
         if ($this->data->isUserLoggedIn($this->data->latestUserId())) {
             return $yes ?? I18N::translate('Yes');
@@ -1231,9 +1231,9 @@ 
         return e($user->userName());
     }
 
-    public function latestUserRegDate(string|null $format = null): string
+    public function latestUserRegDate(string | null $format = null): string
     {
-        $format    ??= I18N::dateFormat();
+        $format ??= I18N::dateFormat();
         $user      = $this->user_service->find($this->data->latestUserId()) ?? Auth::user();
         $timestamp = (int) $user->getPreference(UserInterface::PREF_TIMESTAMP_REGISTERED);
 
@@ -1244,9 +1244,9 @@ 
         return Registry::timestampFactory()->make($timestamp)->format(strtr($format, ['%' => '']));
     }
 
-    public function latestUserRegTime(string|null $format = null): string
+    public function latestUserRegTime(string | null $format = null): string
     {
-        $format    ??= I18N::timeFormat();
+        $format ??= I18N::timeFormat();
         $user      = $this->user_service->find($this->data->latestUserId()) ?? Auth::user();
         $timestamp = (int) $user->getPreference(UserInterface::PREF_TIMESTAMP_REGISTERED);
 

app/SessionDatabaseHandler.php

Spacing +2 added lines, -2 removed lines

@@ -32,7 +32,7 @@ 
 {
     private ServerRequestInterface $request;
 
-    private object|null $row = null;
+    private object | null $row = null;
 
     public function __construct(ServerRequestInterface $request)
     {
@@ -89,7 +89,7 @@ 
 
             // Only update session once a minute to reduce contention on the session table.
             if (date('Y-m-d H:i:s', time() - 60) > $this->row->session_time) {
-                $updates['session_time'] =  date('Y-m-d H:i:s');
+                $updates['session_time'] = date('Y-m-d H:i:s');
             }
 
             if ($updates !== []) {

app/Validator.php

Spacing +15 added lines, -15 removed lines

@@ -125,7 +125,7 @@ 
      */
     public function isBetween(int $minimum, int $maximum): self
     {
-        $this->rules[] = static function (int|null $value) use ($minimum, $maximum): int|null {
+        $this->rules[] = static function (int | null $value) use ($minimum, $maximum): int | null {
             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|null $value): string|null => $value !== null && $value !== '' ? $value : null;
+        $this->rules[] = static fn (string | null $value): string | null => $value !== null && $value !== '' ? $value : null;
 
         return $this;
     }
@@ -175,7 +175,7 @@ 
     {
         $base_url = $this->request->getAttribute('base_url', '');
 
-        $this->rules[] = static function (string|null $value) use ($base_url): string|null {
+        $this->rules[] = static function (string | null $value) use ($base_url): string | null {
             if ($value !== null) {
                 $value_info    = parse_url($value);
                 $base_url_info = parse_url($base_url);
@@ -204,7 +204,7 @@ 
      */
     public function isTag(): self
     {
-        $this->rules[] = static function (string|null $value): string|null {
+        $this->rules[] = static function (string | null $value): string | null {
             if ($value !== null && preg_match('/^' . Gedcom::REGEX_TAG . '$/', $value) === 1) {
                 return $value;
             }
@@ -247,7 +247,7 @@ 
      *
      * @return bool
      */
-    public function boolean(string $parameter, bool|null $default = null): bool
+    public function boolean(string $parameter, bool | null $default = null): bool
     {
         $value = $this->parameters[$parameter] ?? null;
 
@@ -279,7 +279,7 @@ 
             throw new HttpBadRequestException(I18N::translate('The parameter “%s” is missing.', $parameter));
         }
 
-        $callback = static fn (array|null $value, Closure $rule): array|null => $rule($value);
+        $callback = static fn (array | null $value, Closure $rule): array | null => $rule($value);
 
         return array_reduce($this->rules, $callback, $value) ?? [];
     }
@@ -290,7 +290,7 @@ 
      *
      * @return float
      */
-    public function float(string $parameter, float|null $default = null): float
+    public function float(string $parameter, float | null $default = null): float
     {
         $value = $this->parameters[$parameter] ?? null;
 
@@ -300,7 +300,7 @@ 
             $value = null;
         }
 
-        $callback = static fn (float|null $value, Closure $rule): float|null => $rule($value);
+        $callback = static fn (float | null $value, Closure $rule): float | null => $rule($value);
 
         $value = array_reduce($this->rules, $callback, $value) ?? $default;
 
@@ -317,7 +317,7 @@ 
      *
      * @return int
      */
-    public function integer(string $parameter, int|null $default = null): int
+    public function integer(string $parameter, int | null $default = null): int
     {
         $value = $this->parameters[$parameter] ?? null;
 
@@ -333,7 +333,7 @@ 
             $value = null;
         }
 
-        $callback = static fn (int|null $value, Closure $rule): int|null => $rule($value);
+        $callback = static fn (int | null $value, Closure $rule): int | null => $rule($value);
 
         $value = array_reduce($this->rules, $callback, $value) ?? $default;
 
@@ -366,7 +366,7 @@ 
      *
      * @return string
      */
-    public function string(string $parameter, string|null $default = null): string
+    public function string(string $parameter, string | null $default = null): string
     {
         $value = $this->parameters[$parameter] ?? null;
 
@@ -374,9 +374,9 @@ 
             $value = null;
         }
 
-        $callback = static fn (string|null $value, Closure $rule): string|null => $rule($value);
+        $callback = static fn (string | null $value, Closure $rule): string | null => $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));
@@ -401,7 +401,7 @@ 
         throw new HttpBadRequestException(I18N::translate('The parameter “%s” is missing.', $parameter));
     }
 
-    public function treeOptional(string $parameter = 'tree'): Tree|null
+    public function treeOptional(string $parameter = 'tree'): Tree | null
     {
         $value = $this->parameters[$parameter] ?? null;
 

app/StatisticsData.php

Spacing +6 added lines, -6 removed lines

@@ -101,7 +101,7 @@ 
         $rows = $query
             ->groupBy(['n_givn'])
             ->pluck(new Expression('COUNT(DISTINCT n_id)'), 'n_givn')
-            ->map(static fn (int|string $count): int => (int) $count);
+            ->map(static fn (int | string $count): int => (int) $count);
 
 
         $given_names = [];
@@ -784,7 +784,7 @@ 
      *
      * @return object{id:string,year:int,fact:string,type:string}|null
      */
-    private function firstEvent(array $events, bool $ascending): object|null
+    private function firstEvent(array $events, bool $ascending): object | null
     {
         if ($events === []) {
             $events = [
@@ -803,7 +803,7 @@ 
             ->orderBy('d_julianday1', $ascending ? 'ASC' : 'DESC')
             ->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,
@@ -916,14 +916,14 @@ 
         return $date->display();
     }
 
-    public function isUserLoggedIn(int|null $user_id): bool
+    public function isUserLoggedIn(int | null $user_id): bool
     {
         return $user_id !== null && DB::table('session')
             ->where('user_id', '=', $user_id)
             ->exists();
     }
 
-    public function latestUserId(): int|null
+    public function latestUserId(): int | null
     {
         $user_id = DB::table('user')
             ->select(['user.user_id'])
@@ -1135,7 +1135,7 @@ 
     /**
      * @return object{individual:Individual,days:int}|null
      */
-    public function longlifeQuery(string $sex): object|null
+    public function longlifeQuery(string $sex): object | null
     {
         return $this->birthAndDeathQuery($sex)
             ->orderBy('days', 'desc')

resources/lang/en-US/messages.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-return array (
+return array(
   ' but the details are unknown' => ' but the details are unknown',
   '%H:%i:%s' => '%g:%i:%s %a',
   '%j %F %Y' => '%F %j, %Y',

app/Cli/Commands/ConfigIni.php

Spacing +4 added lines, -4 removed lines

@@ -81,10 +81,10 @@
             'dbcert'       => $this->stringOption(input: $input, name: 'dbcert'),
             'dbca'         => $this->stringOption(input: $input, name: 'dbca'),
             'dbverify'     => $this->boolOption(input: $input, name: 'dbverify') ? '1' : '0',
-            'tblpfx'       => $this->stringOption(input: $input, name: 'tblpfx'),
-            'base_url'     => rtrim(string: $this->stringOption(input: $input, name: 'base-url'), characters: '/'),
-            'rewrite_urls' => $this->boolOption(input: $input, name: 'rewrite-urls') ? '1' : '0',
-            'block_asn'    => $this->stringOption(input: $input, name: 'block-asn'),
+            'tblpfx'       => $this->stringOption(input : $input, name : 'tblpfx'),
+            'base_url'     => rtrim(string : $this->stringOption(input : $input, name : 'base-url'), characters : '/'),
+            'rewrite_urls' => $this->boolOption(input : $input, name : 'rewrite-urls') ? '1' : '0',
+            'block_asn'    => $this->stringOption(input : $input, name : 'block-asn'),
         ];
 
         foreach ($config as $key => $value) {

app/Services/MapDataService.php

Spacing +3 added lines, -3 removed lines

@@ -164,7 +164,7 @@ 
     /**
      * @param list<int> $parent_place_ids
      */
-    public function deleteUnusedLocations(int|null $parent_location_id, array $parent_place_ids): void
+    public function deleteUnusedLocations(int | null $parent_location_id, array $parent_place_ids): void
     {
         if ($parent_location_id === null) {
             $location_query = DB::table('place_location')
@@ -199,7 +199,7 @@ 
      *
      * @return Collection<int,object{id:int,key:string,place:string,latitude:float|null,longitude:float|null,child_count:int,no_coord:int}>
      */
-    public function getPlaceListLocation(int|null $parent_id): Collection
+    public function getPlaceListLocation(int | null $parent_id): Collection
     {
         $expression =
             DB::prefix('p1') . '.place IS NOT NULL AND ' . DB::prefix('p1') . 'p1.latitude IS NULL OR ' .
@@ -248,7 +248,7 @@ 
                 'child_count' => (int) $row->child_count,
                 'no_coord'    => (int) $row->no_coord,
             ])
-            ->sort(static fn (object $x, object $y): int => I18N::comparator()($x->place, $y->place));
+            ->sort(static fn (object $x, object $y) : int => I18N::comparator()($x->place, $y->place));
     }
 
     public function writeLatitude(float $latitude): string

app/Services/SearchService.php

Spacing +2 added lines, -2 removed lines

@@ -126,7 +126,7 @@ 
                     ->where('wife_name.n_type', '<>', '_MARNM');
             });
 
-        $field  = new Expression('COALESCE(' . DB::prefix('husb_name') . ".n_full, '') || COALESCE(" . DB::prefix('wife_name') . ".n_full, '')");
+        $field = new Expression('COALESCE(' . DB::prefix('husb_name') . ".n_full, '') || COALESCE(" . DB::prefix('wife_name') . ".n_full, '')");
 
         $this->whereTrees($query, 'f_file', $trees);
         $this->whereSearch($query, $field, $search);
@@ -1068,7 +1068,7 @@ 
      * @param Expression<string>|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, DB::iLike(), '%' . addcslashes($search_term, '\\%_') . '%');