@@ -75,7 +75,7 @@ |
||
75 | 75 | } |
76 | 76 | |
77 | 77 | // Sort the facts |
78 | - $callback = static fn (string $x, string $y): int => array_search($x, $order, true) <=> array_search($y, $order, true); |
|
78 | + $callback = static fn(string $x, string $y): int => array_search($x, $order, true) <=> array_search($y, $order, true); |
|
79 | 79 | uksort($sort_facts, $callback); |
80 | 80 | |
81 | 81 | // Merge the facts |
@@ -158,7 +158,7 @@ |
||
158 | 158 | $updated = 0; |
159 | 159 | |
160 | 160 | // Remove places with 0,0 coordinates at lower levels. |
161 | - $callback = static fn (array $place): bool => !str_contains($place['name'], ',') || $place['longitude'] !== 0.0 || $place['latitude'] !== 0.0; |
|
161 | + $callback = static fn(array $place): bool => !str_contains($place['name'], ',') || $place['longitude'] !== 0.0 || $place['latitude'] !== 0.0; |
|
162 | 162 | |
163 | 163 | $places = array_filter($places, $callback); |
164 | 164 |
@@ -74,7 +74,7 @@ |
||
74 | 74 | } |
75 | 75 | |
76 | 76 | // Sort the facts |
77 | - $callback = static fn (string $x, string $y): int => array_search($x, $order, true) <=> array_search($y, $order, true); |
|
77 | + $callback = static fn(string $x, string $y): int => array_search($x, $order, true) <=> array_search($y, $order, true); |
|
78 | 78 | uksort($sort_facts, $callback); |
79 | 79 | |
80 | 80 | // Merge the facts |
@@ -74,7 +74,7 @@ |
||
74 | 74 | } |
75 | 75 | |
76 | 76 | // Sort the facts |
77 | - $callback = static fn (string $x, string $y): int => array_search($x, $order, true) <=> array_search($y, $order, true); |
|
77 | + $callback = static fn(string $x, string $y): int => array_search($x, $order, true) <=> array_search($y, $order, true); |
|
78 | 78 | uksort($sort_facts, $callback); |
79 | 79 | |
80 | 80 | // Merge the facts |
@@ -77,7 +77,7 @@ |
||
77 | 77 | } |
78 | 78 | |
79 | 79 | // Sort the facts |
80 | - $callback = static fn (string $x, string $y): int => array_search($x, $order, true) <=> array_search($y, $order, true); |
|
80 | + $callback = static fn(string $x, string $y): int => array_search($x, $order, true) <=> array_search($y, $order, true); |
|
81 | 81 | uksort($sort_facts, $callback); |
82 | 82 | |
83 | 83 | // Merge the facts |
@@ -161,7 +161,7 @@ discard block |
||
161 | 161 | if ($note->canShow()) { |
162 | 162 | $noterec = $note->gedcom(); |
163 | 163 | $nt = preg_match("/0 @$nmatch[1]@ NOTE (.*)/", $noterec, $n1match); |
164 | - $data .= self::printNoteRecord($tree, $nt > 0 ? $n1match[1] : '', 1, $noterec); |
|
164 | + $data .= self::printNoteRecord($tree, $nt > 0 ? $n1match[1] : '', 1, $noterec); |
|
165 | 165 | } |
166 | 166 | } else { |
167 | 167 | $data = '<div class="fact_NOTE"><span class="label">' . I18N::translate('Note') . '</span>: <span class="field error">' . $nmatch[1] . '</span></div>'; |
@@ -379,7 +379,7 @@ discard block |
||
379 | 379 | if (preg_match_all('/\n3 (?:_HEB|ROMN) (.+)/', $placerec, $matches)) { |
380 | 380 | foreach ($matches[1] as $match) { |
381 | 381 | $wt_place = new Place($match, $tree); |
382 | - $html .= ' - ' . $wt_place->fullName(); |
|
382 | + $html .= ' - ' . $wt_place->fullName(); |
|
383 | 383 | } |
384 | 384 | } |
385 | 385 | |
@@ -393,7 +393,7 @@ discard block |
||
393 | 393 | // Links to external maps |
394 | 394 | $html .= app(ModuleService::class) |
395 | 395 | ->findByInterface(ModuleMapLinkInterface::class) |
396 | - ->map(fn (ModuleMapLinkInterface $module): string => ' ' . $module->mapLink($event)) |
|
396 | + ->map(fn(ModuleMapLinkInterface $module): string => ' ' . $module->mapLink($event)) |
|
397 | 397 | ->implode(''); |
398 | 398 | } |
399 | 399 | |
@@ -440,7 +440,7 @@ discard block |
||
440 | 440 | $quick_facts = explode(',', $tree->getPreference('INDI_FACTS_QUICK')); |
441 | 441 | $unique_facts = [ |
442 | 442 | 'ADOP', |
443 | - 'AFN' , |
|
443 | + 'AFN', |
|
444 | 444 | 'BAPL', |
445 | 445 | 'BAPM', |
446 | 446 | 'BARM', |
@@ -449,7 +449,7 @@ discard block |
||
449 | 449 | 'BURI', |
450 | 450 | 'CAST', |
451 | 451 | 'CHAN', |
452 | - 'CHR' , |
|
452 | + 'CHR', |
|
453 | 453 | 'CHRA', |
454 | 454 | 'CONF', |
455 | 455 | 'CONL', |
@@ -459,18 +459,18 @@ discard block |
||
459 | 459 | 'FCOM', |
460 | 460 | 'GRAD', |
461 | 461 | 'NCHI', |
462 | - 'NMR' , |
|
462 | + 'NMR', |
|
463 | 463 | 'ORDN', |
464 | 464 | 'PROB', |
465 | 465 | 'REFN', |
466 | 466 | 'RELI', |
467 | 467 | 'RESN', |
468 | 468 | 'RETI', |
469 | - 'RFN' , |
|
470 | - 'RIN' , |
|
471 | - 'SEX' , |
|
469 | + 'RFN', |
|
470 | + 'RIN', |
|
471 | + 'SEX', |
|
472 | 472 | 'SLGC', |
473 | - 'SSN' , |
|
473 | + 'SSN', |
|
474 | 474 | 'WILL', |
475 | 475 | ]; |
476 | 476 | break; |
@@ -492,13 +492,13 @@ discard block |
||
492 | 492 | } |
493 | 493 | |
494 | 494 | // Filter existing tags |
495 | - $filter_fn = fn (string $tag): bool => !in_array($tag, $unique_facts, true) || $record->facts([$tag])->isEmpty(); |
|
495 | + $filter_fn = fn(string $tag): bool => !in_array($tag, $unique_facts, true) || $record->facts([$tag])->isEmpty(); |
|
496 | 496 | |
497 | 497 | $quick_facts = array_filter($quick_facts, $filter_fn); |
498 | 498 | |
499 | 499 | |
500 | 500 | // Create a label for a subtag |
501 | - $label_fn = fn (string $subtag): string => Registry::elementFactory()->make($record->tag() . ':' . $subtag)->label(); |
|
501 | + $label_fn = fn(string $subtag): string => Registry::elementFactory()->make($record->tag() . ':' . $subtag)->label(); |
|
502 | 502 | |
503 | 503 | $quick_facts = array_combine($quick_facts, array_map($label_fn, $quick_facts)); |
504 | 504 | $add_facts = array_combine($add_facts, array_map($label_fn, $add_facts)); |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | */ |
81 | 81 | public function isBetween(int $minimum, int $maximum): self |
82 | 82 | { |
83 | - $this->rules[] = static function (?int $value) use ($minimum, $maximum): ?int { |
|
83 | + $this->rules[] = static function (?int $value) use ($minimum, $maximum) : ?int { |
|
84 | 84 | if (is_int($value) && $value >= $minimum && $value <= $maximum) { |
85 | 85 | return $value; |
86 | 86 | } |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | */ |
99 | 99 | public function isLocalUrl(string $base_url): self |
100 | 100 | { |
101 | - $this->rules[] = static function (?string $value) use ($base_url): ?string { |
|
101 | + $this->rules[] = static function (?string $value) use ($base_url) : ?string { |
|
102 | 102 | if (is_string($value)) { |
103 | 103 | $value_info = parse_url($value); |
104 | 104 | $base_url_info = parse_url($base_url); |
@@ -155,7 +155,7 @@ discard block |
||
155 | 155 | $value = null; |
156 | 156 | } |
157 | 157 | |
158 | - $callback = static fn (?array $value, Closure $rule): ?array => $rule($value); |
|
158 | + $callback = static fn(?array $value, Closure $rule) : ?array => $rule($value); |
|
159 | 159 | |
160 | 160 | return array_reduce($this->rules, $callback, $value); |
161 | 161 | } |
@@ -175,7 +175,7 @@ discard block |
||
175 | 175 | $value = null; |
176 | 176 | } |
177 | 177 | |
178 | - $callback = static fn (?int $value, Closure $rule): ?int => $rule($value); |
|
178 | + $callback = static fn(?int $value, Closure $rule) : ?int => $rule($value); |
|
179 | 179 | |
180 | 180 | return array_reduce($this->rules, $callback, $value); |
181 | 181 | } |
@@ -193,7 +193,7 @@ discard block |
||
193 | 193 | $value = null; |
194 | 194 | } |
195 | 195 | |
196 | - $callback = static fn (?string $value, Closure $rule): ?string => $rule($value); |
|
196 | + $callback = static fn(?string $value, Closure $rule) : ?string => $rule($value); |
|
197 | 197 | |
198 | 198 | return array_reduce($this->rules, $callback, $value); |
199 | 199 | } |
@@ -69,7 +69,7 @@ |
||
69 | 69 | $chart_color1 = $this->theme->parameter('distribution-chart-no-values'); |
70 | 70 | $chart_color2 = $this->theme->parameter('distribution-chart-high-values'); |
71 | 71 | $color_from = $color_from ?? $chart_color1; |
72 | - $color_to = $color_to ?? $chart_color2; |
|
72 | + $color_to = $color_to ?? $chart_color2; |
|
73 | 73 | |
74 | 74 | $data = [ |
75 | 75 | [ |
@@ -107,7 +107,7 @@ |
||
107 | 107 | $chart_color1 = $this->theme->parameter('distribution-chart-no-values'); |
108 | 108 | $chart_color2 = $this->theme->parameter('distribution-chart-high-values'); |
109 | 109 | $color_from = $color_from ?? $chart_color1; |
110 | - $color_to = $color_to ?? $chart_color2; |
|
110 | + $color_to = $color_to ?? $chart_color2; |
|
111 | 111 | |
112 | 112 | $data = [ |
113 | 113 | [ |