diff options
Diffstat (limited to 'app/Statistics/Repository')
7 files changed, 25 insertions, 25 deletions
diff --git a/app/Statistics/Repository/FamilyRepository.php b/app/Statistics/Repository/FamilyRepository.php index 39162d77ed..4d45d96cec 100644 --- a/app/Statistics/Repository/FamilyRepository.php +++ b/app/Statistics/Repository/FamilyRepository.php @@ -686,8 +686,8 @@ class FamilyRepository * @return string */ public function chartLargestFamilies( - string $color_from = null, - string $color_to = null, + string|null $color_from = null, + string|null $color_to = null, int $total = 10 ): string { return (new ChartFamilyLargest($this->color_service, $this->tree)) @@ -1725,7 +1725,7 @@ class FamilyRepository * * @return string */ - public function statsMarr(string $color_from = null, string $color_to = null): string + public function statsMarr(string|null $color_from = null, string|null $color_to = null): string { return (new ChartMarriage($this->century_service, $this->color_service, $this->tree)) ->chartMarriage($color_from, $color_to); @@ -1739,7 +1739,7 @@ class FamilyRepository * * @return string */ - public function statsDiv(string $color_from = null, string $color_to = null): string + public function statsDiv(string|null $color_from = null, string|null $color_to = null): string { return (new ChartDivorce($this->century_service, $this->color_service, $this->tree)) ->chartDivorce($color_from, $color_to); diff --git a/app/Statistics/Repository/IndividualRepository.php b/app/Statistics/Repository/IndividualRepository.php index abb4a789e2..e3e56b4577 100644 --- a/app/Statistics/Repository/IndividualRepository.php +++ b/app/Statistics/Repository/IndividualRepository.php @@ -724,7 +724,7 @@ class IndividualRepository implements IndividualRepositoryInterface * * @return string */ - public function statsBirth(string $color_from = null, string $color_to = null): string + public function statsBirth(string|null $color_from = null, string|null $color_to = null): string { return (new ChartBirth($this->century_service, $this->color_service, $this->tree)) ->chartBirth($color_from, $color_to); @@ -782,7 +782,7 @@ class IndividualRepository implements IndividualRepositoryInterface * * @return string */ - public function statsDeath(string $color_from = null, string $color_to = null): string + public function statsDeath(string|null $color_from = null, string|null $color_to = null): string { return (new ChartDeath($this->century_service, $this->color_service, $this->tree)) ->chartDeath($color_from, $color_to); @@ -1817,8 +1817,8 @@ class IndividualRepository implements IndividualRepositoryInterface * @return string */ public function chartCommonGiven( - string $color_from = null, - string $color_to = null, + string|null $color_from = null, + string|null $color_to = null, int $maxtoshow = 7 ): string { $tot_indi = $this->totalIndividualsQuery(); @@ -1842,8 +1842,8 @@ class IndividualRepository implements IndividualRepositoryInterface * @return string */ public function chartCommonSurnames( - string $color_from = null, - string $color_to = null, + string|null $color_from = null, + string|null $color_to = null, int $number_of_surnames = 10 ): string { $tot_indi = $this->totalIndividualsQuery(); @@ -1868,7 +1868,7 @@ class IndividualRepository implements IndividualRepositoryInterface * * @return string */ - public function chartMortality(string $color_living = null, string $color_dead = null): string + public function chartMortality(string|null $color_living = null, string|null $color_dead = null): string { $tot_l = $this->totalLivingQuery(); $tot_d = $this->totalDeceasedQuery(); @@ -1886,7 +1886,7 @@ class IndividualRepository implements IndividualRepositoryInterface * @return string */ public function chartIndisWithSources( - string $color_from = null, + string|null $color_from = null, string $color_to = null ): string { $tot_indi = $this->totalIndividualsQuery(); @@ -1905,7 +1905,7 @@ class IndividualRepository implements IndividualRepositoryInterface * @return string */ public function chartFamsWithSources( - string $color_from = null, + string|null $color_from = null, string $color_to = null ): string { $tot_fam = $this->totalFamiliesQuery(); @@ -1923,8 +1923,8 @@ class IndividualRepository implements IndividualRepositoryInterface * @return string */ public function chartSex( - string $color_female = null, - string $color_male = null, + string|null $color_female = null, + string|null $color_male = null, string $color_unknown = null ): string { $tot_m = $this->totalSexMalesQuery(); diff --git a/app/Statistics/Repository/Interfaces/IndividualRepositoryInterface.php b/app/Statistics/Repository/Interfaces/IndividualRepositoryInterface.php index 7fdc1bf962..1fc49d097f 100644 --- a/app/Statistics/Repository/Interfaces/IndividualRepositoryInterface.php +++ b/app/Statistics/Repository/Interfaces/IndividualRepositoryInterface.php @@ -188,8 +188,8 @@ interface IndividualRepositoryInterface * @return string */ public function chartSex( - string $color_female = null, - string $color_male = null, + string|null $color_female = null, + string|null $color_male = null, string $color_unknown = null ): string; } diff --git a/app/Statistics/Repository/Interfaces/LatestUserRepositoryInterface.php b/app/Statistics/Repository/Interfaces/LatestUserRepositoryInterface.php index 803171a3ff..5a8e5e74b2 100644 --- a/app/Statistics/Repository/Interfaces/LatestUserRepositoryInterface.php +++ b/app/Statistics/Repository/Interfaces/LatestUserRepositoryInterface.php @@ -52,7 +52,7 @@ interface LatestUserRepositoryInterface * * @return string */ - public function latestUserRegDate(string $format = null): string; + public function latestUserRegDate(string|null $format = null): string; /** * Find the timestamp of the latest user to register. @@ -61,7 +61,7 @@ interface LatestUserRepositoryInterface * * @return string */ - public function latestUserRegTime(string $format = null): string; + public function latestUserRegTime(string|null $format = null): string; /** * Is the most recently registered user logged in right now? @@ -71,5 +71,5 @@ interface LatestUserRepositoryInterface * * @return string */ - public function latestUserLoggedin(string $yes = null, string $no = null): string; + public function latestUserLoggedin(string|null $yes = null, string|null $no = null): string; } diff --git a/app/Statistics/Repository/Interfaces/MediaRepositoryInterface.php b/app/Statistics/Repository/Interfaces/MediaRepositoryInterface.php index 8717e2d690..377e83906d 100644 --- a/app/Statistics/Repository/Interfaces/MediaRepositoryInterface.php +++ b/app/Statistics/Repository/Interfaces/MediaRepositoryInterface.php @@ -172,5 +172,5 @@ interface MediaRepositoryInterface * * @return string */ - public function chartMedia(string $color_from = null, string $color_to = null): string; + public function chartMedia(string|null $color_from = null, string|null $color_to = null): string; } diff --git a/app/Statistics/Repository/LatestUserRepository.php b/app/Statistics/Repository/LatestUserRepository.php index f7fc037e2c..722110709c 100644 --- a/app/Statistics/Repository/LatestUserRepository.php +++ b/app/Statistics/Repository/LatestUserRepository.php @@ -110,7 +110,7 @@ class LatestUserRepository implements LatestUserRepositoryInterface * * @return string */ - public function latestUserRegDate(string $format = null): string + public function latestUserRegDate(string|null $format = null): string { $format ??= I18N::dateFormat(); $user = $this->latestUserQuery(); @@ -124,7 +124,7 @@ class LatestUserRepository implements LatestUserRepositoryInterface * * @return string */ - public function latestUserRegTime(string $format = null): string + public function latestUserRegTime(string|null $format = null): string { $format ??= str_replace('%', '', I18N::timeFormat()); $user = $this->latestUserQuery(); @@ -138,7 +138,7 @@ class LatestUserRepository implements LatestUserRepositoryInterface * * @return string */ - public function latestUserLoggedin(string $yes = null, string $no = null): string + public function latestUserLoggedin(string|null $yes = null, string|null $no = null): string { $yes ??= I18N::translate('yes'); $no ??= I18N::translate('no'); diff --git a/app/Statistics/Repository/MediaRepository.php b/app/Statistics/Repository/MediaRepository.php index 54c5569674..01fce27b81 100644 --- a/app/Statistics/Repository/MediaRepository.php +++ b/app/Statistics/Repository/MediaRepository.php @@ -244,7 +244,7 @@ class MediaRepository implements MediaRepositoryInterface * * @return string */ - public function chartMedia(string $color_from = null, string $color_to = null): string + public function chartMedia(string|null $color_from = null, string|null $color_to = null): string { $media = DB::table('media_file') ->where('m_file', '=', $this->tree->id()) |