fisharebest / webtrees

app/Services/SearchService.php

Spacing +2 added lines, -2 removed lines

@@ -126,7 +126,7 @@ 
                     ->where('wife_name.n_type', '<>', '_MARNM');
             });
 
-        $field  = new Expression('COALESCE(' . DB::prefix('husb_name') . ".n_full, '') || COALESCE(" . DB::prefix('wife_name') . ".n_full, '')");
+        $field = new Expression('COALESCE(' . DB::prefix('husb_name') . ".n_full, '') || COALESCE(" . DB::prefix('wife_name') . ".n_full, '')");
 
         $this->whereTrees($query, 'f_file', $trees);
         $this->whereSearch($query, $field, $search);
@@ -1068,7 +1068,7 @@ 
      * @param Expression<string>|string $column
      * @param array<string>             $search_terms
      */
-    private function whereSearch(Builder $query, Expression|string $column, array $search_terms): void
+    private function whereSearch(Builder $query, Expression | string $column, array $search_terms): void
     {
         foreach ($search_terms as $search_term) {
             $query->where($column, DB::iLike(), '%' . addcslashes($search_term, '\\%_') . '%');

app/Http/Middleware/BadBotBlocker.php

Spacing +1 added lines, -1 removed lines

@@ -323,7 +323,7 @@
     {
         return Registry::cache()->file()->remember('whois-asn-' . $asn, function () use ($asn): array {
             $ranges = $this->network_service->findIpRangesForAsn($asn);
-            $mapper = static fn (string $range): RangeInterface|null => Factory::parseRangeString($range);
+            $mapper = static fn (string $range): RangeInterface | null => Factory::parseRangeString($range);
             $ranges = array_map($mapper, $ranges);
 
             return array_filter($ranges);

Indentation +46 added lines, -46 removed lines

@@ -57,52 +57,52 @@
      * Instead, the list from version 1.26 is copied here.
      */
     public const array AI_ROBOTS = [
-         'AI2Bot',
-         'Ai2Bot-Dolma',
-         'Amazonbot',
-         'anthropic-ai',
-         'Applebot',
-         'Applebot-Extended',
-         'Brightbot 1.0',
-         'Bytespider',
-         'CCBot',
-         'ChatGPT-User',
-         'Claude-Web',
-         'ClaudeBot',
-         'cohere-ai',
-         'cohere-training-data-crawler',
-         'Crawlspace',
-         'Diffbot',
-         'DuckAssistBot',
-         'FacebookBot',
-         'FriendlyCrawler',
-         'Google-Extended',
-         'GoogleOther',
-         'GoogleOther-Image',
-         'GoogleOther-Video',
-         'GPTBot',
-         'iaskspider/2.0',
-         'ICC-Crawler',
-         'ImagesiftBot',
-         'img2dataset',
-         'ISSCyberRiskCrawler',
-         'Kangaroo Bot',
-         'meta-externalagent',
-         'meta-externalfetcher',
-         'OAI-SearchBot',
-         'omgili',
-         'omgilibot',
-         'PanguBot',
-         'PerplexityBot',
-         'PetalBot',
-         'Scrapy',
-         'SemrushBot-OCOB',
-         'SemrushBot-SWA',
-         'Sidetrade indexer bot',
-         'Timpibot',
-         'VelenPublicWebCrawler',
-         'Webzio-Extended',
-         'YouBot',
+            'AI2Bot',
+            'Ai2Bot-Dolma',
+            'Amazonbot',
+            'anthropic-ai',
+            'Applebot',
+            'Applebot-Extended',
+            'Brightbot 1.0',
+            'Bytespider',
+            'CCBot',
+            'ChatGPT-User',
+            'Claude-Web',
+            'ClaudeBot',
+            'cohere-ai',
+            'cohere-training-data-crawler',
+            'Crawlspace',
+            'Diffbot',
+            'DuckAssistBot',
+            'FacebookBot',
+            'FriendlyCrawler',
+            'Google-Extended',
+            'GoogleOther',
+            'GoogleOther-Image',
+            'GoogleOther-Video',
+            'GPTBot',
+            'iaskspider/2.0',
+            'ICC-Crawler',
+            'ImagesiftBot',
+            'img2dataset',
+            'ISSCyberRiskCrawler',
+            'Kangaroo Bot',
+            'meta-externalagent',
+            'meta-externalfetcher',
+            'OAI-SearchBot',
+            'omgili',
+            'omgilibot',
+            'PanguBot',
+            'PerplexityBot',
+            'PetalBot',
+            'Scrapy',
+            'SemrushBot-OCOB',
+            'SemrushBot-SWA',
+            'Sidetrade indexer bot',
+            'Timpibot',
+            'VelenPublicWebCrawler',
+            'Webzio-Extended',
+            'YouBot',
     ];
 
     // Other bad robots - SEO optimisers, advertisers, etc.  This list is shared with robots.txt.

app/Module/IndividualFactsTabModule.php

Spacing +1 added lines, -1 removed lines

@@ -115,7 +115,7 @@
             ->flatten();
 
         // Don't show family meta-data tags
-        $exclude_facts  = new Collection(['FAM:CHAN', 'FAM:_UID', 'FAM:UID', 'FAM:SUBM']);
+        $exclude_facts = new Collection(['FAM:CHAN', 'FAM:_UID', 'FAM:UID', 'FAM:SUBM']);
         // Don't show tags that are shown in tabs or sidebars
         $exclude_facts = $exclude_facts->merge($sidebar_facts)->merge($tab_facts);
 

app/Module/LanguageGerman.php

Spacing +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
 		    ($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 + 1) . ' x Ur' : (($n > -1) ? 'Ur' . str_repeat('ur', $n) : '')) . $simpleGreat, $suffix, $gender
 			// $n <= -1 -> ''
 			// $n == 0 -> Ur 
 			// $n == 1 -> Urur 

Indentation +18 added lines, -18 removed lines

@@ -58,19 +58,19 @@ 
             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 @@ 
             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 @@ 
             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 @@ 
             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 @@ 
             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(),

app/Services/GedcomExportService.php

Spacing +4 added lines, -4 removed lines

@@ -107,7 +107,7 @@ 
         string $line_endings,
         string $filename,
         string $format,
-        Collection|null $records = null
+        Collection | null $records = null
     ): ResponseInterface {
         $access_level = self::ACCESS_LEVELS[$privacy];
 
@@ -177,9 +177,9 @@ 
         string $encoding = UTF8::NAME,
         int $access_level = Auth::PRIV_HIDE,
         string $line_endings = 'CRLF',
-        Collection|null $records = null,
-        ZipArchive|FilesystemOperator|null $zip_filesystem = null,
-        string|null $media_path = null
+        Collection | null $records = null,
+        ZipArchive | FilesystemOperator | null $zip_filesystem = null,
+        string | null $media_path = null
     ) {
         $stream = fopen('php://memory', 'wb+');