@@ -88,7 +88,7 @@ |
||
| 88 | 88 | $repository = Auth::checkRepositoryAccess($repository, false); |
| 89 | 89 | |
| 90 | 90 | // Redirect to correct xref/slug |
| 91 | - if ($repository->xref() !== $xref || $request->getAttribute('slug') !== $repository->slug()) { |
|
| 91 | + if ($repository->xref() !== $xref || $request->getAttribute('slug') !== $repository->slug()) { |
|
| 92 | 92 | return redirect($repository->url(), StatusCodeInterface::STATUS_MOVED_PERMANENTLY); |
| 93 | 93 | } |
| 94 | 94 | |
@@ -545,7 +545,7 @@ discard block |
||
| 545 | 545 | $tree = $request->getAttribute('tree'); |
| 546 | 546 | assert($tree instanceof Tree); |
| 547 | 547 | |
| 548 | - $xref = $request->getQueryParams()['xref']; |
|
| 548 | + $xref = $request->getQueryParams()['xref']; |
|
| 549 | 549 | |
| 550 | 550 | $individual = Individual::getInstance($xref, $tree); |
| 551 | 551 | $individual = Auth::checkIndividualAccess($individual, true); |
@@ -557,7 +557,7 @@ discard block |
||
| 557 | 557 | $family = Family::getInstance($famid, $tree); |
| 558 | 558 | $family = Auth::checkFamilyAccess($family, true); |
| 559 | 559 | |
| 560 | - $PEDI = $params['PEDI']; |
|
| 560 | + $PEDI = $params['PEDI']; |
|
| 561 | 561 | |
| 562 | 562 | // Replace any existing child->family link (we may be changing the PEDI); |
| 563 | 563 | $fact_id = ''; |
@@ -629,7 +629,7 @@ discard block |
||
| 629 | 629 | $tree = $request->getAttribute('tree'); |
| 630 | 630 | assert($tree instanceof Tree); |
| 631 | 631 | |
| 632 | - $xref = $request->getQueryParams()['xref']; |
|
| 632 | + $xref = $request->getQueryParams()['xref']; |
|
| 633 | 633 | |
| 634 | 634 | $individual = Individual::getInstance($xref, $tree); |
| 635 | 635 | $individual = Auth::checkIndividualAccess($individual, true); |
@@ -907,7 +907,7 @@ |
||
| 907 | 907 | private function filterActiveBlocks(Collection $blocks, Collection $active_blocks): Collection |
| 908 | 908 | { |
| 909 | 909 | return $blocks->map(static function (string $block_name) use ($active_blocks): ?ModuleBlockInterface { |
| 910 | - return $active_blocks->filter(static function (ModuleInterface $block) use ($block_name): bool { |
|
| 910 | + return $active_blocks->filter(static function (ModuleInterface $block) use ($block_name) : bool { |
|
| 911 | 911 | return $block->name() === $block_name; |
| 912 | 912 | })->first(); |
| 913 | 913 | })->filter(); |
@@ -87,7 +87,7 @@ |
||
| 87 | 87 | "\n", |
| 88 | 88 | ' ', |
| 89 | 89 | ], $t); |
| 90 | - $t = strip_tags($t); |
|
| 90 | + $t = strip_tags($t); |
|
| 91 | 91 | $this->text .= $t; |
| 92 | 92 | } |
| 93 | 93 | |
@@ -383,7 +383,7 @@ |
||
| 383 | 383 | $this->upgrade_service->cleanFiles($root_filesystem, $folders_to_clean, $files_to_keep); |
| 384 | 384 | |
| 385 | 385 | $url = route(ControlPanel::class); |
| 386 | - $alert = I18N::translate('The upgrade is complete.'); |
|
| 386 | + $alert = I18N::translate('The upgrade is complete.'); |
|
| 387 | 387 | $button = '<a href="' . e($url) . '" class="btn btn-primary">' . I18N::translate('continue') . '</a>'; |
| 388 | 388 | |
| 389 | 389 | return response(view('components/alert-success', [ |
@@ -485,7 +485,7 @@ discard block |
||
| 485 | 485 | */ |
| 486 | 486 | private function applyFilter(array $facts, string $filterof, string $filtersx): array |
| 487 | 487 | { |
| 488 | - $filtered = []; |
|
| 488 | + $filtered = []; |
|
| 489 | 489 | $hundred_years_ago = Carbon::now()->subYears(100)->julianDay(); |
| 490 | 490 | foreach ($facts as $fact) { |
| 491 | 491 | $record = $fact->record(); |
@@ -558,7 +558,7 @@ discard block |
||
| 558 | 558 | $html = ''; |
| 559 | 559 | |
| 560 | 560 | foreach ($list as $xref => $facts) { |
| 561 | - $tmp = GedcomRecord::getInstance((string) $xref, $tree); |
|
| 561 | + $tmp = GedcomRecord::getInstance((string) $xref, $tree); |
|
| 562 | 562 | $html .= $tag1 . '<a href="' . e($tmp->url()) . '">' . $tmp->fullName() . '</a> '; |
| 563 | 563 | $html .= '<div class="indent">' . $facts . '</div>' . $tag2; |
| 564 | 564 | } |
@@ -219,7 +219,7 @@ |
||
| 219 | 219 | */ |
| 220 | 220 | private function surnamesToAdd(Individual $record): array |
| 221 | 221 | { |
| 222 | - $tree = $record->tree(); |
|
| 222 | + $tree = $record->tree(); |
|
| 223 | 223 | |
| 224 | 224 | $wife_surnames = $this->surnames($record); |
| 225 | 225 | $husb_surnames = []; |
@@ -97,7 +97,7 @@ |
||
| 97 | 97 | 'action' => 'update', |
| 98 | 98 | 'xref' => $row->xref, |
| 99 | 99 | ] + $params); |
| 100 | - $update_url = route(DataFixUpdate::class, [ |
|
| 100 | + $update_url = route(DataFixUpdate::class, [ |
|
| 101 | 101 | 'tree' => $tree->name(), |
| 102 | 102 | 'data_fix' => $module->name(), |
| 103 | 103 | 'action' => 'update', |
@@ -103,7 +103,7 @@ |
||
| 103 | 103 | return $row->xref >= $start && $row->xref <= $end; |
| 104 | 104 | })->map(function (stdClass $row) use ($tree): ?GedcomRecord { |
| 105 | 105 | return $this->data_fix_service->getRecordByType($row->xref, $tree, $row->type); |
| 106 | - })->filter(static function (?GedcomRecord $record) use ($module, $params): bool { |
|
| 106 | + })->filter(static function (?GedcomRecord $record) use ($module, $params) : bool { |
|
| 107 | 107 | return $record instanceof GedcomRecord && !$record->isPendingDeletion() && $module->doesRecordNeedUpdate($record, $params); |
| 108 | 108 | }); |
| 109 | 109 | |