@@ -111,8 +111,8 @@ |
||
111 | 111 | public function chartCommonSurnames( |
112 | 112 | int $tot_indi, |
113 | 113 | array $all_surnames, |
114 | - string|null $color_from = null, |
|
115 | - string|null $color_to = null |
|
114 | + string | null $color_from = null, |
|
115 | + string | null $color_to = null |
|
116 | 116 | ): string { |
117 | 117 | $color_from ??= 'ffffff'; |
118 | 118 | $color_to ??= '84beff'; |
@@ -52,8 +52,8 @@ |
||
52 | 52 | */ |
53 | 53 | public function chartMedia( |
54 | 54 | array $media, |
55 | - string|null $color_from = null, |
|
56 | - string|null $color_to = null |
|
55 | + string | null $color_from = null, |
|
56 | + string | null $color_to = null |
|
57 | 57 | ): string { |
58 | 58 | $color_from ??= 'ffffff'; |
59 | 59 | $color_to ??= '84beff'; |
@@ -53,8 +53,8 @@ |
||
53 | 53 | public function chartMortality( |
54 | 54 | int $tot_l, |
55 | 55 | int $tot_d, |
56 | - string|null $color_living = null, |
|
57 | - string|null $color_dead = null |
|
56 | + string | null $color_living = null, |
|
57 | + string | null $color_dead = null |
|
58 | 58 | ): string { |
59 | 59 | $color_living ??= '#ffffff'; |
60 | 60 | $color_dead ??= '#cccccc'; |
@@ -53,8 +53,8 @@ |
||
53 | 53 | public function chartCommonGiven( |
54 | 54 | int $tot_indi, |
55 | 55 | array $given, |
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'; |
@@ -42,9 +42,9 @@ |
||
42 | 42 | int $tot_m, |
43 | 43 | int $tot_f, |
44 | 44 | int $tot_u, |
45 | - string|null $color_female = null, |
|
46 | - string|null $color_male = null, |
|
47 | - string|null $color_unknown = null |
|
45 | + string | null $color_female = null, |
|
46 | + string | null $color_male = null, |
|
47 | + string | null $color_unknown = null |
|
48 | 48 | ): string { |
49 | 49 | $color_female ??= '#ffd1dc'; |
50 | 50 | $color_male ??= '#84beff'; |
@@ -53,8 +53,8 @@ |
||
53 | 53 | public function chartFamsWithSources( |
54 | 54 | int $tot_fam, |
55 | 55 | int $tot_fam_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'; |
@@ -385,7 +385,7 @@ |
||
385 | 385 | */ |
386 | 386 | private function filterActiveBlocks(Collection $blocks, Collection $active_blocks): Collection |
387 | 387 | { |
388 | - return $blocks->map(static fn (string $block_name): ModuleBlockInterface|null => $active_blocks->filter(static fn (ModuleInterface $block): bool => $block->name() === $block_name)->first()) |
|
388 | + return $blocks->map(static fn (string $block_name): ModuleBlockInterface | null => $active_blocks->filter(static fn (ModuleInterface $block): bool => $block->name() === $block_name)->first()) |
|
389 | 389 | ->filter(); |
390 | 390 | } |
391 | 391 | } |
@@ -696,7 +696,7 @@ discard block |
||
696 | 696 | |
697 | 697 | return strlen($module_name) <= 30; |
698 | 698 | }) |
699 | - ->map(static function (string $filename): ModuleCustomInterface|null { |
|
699 | + ->map(static function (string $filename): ModuleCustomInterface | null { |
|
700 | 700 | $module = self::load($filename); |
701 | 701 | |
702 | 702 | if ($module instanceof ModuleCustomInterface) { |
@@ -714,7 +714,7 @@ discard block |
||
714 | 714 | /** |
715 | 715 | * Load a custom module in a static scope, to prevent it from modifying local or object variables. |
716 | 716 | */ |
717 | - private static function load(string $filename): ModuleInterface|null |
|
717 | + private static function load(string $filename): ModuleInterface | null |
|
718 | 718 | { |
719 | 719 | try { |
720 | 720 | return include $filename; |
@@ -826,7 +826,7 @@ discard block |
||
826 | 826 | /** |
827 | 827 | * Find a specified module, if it is currently active. |
828 | 828 | */ |
829 | - public function findByName(string $module_name, bool $include_disabled = false): ModuleInterface|null |
|
829 | + public function findByName(string $module_name, bool $include_disabled = false): ModuleInterface | null |
|
830 | 830 | { |
831 | 831 | return $this->all($include_disabled) |
832 | 832 | ->first(static fn (ModuleInterface $module): bool => $module->name() === $module_name); |
@@ -45,10 +45,10 @@ discard block |
||
45 | 45 | /** |
46 | 46 | * Find the user with a specified user_id. |
47 | 47 | */ |
48 | - public function find(int|null $user_id): User|null |
|
48 | + public function find(int | null $user_id): User | null |
|
49 | 49 | { |
50 | 50 | return Registry::cache()->array() |
51 | - ->remember('user-' . $user_id, static fn (): User|null => DB::table('user') |
|
51 | + ->remember('user-' . $user_id, static fn (): User | null => DB::table('user') |
|
52 | 52 | ->where('user_id', '=', $user_id) |
53 | 53 | ->get() |
54 | 54 | ->map(User::rowMapper()) |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | /** |
59 | 59 | * Find the user with a specified email address. |
60 | 60 | */ |
61 | - public function findByEmail(string $email): User|null |
|
61 | + public function findByEmail(string $email): User | null |
|
62 | 62 | { |
63 | 63 | return DB::table('user') |
64 | 64 | ->where('email', '=', $email) |
@@ -70,7 +70,7 @@ discard block |
||
70 | 70 | /** |
71 | 71 | * Find the user with a specified user_name or email address. |
72 | 72 | */ |
73 | - public function findByIdentifier(string $identifier): User|null |
|
73 | + public function findByIdentifier(string $identifier): User | null |
|
74 | 74 | { |
75 | 75 | return DB::table('user') |
76 | 76 | ->where('user_name', '=', $identifier) |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | /** |
103 | 103 | * Find the user with a specified password reset token. |
104 | 104 | */ |
105 | - public function findByToken(string $token): User|null |
|
105 | + public function findByToken(string $token): User | null |
|
106 | 106 | { |
107 | 107 | return DB::table('user') |
108 | 108 | ->join('user_setting AS us1', 'us1.user_id', '=', 'user.user_id') |
@@ -120,7 +120,7 @@ discard block |
||
120 | 120 | /** |
121 | 121 | * Find the user with a specified user_name. |
122 | 122 | */ |
123 | - public function findByUserName(string $user_name): User|null |
|
123 | + public function findByUserName(string $user_name): User | null |
|
124 | 124 | { |
125 | 125 | return DB::table('user') |
126 | 126 | ->where('user_name', '=', $user_name) |