fisharebest / webtrees

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/Functions/FunctionsPrint.php

Spacing +5 added lines, -5 removed lines

@@ -161,7 +161,7 @@ 
                     if ($note->canShow()) {
                         $noterec = $note->gedcom();
                         $nt      = preg_match("/0 @$nmatch[1]@ NOTE (.*)/", $noterec, $n1match);
-                        $data    .= self::printNoteRecord($tree, $nt > 0 ? $n1match[1] : '', 1, $noterec);
+                        $data .= self::printNoteRecord($tree, $nt > 0 ? $n1match[1] : '', 1, $noterec);
                     }
                 } else {
                     $data = '<div class="fact_NOTE"><span class="label">' . I18N::translate('Note') . '</span>: <span class="field error">' . $nmatch[1] . '</span></div>';
@@ -379,7 +379,7 @@ 
                 if (preg_match_all('/\n3 (?:_HEB|ROMN) (.+)/', $placerec, $matches)) {
                     foreach ($matches[1] as $match) {
                         $wt_place = new Place($match, $tree);
-                        $html     .= ' - ' . $wt_place->fullName();
+                        $html .= ' - ' . $wt_place->fullName();
                     }
                 }
 
@@ -393,7 +393,7 @@ 
                     // Links to external maps
                     $html .= app(ModuleService::class)
                         ->findByInterface(ModuleMapLinkInterface::class)
-                        ->map(fn (ModuleMapLinkInterface $module): string => ' ' . $module->mapLink($event))
+                        ->map(fn(ModuleMapLinkInterface $module): string => ' ' . $module->mapLink($event))
                         ->implode('');
                 }
 
@@ -492,13 +492,13 @@ 
         }
 
         // Filter existing tags
-        $filter_fn = static fn (string $tag): bool => !in_array($tag, $unique_facts, true) || $record->facts([$tag])->isEmpty();
+        $filter_fn = static fn(string $tag): bool => !in_array($tag, $unique_facts, true) || $record->facts([$tag])->isEmpty();
 
         $quick_facts = array_filter($quick_facts, $filter_fn);
 
 
         // Create a label for a subtag
-        $label_fn = static fn (string $subtag): string => Registry::elementFactory()->make($record->tag() . ':' . $subtag)->label();
+        $label_fn = static fn(string $subtag): string => Registry::elementFactory()->make($record->tag() . ':' . $subtag)->label();
 
         $quick_facts = array_combine($quick_facts, array_map($label_fn, $quick_facts));
         $add_facts   = array_combine($add_facts, array_map($label_fn, $add_facts));

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/Statistics/Google/ChartSex.php

Spacing +2 added lines, -2 removed lines

@@ -46,8 +46,8 @@
         string $color_male = null,
         string $color_unknown = null
     ): string {
-        $color_female  = $color_female  ?? ['--sex-f-chart', '#ffd1dc'];
-        $color_male    = $color_male    ?? ['--sex-m-chart', '#84beff'];
+        $color_female  = $color_female ?? ['--sex-f-chart', '#ffd1dc'];
+        $color_male    = $color_male ?? ['--sex-m-chart', '#84beff'];
         $color_unknown = $color_unknown ?? ['--sex-u-chart', '#777777'];
 
         $data = [

app/Statistics/Google/ChartIndividualWithSources.php

Spacing +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
         string $color_to = null
     ): string {
         $color_from = $color_from ?? ['--chart-values-low', '#ffffff'];
-        $color_to   = $color_to ??  ['--chart-values-high', '#84beff'];
+        $color_to   = $color_to ?? ['--chart-values-high', '#84beff'];
 
         $data = [
             [

app/Statistics/Google/ChartFamilyWithSources.php

Spacing +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
         string $color_to = null
     ): string {
         $color_from = $color_from ?? ['--chart-values-low', '#ffffff'];
-        $color_to   = $color_to ??  ['--chart-values-high', '#84beff'];
+        $color_to   = $color_to ?? ['--chart-values-high', '#84beff'];
 
         $data = [
             [

app/Statistics/Google/ChartFamilyLargest.php

Spacing +2 added lines, -2 removed lines

@@ -41,7 +41,7 @@ 
      */
     public function __construct(Tree $tree)
     {
-        $this->tree          = $tree;
+        $this->tree = $tree;
     }
 
     /**
@@ -77,7 +77,7 @@ 
         int $total = 10
     ): string {
         $color_from = $color_from ?? ['--chart-values-low', '#ffffff'];
-        $color_to   = $color_to ??  ['--chart-values-high', '#84beff'];
+        $color_to   = $color_to ?? ['--chart-values-high', '#84beff'];
 
         $data = [
             [

app/Statistics/Google/ChartChildren.php

Spacing +1 added lines, -1 removed lines

@@ -113,7 +113,7 @@
         return view('statistics/other/charts/column', [
             'data'          => $data,
             'chart_options' => $chart_options,
-            'chart_colors'  => [ ['--chart-values-default', '#84beff'] ],
+            'chart_colors'  => [['--chart-values-default', '#84beff']],
             'chart_title'   => $chart_title,
             'language'      => I18N::languageTag(),
         ]);