fisharebest / webtrees

app/Services/GedcomEditService.php

Spacing +3 added lines, -3 removed lines

@@ -438,12 +438,12 @@ 
     {
         $subtags = Registry::elementFactory()->make($record->tag())->subtags();
 
-        $subtags = array_filter($subtags, fn (string $v, string $k) => !str_ends_with($v, ':1') || $record->facts([$k])->isEmpty(), ARRAY_FILTER_USE_BOTH);
+        $subtags = array_filter($subtags, fn(string $v, string $k) => !str_ends_with($v, ':1') || $record->facts([$k])->isEmpty(), ARRAY_FILTER_USE_BOTH);
 
         $subtags = array_keys($subtags);
 
         if (!$include_hidden) {
-            $fn_hidden = fn (string $t): bool => !$this->isHiddenTag($record->tag() . ':' . $t);
+            $fn_hidden = fn(string $t): bool => !$this->isHiddenTag($record->tag() . ':' . $t);
             $subtags   = array_filter($subtags, $fn_hidden);
         }
 
@@ -536,7 +536,7 @@ 
     private function isHiddenTag(string $tag): bool
     {
         // Function to filter hidden tags.
-        $fn_hide = fn (string $x): bool => (bool) Site::getPreference('HIDE_' . $x);
+        $fn_hide = fn(string $x): bool => (bool) Site::getPreference('HIDE_' . $x);
 
         $preferences = array_filter(Gedcom::HIDDEN_TAGS, $fn_hide, ARRAY_FILTER_USE_KEY);
         $preferences = array_values($preferences);

app/Functions/FunctionsPrint.php

Spacing +12 added lines, -12 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('');
                 }
 
@@ -440,7 +440,7 @@ 
                 $quick_facts  = explode(',', $tree->getPreference('INDI_FACTS_QUICK'));
                 $unique_facts = [
                     'ADOP',
-                    'AFN' ,
+                    'AFN',
                     'BAPL',
                     'BAPM',
                     'BARM',
@@ -449,7 +449,7 @@ 
                     'BURI',
                     'CAST',
                     'CHAN',
-                    'CHR' ,
+                    'CHR',
                     'CHRA',
                     'CONF',
                     'CONL',
@@ -459,18 +459,18 @@ 
                     'FCOM',
                     'GRAD',
                     'NCHI',
-                    'NMR' ,
+                    'NMR',
                     'ORDN',
                     'PROB',
                     'REFN',
                     'RELI',
                     'RESN',
                     'RETI',
-                    'RFN' ,
-                    'RIN' ,
-                    'SEX' ,
+                    'RFN',
+                    'RIN',
+                    'SEX',
                     'SLGC',
-                    'SSN' ,
+                    'SSN',
                     'WILL',
                 ];
                 break;
@@ -492,13 +492,13 @@ 
         }
 
         // Filter existing tags
-        $filter_fn = fn ($tag): bool => !in_array($tag, $unique_facts, true) || $record->facts([$tag])->isEmpty();
+        $filter_fn = fn($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 = fn ($subtag): string => Registry::elementFactory()->make($record->tag() . ':' . $subtag)->label();
+        $label_fn = fn($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/Functions/FunctionsRtl.php

Spacing +11 added lines, -11 removed lines

@@ -186,7 +186,7 @@ 
                         $currentLen        = $endPos + 2;
                         $directive         = substr($workingText, 0, $currentLen);
                         $workingText       = substr($workingText, $currentLen);
-                        $result            .= self::$waitingText . $directive;
+                        $result .= self::$waitingText . $directive;
                         self::$waitingText = '';
                         break;
                     }
@@ -299,7 +299,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;
@@ -307,13 +307,13 @@ 
                                 if (substr($workingText, 0, 1) === ' ') {
                                     // Spaces following this left parenthesis inherit the following directionality too
                                     self::$waitingText .= ' ';
-                                    $workingText       = substr($workingText, 1);
+                                    $workingText = substr($workingText, 1);
                                     continue;
                                 }
                                 if (substr($workingText, 0, 6) === ' ') {
                                     // Spaces following this left parenthesis inherit the following directionality too
                                     self::$waitingText .= ' ';
-                                    $workingText       = substr($workingText, 6);
+                                    $workingText = substr($workingText, 6);
                                     continue;
                                 }
                                 break;
@@ -330,9 +330,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
@@ -463,7 +463,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);
@@ -600,11 +600,11 @@ 
     public 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;
     }
 
     /**
@@ -661,7 +661,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, ':');
@@ -1128,7 +1128,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/Functions/FunctionsPrintLists.php

Spacing +2 added lines, -2 removed lines

@@ -49,8 +49,8 @@
      */
     public static function surnameTagCloud(array $surnames, ?ModuleListInterface $module, bool $totals, Tree $tree): string
     {
-        $maximum = max(array_map(static fn (array $x): int => max($x), $surnames));
-        $minimum = min(array_map(static fn (array $x): int => min($x), $surnames));
+        $maximum = max(array_map(static fn(array $x) : int => max($x), $surnames));
+        $minimum = min(array_map(static fn(array $x): int => min($x), $surnames));
 
         $tag_cloud = '';
 

app/Http/RequestHandlers/ManageMediaData.php

Spacing +2 added lines, -2 removed lines

@@ -244,7 +244,7 @@ 
                     $create_form = '';
                     foreach ($media_trees as $media_tree => $media_directory) {
                         if (str_starts_with($row[0], $media_directory)) {
-                            $tmp         = substr($row[0], strlen($media_directory));
+                            $tmp = substr($row[0], strlen($media_directory));
                             $create_form .=
                                 '<p><a href="#" data-bs-toggle="modal" data-bs-backdrop="static" data-bs-target="#modal-create-media-from-file" data-file="' . e($tmp) . '" data-url="' . e(route(CreateMediaObjectFromFile::class, ['tree' => $media_tree])) . '" onclick="document.getElementById(\'modal-create-media-from-file-form\').action=this.dataset.url; document.getElementById(\'file\').value=this.dataset.file;">' . I18N::translate('Create') . '</a> — ' . e($media_tree) . '<p>';
                         }
@@ -349,7 +349,7 @@ 
                 // This will work for local filesystems.  For remote filesystems, we will
                 // need to copy the file locally to work out the image size.
                 $imgsize = getimagesizefromstring($data_filesystem->read($file));
-                $html    .= '<dt>' . I18N::translate('Image dimensions') . '</dt>';
+                $html .= '<dt>' . I18N::translate('Image dimensions') . '</dt>';
                 /* I18N: image dimensions, width × height */
                 $html .= '<dd>' . I18N::translate('%1$s × %2$s pixels', I18N::number($imgsize['0']), I18N::number($imgsize['1'])) . '</dd>';
             } catch (FilesystemException | UnableToReadFile | Throwable $ex) {

app/Module/FanChartModule.php

Spacing +4 added lines, -4 removed lines

@@ -80,7 +80,7 @@ 
 {
     use ModuleChartTrait;
 
-    protected const ROUTE_URL  = '/tree/{tree}/fan-chart-{style}-{generations}-{width}/{xref}';
+    protected const ROUTE_URL = '/tree/{tree}/fan-chart-{style}-{generations}-{width}/{xref}';
 
     // Chart styles
     private const STYLE_HALF_CIRCLE          = '2';
@@ -432,7 +432,7 @@ 
                     ]);
 
                     $text_lines = array_map(
-                        fn (string $line): string => $this->fitTextToPixelWidth($line, $max_text_length),
+                        fn(string $line): string => $this->fitTextToPixelWidth($line, $max_text_length),
                         $text_lines
                     );
 
@@ -488,13 +488,13 @@ 
 
                     foreach ($theme->individualBoxMenu($individual) as $menu) {
                         $link  = $menu->getLink();
-                        $class =  $menu->getClass();
+                        $class = $menu->getClass();
                         $html .= '<a href="' . e($link) . '" class="dropdown-item p-1 ' . e($class) . '">';
                         $html .= $menu->getLabel();
                         $html .= '</a>';
                     }
 
-                    $html  .= '</div>';
+                    $html .= '</div>';
                 }
             }
         }

app/Report/HtmlRenderer.php

Spacing +1 added lines, -1 removed lines

@@ -726,7 +726,7 @@
 
         $lines = explode("\n", $str);
 
-        $lines = array_map(fn (string $string): string => $this->utf8WordWrap($string, $line_width), $lines);
+        $lines = array_map(fn(string $string): string => $this->utf8WordWrap($string, $line_width), $lines);
 
         return implode("\n", $lines);
     }

app/Http/Middleware/BadBotBlocker.php

Spacing +1 added lines, -1 removed lines

@@ -259,7 +259,7 @@
     private function fetchIpRangesForAsn(string $asn): array
     {
         return Registry::cache()->file()->remember('whois-asn-' . $asn, static function () use ($asn): array {
-            $mapper = static fn (AsnRouteInfo $route_info): ?RangeInterface => IPFactory::parseRangeString($route_info->route ?: $route_info->route6);
+            $mapper = static fn(AsnRouteInfo $route_info): ?RangeInterface => IPFactory::parseRangeString($route_info->route ?: $route_info->route6);
 
             try {
                 $loader = new CurlLoader(self::WHOIS_TIMEOUT);

app/Http/RequestHandlers/TreePreferencesPage.php

Spacing +10 added lines, -10 removed lines

@@ -173,19 +173,19 @@
         $ignore_facts = ['CHAN', 'CHIL', 'FAMC', 'FAMS', 'HUSB', 'NOTE', 'OBJE', 'SOUR', 'SUBM', 'WIFE'];
 
         $all_family_facts = Collection::make(Registry::elementFactory()->make('FAM')->subtags())
-            ->filter(static fn (string $value, string $key): bool => !in_array($key, $ignore_facts, true))
-            ->mapWithKeys(static fn (string $value, string $key): array => [$key => 'FAM:' . $key])
-            ->map(static fn (string $tag): ElementInterface => Registry::elementFactory()->make($tag))
-            ->filter(static fn (ElementInterface $element): bool => !$element instanceof UnknownElement)
-            ->map(static fn (ElementInterface $element): string => $element->label())
+            ->filter(static fn(string $value, string $key): bool => !in_array($key, $ignore_facts, true))
+            ->mapWithKeys(static fn(string $value, string $key): array => [$key => 'FAM:' . $key])
+            ->map(static fn(string $tag): ElementInterface => Registry::elementFactory()->make($tag))
+            ->filter(static fn(ElementInterface $element): bool => !$element instanceof UnknownElement)
+            ->map(static fn(ElementInterface $element): string => $element->label())
             ->sort(I18N::comparator());
 
         $all_individual_facts = Collection::make(Registry::elementFactory()->make('INDI')->subtags())
-            ->filter(static fn (string $value, string $key): bool => !in_array($key, $ignore_facts, true))
-            ->mapWithKeys(static fn (string $value, string $key): array => [$key => 'INDI:' . $key])
-            ->map(static fn (string $tag): ElementInterface => Registry::elementFactory()->make($tag))
-            ->filter(static fn (ElementInterface $element): bool => !$element instanceof UnknownElement)
-            ->map(static fn (ElementInterface $element): string => $element->label())
+            ->filter(static fn(string $value, string $key): bool => !in_array($key, $ignore_facts, true))
+            ->mapWithKeys(static fn(string $value, string $key): array => [$key => 'INDI:' . $key])
+            ->map(static fn(string $tag): ElementInterface => Registry::elementFactory()->make($tag))
+            ->filter(static fn(ElementInterface $element): bool => !$element instanceof UnknownElement)
+            ->map(static fn(ElementInterface $element): string => $element->label())
             ->sort(I18N::comparator());
 
         $all_surname_traditions = SurnameTradition::allDescriptions();