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/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/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,

app/Http/RequestHandlers/IndividualPage.php

Spacing +3 added lines, -3 removed lines

@@ -133,7 +133,7 @@ 
 
         $shares = $this->module_service
             ->findByInterface(ModuleShareInterface::class)
-            ->map(fn (ModuleShareInterface $module) => $module->share($individual))
+            ->map(fn(ModuleShareInterface $module) => $module->share($individual))
             ->filter();
 
         return $this->viewResponse('individual-page', [
@@ -241,8 +241,8 @@ 
             }
         }
 
-        $meta_facts = array_map(static fn (string $x): string => strip_tags($x), $meta_facts);
-        $meta_facts = array_map(static fn (string $x): string => trim($x), $meta_facts);
+        $meta_facts = array_map(static fn(string $x): string => strip_tags($x), $meta_facts);
+        $meta_facts = array_map(static fn(string $x): string => trim($x), $meta_facts);
 
         return implode(', ', $meta_facts);
     }

app/Http/RequestHandlers/FamilyPage.php

Spacing +4 added lines, -4 removed lines

@@ -154,15 +154,15 @@
 
         if ($family->children()->isNotEmpty()) {
             $child_names = $family->children()
-            ->map(static fn (Individual $individual): string => e($individual->getAllNames()[0]['givn']))
-            ->filter(static fn (string $x): bool => $x !== Individual::PRAENOMEN_NESCIO)
+            ->map(static fn(Individual $individual): string => e($individual->getAllNames()[0]['givn']))
+            ->filter(static fn(string $x): bool => $x !== Individual::PRAENOMEN_NESCIO)
             ->implode(', ');
 
             $meta_facts[] = I18N::translate('Children') . ' ' . $child_names;
         }
 
-        $meta_facts = array_map(static fn (string $x): string => strip_tags($x), $meta_facts);
-        $meta_facts = array_map(static fn (string $x): string => trim($x), $meta_facts);
+        $meta_facts = array_map(static fn(string $x): string => strip_tags($x), $meta_facts);
+        $meta_facts = array_map(static fn(string $x): string => trim($x), $meta_facts);
 
         return implode(', ', $meta_facts);
     }

app/Report/ReportParserGenerate.php

Spacing +1 added lines, -1 removed lines

@@ -1842,7 +1842,7 @@
                             ->groupBy(['xref']);
                     })
                     ->get()
-                    ->map(fn (object $row): ?GedcomRecord => Registry::gedcomRecordFactory()->make($row->xref, $this->tree, $row->new_gedcom ?: $row->old_gedcom))
+                    ->map(fn(object $row): ?GedcomRecord => Registry::gedcomRecordFactory()->make($row->xref, $this->tree, $row->new_gedcom ?: $row->old_gedcom))
                     ->filter()
                     ->all();
                 break;