fisharebest / webtrees

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 static(fn () => [$nominative, $genitive]);
+        return new static(fn() => [$nominative, $genitive]);
     }
 
     /**
@@ -126,9 +126,9 @@ 
      */
     public function adopted(): Relationship
     {
-        $this->matchers[] = fn (array $nodes): bool => count($nodes) > 2 && $nodes[2]
+        $this->matchers[] = 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[] = fn (array $nodes): bool => $nodes[0]
+        $this->matchers[] = 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[] = fn (array $nodes): bool => count($nodes) > 2 && $nodes[2]
+        $this->matchers[] = 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[] = fn (array $nodes): bool => $nodes[0]
+        $this->matchers[] = 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;
     }
@@ -404,8 +404,8 @@ 
     {
         $this->matchers[] = static function (array $nodes): bool {
             if (count($nodes) > 2) {
-                $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;
             }
@@ -508,8 +508,8 @@ 
     {
         $this->matchers[] = static function (array $nodes): bool {
             if (count($nodes) > 2) {
-                $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() &&
@@ -540,8 +540,8 @@ 
     {
         $this->matchers[] = static function (array $nodes): bool {
             if (count($nodes) > 2) {
-                $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/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 = fn (string $s): array => [$s, $s . '’s %s'];
+        $genitive = 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 = fn (int $n, string $prefix, string $suffix): array => $genitive(
+        $great = 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/Module/LanguageFrench.php

Spacing +27 added lines, -28 removed lines

@@ -34,12 +34,12 @@ 
         1 => [
             'F' => ['cousine germaine', '$s de la cousine germaine'],
             'M' => ['cousin germain', '$s du cousin germain'],
-            'U' => ['cousin germain', '%s du cousin germain' ]
+            'U' => ['cousin germain', '%s du cousin germain']
         ],
         2 => [
             'F' => ['cousine issue de germain', '$s de la cousine issue de germain'],
             'M' => ['cousin issu de germain', '$s du cousin issu de germain'],
-            'U' => ['cousin issu de germain', '%s du cousin issu de germain' ]
+            'U' => ['cousin issu de germain', '%s du cousin issu de germain']
         ]
     ];
 
@@ -66,20 +66,20 @@ 
 
     public function relationships(): array
     {
-        $genitive = fn (string $s, string $genitive_link): array => [$s, '%s ' . $genitive_link . $s];
+        $genitive = fn(string $s, string $genitive_link): array => [$s, '%s ' . $genitive_link . $s];
 
-        $great = fn (int $n, string $suffix, string $genitive_link): array => $genitive(
+        $great = fn(int $n, string $suffix, string $genitive_link): array => $genitive(
             ($n > 2 ? 'arrière-(x' . $n . ')-' : str_repeat('arrière-', max($n, 0))) . $suffix,
             $n === 0 ? $genitive_link : 'de l’'
         );
 
         $compoundgreat =
-            fn (int $n, string $first_level, string $suffix, string $genitive_none, string $genitive_first): array =>
-                $great($n - 1, ($n > 0 ? $first_level : '' ) . $suffix, $n === 0 ? $genitive_none : $genitive_first);
+            fn(int $n, string $first_level, string $suffix, string $genitive_none, string $genitive_first): array =>
+                $great($n - 1, ($n > 0 ? $first_level : '') . $suffix, $n === 0 ? $genitive_none : $genitive_first);
 
         $symmetricCousin = fn(int $n, string $sex): array  => self::SYMMETRIC_COUSINS[$n][$sex] ?? $genitive(
             $sex === 'F' ? 'cousine au ' . $n . '<sup>e</sup> degré' : 'cousin au ' . $n . '<sup>e</sup> degré',
-            $sex === 'F'  ? 'de la ' : 'du '
+            $sex === 'F' ? 'de la ' : 'du '
         );
 
         $asymmetricCousin =
@@ -94,9 +94,8 @@ 
                 }
                 return $genitive(
                     $sex === 'F' ?
-                        'cousine du ' . $down . '<sup>e</sup> au ' . $up . '<sup>e</sup> degré' :
-                        'cousin du ' . $down . '<sup>e</sup> au ' . $up . '<sup>e</sup> degré',
-                    $sex === 'F'  ? 'de la ' : 'du '
+                        'cousine du ' . $down . '<sup>e</sup> au ' . $up . '<sup>e</sup> degré' : 'cousin du ' . $down . '<sup>e</sup> au ' . $up . '<sup>e</sup> degré',
+                    $sex === 'F' ? 'de la ' : 'du '
                 );
             };
 
@@ -174,26 +173,26 @@ 
             Relationship::fixed('beau-frère', '%s du beau-frère')->sibling()->husband(),
             Relationship::fixed('beau-frère/belle-sœur', '%s du beau-frère/belle-sœur')->sibling()->spouse(),
             // Grandparents and above
-            Relationship::dynamic(fn (int $n) => $great($n - 1, 'grand-mère maternelle', 'de la '))->mother()->ancestor()->female(),
-            Relationship::dynamic(fn (int $n) => $great($n - 1, 'grand-père maternel', 'du '))->mother()->ancestor()->male(),
-            Relationship::dynamic(fn (int $n) => $great($n - 1, 'grand-mère paternelle', 'de la '))->father()->ancestor()->female(),
-            Relationship::dynamic(fn (int $n) => $great($n - 1, 'grand-père paternel', 'du '))->father()->ancestor()->male(),
-            Relationship::dynamic(fn (int $n) => $great($n - 2, 'grand-mère', 'de la '))->ancestor()->female(),
-            Relationship::dynamic(fn (int $n) => $great($n - 2, 'grand-père', 'du '))->ancestor()->male(),
-            Relationship::dynamic(fn (int $n) => $great($n - 2, 'grand-parent', 'du '))->ancestor(),
+            Relationship::dynamic(fn(int $n) => $great($n - 1, 'grand-mère maternelle', 'de la '))->mother()->ancestor()->female(),
+            Relationship::dynamic(fn(int $n) => $great($n - 1, 'grand-père maternel', 'du '))->mother()->ancestor()->male(),
+            Relationship::dynamic(fn(int $n) => $great($n - 1, 'grand-mère paternelle', 'de la '))->father()->ancestor()->female(),
+            Relationship::dynamic(fn(int $n) => $great($n - 1, 'grand-père paternel', 'du '))->father()->ancestor()->male(),
+            Relationship::dynamic(fn(int $n) => $great($n - 2, 'grand-mère', 'de la '))->ancestor()->female(),
+            Relationship::dynamic(fn(int $n) => $great($n - 2, 'grand-père', 'du '))->ancestor()->male(),
+            Relationship::dynamic(fn(int $n) => $great($n - 2, 'grand-parent', 'du '))->ancestor(),
             // Grandchildren and below
-            Relationship::dynamic(fn (int $n) => $great($n - 2, 'petite-fille', 'de la '))->descendant()->female(),
-            Relationship::dynamic(fn (int $n) => $great($n - 2, 'petit-fils', 'du '))->descendant()->male(),
-            Relationship::dynamic(fn (int $n) => $great($n - 2, 'petit-enfant', 'du'))->descendant(),
+            Relationship::dynamic(fn(int $n) => $great($n - 2, 'petite-fille', 'de la '))->descendant()->female(),
+            Relationship::dynamic(fn(int $n) => $great($n - 2, 'petit-fils', 'du '))->descendant()->male(),
+            Relationship::dynamic(fn(int $n) => $great($n - 2, 'petit-enfant', 'du'))->descendant(),
             // Collateral relatives
-            Relationship::dynamic(fn (int $n) => $compoundgreat($n - 1, 'grand-', 'tante', 'de la ', 'de la '))->ancestor()->sister(),
-            Relationship::dynamic(fn (int $n) => $compoundgreat($n - 1, 'grand-', 'tante par alliance', 'de la ', 'de la '))->ancestor()->sibling()->wife(),
-            Relationship::dynamic(fn (int $n) => $compoundgreat($n - 1, 'grand-', 'oncle', 'de l’', 'du '))->ancestor()->brother(),
-            Relationship::dynamic(fn (int $n) => $compoundgreat($n - 1, 'grand-', 'oncle par alliance', 'de l’', 'du '))->ancestor()->sibling()->husband(),
-            Relationship::dynamic(fn (int $n) => $compoundgreat($n - 1, 'petite-', 'nièce', 'de la ', 'de la '))->sibling()->descendant()->female(),
-            Relationship::dynamic(fn (int $n) => $compoundgreat($n - 1, 'petite-', 'nièce par alliance', 'de la ', 'de la '))->married()->spouse()->sibling()->descendant()->female(),
-            Relationship::dynamic(fn (int $n) => $compoundgreat($n - 1, 'petit-', 'neveu', 'du ', 'du '))->sibling()->descendant()->male(),
-            Relationship::dynamic(fn (int $n) => $compoundgreat($n - 1, 'petit-', 'neveu par alliance', 'du ', 'du '))->married()->spouse()->sibling()->descendant()->male(),
+            Relationship::dynamic(fn(int $n) => $compoundgreat($n - 1, 'grand-', 'tante', 'de la ', 'de la '))->ancestor()->sister(),
+            Relationship::dynamic(fn(int $n) => $compoundgreat($n - 1, 'grand-', 'tante par alliance', 'de la ', 'de la '))->ancestor()->sibling()->wife(),
+            Relationship::dynamic(fn(int $n) => $compoundgreat($n - 1, 'grand-', 'oncle', 'de l’', 'du '))->ancestor()->brother(),
+            Relationship::dynamic(fn(int $n) => $compoundgreat($n - 1, 'grand-', 'oncle par alliance', 'de l’', 'du '))->ancestor()->sibling()->husband(),
+            Relationship::dynamic(fn(int $n) => $compoundgreat($n - 1, 'petite-', 'nièce', 'de la ', 'de la '))->sibling()->descendant()->female(),
+            Relationship::dynamic(fn(int $n) => $compoundgreat($n - 1, 'petite-', 'nièce par alliance', 'de la ', 'de la '))->married()->spouse()->sibling()->descendant()->female(),
+            Relationship::dynamic(fn(int $n) => $compoundgreat($n - 1, 'petit-', 'neveu', 'du ', 'du '))->sibling()->descendant()->male(),
+            Relationship::dynamic(fn(int $n) => $compoundgreat($n - 1, 'petit-', 'neveu par alliance', 'du ', 'du '))->married()->spouse()->sibling()->descendant()->male(),
             // Cousins (based on canon law)
             Relationship::dynamic(fn(int $n) => $symmetricCousin($n, 'F'))->symmetricCousin()->female(),
             Relationship::dynamic(fn(int $n) => $symmetricCousin($n, 'M'))->symmetricCousin()->male(),