@@ -248,9 +248,9 @@ |
||
| 248 | 248 | protected function chart(Tree $tree, array $xrefs): ResponseInterface |
| 249 | 249 | { |
| 250 | 250 | /** @var Individual[] $individuals */ |
| 251 | - $individuals = array_map(static fn (string $xref): Individual|null => Registry::individualFactory()->make($xref, $tree), $xrefs); |
|
| 251 | + $individuals = array_map(static fn (string $xref): Individual | null => Registry::individualFactory()->make($xref, $tree), $xrefs); |
|
| 252 | 252 | |
| 253 | - $individuals = array_filter($individuals, static fn (Individual|null $individual): bool => $individual instanceof Individual && $individual->canShow()); |
|
| 253 | + $individuals = array_filter($individuals, static fn (Individual | null $individual): bool => $individual instanceof Individual && $individual->canShow()); |
|
| 254 | 254 | |
| 255 | 255 | // Sort the array in order of birth year |
| 256 | 256 | usort($individuals, Individual::birthDateComparator()); |
@@ -75,7 +75,7 @@ |
||
| 75 | 75 | /** |
| 76 | 76 | * Get the first media file that contains an image. |
| 77 | 77 | */ |
| 78 | - public function firstImageFile(): MediaFile|null |
|
| 78 | + public function firstImageFile(): MediaFile | null |
|
| 79 | 79 | { |
| 80 | 80 | return $this->mediaFiles() |
| 81 | 81 | ->first(static fn (MediaFile $media_file): bool => $media_file->isImage() && !$media_file->isExternal()); |
@@ -1069,7 +1069,7 @@ |
||
| 1069 | 1069 | * @param Expression|string $column |
| 1070 | 1070 | * @param array<string> $search_terms |
| 1071 | 1071 | */ |
| 1072 | - private function whereSearch(Builder $query, Expression|string $column, array $search_terms): void |
|
| 1072 | + private function whereSearch(Builder $query, Expression | string $column, array $search_terms): void |
|
| 1073 | 1073 | { |
| 1074 | 1074 | foreach ($search_terms as $search_term) { |
| 1075 | 1075 | $query->where($column, DB::iLike(), '%' . addcslashes($search_term, '\\%_') . '%'); |
@@ -140,7 +140,7 @@ discard block |
||
| 140 | 140 | return self::pdo()->getAttribute(PDO::ATTR_DRIVER_NAME); |
| 141 | 141 | } |
| 142 | 142 | |
| 143 | - public static function exec(string $sql): int|false |
|
| 143 | + public static function exec(string $sql): int | false |
|
| 144 | 144 | { |
| 145 | 145 | return self::pdo()->exec($sql); |
| 146 | 146 | } |
@@ -205,7 +205,7 @@ discard block |
||
| 205 | 205 | } |
| 206 | 206 | } |
| 207 | 207 | |
| 208 | - public static function binaryColumn(string $column, string|null $alias = null): Expression |
|
| 208 | + public static function binaryColumn(string $column, string | null $alias = null): Expression |
|
| 209 | 209 | { |
| 210 | 210 | if (self::driverName() === self::MYSQL) { |
| 211 | 211 | $sql = 'CAST(' . $column . ' AS binary)'; |
@@ -240,7 +240,7 @@ |
||
| 240 | 240 | /** |
| 241 | 241 | * Run the application. |
| 242 | 242 | */ |
| 243 | - public function run(string $php_sapi): int|ResponseInterface |
|
| 243 | + public function run(string $php_sapi): int | ResponseInterface |
|
| 244 | 244 | { |
| 245 | 245 | if ($php_sapi === 'cli') { |
| 246 | 246 | return $this->bootstrap()->cliRequest(); |
@@ -88,7 +88,7 @@ discard block |
||
| 88 | 88 | $mime_type = Mime::DEFAULT_TYPE; |
| 89 | 89 | } |
| 90 | 90 | |
| 91 | - $filename = $download ? addcslashes(string: basename(path: $path), characters: '"') : ''; |
|
| 91 | + $filename = $download ? addcslashes(string : basename(path : $path), characters : '"') : ''; |
|
| 92 | 92 | |
| 93 | 93 | return $this->imageResponse(data: $filesystem->read(location: $path), mime_type: $mime_type, filename: $filename); |
| 94 | 94 | } catch (UnableToReadFile | FilesystemException $ex) { |
@@ -147,7 +147,7 @@ discard block |
||
| 147 | 147 | $image = $this->imageManager()->read(input: $filesystem->readStream($path)); |
| 148 | 148 | $watermark = $this->createWatermark(width: $image->width(), height: $image->height(), media_file: $media_file); |
| 149 | 149 | $image = $this->addWatermark(image: $image, watermark: $watermark); |
| 150 | - $filename = $download ? basename(path: $path) : ''; |
|
| 150 | + $filename = $download ? basename(path : $path) : ''; |
|
| 151 | 151 | $quality = $this->extractImageQuality(image: $image, default: static::GD_DEFAULT_IMAGE_QUALITY); |
| 152 | 152 | $data = $image->encodeByMediaType(type: $mime_type, quality: $quality)->toString(); |
| 153 | 153 | |
@@ -3,19 +3,19 @@ |
||
| 3 | 3 | declare(strict_types=1); |
| 4 | 4 | |
| 5 | 5 | return array ( |
| 6 | - '%H:%i:%s' => '%g:%i:%s %a', |
|
| 7 | - '%j %F %Y' => '%F %j, %Y', |
|
| 8 | - 'Asunción, Paraguay' => 'Asuncion, Paraguay', |
|
| 9 | - 'Bogotá, Colombia' => 'Bogota, Colombia', |
|
| 10 | - 'Ciudad Juárez, Mexico' => 'Ciudad Juarez, Mexico', |
|
| 11 | - 'Colonia Juárez, Mexico' => 'Colonia Juarez, Mexico', |
|
| 12 | - 'Curaçao' => 'Curacao', |
|
| 13 | - 'Córdoba, Argentina' => 'Cordoba, Argentina', |
|
| 14 | - 'Côte d’Ivoire' => 'Cote d’Ivoire', |
|
| 15 | - 'Réunion' => 'Reunion', |
|
| 16 | - 'Saint Barthélemy' => 'Saint Barthelemy', |
|
| 17 | - 'San José, Costa Rica' => 'San Jose, Costa Rica', |
|
| 18 | - 'São Paulo, Brazil' => 'Sao Paulo, Brazil', |
|
| 19 | - 'Tuxtla Gutiérrez, Mexico' => 'Tuxtla Gutierrez, Mexico', |
|
| 20 | - 'Åland Islands' => 'Aland Islands', |
|
| 6 | + '%H:%i:%s' => '%g:%i:%s %a', |
|
| 7 | + '%j %F %Y' => '%F %j, %Y', |
|
| 8 | + 'Asunción, Paraguay' => 'Asuncion, Paraguay', |
|
| 9 | + 'Bogotá, Colombia' => 'Bogota, Colombia', |
|
| 10 | + 'Ciudad Juárez, Mexico' => 'Ciudad Juarez, Mexico', |
|
| 11 | + 'Colonia Juárez, Mexico' => 'Colonia Juarez, Mexico', |
|
| 12 | + 'Curaçao' => 'Curacao', |
|
| 13 | + 'Córdoba, Argentina' => 'Cordoba, Argentina', |
|
| 14 | + 'Côte d’Ivoire' => 'Cote d’Ivoire', |
|
| 15 | + 'Réunion' => 'Reunion', |
|
| 16 | + 'Saint Barthélemy' => 'Saint Barthelemy', |
|
| 17 | + 'San José, Costa Rica' => 'San Jose, Costa Rica', |
|
| 18 | + 'São Paulo, Brazil' => 'Sao Paulo, Brazil', |
|
| 19 | + 'Tuxtla Gutiérrez, Mexico' => 'Tuxtla Gutierrez, Mexico', |
|
| 20 | + 'Åland Islands' => 'Aland Islands', |
|
| 21 | 21 | ); |
@@ -2,7 +2,7 @@ |
||
| 2 | 2 | |
| 3 | 3 | declare(strict_types=1); |
| 4 | 4 | |
| 5 | -return array ( |
|
| 5 | +return array( |
|
| 6 | 6 | '%H:%i:%s' => '%g:%i:%s %a', |
| 7 | 7 | '%j %F %Y' => '%F %j, %Y', |
| 8 | 8 | 'Asunción, Paraguay' => 'Asuncion, Paraguay', |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | /** |
| 66 | 66 | * Find the father of an individual |
| 67 | 67 | */ |
| 68 | - public function father(Individual $individual): Individual|null |
|
| 68 | + public function father(Individual $individual): Individual | null |
|
| 69 | 69 | { |
| 70 | 70 | $family = $individual->childFamilies()->first(); |
| 71 | 71 | |
@@ -79,7 +79,7 @@ discard block |
||
| 79 | 79 | /** |
| 80 | 80 | * Find the mother of an individual |
| 81 | 81 | */ |
| 82 | - public function mother(Individual $individual): Individual|null |
|
| 82 | + public function mother(Individual $individual): Individual | null |
|
| 83 | 83 | { |
| 84 | 84 | $family = $individual->childFamilies()->first(); |
| 85 | 85 | |
@@ -93,7 +93,7 @@ discard block |
||
| 93 | 93 | /** |
| 94 | 94 | * Find the current spouse family of an individual |
| 95 | 95 | */ |
| 96 | - public function spouseFamily(Individual $individual): Family|null |
|
| 96 | + public function spouseFamily(Individual $individual): Family | null |
|
| 97 | 97 | { |
| 98 | 98 | return $individual->spouseFamilies() |
| 99 | 99 | // Exclude families that were created after this census date |
@@ -304,7 +304,8 @@ discard block |
||
| 304 | 304 | <li class="wt-initials-list-item d-flex"> |
| 305 | 305 | <?php if ($count > 0) : ?> |
| 306 | 306 | <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> |
| 307 | - <?php else : ?> |
|
| 307 | + <?php else { |
|
| 308 | + : ?> |
|
| 308 | 309 | <span class="wt-initial px-1 text-muted"><?= $this->displaySurnameInitial((string) $letter) ?></span> |
| 309 | 310 | |
| 310 | 311 | <?php endif ?> |
@@ -359,6 +360,7 @@ discard block |
||
| 359 | 360 | switch ($alpha) { |
| 360 | 361 | case '@': |
| 361 | 362 | $filter = static fn (string $x): bool => $x === Individual::NOMEN_NESCIO; |
| 363 | +} |
|
| 362 | 364 | break; |
| 363 | 365 | case ',': |
| 364 | 366 | $filter = static fn (string $x): bool => $x === ''; |