@@ -179,7 +179,7 @@ |
||
179 | 179 | throw new HttpNotFoundException(I18N::translate('%s does not exist.', 'news_id:' . $news_id)); |
180 | 180 | } |
181 | 181 | } else { |
182 | - $row = (object)['body' => '', 'subject' => '']; |
|
182 | + $row = (object) ['body' => '', 'subject' => '']; |
|
183 | 183 | } |
184 | 184 | |
185 | 185 | $title = I18N::translate('Add/edit a journal/news entry'); |
@@ -88,10 +88,10 @@ |
||
88 | 88 | } |
89 | 89 | |
90 | 90 | return preg_replace_callback_array([ |
91 | - '/\b(\d+)y\b/' => fn (array $match) => I18N::plural('%s year', '%s years', (int) $match[1], I18N::number((float) $match[1])), |
|
92 | - '/\b(\d+)m\b/' => fn (array $match) => I18N::plural('%s month', '%s months', (int) $match[1], I18N::number((float) $match[1])), |
|
93 | - '/\b(\d+)w\b/' => fn (array $match) => I18N::plural('%s week', '%s weeks', (int) $match[1], I18N::number((float) $match[1])), |
|
94 | - '/\b(\d+)d\b/' => fn (array $match) => I18N::plural('%s day', '%s days', (int) $match[1], I18N::number((float) $match[1])), |
|
91 | + '/\b(\d+)y\b/' => fn(array $match) => I18N::plural('%s year', '%s years', (int) $match[1], I18N::number((float) $match[1])), |
|
92 | + '/\b(\d+)m\b/' => fn(array $match) => I18N::plural('%s month', '%s months', (int) $match[1], I18N::number((float) $match[1])), |
|
93 | + '/\b(\d+)w\b/' => fn(array $match) => I18N::plural('%s week', '%s weeks', (int) $match[1], I18N::number((float) $match[1])), |
|
94 | + '/\b(\d+)d\b/' => fn(array $match) => I18N::plural('%s day', '%s days', (int) $match[1], I18N::number((float) $match[1])), |
|
95 | 95 | ], e($canonical)); |
96 | 96 | } |
97 | 97 | } |
@@ -100,7 +100,7 @@ discard block |
||
100 | 100 | { |
101 | 101 | if ($record instanceof Individual) { |
102 | 102 | $facts = $record->facts(static::INDIVIDUAL_EVENTS, true) |
103 | - ->merge($record->spouseFamilies()->map(fn (Family $family): Collection => $family->facts(static::FAMILY_EVENTS, true))); |
|
103 | + ->merge($record->spouseFamilies()->map(fn(Family $family): Collection => $family->facts(static::FAMILY_EVENTS, true))); |
|
104 | 104 | } elseif ($record instanceof Family) { |
105 | 105 | $facts = $record->facts(static::FAMILY_EVENTS, true); |
106 | 106 | } else { |
@@ -110,11 +110,11 @@ discard block |
||
110 | 110 | // iCalendar only supports exact Gregorian dates. |
111 | 111 | $facts = $facts |
112 | 112 | ->flatten() |
113 | - ->filter(fn (Fact $fact): bool => $fact->date()->isOK()) |
|
114 | - ->filter(fn (Fact $fact): bool => $fact->date()->qual1 === '') |
|
115 | - ->filter(fn (Fact $fact): bool => $fact->date()->minimumDate() instanceof GregorianDate) |
|
116 | - ->filter(fn (Fact $fact): bool => $fact->date()->minimumJulianDay() === $fact->date()->maximumJulianDay()) |
|
117 | - ->mapWithKeys(fn (Fact $fact): array => [ |
|
113 | + ->filter(fn(Fact $fact): bool => $fact->date()->isOK()) |
|
114 | + ->filter(fn(Fact $fact): bool => $fact->date()->qual1 === '') |
|
115 | + ->filter(fn(Fact $fact): bool => $fact->date()->minimumDate() instanceof GregorianDate) |
|
116 | + ->filter(fn(Fact $fact): bool => $fact->date()->minimumJulianDay() === $fact->date()->maximumJulianDay()) |
|
117 | + ->mapWithKeys(fn(Fact $fact): array => [ |
|
118 | 118 | route(static::class, ['tree' => $record->tree()->name(), 'xref' => $fact->record()->xref(), 'fact_id' => $fact->id()]) => |
119 | 119 | $fact->label() . ' — ' . $fact->date()->display(), |
120 | 120 | ]); |
@@ -149,7 +149,7 @@ discard block |
||
149 | 149 | $record = Auth::checkRecordAccess($record); |
150 | 150 | |
151 | 151 | $fact = $record->facts() |
152 | - ->filter(fn (Fact $fact): bool => $fact->id() === $fact_id) |
|
152 | + ->filter(fn(Fact $fact): bool => $fact->id() === $fact_id) |
|
153 | 153 | ->first(); |
154 | 154 | |
155 | 155 | if ($fact instanceof Fact) { |
@@ -79,7 +79,7 @@ |
||
79 | 79 | $surname_tradition = SurnameTradition::create($tree->getPreference('SURNAME_TRADITION')); |
80 | 80 | $spouse = $family->spouses()->first(); |
81 | 81 | assert($spouse instanceof Individual); |
82 | - $names = $surname_tradition->newSpouseNames($spouse, $sex); |
|
82 | + $names = $surname_tradition->newSpouseNames($spouse, $sex); |
|
83 | 83 | |
84 | 84 | $facts = [ |
85 | 85 | 'i' => $this->gedcom_edit_service->newIndividualFacts($tree, $sex, $names), |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | { |
69 | 69 | $dummy = Registry::familyFactory()->new('', '0 @@ FAM', null, $tree); |
70 | 70 | $tags = new Collection(explode(',', $tree->getPreference('QUICK_REQUIRED_FAMFACTS'))); |
71 | - $facts = $tags->map(fn (string $tag): Fact => $this->createNewFact($dummy, $tag)); |
|
71 | + $facts = $tags->map(fn(string $tag): Fact => $this->createNewFact($dummy, $tag)); |
|
72 | 72 | |
73 | 73 | return Fact::sortFacts($facts); |
74 | 74 | } |
@@ -84,9 +84,9 @@ discard block |
||
84 | 84 | { |
85 | 85 | $dummy = Registry::individualFactory()->new('', '0 @@ INDI', null, $tree); |
86 | 86 | $tags = new Collection(explode(',', $tree->getPreference('QUICK_REQUIRED_FACTS'))); |
87 | - $facts = $tags->map(fn (string $tag): Fact => $this->createNewFact($dummy, $tag)); |
|
87 | + $facts = $tags->map(fn(string $tag): Fact => $this->createNewFact($dummy, $tag)); |
|
88 | 88 | $sex_fact = new Collection([new Fact('1 SEX ' . $sex, $dummy, '')]); |
89 | - $name_facts = Collection::make($names)->map(static fn (string $gedcom): Fact => new Fact($gedcom, $dummy, '')); |
|
89 | + $name_facts = Collection::make($names)->map(static fn(string $gedcom): Fact => new Fact($gedcom, $dummy, '')); |
|
90 | 90 | |
91 | 91 | return $sex_fact->concat($name_facts)->concat(Fact::sortFacts($facts)); |
92 | 92 | } |
@@ -152,7 +152,7 @@ discard block |
||
152 | 152 | } |
153 | 153 | } |
154 | 154 | |
155 | - if ($values[$i] !== '' || $children_with_values && !$element instanceof AbstractXrefElement) { |
|
155 | + if ($values[$i] !== '' || $children_with_values && !$element instanceof AbstractXrefElement) { |
|
156 | 156 | if ($values[$i] === '') { |
157 | 157 | $gedcom_lines[] = $levels[$i] . ' ' . $tags[$i]; |
158 | 158 | } else { |
@@ -218,15 +218,15 @@ discard block |
||
218 | 218 | { |
219 | 219 | $subtags = Registry::elementFactory()->make($record->tag())->subtags(); |
220 | 220 | |
221 | - $subtags = array_filter($subtags, static fn (string $v, string $k) => !str_ends_with($v, ':1') || $record->facts([$k])->isEmpty(), ARRAY_FILTER_USE_BOTH); |
|
221 | + $subtags = array_filter($subtags, static fn(string $v, string $k) => !str_ends_with($v, ':1') || $record->facts([$k])->isEmpty(), ARRAY_FILTER_USE_BOTH); |
|
222 | 222 | |
223 | 223 | $subtags = array_keys($subtags); |
224 | 224 | |
225 | 225 | // Don't include facts/events that we have hidden in the control panel. |
226 | - $subtags = array_filter($subtags, fn (string $subtag): bool => !$this->isHiddenTag($record->tag() . ':' . $subtag)); |
|
226 | + $subtags = array_filter($subtags, fn(string $subtag): bool => !$this->isHiddenTag($record->tag() . ':' . $subtag)); |
|
227 | 227 | |
228 | 228 | if (!$include_hidden) { |
229 | - $fn_hidden = fn (string $t): bool => !$this->isHiddenTag($record->tag() . ':' . $t); |
|
229 | + $fn_hidden = fn(string $t): bool => !$this->isHiddenTag($record->tag() . ':' . $t); |
|
230 | 230 | $subtags = array_filter($subtags, $fn_hidden); |
231 | 231 | } |
232 | 232 | |
@@ -317,7 +317,7 @@ discard block |
||
317 | 317 | private function isHiddenTag(string $tag): bool |
318 | 318 | { |
319 | 319 | // Function to filter hidden tags. |
320 | - $fn_hide = static fn (string $x): bool => (bool) Site::getPreference('HIDE_' . $x); |
|
320 | + $fn_hide = static fn(string $x): bool => (bool) Site::getPreference('HIDE_' . $x); |
|
321 | 321 | |
322 | 322 | $preferences = array_filter(Gedcom::HIDDEN_TAGS, $fn_hide, ARRAY_FILTER_USE_KEY); |
323 | 323 | $preferences = array_values($preferences); |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | public function getSidebarContent(Individual $individual): string |
102 | 102 | { |
103 | 103 | $html = $individual->facts(static::HANDLED_FACTS) |
104 | - ->map(static fn (Fact $fact): string =>view('fact', ['fact' => $fact, 'record' => $individual])) |
|
104 | + ->map(static fn(Fact $fact): string =>view('fact', ['fact' => $fact, 'record' => $individual])) |
|
105 | 105 | ->implode(''); |
106 | 106 | |
107 | 107 | return strip_tags($html, '<a><div><span><i>'); |
@@ -114,6 +114,6 @@ discard block |
||
114 | 114 | */ |
115 | 115 | public function supportedFacts(): Collection |
116 | 116 | { |
117 | - return new Collection(array_map(static fn (string $tag): string => 'INDI:' . $tag, static::HANDLED_FACTS)); |
|
117 | + return new Collection(array_map(static fn(string $tag): string => 'INDI:' . $tag, static::HANDLED_FACTS)); |
|
118 | 118 | } |
119 | 119 | } |
@@ -142,7 +142,7 @@ |
||
142 | 142 | } |
143 | 143 | } |
144 | 144 | |
145 | - $callback = static fn (Fact $fact): bool => preg_match('/(?:^1|\n\d) NOTE/', $fact->gedcom()) === 1; |
|
145 | + $callback = static fn(Fact $fact): bool => preg_match('/(?:^1|\n\d) NOTE/', $fact->gedcom()) === 1; |
|
146 | 146 | |
147 | 147 | $this->facts = $facts->filter($callback); |
148 | 148 |
@@ -156,7 +156,7 @@ |
||
156 | 156 | if ($note->canShow()) { |
157 | 157 | $noterec = $note->gedcom(); |
158 | 158 | $nt = preg_match("/0 @$nmatch[1]@ NOTE (.*)/", $noterec, $n1match); |
159 | - $data .= self::printNoteRecord($tree, $nt > 0 ? $n1match[1] : '', 1, $noterec); |
|
159 | + $data .= self::printNoteRecord($tree, $nt > 0 ? $n1match[1] : '', 1, $noterec); |
|
160 | 160 | } |
161 | 161 | } else { |
162 | 162 | $data = '<div class="fact_NOTE"><span class="label">' . I18N::translate('Note') . '</span>: <span class="field error">' . $nmatch[1] . '</span></div>'; |