@@ -75,13 +75,13 @@ |
||
| 75 | 75 | $canonical = $this->canonical($value); |
| 76 | 76 | |
| 77 | 77 | return preg_replace_callback_array([ |
| 78 | - '/CHILD/' => fn () => I18N::translate('Child'), |
|
| 79 | - '/INFANT/' => fn () => I18N::translate('Infant'), |
|
| 80 | - '/STILLBORN/' => fn () => I18N::translate('Stillborn'), |
|
| 81 | - '/\b(\d+)y\b/' => fn (array $match) => I18N::plural('%s year', '%s years', (int) ($match[1]), I18N::number((float) $match[1])), |
|
| 82 | - '/\b(\d+)m\b/' => fn (array $match) => I18N::plural('%s month', '%s months', (int) ($match[1]), I18N::number((float) $match[1])), |
|
| 83 | - '/\b(\d+)w\b/' => fn (array $match) => I18N::plural('%s week', '%s weeks', (int) ($match[1]), I18N::number((float) $match[1])), |
|
| 84 | - '/\b(\d+)d\b/' => fn (array $match) => I18N::plural('%s day', '%s days', (int) ($match[1]), I18N::number((float) $match[1])), |
|
| 78 | + '/CHILD/' => fn() => I18N::translate('Child'), |
|
| 79 | + '/INFANT/' => fn() => I18N::translate('Infant'), |
|
| 80 | + '/STILLBORN/' => fn() => I18N::translate('Stillborn'), |
|
| 81 | + '/\b(\d+)y\b/' => fn(array $match) => I18N::plural('%s year', '%s years', (int) ($match[1]), I18N::number((float) $match[1])), |
|
| 82 | + '/\b(\d+)m\b/' => fn(array $match) => I18N::plural('%s month', '%s months', (int) ($match[1]), I18N::number((float) $match[1])), |
|
| 83 | + '/\b(\d+)w\b/' => fn(array $match) => I18N::plural('%s week', '%s weeks', (int) ($match[1]), I18N::number((float) $match[1])), |
|
| 84 | + '/\b(\d+)d\b/' => fn(array $match) => I18N::plural('%s day', '%s days', (int) ($match[1]), I18N::number((float) $match[1])), |
|
| 85 | 85 | ], e($canonical)); |
| 86 | 86 | } |
| 87 | 87 | } |
@@ -120,17 +120,17 @@ |
||
| 120 | 120 | // Which facts and events are handled by other modules? |
| 121 | 121 | $sidebar_facts = $this->module_service |
| 122 | 122 | ->findByComponent(ModuleSidebarInterface::class, $individual->tree(), Auth::user()) |
| 123 | - ->map(fn (ModuleSidebarInterface $sidebar): Collection => $sidebar->supportedFacts()); |
|
| 123 | + ->map(fn(ModuleSidebarInterface $sidebar): Collection => $sidebar->supportedFacts()); |
|
| 124 | 124 | |
| 125 | 125 | $tab_facts = $this->module_service |
| 126 | 126 | ->findByComponent(ModuleTabInterface::class, $individual->tree(), Auth::user()) |
| 127 | - ->map(fn (ModuleTabInterface $tab): Collection => $tab->supportedFacts()); |
|
| 127 | + ->map(fn(ModuleTabInterface $tab): Collection => $tab->supportedFacts()); |
|
| 128 | 128 | |
| 129 | 129 | $exclude_facts = $sidebar_facts->merge($tab_facts)->flatten(); |
| 130 | 130 | |
| 131 | 131 | // The individual’s own facts |
| 132 | 132 | $individual_facts = $individual->facts() |
| 133 | - ->filter(fn (Fact $fact): bool => !$exclude_facts->contains($fact->tag())); |
|
| 133 | + ->filter(fn(Fact $fact): bool => !$exclude_facts->contains($fact->tag())); |
|
| 134 | 134 | |
| 135 | 135 | $relative_facts = new Collection(); |
| 136 | 136 | |
@@ -784,7 +784,7 @@ discard block |
||
| 784 | 784 | $access_level = $access_level ?? Auth::accessLevel($this->tree); |
| 785 | 785 | |
| 786 | 786 | // Convert BIRT into INDI:BIRT, etc. |
| 787 | - $filter = array_map(fn (string $tag): string => $this->tag() . ':' . $tag, $filter); |
|
| 787 | + $filter = array_map(fn(string $tag): string => $this->tag() . ':' . $tag, $filter); |
|
| 788 | 788 | |
| 789 | 789 | $facts = new Collection(); |
| 790 | 790 | if ($this->canShow($access_level)) { |
@@ -804,7 +804,7 @@ discard block |
||
| 804 | 804 | |
| 805 | 805 | default: |
| 806 | 806 | $subtags = Registry::elementFactory()->make($this->tag())->subtags(); |
| 807 | - $subtags = array_map(fn (string $tag): string => $this->tag() . ':' . $tag, array_keys($subtags)); |
|
| 807 | + $subtags = array_map(fn(string $tag): string => $this->tag() . ':' . $tag, array_keys($subtags)); |
|
| 808 | 808 | $subtags = array_combine(range(1, count($subtags)), $subtags); |
| 809 | 809 | |
| 810 | 810 | $facts = $facts |
@@ -432,10 +432,10 @@ discard block |
||
| 432 | 432 | for ($j = 0; $j < $ct; $j++) { |
| 433 | 433 | if (!str_contains($match[$j][1], '@')) { |
| 434 | 434 | $source = e($match[$j][1] . preg_replace('/\n\d CONT ?/', "\n", $match[$j][2])); |
| 435 | - $data .= '<div class="fact_SOUR"><span class="label">' . I18N::translate('Source') . ':</span> <span class="field" dir="auto">'; |
|
| 435 | + $data .= '<div class="fact_SOUR"><span class="label">' . I18N::translate('Source') . ':</span> <span class="field" dir="auto">'; |
|
| 436 | 436 | |
| 437 | 437 | if ($tree->getPreference('FORMAT_TEXT') === 'markdown') { |
| 438 | - $data .= '<div class="markdown" dir="auto">' ; |
|
| 438 | + $data .= '<div class="markdown" dir="auto">'; |
|
| 439 | 439 | $data .= Registry::markdownFactory()->markdown($tree)->convertToHtml($source); |
| 440 | 440 | $data .= '</div>'; |
| 441 | 441 | } else { |
@@ -444,7 +444,7 @@ discard block |
||
| 444 | 444 | $data .= '</div>'; |
| 445 | 445 | } |
| 446 | 446 | |
| 447 | - $data .= '</span></div>'; |
|
| 447 | + $data .= '</span></div>'; |
|
| 448 | 448 | } |
| 449 | 449 | } |
| 450 | 450 | // Find source for each fact |
@@ -462,7 +462,7 @@ discard block |
||
| 462 | 462 | } |
| 463 | 463 | $srec = substr($factrec, $spos1, $spos2 - $spos1); |
| 464 | 464 | $lt = preg_match_all("/$nlevel \w+/", $srec, $matches); |
| 465 | - $data .= '<div class="fact_SOUR">'; |
|
| 465 | + $data .= '<div class="fact_SOUR">'; |
|
| 466 | 466 | $id = 'collapse-' . Uuid::uuid4()->toString(); |
| 467 | 467 | $expanded = (bool) $tree->getPreference('EXPAND_SOURCES'); |
| 468 | 468 | if ($lt > 0) { |
@@ -852,7 +852,7 @@ discard block |
||
| 852 | 852 | } |
| 853 | 853 | |
| 854 | 854 | if ($tree->getPreference('FORMAT_TEXT') === 'markdown') { |
| 855 | - $formatted_text = '<div class="markdown" dir="auto">' ; |
|
| 855 | + $formatted_text = '<div class="markdown" dir="auto">'; |
|
| 856 | 856 | $formatted_text .= Registry::markdownFactory()->markdown($tree)->convertToHtml($text); |
| 857 | 857 | $formatted_text .= '</div>'; |
| 858 | 858 | } else { |