fisharebest / webtrees

app/DB/Index.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
     /**
      * @param array<int,string> $columns
      */
-    public function __construct(public readonly array $columns, string|null $name = null)
+    public function __construct(public readonly array $columns, string | null $name = null)
     {
         parent::__construct(name: $name, columns: $this->columns);
     }

app/Factories/SlugFactory.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
  */
 class SlugFactory implements SlugFactoryInterface
 {
-    private Transliterator|null $transliterator = null;
+    private Transliterator | null $transliterator = null;
 
     public function __construct(private PhpService $php_service)
     {

app/Http/Middleware/CompressResponse.php

Spacing +1 added lines, -1 removed lines

@@ -94,7 +94,7 @@
         return $response;
     }
 
-    protected function compressionMethod(RequestInterface $request): string|null
+    protected function compressionMethod(RequestInterface $request): string | null
     {
         $accept_encoding = strtolower($request->getHeaderLine('accept-encoding'));
         $zlib_available  = $this->php_service->extensionLoaded(extension: 'zlib');

app/Services/TimeoutService.php

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
 
     public function __construct(
         private PhpService $php_service,
-        float|null $start_time = null,
+        float | null $start_time = null,
     ) {
         $this->start_time = $start_time ?? Registry::timeFactory()->now();
     }

app/Cli/Commands/TreeList.php

Spacing +1 added lines, -1 removed lines

@@ -112,7 +112,7 @@
         return implode(separator: ',', array: $columns);
     }
 
-    private function quoteCsvValue(string|int $value): string
+    private function quoteCsvValue(string | int $value): string
     {
         return '"' . addcslashes(string: (string) $value, characters: '"') . '"';
     }

app/Cli/Commands/UserList.php

Spacing +8 added lines, -8 removed lines

@@ -71,13 +71,13 @@ 
             'real_name'  => $user->realName(),
             'email'      => $user->email(),
             'admin'      => $user->getPreference(setting_name: UserInterface::PREF_IS_ADMINISTRATOR) ? 'yes' : 'no',
-            'approved'   => $user->getPreference(setting_name: UserInterface::PREF_IS_ACCOUNT_APPROVED) ? 'yes' : 'no',
-            'verified'   => $user->getPreference(setting_name: UserInterface::PREF_IS_EMAIL_VERIFIED) ? 'yes' : 'no',
-            'language'   => $user->getPreference(setting_name: UserInterface::PREF_LANGUAGE),
-            'timezone'   => $user->getPreference(setting_name: UserInterface::PREF_TIME_ZONE),
-            'contact'    => $user->getPreference(setting_name: UserInterface::PREF_CONTACT_METHOD),
-            'registered' => $this->formatTimestamp(timestamp: (int) $user->getPreference(setting_name: UserInterface::PREF_TIMESTAMP_REGISTERED)),
-            'last_login' => $this->formatTimestamp(timestamp: (int) $user->getPreference(setting_name: UserInterface::PREF_TIMESTAMP_ACTIVE)),
+            'approved'   => $user->getPreference(setting_name : UserInterface::PREF_IS_ACCOUNT_APPROVED) ? 'yes' : 'no',
+            'verified'   => $user->getPreference(setting_name : UserInterface::PREF_IS_EMAIL_VERIFIED) ? 'yes' : 'no',
+            'language'   => $user->getPreference(setting_name : UserInterface::PREF_LANGUAGE),
+            'timezone'   => $user->getPreference(setting_name : UserInterface::PREF_TIME_ZONE),
+            'contact'    => $user->getPreference(setting_name : UserInterface::PREF_CONTACT_METHOD),
+            'registered' => $this->formatTimestamp(timestamp : (int) $user->getPreference(setting_name : UserInterface::PREF_TIMESTAMP_REGISTERED)),
+            'last_login' => $this->formatTimestamp(timestamp : (int) $user->getPreference(setting_name : UserInterface::PREF_TIMESTAMP_ACTIVE)),
         ])
         ->values()
         ->all();
@@ -131,7 +131,7 @@ 
         return implode(separator: ',', array: $columns);
     }
 
-    private function quoteCsvValue(string|int $value): string
+    private function quoteCsvValue(string | int $value): string
     {
         return '"' . addcslashes(string: (string) $value, characters: '"') . '"';
     }

app/StatisticsFormat.php

Spacing +1 added lines, -1 removed lines

@@ -174,7 +174,7 @@
         ]);
     }
 
-    public function record(GedcomRecord|null $record): string
+    public function record(GedcomRecord | null $record): string
     {
         if ($record === null) {
             return $this->missing();

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