@@ -370,10 +370,10 @@ |
||
| 370 | 370 | } |
| 371 | 371 | |
| 372 | 372 | /** |
| 373 | - * @param ServerRequestInterface $request |
|
| 374 | - * |
|
| 375 | - * @return ResponseInterface |
|
| 376 | - */ |
|
| 373 | + * @param ServerRequestInterface $request |
|
| 374 | + * |
|
| 375 | + * @return ResponseInterface |
|
| 376 | + */ |
|
| 377 | 377 | public function duplicates(ServerRequestInterface $request): ResponseInterface |
| 378 | 378 | { |
| 379 | 379 | $tree = $request->getAttribute('tree'); |
@@ -37,12 +37,12 @@ |
||
| 37 | 37 | class EditIndividualController extends AbstractEditController |
| 38 | 38 | { |
| 39 | 39 | /** |
| 40 | - * Add a child to an existing individual (creating a one-parent family). |
|
| 41 | - * |
|
| 42 | - * @param ServerRequestInterface $request |
|
| 43 | - * |
|
| 44 | - * @return ResponseInterface |
|
| 45 | - */ |
|
| 40 | + * Add a child to an existing individual (creating a one-parent family). |
|
| 41 | + * |
|
| 42 | + * @param ServerRequestInterface $request |
|
| 43 | + * |
|
| 44 | + * @return ResponseInterface |
|
| 45 | + */ |
|
| 46 | 46 | public function addChild(ServerRequestInterface $request): ResponseInterface |
| 47 | 47 | { |
| 48 | 48 | $tree = $request->getAttribute('tree'); |
@@ -828,7 +828,7 @@ |
||
| 828 | 828 | // Until this can be re-designed, we need this assertion to help static analysis tools. |
| 829 | 829 | assert($this->current_element instanceof ReportBaseElement, new LogicException()); |
| 830 | 830 | |
| 831 | - $this->wt_report = array_pop($this->wt_report_stack); |
|
| 831 | + $this->wt_report = array_pop($this->wt_report_stack); |
|
| 832 | 832 | $this->wt_report->addElement($this->current_element); |
| 833 | 833 | } |
| 834 | 834 | |
@@ -78,7 +78,7 @@ |
||
| 78 | 78 | public function getIndividuals(Tree $tree, string $request): string |
| 79 | 79 | { |
| 80 | 80 | $json_requests = explode(';', $request); |
| 81 | - $r = []; |
|
| 81 | + $r = []; |
|
| 82 | 82 | foreach ($json_requests as $json_request) { |
| 83 | 83 | $firstLetter = substr($json_request, 0, 1); |
| 84 | 84 | $json_request = substr($json_request, 1); |
@@ -73,7 +73,7 @@ |
||
| 73 | 73 | |
| 74 | 74 | $users = ['' => '']; |
| 75 | 75 | foreach ($this->user_service->all() as $user) { |
| 76 | - $user_name = $user->userName(); |
|
| 76 | + $user_name = $user->userName(); |
|
| 77 | 77 | $users[$user_name] = $user_name; |
| 78 | 78 | } |
| 79 | 79 | |
@@ -192,7 +192,7 @@ |
||
| 192 | 192 | '<div class="gedcom-data" dir="ltr">' . |
| 193 | 193 | preg_replace_callback( |
| 194 | 194 | '/@(' . Gedcom::REGEX_XREF . ')@/', |
| 195 | - static function (array $match) use ($tree): string { |
|
| 195 | + static function (array $match) use ($tree) : string { |
|
| 196 | 196 | $record = GedcomRecord::getInstance($match[1], $tree); |
| 197 | 197 | |
| 198 | 198 | return $record ? '<a href="' . e($record->url()) . '">' . $match[0] . '</a>' : $match[0]; |
@@ -41,7 +41,7 @@ |
||
| 41 | 41 | */ |
| 42 | 42 | public function handle(ServerRequestInterface $request): ResponseInterface |
| 43 | 43 | { |
| 44 | - $tree = $request->getQueryParams()['ged']; |
|
| 44 | + $tree = $request->getQueryParams()['ged']; |
|
| 45 | 45 | assert(is_string($tree)); |
| 46 | 46 | |
| 47 | 47 | $xref = $request->getQueryParams()['mid']; |
@@ -175,7 +175,7 @@ |
||
| 175 | 175 | 'tree' => $tree->name(), |
| 176 | 176 | 'show_all' => 'yes', |
| 177 | 177 | ]; |
| 178 | - $show = $request->getQueryParams()['show'] ?? 'surn'; |
|
| 178 | + $show = $request->getQueryParams()['show'] ?? 'surn'; |
|
| 179 | 179 | } |
| 180 | 180 | } elseif ($surname !== '') { |
| 181 | 181 | $alpha = $this->localization_service->initialLetter($surname, $locale); // so we can highlight the initial letter |
@@ -249,7 +249,8 @@ discard block |
||
| 249 | 249 | <li class="wt-initials-list-item d-flex"> |
| 250 | 250 | <?php if ($count > 0) : ?> |
| 251 | 251 | <a href="<?= e(route('module', ['module' => $module, 'action' => $action, 'alpha' => $letter, 'tree' => $tree->name()])) ?>" class="wt-initial px-1<?= $letter === $alpha ? ' active' : '' ?> '" title="<?= I18N::number($count) ?>"><?= $this->surnameInitial((string) $letter) ?></a> |
| 252 | - <?php else : ?> |
|
| 252 | + <?php else { |
|
| 253 | + : ?> |
|
| 253 | 254 | <span class="wt-initial px-1 text-muted"><?= $this->surnameInitial((string) $letter) ?></span> |
| 254 | 255 | |
| 255 | 256 | <?php endif ?> |
@@ -303,6 +304,7 @@ discard block |
||
| 303 | 304 | |
| 304 | 305 | if ($show === 'indi' || $show === 'surn') { |
| 305 | 306 | $surns = $this->individual_list_service->surnames($surname, $alpha, $show_marnm === 'yes', $families, $locale); |
| 307 | +} |
|
| 306 | 308 | if ($show === 'surn') { |
| 307 | 309 | // Show the surname list |
| 308 | 310 | switch ($tree->getPreference('SURNAME_LIST_STYLE')) { |