@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | * |
| 92 | 92 | * @return Collection<int,string>|null |
| 93 | 93 | */ |
| 94 | - protected function familiesToFix(Tree $tree, array $params): Collection|null |
|
| 94 | + protected function familiesToFix(Tree $tree, array $params): Collection | null |
|
| 95 | 95 | { |
| 96 | 96 | if ($params['search-for'] === '' || $params['replace-with'] === '') { |
| 97 | 97 | return null; |
@@ -113,7 +113,7 @@ discard block |
||
| 113 | 113 | * |
| 114 | 114 | * @return Collection<int,string>|null |
| 115 | 115 | */ |
| 116 | - protected function individualsToFix(Tree $tree, array $params): Collection|null |
|
| 116 | + protected function individualsToFix(Tree $tree, array $params): Collection | null |
|
| 117 | 117 | { |
| 118 | 118 | if ($params['search-for'] === '' || $params['replace-with'] === '') { |
| 119 | 119 | return null; |
@@ -133,7 +133,7 @@ discard block |
||
| 133 | 133 | * |
| 134 | 134 | * @return Collection<int,string>|null |
| 135 | 135 | */ |
| 136 | - protected function familiesToFix(Tree $tree, array $params): Collection|null |
|
| 136 | + protected function familiesToFix(Tree $tree, array $params): Collection | null |
|
| 137 | 137 | { |
| 138 | 138 | if ($params['type'] !== Family::RECORD_TYPE || $params['search-for'] === '') { |
| 139 | 139 | return null; |
@@ -154,7 +154,7 @@ discard block |
||
| 154 | 154 | * |
| 155 | 155 | * @return Collection<int,string>|null |
| 156 | 156 | */ |
| 157 | - protected function individualsToFix(Tree $tree, array $params): Collection|null |
|
| 157 | + protected function individualsToFix(Tree $tree, array $params): Collection | null |
|
| 158 | 158 | { |
| 159 | 159 | if ($params['type'] !== Individual::RECORD_TYPE || $params['search-for'] === '') { |
| 160 | 160 | return null; |
@@ -177,7 +177,7 @@ discard block |
||
| 177 | 177 | * |
| 178 | 178 | * @return Collection<int,string>|null |
| 179 | 179 | */ |
| 180 | - protected function locationsToFix(Tree $tree, array $params): Collection|null |
|
| 180 | + protected function locationsToFix(Tree $tree, array $params): Collection | null |
|
| 181 | 181 | { |
| 182 | 182 | if ($params['type'] !== Location::RECORD_TYPE || $params['search-for'] === '') { |
| 183 | 183 | return null; |
@@ -201,7 +201,7 @@ discard block |
||
| 201 | 201 | * |
| 202 | 202 | * @return Collection<int,string>|null |
| 203 | 203 | */ |
| 204 | - protected function mediaToFix(Tree $tree, array $params): Collection|null |
|
| 204 | + protected function mediaToFix(Tree $tree, array $params): Collection | null |
|
| 205 | 205 | { |
| 206 | 206 | if ($params['type'] !== Media::RECORD_TYPE || $params['search-for'] === '') { |
| 207 | 207 | return null; |
@@ -224,7 +224,7 @@ discard block |
||
| 224 | 224 | * |
| 225 | 225 | * @return Collection<int,string>|null |
| 226 | 226 | */ |
| 227 | - protected function notesToFix(Tree $tree, array $params): Collection|null |
|
| 227 | + protected function notesToFix(Tree $tree, array $params): Collection | null |
|
| 228 | 228 | { |
| 229 | 229 | if ($params['type'] !== Note::RECORD_TYPE || $params['search-for'] === '') { |
| 230 | 230 | return null; |
@@ -248,7 +248,7 @@ discard block |
||
| 248 | 248 | * |
| 249 | 249 | * @return Collection<int,string>|null |
| 250 | 250 | */ |
| 251 | - protected function repositoriesToFix(Tree $tree, array $params): Collection|null |
|
| 251 | + protected function repositoriesToFix(Tree $tree, array $params): Collection | null |
|
| 252 | 252 | { |
| 253 | 253 | if ($params['type'] !== Repository::RECORD_TYPE || $params['search-for'] === '') { |
| 254 | 254 | return null; |
@@ -272,7 +272,7 @@ discard block |
||
| 272 | 272 | * |
| 273 | 273 | * @return Collection<int,string>|null |
| 274 | 274 | */ |
| 275 | - protected function sourcesToFix(Tree $tree, array $params): Collection|null |
|
| 275 | + protected function sourcesToFix(Tree $tree, array $params): Collection | null |
|
| 276 | 276 | { |
| 277 | 277 | if ($params['type'] !== Source::RECORD_TYPE || $params['search-for'] === '') { |
| 278 | 278 | return null; |
@@ -294,7 +294,7 @@ discard block |
||
| 294 | 294 | * |
| 295 | 295 | * @return Collection<int,string>|null |
| 296 | 296 | */ |
| 297 | - protected function submittersToFix(Tree $tree, array $params): Collection|null |
|
| 297 | + protected function submittersToFix(Tree $tree, array $params): Collection | null |
|
| 298 | 298 | { |
| 299 | 299 | if ($params['type'] !== Submitter::RECORD_TYPE || $params['search-for'] === '') { |
| 300 | 300 | return null; |
@@ -60,7 +60,7 @@ |
||
| 60 | 60 | * |
| 61 | 61 | * @return array<Menu> |
| 62 | 62 | */ |
| 63 | - public function userMenu(Tree|null $tree): array |
|
| 63 | + public function userMenu(Tree | null $tree): array |
|
| 64 | 64 | { |
| 65 | 65 | return array_filter([ |
| 66 | 66 | $this->menuPendingChanges($tree), |
@@ -69,7 +69,7 @@ |
||
| 69 | 69 | * |
| 70 | 70 | * @return Menu|null |
| 71 | 71 | */ |
| 72 | - public function getMenu(Tree $tree): Menu|null |
|
| 72 | + public function getMenu(Tree $tree): Menu | null |
|
| 73 | 73 | { |
| 74 | 74 | return null; |
| 75 | 75 | } |
@@ -155,7 +155,7 @@ discard block |
||
| 155 | 155 | * |
| 156 | 156 | * @return Collection<int,string>|null |
| 157 | 157 | */ |
| 158 | - protected function familiesToFix(Tree $tree, array $params): Collection|null |
|
| 158 | + protected function familiesToFix(Tree $tree, array $params): Collection | null |
|
| 159 | 159 | { |
| 160 | 160 | return null; |
| 161 | 161 | } |
@@ -186,7 +186,7 @@ discard block |
||
| 186 | 186 | * |
| 187 | 187 | * @return Collection<int,string>|null |
| 188 | 188 | */ |
| 189 | - protected function individualsToFix(Tree $tree, array $params): Collection|null |
|
| 189 | + protected function individualsToFix(Tree $tree, array $params): Collection | null |
|
| 190 | 190 | { |
| 191 | 191 | return null; |
| 192 | 192 | } |
@@ -217,7 +217,7 @@ discard block |
||
| 217 | 217 | * |
| 218 | 218 | * @return Collection<int,string>|null |
| 219 | 219 | */ |
| 220 | - protected function locationsToFix(Tree $tree, array $params): Collection|null |
|
| 220 | + protected function locationsToFix(Tree $tree, array $params): Collection | null |
|
| 221 | 221 | { |
| 222 | 222 | return null; |
| 223 | 223 | } |
@@ -249,7 +249,7 @@ discard block |
||
| 249 | 249 | * |
| 250 | 250 | * @return Collection<int,string>|null |
| 251 | 251 | */ |
| 252 | - protected function mediaToFix(Tree $tree, array $params): Collection|null |
|
| 252 | + protected function mediaToFix(Tree $tree, array $params): Collection | null |
|
| 253 | 253 | { |
| 254 | 254 | return null; |
| 255 | 255 | } |
@@ -280,7 +280,7 @@ discard block |
||
| 280 | 280 | * |
| 281 | 281 | * @return Collection<int,string>|null |
| 282 | 282 | */ |
| 283 | - protected function notesToFix(Tree $tree, array $params): Collection|null |
|
| 283 | + protected function notesToFix(Tree $tree, array $params): Collection | null |
|
| 284 | 284 | { |
| 285 | 285 | return null; |
| 286 | 286 | } |
@@ -312,7 +312,7 @@ discard block |
||
| 312 | 312 | * |
| 313 | 313 | * @return Collection<int,string>|null |
| 314 | 314 | */ |
| 315 | - protected function repositoriesToFix(Tree $tree, array $params): Collection|null |
|
| 315 | + protected function repositoriesToFix(Tree $tree, array $params): Collection | null |
|
| 316 | 316 | { |
| 317 | 317 | return null; |
| 318 | 318 | } |
@@ -344,7 +344,7 @@ discard block |
||
| 344 | 344 | * |
| 345 | 345 | * @return Collection<int,string>|null |
| 346 | 346 | */ |
| 347 | - protected function sourcesToFix(Tree $tree, array $params): Collection|null |
|
| 347 | + protected function sourcesToFix(Tree $tree, array $params): Collection | null |
|
| 348 | 348 | { |
| 349 | 349 | return null; |
| 350 | 350 | } |
@@ -375,7 +375,7 @@ discard block |
||
| 375 | 375 | * |
| 376 | 376 | * @return Collection<int,string>|null |
| 377 | 377 | */ |
| 378 | - protected function submittersToFix(Tree $tree, array $params): Collection|null |
|
| 378 | + protected function submittersToFix(Tree $tree, array $params): Collection | null |
|
| 379 | 379 | { |
| 380 | 380 | return null; |
| 381 | 381 | } |
@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | public string $qual2 = ''; |
| 46 | 46 | |
| 47 | 47 | // Optional second date |
| 48 | - private AbstractCalendarDate|null $date2 = null; |
|
| 48 | + private AbstractCalendarDate | null $date2 = null; |
|
| 49 | 49 | |
| 50 | 50 | // Optional text, as included with an INTerpreted date |
| 51 | 51 | private string $text = ''; |
@@ -98,7 +98,7 @@ discard block |
||
| 98 | 98 | * |
| 99 | 99 | * @return string |
| 100 | 100 | */ |
| 101 | - public function display(Tree|null $tree = null, string|null $date_format = null, bool $convert_calendars = false): string |
|
| 101 | + public function display(Tree | null $tree = null, string | null $date_format = null, bool $convert_calendars = false): string |
|
| 102 | 102 | { |
| 103 | 103 | if ($tree instanceof Tree) { |
| 104 | 104 | $CALENDAR_FORMAT = $tree->getPreference('CALENDAR_FORMAT'); |
@@ -303,7 +303,7 @@ discard block |
||
| 303 | 303 | public function addYears(int $years, string $qualifier = ''): Date |
| 304 | 304 | { |
| 305 | 305 | $tmp = clone $this; |
| 306 | - $tmp->date1->year += $years; |
|
| 306 | + $tmp->date1->year += $years; |
|
| 307 | 307 | $tmp->date1->month = 0; |
| 308 | 308 | $tmp->date1->day = 0; |
| 309 | 309 | $tmp->date1->setJdFromYmd(); |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | /** |
| 39 | 39 | * Create a individual. |
| 40 | 40 | */ |
| 41 | - public function make(string $xref, Tree $tree, string|null $gedcom = null): Source|null |
|
| 41 | + public function make(string $xref, Tree $tree, string | null $gedcom = null): Source | null |
|
| 42 | 42 | { |
| 43 | 43 | return Registry::cache()->array()->remember(self::class . $xref . '@' . $tree->id(), function () use ($xref, $tree, $gedcom) { |
| 44 | 44 | $gedcom ??= $this->gedcom($xref, $tree); |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | * |
| 78 | 78 | * @return Source |
| 79 | 79 | */ |
| 80 | - public function new(string $xref, string $gedcom, string|null $pending, Tree $tree): Source |
|
| 80 | + public function new(string $xref, string $gedcom, string | null $pending, Tree $tree): Source |
|
| 81 | 81 | { |
| 82 | 82 | return new Source($xref, $gedcom, $pending, $tree); |
| 83 | 83 | } |
@@ -90,7 +90,7 @@ discard block |
||
| 90 | 90 | * |
| 91 | 91 | * @return string|null |
| 92 | 92 | */ |
| 93 | - protected function gedcom(string $xref, Tree $tree): string|null |
|
| 93 | + protected function gedcom(string $xref, Tree $tree): string | null |
|
| 94 | 94 | { |
| 95 | 95 | return DB::table('sources') |
| 96 | 96 | ->where('s_id', '=', $xref) |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | /** |
| 39 | 39 | * Create a submitter. |
| 40 | 40 | */ |
| 41 | - public function make(string $xref, Tree $tree, string|null $gedcom = null): Submitter|null |
|
| 41 | + public function make(string $xref, Tree $tree, string | null $gedcom = null): Submitter | null |
|
| 42 | 42 | { |
| 43 | 43 | return Registry::cache()->array()->remember(self::class . $xref . '@' . $tree->id(), function () use ($xref, $tree, $gedcom) { |
| 44 | 44 | $gedcom ??= $this->gedcom($xref, $tree); |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | * |
| 78 | 78 | * @return Submitter |
| 79 | 79 | */ |
| 80 | - public function new(string $xref, string $gedcom, string|null $pending, Tree $tree): Submitter |
|
| 80 | + public function new(string $xref, string $gedcom, string | null $pending, Tree $tree): Submitter |
|
| 81 | 81 | { |
| 82 | 82 | return new Submitter($xref, $gedcom, $pending, $tree); |
| 83 | 83 | } |
@@ -90,7 +90,7 @@ discard block |
||
| 90 | 90 | * |
| 91 | 91 | * @return string|null |
| 92 | 92 | */ |
| 93 | - protected function gedcom(string $xref, Tree $tree): string|null |
|
| 93 | + protected function gedcom(string $xref, Tree $tree): string | null |
|
| 94 | 94 | { |
| 95 | 95 | return DB::table('other') |
| 96 | 96 | ->where('o_id', '=', $xref) |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | * |
| 45 | 45 | * @return Individual|null |
| 46 | 46 | */ |
| 47 | - public function make(string $xref, Tree $tree, string|null $gedcom = null): Individual|null |
|
| 47 | + public function make(string $xref, Tree $tree, string | null $gedcom = null): Individual | null |
|
| 48 | 48 | { |
| 49 | 49 | return Registry::cache()->array()->remember(self::class . $xref . '@' . $tree->id(), function () use ($xref, $tree, $gedcom) { |
| 50 | 50 | $gedcom ??= $this->gedcom($xref, $tree); |
@@ -82,7 +82,7 @@ discard block |
||
| 82 | 82 | * |
| 83 | 83 | * @return Individual |
| 84 | 84 | */ |
| 85 | - public function new(string $xref, string $gedcom, string|null $pending, Tree $tree): Individual |
|
| 85 | + public function new(string $xref, string $gedcom, string | null $pending, Tree $tree): Individual |
|
| 86 | 86 | { |
| 87 | 87 | return new Individual($xref, $gedcom, $pending, $tree); |
| 88 | 88 | } |
@@ -95,7 +95,7 @@ discard block |
||
| 95 | 95 | * |
| 96 | 96 | * @return string|null |
| 97 | 97 | */ |
| 98 | - protected function gedcom(string $xref, Tree $tree): string|null |
|
| 98 | + protected function gedcom(string $xref, Tree $tree): string | null |
|
| 99 | 99 | { |
| 100 | 100 | return DB::table('individuals') |
| 101 | 101 | ->where('i_id', '=', $xref) |