@@ -48,7 +48,7 @@ |
||
48 | 48 | * |
49 | 49 | * @return Menu|null |
50 | 50 | */ |
51 | - public function chartBoxMenu(Individual $individual): Menu|null |
|
51 | + public function chartBoxMenu(Individual $individual): Menu | null |
|
52 | 52 | { |
53 | 53 | return null; |
54 | 54 | } |
@@ -130,7 +130,7 @@ discard block |
||
130 | 130 | * |
131 | 131 | * @return Menu|null |
132 | 132 | */ |
133 | - public function chartBoxMenu(Individual $individual): Menu|null |
|
133 | + public function chartBoxMenu(Individual $individual): Menu | null |
|
134 | 134 | { |
135 | 135 | return $this->chartMenu($individual); |
136 | 136 | } |
@@ -200,7 +200,7 @@ discard block |
||
200 | 200 | |
201 | 201 | // Father’s ancestors link to the father’s pedigree |
202 | 202 | // Mother’s ancestors link to the mother’s pedigree.. |
203 | - $links = $ancestors->map(function (Individual|null $individual, $sosa) use ($ancestors, $style, $generations): string { |
|
203 | + $links = $ancestors->map(function (Individual | null $individual, $sosa) use ($ancestors, $style, $generations): string { |
|
204 | 204 | if ($individual instanceof Individual && $sosa >= 2 ** $generations / 2 && $individual->childFamilies()->isNotEmpty()) { |
205 | 205 | // The last row/column, and there are more generations. |
206 | 206 | if ($sosa >= 2 ** $generations * 3 / 4) { |
@@ -34,7 +34,7 @@ |
||
34 | 34 | * |
35 | 35 | * @return Menu|null |
36 | 36 | */ |
37 | - public function listMenu(Tree $tree): Menu|null; |
|
37 | + public function listMenu(Tree $tree): Menu | null; |
|
38 | 38 | |
39 | 39 | /** |
40 | 40 | * CSS class for the menu. |
@@ -98,7 +98,7 @@ |
||
98 | 98 | * |
99 | 99 | * @return Menu|null |
100 | 100 | */ |
101 | - public function getMenu(Tree $tree): Menu|null |
|
101 | + public function getMenu(Tree $tree): Menu | null |
|
102 | 102 | { |
103 | 103 | if ($this->faqsExist($tree, I18N::languageTag())) { |
104 | 104 | return new Menu($this->title(), route('module', [ |
@@ -30,7 +30,7 @@ |
||
30 | 30 | /** |
31 | 31 | * A menu item for this chart for an individual box in a chart. |
32 | 32 | */ |
33 | - public function chartBoxMenu(Individual $individual): Menu|null; |
|
33 | + public function chartBoxMenu(Individual $individual): Menu | null; |
|
34 | 34 | |
35 | 35 | /** |
36 | 36 | * A main menu item for this chart. |
@@ -338,7 +338,7 @@ |
||
338 | 338 | * |
339 | 339 | * @return array{columns:array<array<Place>>,place:Place,tree:Tree,col_class:string}|null |
340 | 340 | */ |
341 | - private function getHierarchy(Place $place): array|null |
|
341 | + private function getHierarchy(Place $place): array | null |
|
342 | 342 | { |
343 | 343 | $child_places = $place->getChildPlaces(); |
344 | 344 | $numfound = count($child_places); |
@@ -80,7 +80,7 @@ |
||
80 | 80 | /** |
81 | 81 | * A menu, to be added to the main application menu. |
82 | 82 | */ |
83 | - public function getMenu(Tree $tree): Menu|null |
|
83 | + public function getMenu(Tree $tree): Menu | null |
|
84 | 84 | { |
85 | 85 | $request = Registry::container()->get(ServerRequestInterface::class); |
86 | 86 | $xref = Validator::attributes($request)->isXref()->string('xref', ''); |
@@ -200,7 +200,7 @@ discard block |
||
200 | 200 | * |
201 | 201 | * @return Menu|null |
202 | 202 | */ |
203 | - public function menuChangeBlocks(Tree $tree): Menu|null |
|
203 | + public function menuChangeBlocks(Tree $tree): Menu | null |
|
204 | 204 | { |
205 | 205 | $request = Registry::container()->get(ServerRequestInterface::class); |
206 | 206 | $route = Validator::attributes($request)->route(); |
@@ -223,7 +223,7 @@ discard block |
||
223 | 223 | * |
224 | 224 | * @return Menu|null |
225 | 225 | */ |
226 | - public function menuControlPanel(Tree $tree): Menu|null |
|
226 | + public function menuControlPanel(Tree $tree): Menu | null |
|
227 | 227 | { |
228 | 228 | if (Auth::isAdmin()) { |
229 | 229 | return new Menu(I18N::translate('Control panel'), route(ControlPanel::class), 'menu-admin'); |
@@ -241,7 +241,7 @@ discard block |
||
241 | 241 | * |
242 | 242 | * @return Menu|null |
243 | 243 | */ |
244 | - public function menuLanguages(): Menu|null |
|
244 | + public function menuLanguages(): Menu | null |
|
245 | 245 | { |
246 | 246 | $menu = new Menu(I18N::translate('Language'), '#', 'menu-language'); |
247 | 247 | |
@@ -265,7 +265,7 @@ discard block |
||
265 | 265 | * |
266 | 266 | * @return Menu|null |
267 | 267 | */ |
268 | - public function menuLogin(): Menu|null |
|
268 | + public function menuLogin(): Menu | null |
|
269 | 269 | { |
270 | 270 | if (Auth::check()) { |
271 | 271 | return null; |
@@ -294,7 +294,7 @@ discard block |
||
294 | 294 | * |
295 | 295 | * @return Menu|null |
296 | 296 | */ |
297 | - public function menuLogout(): Menu|null |
|
297 | + public function menuLogout(): Menu | null |
|
298 | 298 | { |
299 | 299 | if (Auth::check()) { |
300 | 300 | $parameters = [ |
@@ -315,7 +315,7 @@ discard block |
||
315 | 315 | * |
316 | 316 | * @return Menu |
317 | 317 | */ |
318 | - public function menuMyAccount(Tree|null $tree): Menu |
|
318 | + public function menuMyAccount(Tree | null $tree): Menu |
|
319 | 319 | { |
320 | 320 | $url = route(AccountEdit::class, ['tree' => $tree?->name()]); |
321 | 321 | |
@@ -329,7 +329,7 @@ discard block |
||
329 | 329 | * |
330 | 330 | * @return Menu|null |
331 | 331 | */ |
332 | - public function menuMyIndividualRecord(Tree $tree): Menu|null |
|
332 | + public function menuMyIndividualRecord(Tree $tree): Menu | null |
|
333 | 333 | { |
334 | 334 | $record = Registry::individualFactory()->make($tree->getUserPreference(Auth::user(), UserInterface::PREF_TREE_ACCOUNT_XREF), $tree); |
335 | 335 | |
@@ -359,7 +359,7 @@ discard block |
||
359 | 359 | * |
360 | 360 | * @return Menu|null |
361 | 361 | */ |
362 | - public function menuMyPages(Tree|null $tree): Menu|null |
|
362 | + public function menuMyPages(Tree | null $tree): Menu | null |
|
363 | 363 | { |
364 | 364 | if (Auth::check()) { |
365 | 365 | if ($tree instanceof Tree) { |
@@ -386,7 +386,7 @@ discard block |
||
386 | 386 | * |
387 | 387 | * @return Menu|null |
388 | 388 | */ |
389 | - public function menuMyPedigree(Tree $tree): Menu|null |
|
389 | + public function menuMyPedigree(Tree $tree): Menu | null |
|
390 | 390 | { |
391 | 391 | $my_xref = $tree->getUserPreference(Auth::user(), UserInterface::PREF_TREE_ACCOUNT_XREF); |
392 | 392 | |
@@ -417,7 +417,7 @@ discard block |
||
417 | 417 | * |
418 | 418 | * @return Menu|null |
419 | 419 | */ |
420 | - public function menuPendingChanges(Tree|null $tree): Menu|null |
|
420 | + public function menuPendingChanges(Tree | null $tree): Menu | null |
|
421 | 421 | { |
422 | 422 | if ($tree instanceof Tree && $tree->hasPendingEdit() && Auth::isModerator($tree)) { |
423 | 423 | $request = Registry::container()->get(ServerRequestInterface::class); |
@@ -438,7 +438,7 @@ discard block |
||
438 | 438 | * |
439 | 439 | * @return Menu|null |
440 | 440 | */ |
441 | - public function menuThemes(): Menu|null |
|
441 | + public function menuThemes(): Menu | null |
|
442 | 442 | { |
443 | 443 | $module_service = Registry::container()->get(ModuleService::class); |
444 | 444 | $themes = $module_service->findByInterface(ModuleThemeInterface::class, false, true); |
@@ -467,7 +467,7 @@ discard block |
||
467 | 467 | * |
468 | 468 | * @return array<Menu> |
469 | 469 | */ |
470 | - public function genealogyMenu(Tree|null $tree): array |
|
470 | + public function genealogyMenu(Tree | null $tree): array |
|
471 | 471 | { |
472 | 472 | if ($tree === null) { |
473 | 473 | return []; |
@@ -477,7 +477,7 @@ discard block |
||
477 | 477 | |
478 | 478 | return $module_service |
479 | 479 | ->findByComponent(ModuleMenuInterface::class, $tree, Auth::user()) |
480 | - ->map(static fn (ModuleMenuInterface $menu): Menu|null => $menu->getMenu($tree)) |
|
480 | + ->map(static fn (ModuleMenuInterface $menu): Menu | null => $menu->getMenu($tree)) |
|
481 | 481 | ->filter() |
482 | 482 | ->all(); |
483 | 483 | } |
@@ -501,7 +501,7 @@ discard block |
||
501 | 501 | * |
502 | 502 | * @return array<Menu> |
503 | 503 | */ |
504 | - public function userMenu(Tree|null $tree): array |
|
504 | + public function userMenu(Tree | null $tree): array |
|
505 | 505 | { |
506 | 506 | return array_filter([ |
507 | 507 | $this->menuPendingChanges($tree), |
@@ -85,7 +85,7 @@ |
||
85 | 85 | * |
86 | 86 | * @return Menu|null |
87 | 87 | */ |
88 | - public function getMenu(Tree $tree): Menu|null |
|
88 | + public function getMenu(Tree $tree): Menu | null |
|
89 | 89 | { |
90 | 90 | $trees = $this->tree_service->all(); |
91 | 91 |