@@ -29,7 +29,7 @@ |
||
| 29 | 29 | { |
| 30 | 30 | public const RECORD_TYPE = 'SOUR'; |
| 31 | 31 | |
| 32 | - protected const ROUTE_NAME = SourcePage::class; |
|
| 32 | + protected const ROUTE_NAME = SourcePage::class; |
|
| 33 | 33 | |
| 34 | 34 | /** |
| 35 | 35 | * Each object type may have its own special rules, and re-implement this function. |
@@ -79,7 +79,7 @@ |
||
| 79 | 79 | ->select(['d_gid as id', 'd_year as year', 'd_fact AS fact', 'd_type AS type']) |
| 80 | 80 | ->where('d_file', '=', $this->tree->id()) |
| 81 | 81 | ->where('d_fact', '=', $fact) |
| 82 | - ->where('d_julianday1', '=', function (Builder $query) use ($operation, $fact): void { |
|
| 82 | + ->where('d_julianday1', '=', function (Builder $query) use ($operation, $fact) : void { |
|
| 83 | 83 | $query->selectRaw($operation . '(d_julianday1)') |
| 84 | 84 | ->from('dates') |
| 85 | 85 | ->where('d_file', '=', $this->tree->id()) |
@@ -583,7 +583,7 @@ discard block |
||
| 583 | 583 | for ($j = 0; $j < $ct; $j++) { |
| 584 | 584 | if (!str_contains($match[$j][1], '@')) { |
| 585 | 585 | $source = e($match[$j][1] . preg_replace('/\n\d CONT ?/', "\n", $match[$j][2])); |
| 586 | - $data .= '<div class="fact_SOUR"><span class="label">' . I18N::translate('Source') . ':</span> <span class="field" dir="auto">' . Filter::formatText($source, $tree) . '</span></div>'; |
|
| 586 | + $data .= '<div class="fact_SOUR"><span class="label">' . I18N::translate('Source') . ':</span> <span class="field" dir="auto">' . Filter::formatText($source, $tree) . '</span></div>'; |
|
| 587 | 587 | } |
| 588 | 588 | } |
| 589 | 589 | // Find source for each fact |
@@ -601,7 +601,7 @@ discard block |
||
| 601 | 601 | } |
| 602 | 602 | $srec = substr($factrec, $spos1, $spos2 - $spos1); |
| 603 | 603 | $lt = preg_match_all("/$nlevel \w+/", $srec, $matches); |
| 604 | - $data .= '<div class="fact_SOUR">'; |
|
| 604 | + $data .= '<div class="fact_SOUR">'; |
|
| 605 | 605 | $id = 'collapse-' . Uuid::uuid4()->toString(); |
| 606 | 606 | $expanded = (bool) $tree->getPreference('EXPAND_SOURCES'); |
| 607 | 607 | if ($lt > 0) { |
@@ -64,7 +64,7 @@ |
||
| 64 | 64 | { |
| 65 | 65 | use ModuleListTrait; |
| 66 | 66 | |
| 67 | - protected const ROUTE_URL = '/tree/{tree}/branches{/surname}'; |
|
| 67 | + protected const ROUTE_URL = '/tree/{tree}/branches{/surname}'; |
|
| 68 | 68 | |
| 69 | 69 | /** @var ModuleService */ |
| 70 | 70 | protected $module_service; |
@@ -326,7 +326,8 @@ discard block |
||
| 326 | 326 | <li class="wt-initials-list-item d-flex"> |
| 327 | 327 | <?php if ($count > 0) : ?> |
| 328 | 328 | <a href="<?= e($this->listUrl($tree, ['alpha' => $letter, 'tree' => $tree->name()])) ?>" class="wt-initial px-1<?= $letter === $alpha ? ' active' : '' ?> '" title="<?= I18N::number($count) ?>"><?= $this->surnameInitial((string) $letter) ?></a> |
| 329 | - <?php else : ?> |
|
| 329 | + <?php else { |
|
| 330 | + : ?> |
|
| 330 | 331 | <span class="wt-initial px-1 text-muted"><?= $this->surnameInitial((string) $letter) ?></span> |
| 331 | 332 | |
| 332 | 333 | <?php endif ?> |
@@ -380,6 +381,7 @@ discard block |
||
| 380 | 381 | |
| 381 | 382 | if ($show === 'indi' || $show === 'surn') { |
| 382 | 383 | $surns = $this->surnames($tree, $surname, $alpha, $show_marnm === 'yes', $families, I18N::locale()); |
| 384 | +} |
|
| 383 | 385 | if ($show === 'surn') { |
| 384 | 386 | // Show the surname list |
| 385 | 387 | switch ($tree->getPreference('SURNAME_LIST_STYLE')) { |
@@ -112,7 +112,7 @@ |
||
| 112 | 112 | '<div class="gedcom-data" dir="ltr">' . |
| 113 | 113 | preg_replace_callback( |
| 114 | 114 | '/@(' . Gedcom::REGEX_XREF . ')@/', |
| 115 | - static function (array $match) use ($tree): string { |
|
| 115 | + static function (array $match) use ($tree) : string { |
|
| 116 | 116 | $record = Registry::gedcomRecordFactory()->make($match[1], $tree); |
| 117 | 117 | |
| 118 | 118 | return $record ? '<a href="' . e($record->url()) . '">' . $match[0] . '</a>' : $match[0]; |
@@ -94,7 +94,7 @@ |
||
| 94 | 94 | /** @var Collection<GedcomRecord> $records */ |
| 95 | 95 | $records = $rows->map(function (stdClass $row) use ($tree): ?GedcomRecord { |
| 96 | 96 | return $this->data_fix_service->getRecordByType($row->xref, $tree, $row->type); |
| 97 | - })->filter(static function (?GedcomRecord $record) use ($module, $params): bool { |
|
| 97 | + })->filter(static function (?GedcomRecord $record) use ($module, $params) : bool { |
|
| 98 | 98 | return $record instanceof GedcomRecord && !$record->isPendingDeletion() && $module->doesRecordNeedUpdate($record, $params); |
| 99 | 99 | }); |
| 100 | 100 | |
@@ -85,7 +85,7 @@ |
||
| 85 | 85 | } |
| 86 | 86 | |
| 87 | 87 | // Request for a non-existent location? |
| 88 | - if ($parent_id !== null && $parent->id() === null) { |
|
| 88 | + if ($parent_id !== null && $parent->id() === null) { |
|
| 89 | 89 | return redirect(route(__CLASS__)); |
| 90 | 90 | } |
| 91 | 91 | |
@@ -52,7 +52,7 @@ |
||
| 52 | 52 | */ |
| 53 | 53 | public function find(?int $user_id): ?User |
| 54 | 54 | { |
| 55 | - return Registry::cache()->array()->remember('user-' . $user_id, static function () use ($user_id): ?User { |
|
| 55 | + return Registry::cache()->array()->remember('user-' . $user_id, static function () use ($user_id) : ?User { |
|
| 56 | 56 | return DB::table('user') |
| 57 | 57 | ->where('user_id', '=', $user_id) |
| 58 | 58 | ->get() |