fisharebest / webtrees

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

Spacing +4 added lines, -4 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,
@@ -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')

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