fisharebest / webtrees

app/Services/GedcomEditService.php

Spacing +4 added lines, -4 removed lines

@@ -438,15 +438,15 @@ 
     {
         $subtags = Registry::elementFactory()->make($record->tag())->subtags();
 
-        $subtags = array_filter($subtags, static fn (string $v, string $k) => !str_ends_with($v, ':1') || $record->facts([$k])->isEmpty(), ARRAY_FILTER_USE_BOTH);
+        $subtags = array_filter($subtags, static fn(string $v, string $k) => !str_ends_with($v, ':1') || $record->facts([$k])->isEmpty(), ARRAY_FILTER_USE_BOTH);
 
         $subtags = array_keys($subtags);
 
         // Don't include facts/events that we have hidden in the control panel.
-        $subtags = array_filter($subtags, fn (string $subtag): bool => !$this->isHiddenTag($record->tag() . ':' . $subtag));
+        $subtags = array_filter($subtags, fn(string $subtag): bool => !$this->isHiddenTag($record->tag() . ':' . $subtag));
 
         if (!$include_hidden) {
-            $fn_hidden = fn (string $t): bool => !$this->isHiddenTag($record->tag() . ':' . $t);
+            $fn_hidden = fn(string $t): bool => !$this->isHiddenTag($record->tag() . ':' . $t);
             $subtags   = array_filter($subtags, $fn_hidden);
         }
 
@@ -539,7 +539,7 @@ 
     private function isHiddenTag(string $tag): bool
     {
         // Function to filter hidden tags.
-        $fn_hide = static fn (string $x): bool => (bool) Site::getPreference('HIDE_' . $x);
+        $fn_hide = static fn(string $x): bool => (bool) Site::getPreference('HIDE_' . $x);
 
         $preferences = array_filter(Gedcom::HIDDEN_TAGS, $fn_hide, ARRAY_FILTER_USE_KEY);
         $preferences = array_values($preferences);

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

Spacing +1 added lines, -1 removed lines

@@ -80,7 +80,7 @@
         // Default names facts.
         $surname_tradition = SurnameTradition::create($tree->getPreference('SURNAME_TRADITION'));
         $names             = $surname_tradition->newParentNames($individual, $sex);
-        $name_facts        = array_map(static fn (string $gedcom): Fact => new Fact($gedcom, $dummy, ''), $names);
+        $name_facts        = array_map(static fn(string $gedcom): Fact => new Fact($gedcom, $dummy, ''), $names);
 
         $facts = [
             'i' => [

app/Http/RequestHandlers/AddSpouseToIndividualPage.php

Spacing +1 added lines, -1 removed lines

@@ -86,7 +86,7 @@
         // Default names facts.
         $surname_tradition = SurnameTradition::create($tree->getPreference('SURNAME_TRADITION'));
         $names             = $surname_tradition->newSpouseNames($individual, $sex);
-        $name_facts        = array_map(static fn (string $gedcom): Fact => new Fact($gedcom, $dummyi, ''), $names);
+        $name_facts        = array_map(static fn(string $gedcom): Fact => new Fact($gedcom, $dummyi, ''), $names);
 
         $facts = [
             'i' => [

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/Http/RequestHandlers/AddSpouseToFamilyPage.php

Spacing +1 added lines, -1 removed lines

@@ -84,7 +84,7 @@
         $spouse            = $family->spouses()->first();
         assert($spouse instanceof Individual);
         $names      = $surname_tradition->newSpouseNames($spouse, $sex);
-        $name_facts = array_map(static fn (string $gedcom): Fact => new Fact($gedcom, $dummyi, ''), $names);
+        $name_facts = array_map(static fn(string $gedcom): Fact => new Fact($gedcom, $dummyi, ''), $names);
 
         $facts = [
             'i' => [

app/Http/RequestHandlers/AddChildToIndividualPage.php

Spacing +1 added lines, -1 removed lines

@@ -91,7 +91,7 @@
                 break;
         }
 
-        $name_facts = array_map(static fn (string $gedcom): Fact => new Fact($gedcom, $dummy, ''), $names);
+        $name_facts = array_map(static fn(string $gedcom): Fact => new Fact($gedcom, $dummy, ''), $names);
 
         $facts = [
             'i' => [

app/Http/RequestHandlers/AddChildToFamilyPage.php

Spacing +1 added lines, -1 removed lines

@@ -80,7 +80,7 @@
         // Default names facts.
         $surname_tradition = SurnameTradition::create($tree->getPreference('SURNAME_TRADITION'));
         $names             = $surname_tradition->newChildNames($family->husband(), $family->wife(), $sex);
-        $name_facts        = array_map(static fn (string $gedcom): Fact => new Fact($gedcom, $dummy, ''), $names);
+        $name_facts        = array_map(static fn(string $gedcom): Fact => new Fact($gedcom, $dummy, ''), $names);
 
         $facts = [
             'i' => [

app/Module/TopSurnamesModule.php

Spacing +3 added lines, -3 removed lines

@@ -113,7 +113,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;
@@ -135,11 +135,11 @@ 
                 $content = FunctionsPrintLists::surnameTagCloud($all_surnames, $module, true, $tree);
                 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 = FunctionsPrintLists::surnameList($all_surnames, 1, true, $module, $tree);
                 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 = FunctionsPrintLists::surnameList($all_surnames, 2, true, $module, $tree);
                 break;
             case 'table':