@@ -92,7 +92,7 @@ |
||
92 | 92 | * |
93 | 93 | * @return Collection<int,string>|null |
94 | 94 | */ |
95 | - protected function individualsToFix(Tree $tree, array $params): Collection|null |
|
95 | + protected function individualsToFix(Tree $tree, array $params): Collection | null |
|
96 | 96 | { |
97 | 97 | // No DB querying possible? Select all. |
98 | 98 | return $this->individualsToFixQuery($tree, $params) |
@@ -252,7 +252,7 @@ |
||
252 | 252 | ]); |
253 | 253 | } |
254 | 254 | |
255 | - private function getRecordForType(string $type, string $xref, Tree $tree): GedcomRecord|null |
|
255 | + private function getRecordForType(string $type, string $xref, Tree $tree): GedcomRecord | null |
|
256 | 256 | { |
257 | 257 | switch ($type) { |
258 | 258 | case 'indi': |
@@ -104,7 +104,7 @@ |
||
104 | 104 | /** |
105 | 105 | * Return a menu item for this chart - for use in individual boxes. |
106 | 106 | */ |
107 | - public function chartBoxMenu(Individual $individual): Menu|null |
|
107 | + public function chartBoxMenu(Individual $individual): Menu | null |
|
108 | 108 | { |
109 | 109 | return $this->chartMenu($individual); |
110 | 110 | } |
@@ -141,7 +141,7 @@ |
||
141 | 141 | * |
142 | 142 | * @return Menu|null |
143 | 143 | */ |
144 | - public function chartBoxMenu(Individual $individual): Menu|null |
|
144 | + public function chartBoxMenu(Individual $individual): Menu | null |
|
145 | 145 | { |
146 | 146 | return $this->chartMenu($individual); |
147 | 147 | } |
@@ -141,7 +141,7 @@ |
||
141 | 141 | * |
142 | 142 | * @return Menu|null |
143 | 143 | */ |
144 | - public function chartBoxMenu(Individual $individual): Menu|null |
|
144 | + public function chartBoxMenu(Individual $individual): Menu | null |
|
145 | 145 | { |
146 | 146 | return $this->chartMenu($individual); |
147 | 147 | } |
@@ -87,7 +87,7 @@ |
||
87 | 87 | * |
88 | 88 | * @return array<int,string> |
89 | 89 | */ |
90 | - public function newChildNames(Individual|null $father, Individual|null $mother, string $sex): array |
|
90 | + public function newChildNames(Individual | null $father, Individual | null $mother, string $sex): array |
|
91 | 91 | { |
92 | 92 | if (preg_match(self::REGEX_SURN, $this->extractName($father), $match) === 1) { |
93 | 93 | if ($sex === 'F') { |
@@ -175,7 +175,7 @@ discard block |
||
175 | 175 | * |
176 | 176 | * @return void |
177 | 177 | */ |
178 | - public function deleteUnusedLocations(int|null $parent_location_id, array $parent_place_ids): void |
|
178 | + public function deleteUnusedLocations(int | null $parent_location_id, array $parent_place_ids): void |
|
179 | 179 | { |
180 | 180 | if ($parent_location_id === null) { |
181 | 181 | $location_query = DB::table('place_location') |
@@ -212,7 +212,7 @@ discard block |
||
212 | 212 | * |
213 | 213 | * @return Collection<int,object> |
214 | 214 | */ |
215 | - public function getPlaceListLocation(int|null $parent_id): Collection |
|
215 | + public function getPlaceListLocation(int | null $parent_id): Collection |
|
216 | 216 | { |
217 | 217 | $prefix = DB::prefix(); |
218 | 218 |
@@ -316,8 +316,8 @@ discard block |
||
316 | 316 | * @return string |
317 | 317 | */ |
318 | 318 | public function chartIndisWithSources( |
319 | - string|null $color_from = null, |
|
320 | - string|null $color_to = null |
|
319 | + string | null $color_from = null, |
|
320 | + string | null $color_to = null |
|
321 | 321 | ): string { |
322 | 322 | return $this->individual_repository->chartIndisWithSources($color_from, $color_to); |
323 | 323 | } |
@@ -369,8 +369,8 @@ discard block |
||
369 | 369 | * @return string |
370 | 370 | */ |
371 | 371 | public function chartFamsWithSources( |
372 | - string|null $color_from = null, |
|
373 | - string|null $color_to = null |
|
372 | + string | null $color_from = null, |
|
373 | + string | null $color_to = null |
|
374 | 374 | ): string { |
375 | 375 | return $this->individual_repository->chartFamsWithSources($color_from, $color_to); |
376 | 376 | } |
@@ -581,9 +581,9 @@ discard block |
||
581 | 581 | * @return string |
582 | 582 | */ |
583 | 583 | public function chartSex( |
584 | - string|null $color_female = null, |
|
585 | - string|null $color_male = null, |
|
586 | - string|null $color_unknown = null |
|
584 | + string | null $color_female = null, |
|
585 | + string | null $color_male = null, |
|
586 | + string | null $color_unknown = null |
|
587 | 587 | ): string { |
588 | 588 | return $this->individual_repository->chartSex($color_female, $color_male, $color_unknown); |
589 | 589 | } |
@@ -626,7 +626,7 @@ discard block |
||
626 | 626 | * |
627 | 627 | * @return string |
628 | 628 | */ |
629 | - public function chartMortality(string|null $color_living = null, string|null $color_dead = null): string |
|
629 | + public function chartMortality(string | null $color_living = null, string | null $color_dead = null): string |
|
630 | 630 | { |
631 | 631 | return $this->individual_repository->chartMortality($color_living, $color_dead); |
632 | 632 | } |
@@ -797,7 +797,7 @@ discard block |
||
797 | 797 | * |
798 | 798 | * @return string |
799 | 799 | */ |
800 | - public function chartMedia(string|null $color_from = null, string|null $color_to = null): string |
|
800 | + public function chartMedia(string | null $color_from = null, string | null $color_to = null): string |
|
801 | 801 | { |
802 | 802 | return $this->media_repository->chartMedia($color_from, $color_to); |
803 | 803 | } |
@@ -949,7 +949,7 @@ discard block |
||
949 | 949 | * |
950 | 950 | * @return string |
951 | 951 | */ |
952 | - public function statsBirth(string|null $color_from = null, string|null $color_to = null): string |
|
952 | + public function statsBirth(string | null $color_from = null, string | null $color_to = null): string |
|
953 | 953 | { |
954 | 954 | return $this->individual_repository->statsBirth($color_from, $color_to); |
955 | 955 | } |
@@ -1046,7 +1046,7 @@ discard block |
||
1046 | 1046 | * |
1047 | 1047 | * @return string |
1048 | 1048 | */ |
1049 | - public function statsDeath(string|null $color_from = null, string|null $color_to = null): string |
|
1049 | + public function statsDeath(string | null $color_from = null, string | null $color_to = null): string |
|
1050 | 1050 | { |
1051 | 1051 | return $this->individual_repository->statsDeath($color_from, $color_to); |
1052 | 1052 | } |
@@ -1468,7 +1468,7 @@ discard block |
||
1468 | 1468 | * |
1469 | 1469 | * @return string |
1470 | 1470 | */ |
1471 | - public function statsMarr(string|null $color_from = null, string|null $color_to = null): string |
|
1471 | + public function statsMarr(string | null $color_from = null, string | null $color_to = null): string |
|
1472 | 1472 | { |
1473 | 1473 | return $this->family_repository->statsMarr($color_from, $color_to); |
1474 | 1474 | } |
@@ -1543,7 +1543,7 @@ discard block |
||
1543 | 1543 | * |
1544 | 1544 | * @return string |
1545 | 1545 | */ |
1546 | - public function statsDiv(string|null $color_from = null, string|null $color_to = null): string |
|
1546 | + public function statsDiv(string | null $color_from = null, string | null $color_to = null): string |
|
1547 | 1547 | { |
1548 | 1548 | return $this->family_repository->statsDiv($color_from, $color_to); |
1549 | 1549 | } |
@@ -1978,8 +1978,8 @@ discard block |
||
1978 | 1978 | * @return string |
1979 | 1979 | */ |
1980 | 1980 | public function chartLargestFamilies( |
1981 | - string|null $color_from = null, |
|
1982 | - string|null $color_to = null, |
|
1981 | + string | null $color_from = null, |
|
1982 | + string | null $color_to = null, |
|
1983 | 1983 | string $total = '10' |
1984 | 1984 | ): string { |
1985 | 1985 | return $this->family_repository->chartLargestFamilies($color_from, $color_to, (int) $total); |
@@ -2189,8 +2189,8 @@ discard block |
||
2189 | 2189 | * @return string |
2190 | 2190 | */ |
2191 | 2191 | public function chartCommonSurnames( |
2192 | - string|null $color_from = null, |
|
2193 | - string|null $color_to = null, |
|
2192 | + string | null $color_from = null, |
|
2193 | + string | null $color_to = null, |
|
2194 | 2194 | string $number_of_surnames = '10' |
2195 | 2195 | ): string { |
2196 | 2196 | return $this->individual_repository |
@@ -2425,8 +2425,8 @@ discard block |
||
2425 | 2425 | * @return string |
2426 | 2426 | */ |
2427 | 2427 | public function chartCommonGiven( |
2428 | - string|null $color_from = null, |
|
2429 | - string|null $color_to = null, |
|
2428 | + string | null $color_from = null, |
|
2429 | + string | null $color_to = null, |
|
2430 | 2430 | string $maxtoshow = '7' |
2431 | 2431 | ): string { |
2432 | 2432 | return $this->individual_repository->chartCommonGiven($color_from, $color_to, (int) $maxtoshow); |
@@ -2551,7 +2551,7 @@ discard block |
||
2551 | 2551 | * |
2552 | 2552 | * @return string |
2553 | 2553 | */ |
2554 | - public function latestUserRegDate(string|null $format = null): string |
|
2554 | + public function latestUserRegDate(string | null $format = null): string |
|
2555 | 2555 | { |
2556 | 2556 | return $this->latest_user_repository->latestUserRegDate($format); |
2557 | 2557 | } |
@@ -2561,7 +2561,7 @@ discard block |
||
2561 | 2561 | * |
2562 | 2562 | * @return string |
2563 | 2563 | */ |
2564 | - public function latestUserRegTime(string|null $format = null): string |
|
2564 | + public function latestUserRegTime(string | null $format = null): string |
|
2565 | 2565 | { |
2566 | 2566 | return $this->latest_user_repository->latestUserRegTime($format); |
2567 | 2567 | } |
@@ -2572,7 +2572,7 @@ discard block |
||
2572 | 2572 | * |
2573 | 2573 | * @return string |
2574 | 2574 | */ |
2575 | - public function latestUserLoggedin(string|null $yes = null, string|null $no = null): string |
|
2575 | + public function latestUserLoggedin(string | null $yes = null, string | null $no = null): string |
|
2576 | 2576 | { |
2577 | 2577 | return $this->latest_user_repository->latestUserLoggedin($yes, $no); |
2578 | 2578 | } |
@@ -2796,7 +2796,7 @@ discard block |
||
2796 | 2796 | * |
2797 | 2797 | * @return string|null |
2798 | 2798 | */ |
2799 | - public function callBlock(string $block = '', ...$params): string|null |
|
2799 | + public function callBlock(string $block = '', ...$params): string | null |
|
2800 | 2800 | { |
2801 | 2801 | /** @var ModuleBlockInterface|null $module */ |
2802 | 2802 | $module = $this->module_service |
@@ -53,8 +53,8 @@ |
||
53 | 53 | public function chartIndisWithSources( |
54 | 54 | int $tot_indi, |
55 | 55 | int $tot_indi_source, |
56 | - string|null $color_from = null, |
|
57 | - string|null $color_to = null |
|
56 | + string | null $color_from = null, |
|
57 | + string | null $color_to = null |
|
58 | 58 | ): string { |
59 | 59 | $color_from ??= 'ffffff'; |
60 | 60 | $color_to ??= '84beff'; |