fisharebest / webtrees

app/Http/RequestHandlers/EditFactPage.php

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
         $record = Auth::checkRecordAccess($record, true);
 
         // Find the fact to edit
-        $fact = $record->facts()->first(fn (Fact $fact): bool => $fact->id() === $fact_id && $fact->canEdit());
+        $fact = $record->facts()->first(fn(Fact $fact): bool => $fact->id() === $fact_id && $fact->canEdit());
 
         if ($fact === null) {
             return Registry::responseFactory()->redirectUrl($record->url());

app/Factories/ResponseFactory.php

Spacing +1 added lines, -1 removed lines

@@ -108,7 +108,7 @@
         if (is_string($content)) {
             $headers['Content-Type'] ??= 'text/html; charset=UTF-8';
         } else {
-            $content                 = json_encode($content, JSON_THROW_ON_ERROR | JSON_UNESCAPED_UNICODE);
+            $content = json_encode($content, JSON_THROW_ON_ERROR | JSON_UNESCAPED_UNICODE);
             $headers['Content-Type'] ??= 'application/json';
         }
 

app/Validator.php

Spacing +8 added lines, -8 removed lines

@@ -102,7 +102,7 @@ 
      */
     public function isBetween(int $minimum, int $maximum): self
     {
-        $this->rules[] = static function (?int $value) use ($minimum, $maximum): ?int {
+        $this->rules[] = static function (?int $value) use ($minimum, $maximum) : ?int {
             if (is_int($value) && $value >= $minimum && $value <= $maximum) {
                 return $value;
             }
@@ -120,7 +120,7 @@ 
      */
     public function isInArray(array $values): self
     {
-        $this->rules[] = static fn (?string $value): ?string => $value !== null && in_array($value, $values, true) ? $value : null;
+        $this->rules[] = static fn(?string $value) : ?string => $value !== null && in_array($value, $values, true) ? $value : null;
 
         return $this;
     }
@@ -130,7 +130,7 @@ 
      */
     public function isNotEmpty(): self
     {
-        $this->rules[] = static fn (?string $value): ?string => $value !== null && $value !== '' ? $value : null;
+        $this->rules[] = static fn(?string $value) : ?string => $value !== null && $value !== '' ? $value : null;
 
         return $this;
     }
@@ -142,7 +142,7 @@ 
      */
     public function isLocalUrl(string $base_url): self
     {
-        $this->rules[] = static function (?string $value) use ($base_url): ?string {
+        $this->rules[] = static function (?string $value) use ($base_url) : ?string {
             if ($value !== null) {
                 $value_info    = parse_url($value);
                 $base_url_info = parse_url($base_url);
@@ -240,7 +240,7 @@ 
             throw new HttpBadRequestException(I18N::translate('The parameter “%s” is missing.', $parameter));
         }
 
-        $callback = static fn (?array $value, Closure $rule): ?array => $rule($value);
+        $callback = static fn(?array $value, Closure $rule) : ?array => $rule($value);
 
         $value = array_reduce($this->rules, $callback, $value);
         $value ??= [];
@@ -272,7 +272,7 @@ 
             $value = null;
         }
 
-        $callback = static fn (?int $value, Closure $rule): ?int => $rule($value);
+        $callback = static fn(?int $value, Closure $rule) : ?int => $rule($value);
 
         $value = array_reduce($this->rules, $callback, $value);
 
@@ -315,9 +315,9 @@ 
             $value = null;
         }
 
-        $callback = static fn (?string $value, Closure $rule): ?string => $rule($value);
+        $callback = static fn(?string $value, Closure $rule) : ?string => $rule($value);
 
-        $value =  array_reduce($this->rules, $callback, $value);
+        $value = array_reduce($this->rules, $callback, $value);
         $value ??= $default;
 
         if ($value === null || preg_match('//u', $value) !== 1) {

app/Factories/RouteFactory.php

Spacing +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
 
         // webtrees uses http_build_query() to generate URLs - which maps false onto "0".
         // Aura uses rawurlencode(), which maps false onto "" - which does not work as an aura URL parameter.
-        $parameters = array_map(static fn ($var) => is_bool($var) ? (int) $var : $var, $parameters);
+        $parameters = array_map(static fn($var) => is_bool($var) ? (int) $var : $var, $parameters);
 
         $url = $router_container->getGenerator()->generate($route_name, $parameters);
 

app/Module/UpcomingAnniversariesModule.php

Spacing +4 added lines, -4 removed lines

@@ -146,8 +146,8 @@ 
     {
         $default_events = implode(',', self::DEFAULT_EVENTS);
 
-        $days      = (int)$this->getBlockSetting($block_id, 'days', self::DEFAULT_DAYS);
-        $filter    = (bool)$this->getBlockSetting($block_id, 'filter', self::DEFAULT_FILTER);
+        $days      = (int) $this->getBlockSetting($block_id, 'days', self::DEFAULT_DAYS);
+        $filter    = (bool) $this->getBlockSetting($block_id, 'filter', self::DEFAULT_FILTER);
         $infoStyle = $this->getBlockSetting($block_id, 'infoStyle', self::DEFAULT_STYLE);
         $sortStyle = $this->getBlockSetting($block_id, 'sortStyle', self::DEFAULT_SORT);
         $events    = $this->getBlockSetting($block_id, 'events', $default_events);
@@ -256,8 +256,8 @@ 
         $sort_style = Validator::parsedBody($request)->isInArrayKeys($this->sortStyles())->string('sortStyle');
         $events     = Validator::parsedBody($request)->array('events');
 
-        $this->setBlockSetting($block_id, 'days', (string)$days);
-        $this->setBlockSetting($block_id, 'filter', (string)$filter);
+        $this->setBlockSetting($block_id, 'days', (string) $days);
+        $this->setBlockSetting($block_id, 'filter', (string) $filter);
         $this->setBlockSetting($block_id, 'infoStyle', $info_style);
         $this->setBlockSetting($block_id, 'sortStyle', $sort_style);
         $this->setBlockSetting($block_id, 'events', implode(',', $events));

app/Http/RequestHandlers/UnconnectedPage.php

Spacing +2 added lines, -2 removed lines

@@ -93,7 +93,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')
@@ -105,7 +105,7 @@ 
             }
         }
 
-        usort($individual_groups, static fn (Collection $x, Collection $y): int => count($x) <=> count($y));
+        usort($individual_groups, static fn(Collection $x, Collection $y): int => count($x) <=> count($y));
 
         $title = I18N::translate('Find unrelated individuals') . ' — ' . e($tree->title());
 

app/Services/LinkedRecordService.php

Spacing +1 added lines, -1 removed lines

@@ -75,7 +75,7 @@
             ->union($union)
             ->pluck('l_from');
 
-        return $xrefs->map(static fn (string $xref) => Registry::gedcomRecordFactory()->make($xref, $record->tree()));
+        return $xrefs->map(static fn(string $xref) => Registry::gedcomRecordFactory()->make($xref, $record->tree()));
     }
 
     /**

app/Report/RightToLeftSupport.php

Spacing +11 added lines, -11 removed lines

@@ -199,7 +199,7 @@ 
                         $currentLen        = $endPos + 2;
                         $directive         = substr($workingText, 0, $currentLen);
                         $workingText       = substr($workingText, $currentLen);
-                        $result            .= self::$waitingText . $directive;
+                        $result .= self::$waitingText . $directive;
                         self::$waitingText = '';
                         break;
                     }
@@ -310,7 +310,7 @@ 
                         if ($openParIndex !== false) {
                             // Opening parentheses always inherit the following directionality
                             self::$waitingText .= $currentLetter;
-                            $workingText       = substr($workingText, $currentLen);
+                            $workingText = substr($workingText, $currentLen);
                             while (true) {
                                 if ($workingText === '') {
                                     break;
@@ -318,13 +318,13 @@ 
                                 if (str_starts_with($workingText, ' ')) {
                                     // Spaces following this left parenthesis inherit the following directionality too
                                     self::$waitingText .= ' ';
-                                    $workingText       = substr($workingText, 1);
+                                    $workingText = substr($workingText, 1);
                                     continue;
                                 }
                                 if (str_starts_with($workingText, ' ')) {
                                     // Spaces following this left parenthesis inherit the following directionality too
                                     self::$waitingText .= ' ';
-                                    $workingText       = substr($workingText, 6);
+                                    $workingText = substr($workingText, 6);
                                     continue;
                                 }
                                 break;
@@ -341,9 +341,9 @@ 
                         // Exceptions to this rule will be handled later during final clean-up.
                         //
                         self::$waitingText .= $currentLetter;
-                        $workingText       = substr($workingText, $currentLen);
+                        $workingText = substr($workingText, $currentLen);
                         if (self::$currentState !== '') {
-                            $result            .= self::$waitingText;
+                            $result .= self::$waitingText;
                             self::$waitingText = '';
                         }
                         break 2; // double break because we're waiting for more information
@@ -472,7 +472,7 @@ 
                 }
                 if (substr($result . "\n", 0, self::LENGTH_START) !== self::START_LTR && substr($result . "\n", 0, self::LENGTH_START) !== self::START_RTL) {
                     $leadingText .= substr($result, 0, 1);
-                    $result      = substr($result, 1);
+                    $result = substr($result, 1);
                     continue;
                 }
                 $result = substr($result, 0, self::LENGTH_START) . $leadingText . substr($result, self::LENGTH_START);
@@ -614,11 +614,11 @@ 
     private static function breakCurrentSpan(string &$result): void
     {
         // Interrupt the current span, insert that <br>, and then continue the current span
-        $result            .= self::$waitingText;
+        $result .= self::$waitingText;
         self::$waitingText = '';
 
         $breakString = '<' . self::$currentState . 'br>';
-        $result      .= $breakString;
+        $result .= $breakString;
     }
 
     /**
@@ -675,7 +675,7 @@ 
                 break;
             } // No more numeric strings
 
-            $tempResult    .= substr($textSpan, 0, $posLRE + 3); // Copy everything preceding the numeric string
+            $tempResult .= substr($textSpan, 0, $posLRE + 3); // Copy everything preceding the numeric string
             $numericString = substr($textSpan, $posLRE + 3, $posPDF - $posLRE); // Separate the entire numeric string
             $textSpan      = substr($textSpan, $posPDF + 3);
             $posColon      = strpos($numericString, ':');
@@ -1142,7 +1142,7 @@ 
 
             // We're done: finish the span
             $textSpan = self::starredName($textSpan, 'RTL'); // Wrap starred name in <u> and </u> tags
-            $result   .= $textSpan . self::END_RTL;
+            $result .= $textSpan . self::END_RTL;
         }
 
         if (self::$currentState !== 'LTR' && self::$currentState !== 'RTL') {

app/Module/LanguageSlovakian.php

Spacing +15 added lines, -15 removed lines

@@ -86,12 +86,12 @@ 
      */
     public function relationships(): array
     {
-        $pra = static fn (int $n, string $nominative, string $genitive): array => [
+        $pra = static fn(int $n, string $nominative, string $genitive): array => [
             ($n > 3 ? 'pra ×' . $n . ' ' : str_repeat('pra-', $n)) . $nominative,
             ($n > 3 ? 'pra ×' . $n . ' ' : str_repeat('pra-', $n)) . $genitive,
         ];
 
-        $cousin = static fn (int $n, array $cousins, string $nominative, string $genitive): array => $cousins[$n] ?? [
+        $cousin = static fn(int $n, array $cousins, string $nominative, string $genitive): array => $cousins[$n] ?? [
             $nominative . ' z ' . $n . '. kolena',
             $genitive . '%s z ' . $n . '. kolena',
         ];
@@ -147,9 +147,9 @@ 
             Relationship::fixed('prastarý otec', '%s prastarého otca')->parent()->parent()->mother(),
             Relationship::fixed('prastarý otec', '%s prastarého otca')->parent()->parent()->parent(),
             // Ancestors
-            Relationship::dynamic(static fn (int $n) => $pra($n - 1, 'prastarý otec', '%s prastarého otca'))->ancestor()->male(),
-            Relationship::dynamic(static fn (int $n) => $pra($n - 1, 'prastará matka', '%s prastarej matky'))->ancestor()->female(),
-            Relationship::dynamic(static fn (int $n) => $pra($n - 1, 'prastarý rodič', '%s prastarého rodiča'))->ancestor(),
+            Relationship::dynamic(static fn(int $n) => $pra($n - 1, 'prastarý otec', '%s prastarého otca'))->ancestor()->male(),
+            Relationship::dynamic(static fn(int $n) => $pra($n - 1, 'prastará matka', '%s prastarej matky'))->ancestor()->female(),
+            Relationship::dynamic(static fn(int $n) => $pra($n - 1, 'prastarý rodič', '%s prastarého rodiča'))->ancestor(),
             // Grandchildren
             Relationship::fixed('vnuk', '%s vnuka')->child()->son(),
             Relationship::fixed('vnučka', '%s vnučky')->child()->daughter(),
@@ -159,9 +159,9 @@ 
             Relationship::fixed('pravnučka', '%s pravnučky')->child()->child()->daughter(),
             Relationship::fixed('pravnúča', '%s pravnúčaťa')->child()->child()->child(),
             // Descendants
-            Relationship::dynamic(static fn (int $n) => $pra($n - 1, 'pravnuk', '%s pravnuka'))->ancestor()->male(),
-            Relationship::dynamic(static fn (int $n) => $pra($n - 1, 'pravnučka', '%s pravnučky'))->ancestor()->female(),
-            Relationship::dynamic(static fn (int $n) => $pra($n - 1, 'pravnúča', '%s pravnúčaťa'))->ancestor(),
+            Relationship::dynamic(static fn(int $n) => $pra($n - 1, 'pravnuk', '%s pravnuka'))->ancestor()->male(),
+            Relationship::dynamic(static fn(int $n) => $pra($n - 1, 'pravnučka', '%s pravnučky'))->ancestor()->female(),
+            Relationship::dynamic(static fn(int $n) => $pra($n - 1, 'pravnúča', '%s pravnúčaťa'))->ancestor(),
             // Aunts and uncles
             Relationship::fixed('ujo', '%s uja')->mother()->brother(),
             Relationship::fixed('ujčiná', '%s ujčinej')->mother()->brother()->wife(),
@@ -169,20 +169,20 @@ 
             Relationship::fixed('strýko', '%s strýka')->parent()->brother(),
             Relationship::fixed('teta', '%s tety')->parent()->sister(),
             // Great-aunts and great-uncles
-            Relationship::dynamic(static fn (int $n) => $pra($n - 2, 'prastrýko', '%s prastrýka'))->ancestor()->brother(),
-            Relationship::dynamic(static fn (int $n) => $pra($n - 2, 'prateta', '%s pratety'))->ancestor()->sister(),
+            Relationship::dynamic(static fn(int $n) => $pra($n - 2, 'prastrýko', '%s prastrýka'))->ancestor()->brother(),
+            Relationship::dynamic(static fn(int $n) => $pra($n - 2, 'prateta', '%s pratety'))->ancestor()->sister(),
             // Nieces and nephews
             Relationship::fixed('synovec', '%s synovca')->sibling()->son(),
             Relationship::fixed('neter', '%s netere')->sibling()->daughter(),
             // Great-nieces and great-nephews
             Relationship::fixed('prasynovec', '%s prasynovca')->sibling()->child()->son(),
             Relationship::fixed('praneter', '%s pranetere')->sibling()->child()->daughter(),
-            Relationship::dynamic(static fn (int $n) => $pra($n - 2, 'prasynovec', '%s prasynovca'))->sibling()->descendant()->son(),
-            Relationship::dynamic(static fn (int $n) => $pra($n - 2, 'praneter', '%s pranetere'))->sibling()->descendant()->daughter(),
+            Relationship::dynamic(static fn(int $n) => $pra($n - 2, 'prasynovec', '%s prasynovca'))->sibling()->descendant()->son(),
+            Relationship::dynamic(static fn(int $n) => $pra($n - 2, 'praneter', '%s pranetere'))->sibling()->descendant()->daughter(),
             // Cousins
-            Relationship::dynamic(static fn (int $n): array => $cousin($n, static::FEMALE_COUSINS, '', ''))->symmetricCousin()->female(),
-            Relationship::dynamic(static fn (int $n): array => $cousin($n, static::MALE_COUSINS, '', ''))->symmetricCousin()->male(),
-            Relationship::dynamic(static fn (int $n): array => $cousin($n, static::MALE_COUSINS, '', ''))->symmetricCousin(),
+            Relationship::dynamic(static fn(int $n): array => $cousin($n, static::FEMALE_COUSINS, '', ''))->symmetricCousin()->female(),
+            Relationship::dynamic(static fn(int $n): array => $cousin($n, static::MALE_COUSINS, '', ''))->symmetricCousin()->male(),
+            Relationship::dynamic(static fn(int $n): array => $cousin($n, static::MALE_COUSINS, '', ''))->symmetricCousin(),
         ];
     }
 }