@@ -53,7 +53,7 @@ discard block |
||
| 53 | 53 | * |
| 54 | 54 | * @return ResponseInterface |
| 55 | 55 | */ |
| 56 | - public function redirectUrl(UriInterface|string $url, int $code = StatusCodeInterface::STATUS_FOUND): ResponseInterface; |
|
| 56 | + public function redirectUrl(UriInterface | string $url, int $code = StatusCodeInterface::STATUS_FOUND): ResponseInterface; |
|
| 57 | 57 | |
| 58 | 58 | /** |
| 59 | 59 | * @param string|array<mixed>|object $content |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | * |
| 63 | 63 | * @return ResponseInterface |
| 64 | 64 | */ |
| 65 | - public function response(string|array|object $content = '', int $code = StatusCodeInterface::STATUS_OK, array $headers = []): ResponseInterface; |
|
| 65 | + public function response(string | array | object $content = '', int $code = StatusCodeInterface::STATUS_OK, array $headers = []): ResponseInterface; |
|
| 66 | 66 | |
| 67 | 67 | /** |
| 68 | 68 | * Create and render a view, and embed it in an HTML page. |
@@ -85,7 +85,7 @@ discard block |
||
| 85 | 85 | * |
| 86 | 86 | * @return ResponseInterface |
| 87 | 87 | */ |
| 88 | - public function redirectUrl(UriInterface|string $url, int $code = StatusCodeInterface::STATUS_FOUND): ResponseInterface |
|
| 88 | + public function redirectUrl(UriInterface | string $url, int $code = StatusCodeInterface::STATUS_FOUND): ResponseInterface |
|
| 89 | 89 | { |
| 90 | 90 | return $this->response_factory |
| 91 | 91 | ->createResponse($code) |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | * |
| 100 | 100 | * @return ResponseInterface |
| 101 | 101 | */ |
| 102 | - public function response(string|array|object $content = '', int $code = StatusCodeInterface::STATUS_OK, array $headers = []): ResponseInterface |
|
| 102 | + public function response(string | array | object $content = '', int $code = StatusCodeInterface::STATUS_OK, array $headers = []): ResponseInterface |
|
| 103 | 103 | { |
| 104 | 104 | if ($content === '' && $code === StatusCodeInterface::STATUS_OK) { |
| 105 | 105 | $code = StatusCodeInterface::STATUS_NO_CONTENT; |
@@ -108,7 +108,7 @@ discard block |
||
| 108 | 108 | if (is_string($content)) { |
| 109 | 109 | $headers['content-type'] ??= 'text/html; charset=UTF-8'; |
| 110 | 110 | } else { |
| 111 | - $content = json_encode($content, JSON_THROW_ON_ERROR | JSON_UNESCAPED_UNICODE); |
|
| 111 | + $content = json_encode($content, JSON_THROW_ON_ERROR | JSON_UNESCAPED_UNICODE); |
|
| 112 | 112 | $headers['content-type'] ??= 'application/json'; |
| 113 | 113 | } |
| 114 | 114 | |
@@ -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 | } |
@@ -660,11 +660,11 @@ |
||
| 660 | 660 | */ |
| 661 | 661 | protected function surnameInitials(array $all_surnames): array |
| 662 | 662 | { |
| 663 | - $initials = []; |
|
| 663 | + $initials = []; |
|
| 664 | 664 | |
| 665 | 665 | // Ensure our own language comes before others. |
| 666 | 666 | foreach (I18N::language()->alphabet() as $initial) { |
| 667 | - $initials[$initial] = 0; |
|
| 667 | + $initials[$initial] = 0; |
|
| 668 | 668 | } |
| 669 | 669 | |
| 670 | 670 | foreach ($all_surnames as $surn => $surnames) { |
@@ -313,7 +313,8 @@ discard block |
||
| 313 | 313 | <li class="wt-initials-list-item d-flex"> |
| 314 | 314 | <?php if ($count > 0) : ?> |
| 315 | 315 | <a href="<?= e($this->listUrl($tree, ['alpha' => $letter, 'tree' => $tree->name()])) ?>" class="wt-initial px-1<?= $letter === $alpha ? ' active' : '' ?> '" title="<?= I18N::number($count) ?>"><?= $this->displaySurnameInitial((string) $letter) ?></a> |
| 316 | - <?php else : ?> |
|
| 316 | + <?php else { |
|
| 317 | + : ?> |
|
| 317 | 318 | <span class="wt-initial px-1 text-muted"><?= $this->displaySurnameInitial((string) $letter) ?></span> |
| 318 | 319 | |
| 319 | 320 | <?php endif ?> |
@@ -368,6 +369,7 @@ discard block |
||
| 368 | 369 | switch ($alpha) { |
| 369 | 370 | case '@': |
| 370 | 371 | $surns = array_filter($all_surnames, static fn (string $x): bool => $x === Individual::NOMEN_NESCIO, ARRAY_FILTER_USE_KEY); |
| 372 | +} |
|
| 371 | 373 | break; |
| 372 | 374 | case ',': |
| 373 | 375 | $surns = array_filter($all_surnames, static fn (string $x): bool => $x === '', ARRAY_FILTER_USE_KEY); |
@@ -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 | } |
@@ -67,7 +67,7 @@ |
||
| 67 | 67 | |
| 68 | 68 | $connection = new \Fisharebest\Webtrees\DB\Connection($pdo, $config['tblpfx']); |
| 69 | 69 | |
| 70 | - var_dump($connection->introspectSchema('webtrees'));exit; |
|
| 70 | + var_dump($connection->introspectSchema('webtrees')); exit; |
|
| 71 | 71 | |
| 72 | 72 | |
| 73 | 73 | |
@@ -59,7 +59,7 @@ discard block |
||
| 59 | 59 | */ |
| 60 | 60 | public function introspectSchema(string $schema_name = null): Schema |
| 61 | 61 | { |
| 62 | - $schema_name ??= $this->query(sql: 'SELECT DATABASE() AS schema_name')[0]->schema_name; |
|
| 62 | + $schema_name ??= $this->query(sql: 'SELECT DATABASE() AS schema_name')[0]->schema_name; |
|
| 63 | 63 | $pattern = $this->escapeLike(string: $this->prefix) . '%'; |
| 64 | 64 | $table_data = $this->getTableDataFromInformationSchema(schema_name: $schema_name, pattern: $pattern); |
| 65 | 65 | $column_data = $this->getColumnDataFromInformationSchema(schema_name: $schema_name, pattern: $pattern); |
@@ -157,7 +157,7 @@ discard block |
||
| 157 | 157 | * |
| 158 | 158 | * @return ColumnInterface |
| 159 | 159 | */ |
| 160 | - private function columnDefinitionToColumn(string $name, string $type, string|null $collation): ColumnInterface |
|
| 160 | + private function columnDefinitionToColumn(string $name, string $type, string | null $collation): ColumnInterface |
|
| 161 | 161 | { |
| 162 | 162 | if (preg_match('/^bit\((\d+)\)$/', $type, $match) === 1) { |
| 163 | 163 | return Schema::bit(name: $name, bits: (int) $match[1]); |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | * |
| 39 | 39 | * @return $this |
| 40 | 40 | */ |
| 41 | - public function default(int|string|Expression|null $default): static; |
|
| 41 | + public function default(int | string | Expression | null $default): static; |
|
| 42 | 42 | |
| 43 | 43 | /** |
| 44 | 44 | * @param bool $nullable |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | /** |
| 63 | 63 | * @return int|string|Expression|null |
| 64 | 64 | */ |
| 65 | - public function getDefault(): int|string|Expression|null; |
|
| 65 | + public function getDefault(): int | string | Expression | null; |
|
| 66 | 66 | |
| 67 | 67 | /** |
| 68 | 68 | * @return bool |