@@ -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 | } |
@@ -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': |
@@ -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') { |
@@ -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) |