@@ -183,7 +183,7 @@ discard block |
||
| 183 | 183 | $currentLen = $endPos + 2; |
| 184 | 184 | $directive = substr($workingText, 0, $currentLen); |
| 185 | 185 | $workingText = substr($workingText, $currentLen); |
| 186 | - $result .= self::$waitingText . $directive; |
|
| 186 | + $result .= self::$waitingText . $directive; |
|
| 187 | 187 | self::$waitingText = ''; |
| 188 | 188 | break; |
| 189 | 189 | } |
@@ -1125,7 +1125,7 @@ discard block |
||
| 1125 | 1125 | |
| 1126 | 1126 | // We're done: finish the span |
| 1127 | 1127 | $textSpan = self::starredName($textSpan, 'RTL'); // Wrap starred name in <u> and </u> tags |
| 1128 | - $result .= $textSpan . self::END_RTL; |
|
| 1128 | + $result .= $textSpan . self::END_RTL; |
|
| 1129 | 1129 | } |
| 1130 | 1130 | |
| 1131 | 1131 | if (self::$currentState !== 'LTR' && self::$currentState !== 'RTL') { |
@@ -64,7 +64,7 @@ |
||
| 64 | 64 | '_TODO', |
| 65 | 65 | 'CHAN', |
| 66 | 66 | ]; |
| 67 | - protected const BHEIGHT = 30; |
|
| 67 | + protected const BHEIGHT = 30; |
|
| 68 | 68 | |
| 69 | 69 | // Box height |
| 70 | 70 | |
@@ -299,6 +299,6 @@ |
||
| 299 | 299 | */ |
| 300 | 300 | private function dmyOrder(): string |
| 301 | 301 | { |
| 302 | - return preg_replace('/[^DMY]/', '', str_replace(['J', 'F',], ['D', 'M',], I18N::dateFormat())); |
|
| 302 | + return preg_replace('/[^DMY]/', '', str_replace(['J', 'F', ], ['D', 'M', ], I18N::dateFormat())); |
|
| 303 | 303 | } |
| 304 | 304 | } |
@@ -188,7 +188,7 @@ |
||
| 188 | 188 | $params['tree'] = $media_file->media()->tree()->name(); |
| 189 | 189 | $this->glideSignature()->validateRequest('', $params); |
| 190 | 190 | |
| 191 | - $path = $media_file->media()->tree()->getPreference('MEDIA_DIRECTORY', 'media/') . $media_file->filename(); |
|
| 191 | + $path = $media_file->media()->tree()->getPreference('MEDIA_DIRECTORY', 'media/') . $media_file->filename(); |
|
| 192 | 192 | $folder = dirname($path); |
| 193 | 193 | |
| 194 | 194 | $cache_path = 'thumbnail-cache/' . md5($folder); |
@@ -124,7 +124,7 @@ |
||
| 124 | 124 | */ |
| 125 | 125 | public function findByName($name): ?Tree |
| 126 | 126 | { |
| 127 | - return $this->all()->first(static function (Tree $tree) use ($name): bool { |
|
| 127 | + return $this->all()->first(static function (Tree $tree) use ($name) : bool { |
|
| 128 | 128 | return $tree->name() === $name; |
| 129 | 129 | }); |
| 130 | 130 | } |
@@ -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'); |
@@ -166,7 +166,7 @@ |
||
| 166 | 166 | 'tree' => $tree->name(), |
| 167 | 167 | 'show_all' => 'yes', |
| 168 | 168 | ]; |
| 169 | - $show = $request->getQueryParams()['show'] ?? 'surn'; |
|
| 169 | + $show = $request->getQueryParams()['show'] ?? 'surn'; |
|
| 170 | 170 | } |
| 171 | 171 | } elseif ($surname) { |
| 172 | 172 | $alpha = $this->localization_service->initialLetter($surname); // so we can highlight the initial letter |
@@ -240,7 +240,8 @@ discard block |
||
| 240 | 240 | <li class="wt-initials-list-item d-flex"> |
| 241 | 241 | <?php if ($count > 0) : ?> |
| 242 | 242 | <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> |
| 243 | - <?php else : ?> |
|
| 243 | + <?php else { |
|
| 244 | + : ?> |
|
| 244 | 245 | <span class="wt-initial px-1 text-muted"><?= $this->surnameInitial((string) $letter) ?></span> |
| 245 | 246 | |
| 246 | 247 | <?php endif ?> |
@@ -294,6 +295,7 @@ discard block |
||
| 294 | 295 | |
| 295 | 296 | if ($show === 'indi' || $show === 'surn') { |
| 296 | 297 | $surns = $this->individual_list_service->surnames($surname, $alpha, $show_marnm === 'yes', $families, WT_LOCALE, I18N::collation()); |
| 298 | +} |
|
| 297 | 299 | if ($show === 'surn') { |
| 298 | 300 | // Show the surname list |
| 299 | 301 | switch ($tree->getPreference('SURNAME_LIST_STYLE')) { |
@@ -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'); |
@@ -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), new InvalidArgumentException()); |
| 46 | 46 | |
| 47 | 47 | $xref = $request->getQueryParams()['mid']; |