Inspection of "update for german relationships" - fisharebest/webtrees - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Pull Request — main (#5150)

unknown

created 2025-05-13 18:59 UTC

Status

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

		@@ -66,7 +66,7 @@
		block discarded – undo
66	66	($gender == 0) ? [$prefix . $suffix, '%s' . ' des ' . $prefix . 's' . $suffix] : (($gender == 1) ? [$prefix . $suffix, '%s' . ' der ' . $prefix . $suffix] : [$prefix . $suffix, '%s' . ' der ' . $prefix . $suffix]);
67	67
68	68	$ur = static fn (int $n, string $simpleGreat, string $suffix, int $gender): array => $genitive(
69		- (($n > 1) ? ($n + 1) . ' x Ur' : (($n > -1) ? 'Ur' . str_repeat('ur', $n) : '')) . $simpleGreat, $suffix, $gender
	69	+ (($n > 1) ? ($n + 1) . ' x Ur' : (($n > -1) ? 'Ur' . str_repeat('ur', $n) : '')) . $simpleGreat, $suffix, $gender
70	70	// $n <= -1 -> ''
71	71	// $n == 0 -> Ur
72	72	// $n == 1 -> Urur

Please login to merge, or discard this patch.

Indentation +18 added lines, -18 removed lines patch added patch discarded remove patch

@@ -58,19 +58,19 @@  discard block
 block discarded – undo
             UTF8::LATIN_SMALL_LETTER_SHARP_S   => 'ss',
         ];
     }
-	public function relationships(): array
+    public function relationships(): array
     {
         // returns array => [nominativ, genitive %s] 
         // $genitive = static fn (string $prefix, string $suffix): array => [$prefix . $suffix, $prefix . 's' . $suffix . '%s'];
         $genitive = static fn (string $prefix, string $suffix, int $gender): array =>			
-		    ($gender == 0) ? [$prefix . $suffix, '%s' . ' des ' . $prefix . 's' . $suffix] : (($gender == 1) ? [$prefix . $suffix, '%s' . ' der ' . $prefix . $suffix] : [$prefix . $suffix, '%s' . ' der ' . $prefix . $suffix]);
+            ($gender == 0) ? [$prefix . $suffix, '%s' . ' des ' . $prefix . 's' . $suffix] : (($gender == 1) ? [$prefix . $suffix, '%s' . ' der ' . $prefix . $suffix] : [$prefix . $suffix, '%s' . ' der ' . $prefix . $suffix]);
 		
         $ur = static fn (int $n, string $simpleGreat, string $suffix, int $gender): array => $genitive(
-		    (($n > 1) ?  ($n + 1) . ' x Ur' : (($n > -1) ? 'Ur' . str_repeat('ur', $n) : '')) . $simpleGreat, $suffix, $gender
-			// $n <= -1 -> ''
-			// $n == 0 -> Ur 
-			// $n == 1 -> Urur 
-			// $n >= 2 -> $n+1 ' x Ur'
+            (($n > 1) ?  ($n + 1) . ' x Ur' : (($n > -1) ? 'Ur' . str_repeat('ur', $n) : '')) . $simpleGreat, $suffix, $gender
+            // $n <= -1 -> ''
+            // $n == 0 -> Ur 
+            // $n == 1 -> Urur 
+            // $n >= 2 -> $n+1 ' x Ur'
         );
 
         return [
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
             Relationship::fixed('Stiefschwester', '%s der Stiefschwester')->parent()->spouse()->daughter(),
             Relationship::fixed('Stiefbruder', '%s des Stiefbruders')->parent()->spouse()->son(),
             Relationship::fixed('Stiefgeschwister', '%s der Stiefgeschwister')->parent()->spouse()->child(),
-			// Cousin / Cousine
+            // Cousin / Cousine
             Relationship::fixed('Cousine', '%s der Cousine')->parent()->sister()->child()->female(),
             Relationship::fixed('Cousine', '%s der Cousine')->parent()->brother()->child()->female(),
             Relationship::fixed('Cousin', '%s des Cousins')->parent()->sister()->child()->male(),
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
             Relationship::fixed('Schwiegertochter', '%s der Schwiegertochter')->child()->wife(),
             Relationship::fixed('Schwiegersohn', '%s des Schwiegersohnes')->child()->husband(),
             Relationship::fixed('Schwiegerkind', '%s des Schwiegerkindes')->child()->married()->spouse(),
-			//
+            //
             Relationship::fixed('Schwägerin', '%s der Schwägerin')->sibling()->spouse()->sister(),
             Relationship::fixed('Schwager', '%s des Schwagers')->sibling()->spouse()->brother(),
             Relationship::fixed('Schwager/Schwägerin', '%s des Schwagers / der Schwägerin')->sibling()->spouse()->sibling(),
@@ -162,7 +162,7 @@  discard block
 block discarded – undo
             Relationship::fixed('Großmutter väterlicherseits', '%s der Großmutter (väterlicherseits)')->father()->mother(),
             Relationship::fixed('Großvater väterlicherseits', '%s des Großvaters (väterlicherseits)')->father()->father(),
             Relationship::fixed('Großeltern väterlicherseits', '%s der Großeltern (väterlicherseits)')->father()->parent(),
-			// 
+            // 
             Relationship::fixed('Großmutter', '%s der Großmutter')->parent()->mother(),
             Relationship::fixed('Großvater', '%s des Großvaters')->parent()->father(),
             Relationship::fixed('Großeltern', '%s der Großeltern')->parent()->parent(),
@@ -170,43 +170,43 @@  discard block
 block discarded – undo
             Relationship::fixed('Enkelin', '%s der Enkelin')->child()->daughter(),
             Relationship::fixed('Enkel', '%s des Enkels')->child()->son(),
             Relationship::fixed('Enkelin/Enkel', '%s der Enkelin/des Enkels')->child()->child(),
-			// Nichte / Neffe
+            // Nichte / Neffe
             Relationship::fixed('Nichte', '%s der Nichte')->sibling()->daughter(),
             Relationship::fixed('Nichte', '%s der Nichte')->married()->spouse()->sibling()->daughter(),			
             Relationship::fixed('Neffe', '%s des Neffen')->sibling()->son(),
             Relationship::fixed('Neffe', '%s des Neffen')->married()->spouse()->sibling()->son(),
             Relationship::fixed('Nichte/Neffe', '%s der Nichte / des Neffen')->sibling()->child(),
             Relationship::fixed('Nichte/Neffe', '%s der Nichte/ des Neffen')->married()->spouse()->sibling()->child(),
-			// Großnichte / Großneffe
+            // Großnichte / Großneffe
             Relationship::fixed('Großnichte', '%s der Großnichte')->sibling()->child()->child()->female(),
             Relationship::fixed('Großnichte', '%s der Großnichte')->married()->spouse()->sibling()->child()->child()->female(),
             Relationship::fixed('Großneffe', '%s des Großneffen')->sibling()->child()->child()->male(),
             Relationship::fixed('Großneffe', '%s des Großneffen')->married()->spouse()->sibling()->child()->child()->male(),
-			// Tante / Onkel
+            // Tante / Onkel
             Relationship::fixed('Tante', '%s der Tante')->parent()->sister(),
             Relationship::fixed('Tante', '%s der Tante')->parent()->brother()->wife(),
             Relationship::fixed('Onkel', '%s des Onkels')->parent()->sister()->husband(),
             Relationship::fixed('Onkel', '%s des Onkels')->parent()->brother(),
-			// Großtante / Großonkel
+            // Großtante / Großonkel
             Relationship::fixed('Großtante', '%s der Großtante')->parent()->parent()->sister(),
             Relationship::fixed('Großtante', '%s der Großtante')->parent()->parent()->brother()->wife(),
             Relationship::fixed('Großonkel', '%s des Großonkels')->parent()->parent()->brother(),
             Relationship::fixed('Großonkel', '%s des Großonkels')->parent()->parent()->sister()->husband(),
             // Relationships with dynamically generated names
-			// ancestors: n=2 -> Urgroßmutter (mütterlicherseits) / Großmutter der Mutter
+            // ancestors: n=2 -> Urgroßmutter (mütterlicherseits) / Großmutter der Mutter
             Relationship::dynamic(static fn (int $n) => $ur($n - 2, 'großmutter', ' (mütterlicherseits) ', 1))->mother()->ancestor()->female(),
             Relationship::dynamic(static fn (int $n) => $ur($n - 2, 'großvater', ' (mütterlicherseits) ', 0))->mother()->ancestor()->male(),
             Relationship::dynamic(static fn (int $n) => $ur($n - 2, 'großmutter', ' (väterlicherseits) ', 1))->father()->ancestor()->female(),
             Relationship::dynamic(static fn (int $n) => $ur($n - 2, 'großvater', ' (väterlicherseits) ', 0))->father()->ancestor()->male(),
-			//
+            //
             Relationship::dynamic(static fn (int $n) => $ur($n - 2, 'großeltern', ' (väterlicherseits) ', 2))->father()->ancestor(),
             Relationship::dynamic(static fn (int $n) => $ur($n - 2, 'großeltern', ' (mütterlicherseits) ', 2))->mother()->ancestor(),
-			//
+            //
             Relationship::dynamic(static fn (int $n) => $ur($n - 3, 'großtante', ' ', 1))->ancestor()->sister(),
             Relationship::dynamic(static fn (int $n) => $ur($n - 3, 'großtante', ' ', 1))->ancestor()->sibling()->wife(),
             Relationship::dynamic(static fn (int $n) => $ur($n - 3, 'großonkel', ' ', 0))->ancestor()->brother(),
             Relationship::dynamic(static fn (int $n) => $ur($n - 3, 'großonkel', ' ', 0))->ancestor()->sibling()->husband(),
-			// descendants
+            // descendants
             Relationship::dynamic(static fn (int $n) => $ur($n - 3, 'großnichte', ' ', 1))->sibling()->descendant()->female(),
             Relationship::dynamic(static fn (int $n) => $ur($n - 3, 'großnichte', ' ', 1))->married()->spouse()->sibling()->descendant()->female(),
             Relationship::dynamic(static fn (int $n) => $ur($n - 3, 'großneffe', ' ', 0))->sibling()->descendant()->male(),

Please login to merge, or discard this patch.

		@@ -58,19 +58,19 @@ discard block
		block discarded – undo
58	58	UTF8::LATIN_SMALL_LETTER_SHARP_S => 'ss',
59	59	];
60	60	}
61		- public function relationships(): array
	61	+ public function relationships(): array
62	62	{
63	63	// returns array => [nominativ, genitive %s]
64	64	// $genitive = static fn (string $prefix, string $suffix): array => [$prefix . $suffix, $prefix . 's' . $suffix . '%s'];
65	65	$genitive = static fn (string $prefix, string $suffix, int $gender): array =>
66		- ($gender == 0) ? [$prefix . $suffix, '%s' . ' des ' . $prefix . 's' . $suffix] : (($gender == 1) ? [$prefix . $suffix, '%s' . ' der ' . $prefix . $suffix] : [$prefix . $suffix, '%s' . ' der ' . $prefix . $suffix]);
	66	+ ($gender == 0) ? [$prefix . $suffix, '%s' . ' des ' . $prefix . 's' . $suffix] : (($gender == 1) ? [$prefix . $suffix, '%s' . ' der ' . $prefix . $suffix] : [$prefix . $suffix, '%s' . ' der ' . $prefix . $suffix]);
67	67
68	68	$ur = static fn (int $n, string $simpleGreat, string $suffix, int $gender): array => $genitive(
69		- (($n > 1) ? ($n + 1) . ' x Ur' : (($n > -1) ? 'Ur' . str_repeat('ur', $n) : '')) . $simpleGreat, $suffix, $gender
70		- // $n <= -1 -> ''
71		- // $n == 0 -> Ur
72		- // $n == 1 -> Urur
73		- // $n >= 2 -> $n+1 ' x Ur'
	69	+ (($n > 1) ? ($n + 1) . ' x Ur' : (($n > -1) ? 'Ur' . str_repeat('ur', $n) : '')) . $simpleGreat, $suffix, $gender
	70	+ // $n <= -1 -> ''
	71	+ // $n == 0 -> Ur
	72	+ // $n == 1 -> Urur
	73	+ // $n >= 2 -> $n+1 ' x Ur'
74	74	);
75	75
76	76	return [
		@@ -123,7 +123,7 @@ discard block
		block discarded – undo
123	123	Relationship::fixed('Stiefschwester', '%s der Stiefschwester')->parent()->spouse()->daughter(),
124	124	Relationship::fixed('Stiefbruder', '%s des Stiefbruders')->parent()->spouse()->son(),
125	125	Relationship::fixed('Stiefgeschwister', '%s der Stiefgeschwister')->parent()->spouse()->child(),
126		- // Cousin / Cousine
	126	+ // Cousin / Cousine
127	127	Relationship::fixed('Cousine', '%s der Cousine')->parent()->sister()->child()->female(),
128	128	Relationship::fixed('Cousine', '%s der Cousine')->parent()->brother()->child()->female(),
129	129	Relationship::fixed('Cousin', '%s des Cousins')->parent()->sister()->child()->male(),
		@@ -145,7 +145,7 @@ discard block
		block discarded – undo
145	145	Relationship::fixed('Schwiegertochter', '%s der Schwiegertochter')->child()->wife(),
146	146	Relationship::fixed('Schwiegersohn', '%s des Schwiegersohnes')->child()->husband(),
147	147	Relationship::fixed('Schwiegerkind', '%s des Schwiegerkindes')->child()->married()->spouse(),
148		- //
	148	+ //
149	149	Relationship::fixed('Schwägerin', '%s der Schwägerin')->sibling()->spouse()->sister(),
150	150	Relationship::fixed('Schwager', '%s des Schwagers')->sibling()->spouse()->brother(),
151	151	Relationship::fixed('Schwager/Schwägerin', '%s des Schwagers / der Schwägerin')->sibling()->spouse()->sibling(),
		@@ -162,7 +162,7 @@ discard block
		block discarded – undo
162	162	Relationship::fixed('Großmutter väterlicherseits', '%s der Großmutter (väterlicherseits)')->father()->mother(),
163	163	Relationship::fixed('Großvater väterlicherseits', '%s des Großvaters (väterlicherseits)')->father()->father(),
164	164	Relationship::fixed('Großeltern väterlicherseits', '%s der Großeltern (väterlicherseits)')->father()->parent(),
165		- //
	165	+ //
166	166	Relationship::fixed('Großmutter', '%s der Großmutter')->parent()->mother(),
167	167	Relationship::fixed('Großvater', '%s des Großvaters')->parent()->father(),
168	168	Relationship::fixed('Großeltern', '%s der Großeltern')->parent()->parent(),
		@@ -170,43 +170,43 @@ discard block
		block discarded – undo
170	170	Relationship::fixed('Enkelin', '%s der Enkelin')->child()->daughter(),
171	171	Relationship::fixed('Enkel', '%s des Enkels')->child()->son(),
172	172	Relationship::fixed('Enkelin/Enkel', '%s der Enkelin/des Enkels')->child()->child(),
173		- // Nichte / Neffe
	173	+ // Nichte / Neffe
174	174	Relationship::fixed('Nichte', '%s der Nichte')->sibling()->daughter(),
175	175	Relationship::fixed('Nichte', '%s der Nichte')->married()->spouse()->sibling()->daughter(),
176	176	Relationship::fixed('Neffe', '%s des Neffen')->sibling()->son(),
177	177	Relationship::fixed('Neffe', '%s des Neffen')->married()->spouse()->sibling()->son(),
178	178	Relationship::fixed('Nichte/Neffe', '%s der Nichte / des Neffen')->sibling()->child(),
179	179	Relationship::fixed('Nichte/Neffe', '%s der Nichte/ des Neffen')->married()->spouse()->sibling()->child(),
180		- // Großnichte / Großneffe
	180	+ // Großnichte / Großneffe
181	181	Relationship::fixed('Großnichte', '%s der Großnichte')->sibling()->child()->child()->female(),
182	182	Relationship::fixed('Großnichte', '%s der Großnichte')->married()->spouse()->sibling()->child()->child()->female(),
183	183	Relationship::fixed('Großneffe', '%s des Großneffen')->sibling()->child()->child()->male(),
184	184	Relationship::fixed('Großneffe', '%s des Großneffen')->married()->spouse()->sibling()->child()->child()->male(),
185		- // Tante / Onkel
	185	+ // Tante / Onkel
186	186	Relationship::fixed('Tante', '%s der Tante')->parent()->sister(),
187	187	Relationship::fixed('Tante', '%s der Tante')->parent()->brother()->wife(),
188	188	Relationship::fixed('Onkel', '%s des Onkels')->parent()->sister()->husband(),
189	189	Relationship::fixed('Onkel', '%s des Onkels')->parent()->brother(),
190		- // Großtante / Großonkel
	190	+ // Großtante / Großonkel
191	191	Relationship::fixed('Großtante', '%s der Großtante')->parent()->parent()->sister(),
192	192	Relationship::fixed('Großtante', '%s der Großtante')->parent()->parent()->brother()->wife(),
193	193	Relationship::fixed('Großonkel', '%s des Großonkels')->parent()->parent()->brother(),
194	194	Relationship::fixed('Großonkel', '%s des Großonkels')->parent()->parent()->sister()->husband(),
195	195	// Relationships with dynamically generated names
196		- // ancestors: n=2 -> Urgroßmutter (mütterlicherseits) / Großmutter der Mutter
	196	+ // ancestors: n=2 -> Urgroßmutter (mütterlicherseits) / Großmutter der Mutter
197	197	Relationship::dynamic(static fn (int $n) => $ur($n - 2, 'großmutter', ' (mütterlicherseits) ', 1))->mother()->ancestor()->female(),
198	198	Relationship::dynamic(static fn (int $n) => $ur($n - 2, 'großvater', ' (mütterlicherseits) ', 0))->mother()->ancestor()->male(),
199	199	Relationship::dynamic(static fn (int $n) => $ur($n - 2, 'großmutter', ' (väterlicherseits) ', 1))->father()->ancestor()->female(),
200	200	Relationship::dynamic(static fn (int $n) => $ur($n - 2, 'großvater', ' (väterlicherseits) ', 0))->father()->ancestor()->male(),
201		- //
	201	+ //
202	202	Relationship::dynamic(static fn (int $n) => $ur($n - 2, 'großeltern', ' (väterlicherseits) ', 2))->father()->ancestor(),
203	203	Relationship::dynamic(static fn (int $n) => $ur($n - 2, 'großeltern', ' (mütterlicherseits) ', 2))->mother()->ancestor(),
204		- //
	204	+ //
205	205	Relationship::dynamic(static fn (int $n) => $ur($n - 3, 'großtante', ' ', 1))->ancestor()->sister(),
206	206	Relationship::dynamic(static fn (int $n) => $ur($n - 3, 'großtante', ' ', 1))->ancestor()->sibling()->wife(),
207	207	Relationship::dynamic(static fn (int $n) => $ur($n - 3, 'großonkel', ' ', 0))->ancestor()->brother(),
208	208	Relationship::dynamic(static fn (int $n) => $ur($n - 3, 'großonkel', ' ', 0))->ancestor()->sibling()->husband(),
209		- // descendants
	209	+ // descendants
210	210	Relationship::dynamic(static fn (int $n) => $ur($n - 3, 'großnichte', ' ', 1))->sibling()->descendant()->female(),
211	211	Relationship::dynamic(static fn (int $n) => $ur($n - 3, 'großnichte', ' ', 1))->married()->spouse()->sibling()->descendant()->female(),
212	212	Relationship::dynamic(static fn (int $n) => $ur($n - 3, 'großneffe', ' ', 0))->sibling()->descendant()->male(),

fisharebest / webtrees

Pull Request — main (#5150)

Status

Category

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +18 added lines, -18 removed lines patch added patch discarded remove patch