@@ -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(); |
@@ -72,11 +72,11 @@ |
||
72 | 72 | $user->realName(), |
73 | 73 | $user->email(), |
74 | 74 | Auth::isAdmin(user: $user) ? 'Yes' : 'No', |
75 | - $user->getPreference(setting_name: UserInterface::PREF_IS_ACCOUNT_APPROVED) ? 'Yes' : 'No', |
|
76 | - $user->getPreference(setting_name: UserInterface::PREF_IS_EMAIL_VERIFIED) ? 'Yes' : 'No', |
|
77 | - $user->getPreference(setting_name: UserInterface::PREF_LANGUAGE), |
|
78 | - $user->getPreference(setting_name: UserInterface::PREF_TIME_ZONE), |
|
79 | - $user->getPreference(setting_name: UserInterface::PREF_CONTACT_METHOD), |
|
75 | + $user->getPreference(setting_name : UserInterface::PREF_IS_ACCOUNT_APPROVED) ? 'Yes' : 'No', |
|
76 | + $user->getPreference(setting_name : UserInterface::PREF_IS_EMAIL_VERIFIED) ? 'Yes' : 'No', |
|
77 | + $user->getPreference(setting_name : UserInterface::PREF_LANGUAGE), |
|
78 | + $user->getPreference(setting_name : UserInterface::PREF_TIME_ZONE), |
|
79 | + $user->getPreference(setting_name : UserInterface::PREF_CONTACT_METHOD), |
|
80 | 80 | $registered, |
81 | 81 | $last_login, |
82 | 82 | ]); |
@@ -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 === ''; |
@@ -130,7 +130,7 @@ discard block |
||
130 | 130 | return 6; |
131 | 131 | } |
132 | 132 | |
133 | - public function getMenu(Tree $tree): Menu|null |
|
133 | + public function getMenu(Tree $tree): Menu | null |
|
134 | 134 | { |
135 | 135 | $request = Registry::container()->get(ServerRequestInterface::class); |
136 | 136 | $route = Validator::attributes($request)->route(); |
@@ -353,7 +353,7 @@ discard block |
||
353 | 353 | $xrefs = array_map('strval', $xrefs); // PHP converts numeric keys to integers. |
354 | 354 | |
355 | 355 | // Fetch all the records in the cart. |
356 | - $records = array_map(static fn (string $xref): GedcomRecord|null => Registry::gedcomRecordFactory()->make($xref, $tree), $xrefs); |
|
356 | + $records = array_map(static fn (string $xref): GedcomRecord | null => Registry::gedcomRecordFactory()->make($xref, $tree), $xrefs); |
|
357 | 357 | |
358 | 358 | // Some records may have been deleted after they were added to the cart. |
359 | 359 | $records = array_filter($records); |
@@ -289,8 +289,8 @@ |
||
289 | 289 | public function check2facode(string $code2fa): bool |
290 | 290 | { |
291 | 291 | $secret = DB::table('user') |
292 | - ->where('user_id', '=', $this->id()) |
|
293 | - ->value('secret'); |
|
292 | + ->where('user_id', '=', $this->id()) |
|
293 | + ->value('secret'); |
|
294 | 294 | $google2fa = new Google2FA(); |
295 | 295 | if ($google2fa->verifyKey($secret, $code2fa)) { |
296 | 296 | return true; |