@@ -172,7 +172,7 @@ |
||
172 | 172 | return $this->totalMedia(self::MEDIA_TYPE_UNKNOWN); |
173 | 173 | } |
174 | 174 | |
175 | - public function chartMedia(string|null $color_from = null, string|null $color_to = null): string |
|
175 | + public function chartMedia(string | null $color_from = null, string | null $color_to = null): string |
|
176 | 176 | { |
177 | 177 | $media = DB::table('media_file') |
178 | 178 | ->where('m_file', '=', $this->tree->id()) |
@@ -469,7 +469,7 @@ discard block |
||
469 | 469 | ->groupBy(['i_sex']); |
470 | 470 | } |
471 | 471 | |
472 | - public function statsBirth(string|null $color_from = null, string|null $color_to = null): string |
|
472 | + public function statsBirth(string | null $color_from = null, string | null $color_to = null): string |
|
473 | 473 | { |
474 | 474 | return (new ChartBirth($this->century_service, $this->color_service, $this->tree)) |
475 | 475 | ->chartBirth($color_from, $color_to); |
@@ -503,7 +503,7 @@ discard block |
||
503 | 503 | ->groupBy(['i_sex']); |
504 | 504 | } |
505 | 505 | |
506 | - public function statsDeath(string|null $color_from = null, string|null $color_to = null): string |
|
506 | + public function statsDeath(string | null $color_from = null, string | null $color_to = null): string |
|
507 | 507 | { |
508 | 508 | return (new ChartDeath($this->century_service, $this->color_service, $this->tree)) |
509 | 509 | ->chartDeath($color_from, $color_to); |
@@ -1160,8 +1160,8 @@ discard block |
||
1160 | 1160 | } |
1161 | 1161 | |
1162 | 1162 | public function chartCommonGiven( |
1163 | - string|null $color_from = null, |
|
1164 | - string|null $color_to = null, |
|
1163 | + string | null $color_from = null, |
|
1164 | + string | null $color_to = null, |
|
1165 | 1165 | int $maxtoshow = 7 |
1166 | 1166 | ): string { |
1167 | 1167 | $tot_indi = $this->totalIndividualsQuery(); |
@@ -1176,8 +1176,8 @@ discard block |
||
1176 | 1176 | } |
1177 | 1177 | |
1178 | 1178 | public function chartCommonSurnames( |
1179 | - string|null $color_from = null, |
|
1180 | - string|null $color_to = null, |
|
1179 | + string | null $color_from = null, |
|
1180 | + string | null $color_to = null, |
|
1181 | 1181 | int $number_of_surnames = 10 |
1182 | 1182 | ): string { |
1183 | 1183 | $tot_indi = $this->totalIndividualsQuery(); |
@@ -1194,7 +1194,7 @@ discard block |
||
1194 | 1194 | ->chartCommonSurnames($tot_indi, $all_surnames, $color_from, $color_to); |
1195 | 1195 | } |
1196 | 1196 | |
1197 | - public function chartMortality(string|null $color_living = null, string|null $color_dead = null): string |
|
1197 | + public function chartMortality(string | null $color_living = null, string | null $color_dead = null): string |
|
1198 | 1198 | { |
1199 | 1199 | $tot_l = $this->totalLivingQuery(); |
1200 | 1200 | $tot_d = $this->totalDeceasedQuery(); |
@@ -1204,8 +1204,8 @@ discard block |
||
1204 | 1204 | } |
1205 | 1205 | |
1206 | 1206 | public function chartIndisWithSources( |
1207 | - string|null $color_from = null, |
|
1208 | - string|null $color_to = null |
|
1207 | + string | null $color_from = null, |
|
1208 | + string | null $color_to = null |
|
1209 | 1209 | ): string { |
1210 | 1210 | $tot_indi = $this->totalIndividualsQuery(); |
1211 | 1211 | $tot_indi_source = $this->totalIndisWithSourcesQuery(); |
@@ -1215,8 +1215,8 @@ discard block |
||
1215 | 1215 | } |
1216 | 1216 | |
1217 | 1217 | public function chartFamsWithSources( |
1218 | - string|null $color_from = null, |
|
1219 | - string|null $color_to = null |
|
1218 | + string | null $color_from = null, |
|
1219 | + string | null $color_to = null |
|
1220 | 1220 | ): string { |
1221 | 1221 | $tot_fam = $this->totalFamiliesQuery(); |
1222 | 1222 | $tot_fam_source = $this->totalFamsWithSourcesQuery(); |
@@ -1226,9 +1226,9 @@ discard block |
||
1226 | 1226 | } |
1227 | 1227 | |
1228 | 1228 | public function chartSex( |
1229 | - string|null $color_female = null, |
|
1230 | - string|null $color_male = null, |
|
1231 | - string|null $color_unknown = null |
|
1229 | + string | null $color_female = null, |
|
1230 | + string | null $color_male = null, |
|
1231 | + string | null $color_unknown = null |
|
1232 | 1232 | ): string { |
1233 | 1233 | $tot_m = $this->totalSexMalesQuery(); |
1234 | 1234 | $tot_f = $this->totalSexFemalesQuery(); |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | return e($this->latestUserQuery()->realName()); |
87 | 87 | } |
88 | 88 | |
89 | - public function latestUserRegDate(string|null $format = null): string |
|
89 | + public function latestUserRegDate(string | null $format = null): string |
|
90 | 90 | { |
91 | 91 | $format ??= I18N::dateFormat(); |
92 | 92 | $user = $this->latestUserQuery(); |
@@ -95,7 +95,7 @@ discard block |
||
95 | 95 | return Registry::timestampFactory()->make($timestamp)->format(strtr($format, ['%' => ''])); |
96 | 96 | } |
97 | 97 | |
98 | - public function latestUserRegTime(string|null $format = null): string |
|
98 | + public function latestUserRegTime(string | null $format = null): string |
|
99 | 99 | { |
100 | 100 | $format ??= str_replace('%', '', I18N::timeFormat()); |
101 | 101 | $user = $this->latestUserQuery(); |
@@ -103,7 +103,7 @@ discard block |
||
103 | 103 | return date($format, (int) $user->getPreference(UserInterface::PREF_TIMESTAMP_REGISTERED)); |
104 | 104 | } |
105 | 105 | |
106 | - public function latestUserLoggedin(string|null $yes = null, string|null $no = null): string |
|
106 | + public function latestUserLoggedin(string | null $yes = null, string | null $no = null): string |
|
107 | 107 | { |
108 | 108 | $yes ??= I18N::translate('yes'); |
109 | 109 | $no ??= I18N::translate('no'); |
@@ -66,8 +66,8 @@ |
||
66 | 66 | public function getCommonSurname(): string; |
67 | 67 | |
68 | 68 | public function chartSex( |
69 | - string|null $color_female = null, |
|
70 | - string|null $color_male = null, |
|
71 | - string|null $color_unknown = null |
|
69 | + string | null $color_female = null, |
|
70 | + string | null $color_male = null, |
|
71 | + string | null $color_unknown = null |
|
72 | 72 | ): string; |
73 | 73 | } |
@@ -61,5 +61,5 @@ |
||
61 | 61 | |
62 | 62 | public function totalMediaUnknown(): string; |
63 | 63 | |
64 | - public function chartMedia(string|null $color_from = null, string|null $color_to = null): string; |
|
64 | + public function chartMedia(string | null $color_from = null, string | null $color_to = null): string; |
|
65 | 65 | } |
@@ -27,9 +27,9 @@ |
||
27 | 27 | |
28 | 28 | public function latestUserFullName(): string; |
29 | 29 | |
30 | - public function latestUserRegDate(string|null $format = null): string; |
|
30 | + public function latestUserRegDate(string | null $format = null): string; |
|
31 | 31 | |
32 | - public function latestUserRegTime(string|null $format = null): string; |
|
32 | + public function latestUserRegTime(string | null $format = null): string; |
|
33 | 33 | |
34 | - public function latestUserLoggedin(string|null $yes = null, string|null $no = null): string; |
|
34 | + public function latestUserLoggedin(string | null $yes = null, string | null $no = null): string; |
|
35 | 35 | } |
@@ -251,8 +251,8 @@ discard block |
||
251 | 251 | } |
252 | 252 | |
253 | 253 | public function chartIndisWithSources( |
254 | - string|null $color_from = null, |
|
255 | - string|null $color_to = null |
|
254 | + string | null $color_from = null, |
|
255 | + string | null $color_to = null |
|
256 | 256 | ): string { |
257 | 257 | return $this->individual_repository->chartIndisWithSources($color_from, $color_to); |
258 | 258 | } |
@@ -283,8 +283,8 @@ discard block |
||
283 | 283 | } |
284 | 284 | |
285 | 285 | public function chartFamsWithSources( |
286 | - string|null $color_from = null, |
|
287 | - string|null $color_to = null |
|
286 | + string | null $color_from = null, |
|
287 | + string | null $color_to = null |
|
288 | 288 | ): string { |
289 | 289 | return $this->individual_repository->chartFamsWithSources($color_from, $color_to); |
290 | 290 | } |
@@ -419,9 +419,9 @@ discard block |
||
419 | 419 | } |
420 | 420 | |
421 | 421 | public function chartSex( |
422 | - string|null $color_female = null, |
|
423 | - string|null $color_male = null, |
|
424 | - string|null $color_unknown = null |
|
422 | + string | null $color_female = null, |
|
423 | + string | null $color_male = null, |
|
424 | + string | null $color_unknown = null |
|
425 | 425 | ): string { |
426 | 426 | return $this->individual_repository->chartSex($color_female, $color_male, $color_unknown); |
427 | 427 | } |
@@ -446,7 +446,7 @@ discard block |
||
446 | 446 | return $this->individual_repository->totalDeceasedPercentage(); |
447 | 447 | } |
448 | 448 | |
449 | - public function chartMortality(string|null $color_living = null, string|null $color_dead = null): string |
|
449 | + public function chartMortality(string | null $color_living = null, string | null $color_dead = null): string |
|
450 | 450 | { |
451 | 451 | return $this->individual_repository->chartMortality($color_living, $color_dead); |
452 | 452 | } |
@@ -551,7 +551,7 @@ discard block |
||
551 | 551 | return $this->media_repository->totalMediaUnknown(); |
552 | 552 | } |
553 | 553 | |
554 | - public function chartMedia(string|null $color_from = null, string|null $color_to = null): string |
|
554 | + public function chartMedia(string | null $color_from = null, string | null $color_to = null): string |
|
555 | 555 | { |
556 | 556 | return $this->media_repository->chartMedia($color_from, $color_to); |
557 | 557 | } |
@@ -639,7 +639,7 @@ discard block |
||
639 | 639 | return $this->individual_repository->statsBirthBySexQuery($year1, $year2); |
640 | 640 | } |
641 | 641 | |
642 | - public function statsBirth(string|null $color_from = null, string|null $color_to = null): string |
|
642 | + public function statsBirth(string | null $color_from = null, string | null $color_to = null): string |
|
643 | 643 | { |
644 | 644 | return $this->individual_repository->statsBirth($color_from, $color_to); |
645 | 645 | } |
@@ -694,7 +694,7 @@ discard block |
||
694 | 694 | return $this->individual_repository->statsDeathBySexQuery($year1, $year2); |
695 | 695 | } |
696 | 696 | |
697 | - public function statsDeath(string|null $color_from = null, string|null $color_to = null): string |
|
697 | + public function statsDeath(string | null $color_from = null, string | null $color_to = null): string |
|
698 | 698 | { |
699 | 699 | return $this->individual_repository->statsDeath($color_from, $color_to); |
700 | 700 | } |
@@ -934,7 +934,7 @@ discard block |
||
934 | 934 | return $this->family_repository->statsFirstMarriageQuery($year1, $year2); |
935 | 935 | } |
936 | 936 | |
937 | - public function statsMarr(string|null $color_from = null, string|null $color_to = null): string |
|
937 | + public function statsMarr(string | null $color_from = null, string | null $color_to = null): string |
|
938 | 938 | { |
939 | 939 | return $this->family_repository->statsMarr($color_from, $color_to); |
940 | 940 | } |
@@ -979,7 +979,7 @@ discard block |
||
979 | 979 | return $this->family_dates_repository->lastDivorcePlace(); |
980 | 980 | } |
981 | 981 | |
982 | - public function statsDiv(string|null $color_from = null, string|null $color_to = null): string |
|
982 | + public function statsDiv(string | null $color_from = null, string | null $color_to = null): string |
|
983 | 983 | { |
984 | 984 | return $this->family_repository->statsDiv($color_from, $color_to); |
985 | 985 | } |
@@ -1223,8 +1223,8 @@ discard block |
||
1223 | 1223 | } |
1224 | 1224 | |
1225 | 1225 | public function chartLargestFamilies( |
1226 | - string|null $color_from = null, |
|
1227 | - string|null $color_to = null, |
|
1226 | + string | null $color_from = null, |
|
1227 | + string | null $color_to = null, |
|
1228 | 1228 | string $total = '10' |
1229 | 1229 | ): string { |
1230 | 1230 | return $this->family_repository->chartLargestFamilies($color_from, $color_to, (int) $total); |
@@ -1339,8 +1339,8 @@ discard block |
||
1339 | 1339 | } |
1340 | 1340 | |
1341 | 1341 | public function chartCommonSurnames( |
1342 | - string|null $color_from = null, |
|
1343 | - string|null $color_to = null, |
|
1342 | + string | null $color_from = null, |
|
1343 | + string | null $color_to = null, |
|
1344 | 1344 | string $number_of_surnames = '10' |
1345 | 1345 | ): string { |
1346 | 1346 | return $this->individual_repository |
@@ -1448,8 +1448,8 @@ discard block |
||
1448 | 1448 | } |
1449 | 1449 | |
1450 | 1450 | public function chartCommonGiven( |
1451 | - string|null $color_from = null, |
|
1452 | - string|null $color_to = null, |
|
1451 | + string | null $color_from = null, |
|
1452 | + string | null $color_to = null, |
|
1453 | 1453 | string $maxtoshow = '7' |
1454 | 1454 | ): string { |
1455 | 1455 | return $this->individual_repository->chartCommonGiven($color_from, $color_to, (int) $maxtoshow); |
@@ -1525,17 +1525,17 @@ discard block |
||
1525 | 1525 | return $this->latest_user_repository->latestUserFullName(); |
1526 | 1526 | } |
1527 | 1527 | |
1528 | - public function latestUserRegDate(string|null $format = null): string |
|
1528 | + public function latestUserRegDate(string | null $format = null): string |
|
1529 | 1529 | { |
1530 | 1530 | return $this->latest_user_repository->latestUserRegDate($format); |
1531 | 1531 | } |
1532 | 1532 | |
1533 | - public function latestUserRegTime(string|null $format = null): string |
|
1533 | + public function latestUserRegTime(string | null $format = null): string |
|
1534 | 1534 | { |
1535 | 1535 | return $this->latest_user_repository->latestUserRegTime($format); |
1536 | 1536 | } |
1537 | 1537 | |
1538 | - public function latestUserLoggedin(string|null $yes = null, string|null $no = null): string |
|
1538 | + public function latestUserLoggedin(string | null $yes = null, string | null $no = null): string |
|
1539 | 1539 | { |
1540 | 1540 | return $this->latest_user_repository->latestUserLoggedin($yes, $no); |
1541 | 1541 | } |