fisharebest / webtrees

app/SurnameTradition/DefaultSurnameTradition.php

Spacing +2 added lines, -2 removed lines

@@ -124,7 +124,7 @@ 
         $parts = array_filter($parts);
 
         $parts = array_map(
-            static fn (string $tag, string $value): string => "\n2 " . $tag . ' ' . $value,
+            static fn(string $tag, string $value): string => "\n2 " . $tag . ' ' . $value,
             array_keys($parts),
             $parts
         );
@@ -148,7 +148,7 @@ 
         if ($individual instanceof Individual) {
             $fact = $individual
                 ->facts(['NAME'])
-                ->first(fn (Fact $fact): bool => in_array($fact->attribute('TYPE'), ['', 'birth', 'change'], true));
+                ->first(fn(Fact $fact): bool => in_array($fact->attribute('TYPE'), ['', 'birth', 'change'], true));
 
             if ($fact instanceof Fact) {
                 return $fact->value();

app/Session.php

Spacing +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
         $path   = (string) parse_url($url, PHP_URL_PATH);
 
         // Paths containing UTF-8 characters need special handling.
-        $path = implode('/', array_map(static fn (string $x): string => rawurlencode($x), explode('/', $path)));
+        $path = implode('/', array_map(static fn(string $x): string => rawurlencode($x), explode('/', $path)));
 
         session_name($secure ? self::SECURE_SESSION_NAME : self::SESSION_NAME);
         session_register_shutdown();

app/Relationship.php

Spacing +15 added lines, -15 removed lines

@@ -81,7 +81,7 @@ 
      */
     public static function fixed(string $nominative, string $genitive): Relationship
     {
-        return new self(fn () => [$nominative, $genitive]);
+        return new self(fn() => [$nominative, $genitive]);
     }
 
     /**
@@ -126,9 +126,9 @@ 
      */
     public function adopted(): Relationship
     {
-        $this->matchers[] = static fn (array $nodes): bool => count($nodes) > 2 && $nodes[2]
+        $this->matchers[] = static fn(array $nodes): bool => count($nodes) > 2 && $nodes[2]
                 ->facts(['FAMC'], false, Auth::PRIV_HIDE)
-                ->contains(fn (Fact $fact): bool => $fact->value() === '@' . $nodes[1]->xref() . '@' && $fact->attribute('PEDI') === 'adopted');
+                ->contains(fn(Fact $fact): bool => $fact->value() === '@' . $nodes[1]->xref() . '@' && $fact->attribute('PEDI') === 'adopted');
 
         return $this;
     }
@@ -138,9 +138,9 @@ 
      */
     public function adoptive(): Relationship
     {
-        $this->matchers[] = static fn (array $nodes): bool => $nodes[0]
+        $this->matchers[] = static fn(array $nodes): bool => $nodes[0]
             ->facts(['FAMC'], false, Auth::PRIV_HIDE)
-            ->contains(fn (Fact $fact): bool => $fact->value() === '@' . $nodes[1]->xref() . '@' && $fact->attribute('PEDI') === 'adopted');
+            ->contains(fn(Fact $fact): bool => $fact->value() === '@' . $nodes[1]->xref() . '@' && $fact->attribute('PEDI') === 'adopted');
 
         return $this;
     }
@@ -346,9 +346,9 @@ 
      */
     public function fostered(): Relationship
     {
-        $this->matchers[] = static fn (array $nodes): bool => count($nodes) > 2 && $nodes[2]
+        $this->matchers[] = static fn(array $nodes): bool => count($nodes) > 2 && $nodes[2]
                 ->facts(['FAMC'], false, Auth::PRIV_HIDE)
-                ->contains(fn (Fact $fact): bool => $fact->value() === '@' . $nodes[1]->xref() . '@' && $fact->attribute('PEDI') === 'foster');
+                ->contains(fn(Fact $fact): bool => $fact->value() === '@' . $nodes[1]->xref() . '@' && $fact->attribute('PEDI') === 'foster');
 
         return $this;
     }
@@ -358,9 +358,9 @@ 
      */
     public function fostering(): Relationship
     {
-        $this->matchers[] = static fn (array $nodes): bool => $nodes[0]
+        $this->matchers[] = static fn(array $nodes): bool => $nodes[0]
             ->facts(['FAMC'], false, Auth::PRIV_HIDE)
-            ->contains(fn (Fact $fact): bool => $fact->value() === '@' . $nodes[1]->xref() . '@' && $fact->attribute('PEDI') === 'foster');
+            ->contains(fn(Fact $fact): bool => $fact->value() === '@' . $nodes[1]->xref() . '@' && $fact->attribute('PEDI') === 'foster');
 
         return $this;
     }
@@ -403,8 +403,8 @@ 
     public function older(): Relationship
     {
         $this->matchers[] = static function (array $nodes): bool {
-            $date1 = $nodes[0]->facts(['BIRT'], false, Auth::PRIV_HIDE)->map(fn (Fact $fact): Date => $fact->date())->first() ?? new Date('');
-            $date2 = $nodes[2]->facts(['BIRT'], false, Auth::PRIV_HIDE)->map(fn (Fact $fact): Date => $fact->date())->first() ?? new Date('');
+            $date1 = $nodes[0]->facts(['BIRT'], false, Auth::PRIV_HIDE)->map(fn(Fact $fact): Date => $fact->date())->first() ?? new Date('');
+            $date2 = $nodes[2]->facts(['BIRT'], false, Auth::PRIV_HIDE)->map(fn(Fact $fact): Date => $fact->date())->first() ?? new Date('');
 
             return Date::compare($date1, $date2) > 0;
         };
@@ -503,8 +503,8 @@ 
     public function twin(): Relationship
     {
         $this->matchers[] = static function (array $nodes): bool {
-            $date1 = $nodes[0]->facts(['BIRT'], false, Auth::PRIV_HIDE)->map(fn (Fact $fact): Date => $fact->date())->first() ?? new Date('');
-            $date2 = $nodes[2]->facts(['BIRT'], false, Auth::PRIV_HIDE)->map(fn (Fact $fact): Date => $fact->date())->first() ?? new Date('');
+            $date1 = $nodes[0]->facts(['BIRT'], false, Auth::PRIV_HIDE)->map(fn(Fact $fact): Date => $fact->date())->first() ?? new Date('');
+            $date2 = $nodes[2]->facts(['BIRT'], false, Auth::PRIV_HIDE)->map(fn(Fact $fact): Date => $fact->date())->first() ?? new Date('');
 
             return
                 $date1->isOK() &&
@@ -531,8 +531,8 @@ 
     public function younger(): Relationship
     {
         $this->matchers[] = static function (array $nodes): bool {
-            $date1 = $nodes[0]->facts(['BIRT'], false, Auth::PRIV_HIDE)->map(fn (Fact $fact): Date => $fact->date())->first() ?? new Date('');
-            $date2 = $nodes[2]->facts(['BIRT'], false, Auth::PRIV_HIDE)->map(fn (Fact $fact): Date => $fact->date())->first() ?? new Date('');
+            $date1 = $nodes[0]->facts(['BIRT'], false, Auth::PRIV_HIDE)->map(fn(Fact $fact): Date => $fact->date())->first() ?? new Date('');
+            $date2 = $nodes[2]->facts(['BIRT'], false, Auth::PRIV_HIDE)->map(fn(Fact $fact): Date => $fact->date())->first() ?? new Date('');
 
             return Date::compare($date1, $date2) < 0;
         };

app/Http/RequestHandlers/SearchReplaceAction.php

Spacing +1 added lines, -1 removed lines

@@ -94,7 +94,7 @@
 
             case 'name':
                 $name_tags = Registry::elementFactory()->make('INDI:NAME')->subtags();
-                $name_tags = array_map(static fn (string $tag): string => '2 ' . $tag, $name_tags);
+                $name_tags = array_map(static fn(string $tag): string => '2 ' . $tag, $name_tags);
                 $name_tags[] = '1 NAME';
 
                 $records = $this->search_service->searchIndividuals([$tree], [$search]);

app/Module/LanguageSlovakian.php

Spacing +15 added lines, -15 removed lines

@@ -86,12 +86,12 @@ 
      */
     public function relationships(): array
     {
-        $pra = static fn (int $n, string $nominative, string $genitive): array => [
+        $pra = static fn(int $n, string $nominative, string $genitive): array => [
             ($n > 3 ? 'pra ×' . $n . ' ' : str_repeat('pra-', $n)) . $nominative,
             ($n > 3 ? 'pra ×' . $n . ' ' : str_repeat('pra-', $n)) . $genitive,
         ];
 
-        $cousin = static fn (int $n, array $cousins, string $nominative, string $genitive): array => $cousins[$n] ?? [
+        $cousin = static fn(int $n, array $cousins, string $nominative, string $genitive): array => $cousins[$n] ?? [
             $nominative . ' z ' . $n . '. kolena',
             $genitive . '%s z ' . $n . '. kolena',
         ];
@@ -147,9 +147,9 @@ 
             Relationship::fixed('prastarý otec', '%s prastarého otca')->parent()->parent()->mother(),
             Relationship::fixed('prastarý otec', '%s prastarého otca')->parent()->parent()->parent(),
             // Ancestors
-            Relationship::dynamic(fn (int $n) => $pra($n - 1, 'prastarý otec', '%s prastarého otca'))->ancestor()->male(),
-            Relationship::dynamic(fn (int $n) => $pra($n - 1, 'prastará matka', '%s prastarej matky'))->ancestor()->female(),
-            Relationship::dynamic(fn (int $n) => $pra($n - 1, 'prastarý rodič', '%s prastarého rodiča'))->ancestor(),
+            Relationship::dynamic(fn(int $n) => $pra($n - 1, 'prastarý otec', '%s prastarého otca'))->ancestor()->male(),
+            Relationship::dynamic(fn(int $n) => $pra($n - 1, 'prastará matka', '%s prastarej matky'))->ancestor()->female(),
+            Relationship::dynamic(fn(int $n) => $pra($n - 1, 'prastarý rodič', '%s prastarého rodiča'))->ancestor(),
             // Grandchildren
             Relationship::fixed('vnuk', '%s vnuka')->child()->son(),
             Relationship::fixed('vnučka', '%s vnučky')->child()->daughter(),
@@ -159,9 +159,9 @@ 
             Relationship::fixed('pravnučka', '%s pravnučky')->child()->child()->daughter(),
             Relationship::fixed('pravnúča', '%s pravnúčaťa')->child()->child()->child(),
             // Descendants
-            Relationship::dynamic(fn (int $n) => $pra($n - 1, 'pravnuk', '%s pravnuka'))->ancestor()->male(),
-            Relationship::dynamic(fn (int $n) => $pra($n - 1, 'pravnučka', '%s pravnučky'))->ancestor()->female(),
-            Relationship::dynamic(fn (int $n) => $pra($n - 1, 'pravnúča', '%s pravnúčaťa'))->ancestor(),
+            Relationship::dynamic(fn(int $n) => $pra($n - 1, 'pravnuk', '%s pravnuka'))->ancestor()->male(),
+            Relationship::dynamic(fn(int $n) => $pra($n - 1, 'pravnučka', '%s pravnučky'))->ancestor()->female(),
+            Relationship::dynamic(fn(int $n) => $pra($n - 1, 'pravnúča', '%s pravnúčaťa'))->ancestor(),
             // Aunts and uncles
             Relationship::fixed('ujo', '%s uja')->mother()->brother(),
             Relationship::fixed('ujčiná', '%s ujčinej')->mother()->brother()->wife(),
@@ -169,20 +169,20 @@ 
             Relationship::fixed('strýko', '%s strýka')->parent()->brother(),
             Relationship::fixed('teta', '%s tety')->parent()->sister(),
             // Great-aunts and great-uncles
-            Relationship::dynamic(fn (int $n) => $pra($n - 2, 'prastrýko', '%s prastrýka'))->ancestor()->brother(),
-            Relationship::dynamic(fn (int $n) => $pra($n - 2, 'prateta', '%s pratety'))->ancestor()->sister(),
+            Relationship::dynamic(fn(int $n) => $pra($n - 2, 'prastrýko', '%s prastrýka'))->ancestor()->brother(),
+            Relationship::dynamic(fn(int $n) => $pra($n - 2, 'prateta', '%s pratety'))->ancestor()->sister(),
             // Nieces and nephews
             Relationship::fixed('synovec', '%s synovca')->sibling()->son(),
             Relationship::fixed('neter', '%s netere')->sibling()->daughter(),
             // Great-nieces and great-nephews
             Relationship::fixed('prasynovec', '%s prasynovca')->sibling()->child()->son(),
             Relationship::fixed('praneter', '%s pranetere')->sibling()->child()->daughter(),
-            Relationship::dynamic(fn (int $n) => $pra($n - 2, 'prasynovec', '%s prasynovca'))->sibling()->descendant()->son(),
-            Relationship::dynamic(fn (int $n) => $pra($n - 2, 'praneter', '%s pranetere'))->sibling()->descendant()->daughter(),
+            Relationship::dynamic(fn(int $n) => $pra($n - 2, 'prasynovec', '%s prasynovca'))->sibling()->descendant()->son(),
+            Relationship::dynamic(fn(int $n) => $pra($n - 2, 'praneter', '%s pranetere'))->sibling()->descendant()->daughter(),
             // Cousins
-            Relationship::dynamic(fn (int $n): array => $cousin($n, static::FEMALE_COUSINS, '', ''))->symmetricCousin()->female(),
-            Relationship::dynamic(fn (int $n): array => $cousin($n, static::MALE_COUSINS, '', ''))->symmetricCousin()->male(),
-            Relationship::dynamic(fn (int $n): array => $cousin($n, static::MALE_COUSINS, '', ''))->symmetricCousin(),
+            Relationship::dynamic(fn(int $n): array => $cousin($n, static::FEMALE_COUSINS, '', ''))->symmetricCousin()->female(),
+            Relationship::dynamic(fn(int $n): array => $cousin($n, static::MALE_COUSINS, '', ''))->symmetricCousin()->male(),
+            Relationship::dynamic(fn(int $n): array => $cousin($n, static::MALE_COUSINS, '', ''))->symmetricCousin(),
         ];
     }
 }

app/Module/LanguageEnglishUnitedStates.php

Spacing +19 added lines, -19 removed lines

@@ -118,15 +118,15 @@ 
     public function relationships(): array
     {
         // Genitive forms in English are simple/regular, as no relationship name ends in "s".
-        $genitive = static fn (string $s): array => [$s, $s . '’s %s'];
+        $genitive = static fn(string $s): array => [$s, $s . '’s %s'];
 
-        $cousin = fn (int $up, int $down): array => $genitive(
+        $cousin = fn(int $up, int $down): array => $genitive(
             (static::COUSIN[min($up, $down)] ?? 'distant cousin') .
             (static::REMOVED[abs($up - $down)] ?? ' many times removed') .
             static::DIRECTION[$up <=> $down]
         );
 
-        $great = static fn (int $n, string $prefix, string $suffix): array => $genitive(
+        $great = static fn(int $n, string $prefix, string $suffix): array => $genitive(
             $prefix . ($n > 3 ? 'great ×' . $n . ' ' : str_repeat('great-', $n)) . $suffix
         );
 
@@ -221,22 +221,22 @@ 
             Relationship::fixed('grandson', 'grandson’s %s')->child()->son(),
             Relationship::fixed('grandchild', 'grandchild’s %s')->child()->child(),
             // Relationships with dynamically generated names
-            Relationship::dynamic(fn (int $n) => $great($n - 1, '', 'aunt'))->ancestor()->sister(),
-            Relationship::dynamic(fn (int $n) => $great($n - 1, '', 'aunt'))->ancestor()->sibling()->wife(),
-            Relationship::dynamic(fn (int $n) => $great($n - 1, '', 'uncle'))->ancestor()->brother(),
-            Relationship::dynamic(fn (int $n) => $great($n - 1, '', 'uncle'))->ancestor()->sibling()->husband(),
-            Relationship::dynamic(fn (int $n) => $great($n - 1, '', 'niece'))->sibling()->descendant()->female(),
-            Relationship::dynamic(fn (int $n) => $great($n - 1, '', 'niece'))->married()->spouse()->sibling()->descendant()->female(),
-            Relationship::dynamic(fn (int $n) => $great($n - 1, '', 'nephew'))->sibling()->descendant()->male(),
-            Relationship::dynamic(fn (int $n) => $great($n - 1, '', 'nephew'))->married()->spouse()->sibling()->descendant()->male(),
-            Relationship::dynamic(fn (int $n) => $great($n - 2, 'maternal ', 'grandmother'))->mother()->ancestor()->female(),
-            Relationship::dynamic(fn (int $n) => $great($n - 1, 'maternal ', 'grandfather'))->mother()->ancestor()->male(),
-            Relationship::dynamic(fn (int $n) => $great($n - 1, 'paternal ', 'grandmother'))->father()->ancestor()->female(),
-            Relationship::dynamic(fn (int $n) => $great($n - 1, 'paternal ', 'grandfather'))->father()->ancestor()->male(),
-            Relationship::dynamic(fn (int $n) => $great($n - 1, '', 'grandparent'))->ancestor(),
-            Relationship::dynamic(fn (int $n) => $great($n - 2, '', 'granddaughter'))->descendant()->female(),
-            Relationship::dynamic(fn (int $n) => $great($n - 2, '', 'grandson'))->descendant()->male(),
-            Relationship::dynamic(fn (int $n) => $great($n - 2, '', 'grandchild'))->descendant(),
+            Relationship::dynamic(fn(int $n) => $great($n - 1, '', 'aunt'))->ancestor()->sister(),
+            Relationship::dynamic(fn(int $n) => $great($n - 1, '', 'aunt'))->ancestor()->sibling()->wife(),
+            Relationship::dynamic(fn(int $n) => $great($n - 1, '', 'uncle'))->ancestor()->brother(),
+            Relationship::dynamic(fn(int $n) => $great($n - 1, '', 'uncle'))->ancestor()->sibling()->husband(),
+            Relationship::dynamic(fn(int $n) => $great($n - 1, '', 'niece'))->sibling()->descendant()->female(),
+            Relationship::dynamic(fn(int $n) => $great($n - 1, '', 'niece'))->married()->spouse()->sibling()->descendant()->female(),
+            Relationship::dynamic(fn(int $n) => $great($n - 1, '', 'nephew'))->sibling()->descendant()->male(),
+            Relationship::dynamic(fn(int $n) => $great($n - 1, '', 'nephew'))->married()->spouse()->sibling()->descendant()->male(),
+            Relationship::dynamic(fn(int $n) => $great($n - 2, 'maternal ', 'grandmother'))->mother()->ancestor()->female(),
+            Relationship::dynamic(fn(int $n) => $great($n - 1, 'maternal ', 'grandfather'))->mother()->ancestor()->male(),
+            Relationship::dynamic(fn(int $n) => $great($n - 1, 'paternal ', 'grandmother'))->father()->ancestor()->female(),
+            Relationship::dynamic(fn(int $n) => $great($n - 1, 'paternal ', 'grandfather'))->father()->ancestor()->male(),
+            Relationship::dynamic(fn(int $n) => $great($n - 1, '', 'grandparent'))->ancestor(),
+            Relationship::dynamic(fn(int $n) => $great($n - 2, '', 'granddaughter'))->descendant()->female(),
+            Relationship::dynamic(fn(int $n) => $great($n - 2, '', 'grandson'))->descendant()->male(),
+            Relationship::dynamic(fn(int $n) => $great($n - 2, '', 'grandchild'))->descendant(),
             Relationship::dynamic($cousin)->ancestor()->sibling()->descendant(),
         ];
     }

app/Elements/AbstractElement.php

Spacing +1 added lines, -1 removed lines

@@ -148,7 +148,7 @@
             }
 
             // We may use markup to display values, but not when editing them.
-            $values = array_map(static fn (string $x): string => strip_tags($x), $values);
+            $values = array_map(static fn(string $x): string => strip_tags($x), $values);
 
             return view('components/select', [
                 'id'       => $id,

app/Http/RequestHandlers/UnconnectedPage.php

Spacing +1 added lines, -1 removed lines

@@ -98,7 +98,7 @@
 
         foreach ($components as $component) {
             // Allow for upper/lower-case mismatches, and all-numeric XREFs
-            $component = array_map(static fn ($x): string => strtolower((string) $x), $component);
+            $component = array_map(static fn($x): string => strtolower((string) $x), $component);
 
             if (!in_array(strtolower($xref), $component, true)) {
                 $individual_groups[] = DB::table('individuals')

app/Module/TopSurnamesModule.php

Spacing +3 added lines, -3 removed lines

@@ -119,7 +119,7 @@ 
                 ->groupBy(['surname'])
                 ->select([new Expression('n_surname /*! COLLATE utf8_bin */ AS surname'), new Expression('count(*) AS total')])
                 ->pluck('total', 'surname')
-                ->map(static fn (string $n): int => (int) $n)
+                ->map(static fn(string $n): int => (int) $n)
                 ->all();
 
             $all_surnames[$top_surname] = $variants;
@@ -147,7 +147,7 @@ 
                 break;
 
             case 'list':
-                uasort($all_surnames, static fn (array $a, array $b): int => array_sum($b) <=> array_sum($a));
+                uasort($all_surnames, static fn(array $a, array $b): int => array_sum($b) <=> array_sum($a));
                 $content = view('lists/surnames-bullet-list', [
                     'module'   => $module,
                     'surnames' => $all_surnames,
@@ -157,7 +157,7 @@ 
                 break;
 
             case 'array':
-                uasort($all_surnames, static fn (array $a, array $b): int => array_sum($b) <=> array_sum($a));
+                uasort($all_surnames, static fn(array $a, array $b): int => array_sum($b) <=> array_sum($a));
                 $content = view('lists/surnames-compact-list', [
                     'module'   => $module,
                     'surnames' => $all_surnames,