fisharebest / webtrees

app/Elements/AgeAtEvent.php

Spacing +7 added lines, -7 removed lines

@@ -75,13 +75,13 @@
         $canonical = $this->canonical($value);
 
         return preg_replace_callback_array([
-            '/CHILD/'     => fn () => I18N::translate('Child'),
-            '/INFANT/'    => fn () => I18N::translate('Infant'),
-            '/STILLBORN/' => fn () => I18N::translate('Stillborn'),
-            '/\b(\d+)y\b/' => fn (array $match) => I18N::plural('%s year', '%s years', (int) ($match[1]), I18N::number((float) $match[1])),
-            '/\b(\d+)m\b/' => fn (array $match) => I18N::plural('%s month', '%s months', (int) ($match[1]), I18N::number((float) $match[1])),
-            '/\b(\d+)w\b/' => fn (array $match) => I18N::plural('%s week', '%s weeks', (int) ($match[1]), I18N::number((float) $match[1])),
-            '/\b(\d+)d\b/' => fn (array $match) => I18N::plural('%s day', '%s days', (int) ($match[1]), I18N::number((float) $match[1])),
+            '/CHILD/'     => fn() => I18N::translate('Child'),
+            '/INFANT/'    => fn() => I18N::translate('Infant'),
+            '/STILLBORN/' => fn() => I18N::translate('Stillborn'),
+            '/\b(\d+)y\b/' => fn(array $match) => I18N::plural('%s year', '%s years', (int) ($match[1]), I18N::number((float) $match[1])),
+            '/\b(\d+)m\b/' => fn(array $match) => I18N::plural('%s month', '%s months', (int) ($match[1]), I18N::number((float) $match[1])),
+            '/\b(\d+)w\b/' => fn(array $match) => I18N::plural('%s week', '%s weeks', (int) ($match[1]), I18N::number((float) $match[1])),
+            '/\b(\d+)d\b/' => fn(array $match) => I18N::plural('%s day', '%s days', (int) ($match[1]), I18N::number((float) $match[1])),
         ], e($canonical));
     }
 }

app/Module/IndividualFactsTabModule.php

Spacing +3 added lines, -3 removed lines

@@ -120,17 +120,17 @@
         // Which facts and events are handled by other modules?
         $sidebar_facts = $this->module_service
             ->findByComponent(ModuleSidebarInterface::class, $individual->tree(), Auth::user())
-            ->map(fn (ModuleSidebarInterface $sidebar): Collection => $sidebar->supportedFacts());
+            ->map(fn(ModuleSidebarInterface $sidebar): Collection => $sidebar->supportedFacts());
 
         $tab_facts = $this->module_service
             ->findByComponent(ModuleTabInterface::class, $individual->tree(), Auth::user())
-            ->map(fn (ModuleTabInterface $tab): Collection => $tab->supportedFacts());
+            ->map(fn(ModuleTabInterface $tab): Collection => $tab->supportedFacts());
 
         $exclude_facts = $sidebar_facts->merge($tab_facts)->flatten();
 
         // The individual’s own facts
         $individual_facts = $individual->facts()
-            ->filter(fn (Fact $fact): bool => !$exclude_facts->contains($fact->tag()));
+            ->filter(fn(Fact $fact): bool => !$exclude_facts->contains($fact->tag()));
 
         $relative_facts = new Collection();
 

app/GedcomRecord.php

Spacing +2 added lines, -2 removed lines

@@ -784,7 +784,7 @@ 
         $access_level = $access_level ?? Auth::accessLevel($this->tree);
 
         // Convert BIRT into INDI:BIRT, etc.
-        $filter = array_map(fn (string $tag): string => $this->tag() . ':' . $tag, $filter);
+        $filter = array_map(fn(string $tag): string => $this->tag() . ':' . $tag, $filter);
 
         $facts = new Collection();
         if ($this->canShow($access_level)) {
@@ -804,7 +804,7 @@ 
 
                 default:
                     $subtags = Registry::elementFactory()->make($this->tag())->subtags();
-                    $subtags = array_map(fn (string $tag): string => $this->tag() . ':' . $tag, array_keys($subtags));
+                    $subtags = array_map(fn(string $tag): string => $this->tag() . ':' . $tag, array_keys($subtags));
                     $subtags = array_combine(range(1, count($subtags)), $subtags);
 
                     $facts = $facts

app/Functions/FunctionsPrintFacts.php

Spacing +5 added lines, -5 removed lines

@@ -432,10 +432,10 @@ 
         for ($j = 0; $j < $ct; $j++) {
             if (!str_contains($match[$j][1], '@')) {
                 $source = e($match[$j][1] . preg_replace('/\n\d CONT ?/', "\n", $match[$j][2]));
-                $data   .= '<div class="fact_SOUR"><span class="label">' . I18N::translate('Source') . ':</span> <span class="field" dir="auto">';
+                $data .= '<div class="fact_SOUR"><span class="label">' . I18N::translate('Source') . ':</span> <span class="field" dir="auto">';
 
                 if ($tree->getPreference('FORMAT_TEXT') === 'markdown') {
-                    $data .= '<div class="markdown" dir="auto">' ;
+                    $data .= '<div class="markdown" dir="auto">';
                     $data .= Registry::markdownFactory()->markdown($tree)->convertToHtml($source);
                     $data .= '</div>';
                 } else {
@@ -444,7 +444,7 @@ 
                     $data .= '</div>';
                 }
 
-                $data   .= '</span></div>';
+                $data .= '</span></div>';
             }
         }
         // Find source for each fact
@@ -462,7 +462,7 @@ 
                     }
                     $srec     = substr($factrec, $spos1, $spos2 - $spos1);
                     $lt       = preg_match_all("/$nlevel \w+/", $srec, $matches);
-                    $data     .= '<div class="fact_SOUR">';
+                    $data .= '<div class="fact_SOUR">';
                     $id       = 'collapse-' . Uuid::uuid4()->toString();
                     $expanded = (bool) $tree->getPreference('EXPAND_SOURCES');
                     if ($lt > 0) {
@@ -852,7 +852,7 @@ 
             }
 
             if ($tree->getPreference('FORMAT_TEXT') === 'markdown') {
-                $formatted_text = '<div class="markdown" dir="auto">' ;
+                $formatted_text = '<div class="markdown" dir="auto">';
                 $formatted_text .= Registry::markdownFactory()->markdown($tree)->convertToHtml($text);
                 $formatted_text .= '</div>';
             } else {

app/Services/SearchService.php

Spacing +6 added lines, -6 removed lines

@@ -740,7 +740,7 @@ 
                         $query->where('individuals.i_gedcom', 'LIKE', $like);
                         break;
                 }
-            } elseif (str_starts_with($field_name, 'INDI:')  && str_ends_with($field_name, ':DATE')) {
+            } elseif (str_starts_with($field_name, 'INDI:') && str_ends_with($field_name, ':DATE')) {
                 $date = new Date($field_value);
                 if ($date->isOK()) {
                     $delta = 365 * ($modifiers[$field_name] ?? 0);
@@ -750,7 +750,7 @@ 
                         ->where('date_' . $parts[1] . '.d_julianday2', '<=', $date->maximumJulianDay() + $delta);
                 }
                 unset($fields[$field_name]);
-            } elseif (str_starts_with($field_name, 'FAM:')  && str_ends_with($field_name, ':DATE')) {
+            } elseif (str_starts_with($field_name, 'FAM:') && str_ends_with($field_name, ':DATE')) {
                 $date = new Date($field_value);
                 if ($date->isOK()) {
                     $delta = 365 * $modifiers[$field_name];
@@ -760,10 +760,10 @@ 
                         ->where('date_' . $parts[1] . '.d_julianday2', '<=', $date->maximumJulianDay() + $delta);
                 }
                 unset($fields[$field_name]);
-            } elseif (str_starts_with($field_name, 'INDI:')  && str_ends_with($field_name, ':PLAC')) {
+            } elseif (str_starts_with($field_name, 'INDI:') && str_ends_with($field_name, ':PLAC')) {
                 // SQL can only link a place to a person/family, not to an event.
                 $query->where('individual_places.p_place', 'LIKE', '%' . $field_value . '%');
-            } elseif (str_starts_with($field_name, 'FAM:')  && str_ends_with($field_name, ':PLAC')) {
+            } elseif (str_starts_with($field_name, 'FAM:') && str_ends_with($field_name, ':PLAC')) {
                 // SQL can only link a place to a person/family, not to an event.
                 $query->where('family_places.p_place', 'LIKE', '%' . $field_value . '%');
             } elseif (str_starts_with($field_name, 'MOTHER:NAME:') || str_starts_with($field_name, 'FATHER:NAME:')) {
@@ -871,7 +871,7 @@ 
 
                     $regex = '/' . preg_quote($field_value, '/') . '/i';
 
-                    if (str_starts_with($field_name, 'INDI:')  && str_ends_with($field_name, ':PLAC')) {
+                    if (str_starts_with($field_name, 'INDI:') && str_ends_with($field_name, ':PLAC')) {
                         foreach ($individual->facts([$parts[1]]) as $fact) {
                             if (preg_match($regex, $fact->place()->gedcomName())) {
                                 continue 2;
@@ -880,7 +880,7 @@ 
                         return false;
                     }
 
-                    if (str_starts_with($field_name, 'FAM:')  && str_ends_with($field_name, ':PLAC')) {
+                    if (str_starts_with($field_name, 'FAM:') && str_ends_with($field_name, ':PLAC')) {
                         foreach ($individual->spouseFamilies() as $family) {
                             foreach ($family->facts([$parts[1]]) as $fact) {
                                 if (preg_match($regex, $fact->place()->gedcomName())) {

app/Http/RequestHandlers/SearchAdvancedPage.php

Spacing +2 added lines, -2 removed lines

@@ -198,9 +198,9 @@
         };
 
         return $default_facts
-            ->reject(fn (string $field): bool => array_key_exists($field, $fields))
+            ->reject(fn(string $field): bool => array_key_exists($field, $fields))
             ->sort($comparator)
-            ->mapWithKeys(fn (string $fact): array => [$fact => Registry::elementFactory()->make($fact)->label()])
+            ->mapWithKeys(fn(string $fact): array => [$fact => Registry::elementFactory()->make($fact)->label()])
             ->all();
     }