@@ -157,7 +157,7 @@ discard block |
||
| 157 | 157 | } |
| 158 | 158 | } |
| 159 | 159 | |
| 160 | - if ($values[$i] !== '' || $children_with_values && !$element instanceof AbstractXrefElement) { |
|
| 160 | + if ($values[$i] !== '' || $children_with_values && !$element instanceof AbstractXrefElement) { |
|
| 161 | 161 | if ($values[$i] === '') { |
| 162 | 162 | $gedcom_lines[] = $levels[$i] . ' ' . $tags[$i]; |
| 163 | 163 | } else { |
@@ -231,7 +231,7 @@ discard block |
||
| 231 | 231 | * |
| 232 | 232 | * @return array<string> |
| 233 | 233 | */ |
| 234 | - public function factsToAdd(Family|Individual $record, bool $include_hidden): array |
|
| 234 | + public function factsToAdd(Family | Individual $record, bool $include_hidden): array |
|
| 235 | 235 | { |
| 236 | 236 | $subtags = Registry::elementFactory()->make($record->tag())->subtags(); |
| 237 | 237 | |
@@ -114,7 +114,7 @@ |
||
| 114 | 114 | * |
| 115 | 115 | * @return ResponseInterface |
| 116 | 116 | */ |
| 117 | -function response(array|object|string $content = '', int $code = StatusCodeInterface::STATUS_OK, array $headers = []): ResponseInterface |
|
| 117 | +function response(array | object | string $content = '', int $code = StatusCodeInterface::STATUS_OK, array $headers = []): ResponseInterface |
|
| 118 | 118 | { |
| 119 | 119 | return Registry::responseFactory()->response($content, $code, $headers); |
| 120 | 120 | } |
@@ -301,7 +301,7 @@ |
||
| 301 | 301 | { |
| 302 | 302 | $latest_version = $this->fetchLatestVersion(false); |
| 303 | 303 | |
| 304 | - [, , $url] = explode('|', $latest_version . '||'); |
|
| 304 | + [,, $url] = explode('|', $latest_version . '||'); |
|
| 305 | 305 | |
| 306 | 306 | return $url; |
| 307 | 307 | } |
@@ -37,9 +37,9 @@ discard block |
||
| 37 | 37 | private readonly bool $unsigned = false, |
| 38 | 38 | private readonly bool $fixed = false, |
| 39 | 39 | private readonly bool $nullable = false, |
| 40 | - private readonly float|int|string|null $default = null, |
|
| 40 | + private readonly float | int | string | null $default = null, |
|
| 41 | 41 | private readonly bool $autoincrement = false, |
| 42 | - private readonly string|null $collation = null, |
|
| 42 | + private readonly string | null $collation = null, |
|
| 43 | 43 | ) { |
| 44 | 44 | } |
| 45 | 45 | |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | ); |
| 61 | 61 | } |
| 62 | 62 | |
| 63 | - public function default(float|int|string $default): self |
|
| 63 | + public function default(float | int | string $default): self |
|
| 64 | 64 | { |
| 65 | 65 | return new self( |
| 66 | 66 | name: $this->name, |
@@ -107,7 +107,7 @@ |
||
| 107 | 107 | return (object) []; |
| 108 | 108 | } |
| 109 | 109 | |
| 110 | - public function first(): string|int|float|null |
|
| 110 | + public function first(): string | int | float | null |
|
| 111 | 111 | { |
| 112 | 112 | return 0; |
| 113 | 113 | } |
@@ -1070,7 +1070,7 @@ |
||
| 1070 | 1070 | * @param Expression|string $column |
| 1071 | 1071 | * @param array<string> $search_terms |
| 1072 | 1072 | */ |
| 1073 | - private function whereSearch(Builder $query, Expression|string $column, array $search_terms): void |
|
| 1073 | + private function whereSearch(Builder $query, Expression | string $column, array $search_terms): void |
|
| 1074 | 1074 | { |
| 1075 | 1075 | foreach ($search_terms as $search_term) { |
| 1076 | 1076 | $query->where($column, $this->iLike(), '%' . addcslashes($search_term, '\\%_') . '%'); |
@@ -290,7 +290,8 @@ discard block |
||
| 290 | 290 | <li class="wt-initials-list-item d-flex"> |
| 291 | 291 | <?php if ($count > 0) : ?> |
| 292 | 292 | <a href="<?= e($this->listUrl($tree, ['alpha' => $letter, 'show_marnm' => $show_marnm, 'tree' => $tree->name()])) ?>" class="wt-initial px-1<?= $letter === $alpha ? ' active' : '' ?> '" title="<?= I18N::number($count) ?>"><?= $this->displaySurnameInitial((string) $letter) ?></a> |
| 293 | - <?php else : ?> |
|
| 293 | + <?php else { |
|
| 294 | + : ?> |
|
| 294 | 295 | <span class="wt-initial px-1 text-muted"><?= $this->displaySurnameInitial((string) $letter) ?></span> |
| 295 | 296 | |
| 296 | 297 | <?php endif ?> |
@@ -345,6 +346,7 @@ discard block |
||
| 345 | 346 | switch ($alpha) { |
| 346 | 347 | case '@': |
| 347 | 348 | $filter = static fn(string $x): bool => $x === Individual::NOMEN_NESCIO; |
| 349 | +} |
|
| 348 | 350 | break; |
| 349 | 351 | case ',': |
| 350 | 352 | $filter = static fn(string $x): bool => $x === ''; |
@@ -216,7 +216,7 @@ discard block |
||
| 216 | 216 | $surname_initials = $this->surnameInitials($surname_data); |
| 217 | 217 | |
| 218 | 218 | // We've requested a surname that doesn't currently exist. |
| 219 | - if ($surname !== '' && !array_key_exists($surname, $all_surns)) { |
|
| 219 | + if ($surname !== '' && !array_key_exists($surname, $all_surns)) { |
|
| 220 | 220 | $message = I18N::translate('There are no individuals with the surname “%s”', e($surname)); |
| 221 | 221 | FlashMessages::addMessage($message); |
| 222 | 222 | |
@@ -604,7 +604,7 @@ discard block |
||
| 604 | 604 | ->groupBy([$this->binaryColumn('n_givn')]); |
| 605 | 605 | |
| 606 | 606 | foreach ($query->get() as $row) { |
| 607 | - $initial = I18N::strtoupper(I18N::language()->initialLetter($row->n_givn)); |
|
| 607 | + $initial = I18N::strtoupper(I18N::language()->initialLetter($row->n_givn)); |
|
| 608 | 608 | $initials[$initial] ??= 0; |
| 609 | 609 | $initials[$initial] += (int) $row->count; |
| 610 | 610 | } |
@@ -832,7 +832,7 @@ discard block |
||
| 832 | 832 | * |
| 833 | 833 | * @return Expression |
| 834 | 834 | */ |
| 835 | - private function binaryColumn(string $column, string|null $alias = null): Expression |
|
| 835 | + private function binaryColumn(string $column, string | null $alias = null): Expression |
|
| 836 | 836 | { |
| 837 | 837 | if (DB::driverName() === 'mysql') { |
| 838 | 838 | $sql = 'CAST(' . $column . ' AS binary)'; |
@@ -114,7 +114,7 @@ |
||
| 114 | 114 | |
| 115 | 115 | // Only update session once a minute to reduce contention on the session table. |
| 116 | 116 | if ($now->subtractMinutes(1)->timestamp() > Registry::timestampFactory()->fromString($this->row->session_time)->timestamp()) { |
| 117 | - $updates['session_time'] = $now->toDateTimeString(); |
|
| 117 | + $updates['session_time'] = $now->toDateTimeString(); |
|
| 118 | 118 | } |
| 119 | 119 | |
| 120 | 120 | if ($updates !== []) { |
@@ -32,7 +32,7 @@ discard block |
||
| 32 | 32 | * |
| 33 | 33 | * @return string |
| 34 | 34 | */ |
| 35 | - public function autolink(string $markdown, Tree|null $tree = null): string; |
|
| 35 | + public function autolink(string $markdown, Tree | null $tree = null): string; |
|
| 36 | 36 | |
| 37 | 37 | /** |
| 38 | 38 | * @param string $markdown |
@@ -40,5 +40,5 @@ discard block |
||
| 40 | 40 | * |
| 41 | 41 | * @return string |
| 42 | 42 | */ |
| 43 | - public function markdown(string $markdown, Tree|null $tree = null): string; |
|
| 43 | + public function markdown(string $markdown, Tree | null $tree = null): string; |
|
| 44 | 44 | } |