@@ -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) |
@@ -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): Media|null |
|
| 41 | + public function make(string $xref, Tree $tree, string | null $gedcom = null): Media | 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 Media |
| 79 | 79 | */ |
| 80 | - public function new(string $xref, string $gedcom, string|null $pending, Tree $tree): Media |
|
| 80 | + public function new(string $xref, string $gedcom, string | null $pending, Tree $tree): Media |
|
| 81 | 81 | { |
| 82 | 82 | return new Media($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('media') |
| 96 | 96 | ->where('m_id', '=', $xref) |
@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | * |
| 46 | 46 | * @return Family|null |
| 47 | 47 | */ |
| 48 | - public function make(string $xref, Tree $tree, string|null $gedcom = null): Family|null |
|
| 48 | + public function make(string $xref, Tree $tree, string | null $gedcom = null): Family | null |
|
| 49 | 49 | { |
| 50 | 50 | return Registry::cache()->array()->remember(self::class . $xref . '@' . $tree->id(), function () use ($xref, $tree, $gedcom) { |
| 51 | 51 | $gedcom ??= $this->gedcom($xref, $tree); |
@@ -92,7 +92,7 @@ discard block |
||
| 92 | 92 | * |
| 93 | 93 | * @return Family |
| 94 | 94 | */ |
| 95 | - public function new(string $xref, string $gedcom, string|null $pending, Tree $tree): Family |
|
| 95 | + public function new(string $xref, string $gedcom, string | null $pending, Tree $tree): Family |
|
| 96 | 96 | { |
| 97 | 97 | return new Family($xref, $gedcom, $pending, $tree); |
| 98 | 98 | } |
@@ -105,7 +105,7 @@ discard block |
||
| 105 | 105 | * |
| 106 | 106 | * @return string|null |
| 107 | 107 | */ |
| 108 | - protected function gedcom(string $xref, Tree $tree): string|null |
|
| 108 | + protected function gedcom(string $xref, Tree $tree): string | null |
|
| 109 | 109 | { |
| 110 | 110 | return DB::table('families') |
| 111 | 111 | ->where('f_id', '=', $xref) |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | /** |
| 39 | 39 | * Create a header. |
| 40 | 40 | */ |
| 41 | - public function make(string $xref, Tree $tree, string|null $gedcom = null): Header|null |
|
| 41 | + public function make(string $xref, Tree $tree, string | null $gedcom = null): Header | 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 Header |
| 79 | 79 | */ |
| 80 | - public function new(string $xref, string $gedcom, string|null $pending, Tree $tree): Header |
|
| 80 | + public function new(string $xref, string $gedcom, string | null $pending, Tree $tree): Header |
|
| 81 | 81 | { |
| 82 | 82 | return new Header($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) |
@@ -39,7 +39,7 @@ discard block |
||
| 39 | 39 | /** |
| 40 | 40 | * Create a repository. |
| 41 | 41 | */ |
| 42 | - public function make(string $xref, Tree $tree, string|null $gedcom = null): Repository|null |
|
| 42 | + public function make(string $xref, Tree $tree, string | null $gedcom = null): Repository | null |
|
| 43 | 43 | { |
| 44 | 44 | return Registry::cache()->array()->remember(self::class . $xref . '@' . $tree->id(), function () use ($xref, $tree, $gedcom) { |
| 45 | 45 | $gedcom ??= $this->gedcom($xref, $tree); |
@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | * |
| 84 | 84 | * @return Repository |
| 85 | 85 | */ |
| 86 | - public function new(string $xref, string $gedcom, string|null $pending, Tree $tree): Repository |
|
| 86 | + public function new(string $xref, string $gedcom, string | null $pending, Tree $tree): Repository |
|
| 87 | 87 | { |
| 88 | 88 | return new Repository($xref, $gedcom, $pending, $tree); |
| 89 | 89 | } |
@@ -96,7 +96,7 @@ discard block |
||
| 96 | 96 | * |
| 97 | 97 | * @return string|null |
| 98 | 98 | */ |
| 99 | - protected function gedcom(string $xref, Tree $tree): string|null |
|
| 99 | + protected function gedcom(string $xref, Tree $tree): string | null |
|
| 100 | 100 | { |
| 101 | 101 | return DB::table('other') |
| 102 | 102 | ->where('o_id', '=', $xref) |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | /** |
| 39 | 39 | * Create a note. |
| 40 | 40 | */ |
| 41 | - public function make(string $xref, Tree $tree, string|null $gedcom = null): SharedNote|null |
|
| 41 | + public function make(string $xref, Tree $tree, string | null $gedcom = null): SharedNote | 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 SharedNote |
| 79 | 79 | */ |
| 80 | - public function new(string $xref, string $gedcom, string|null $pending, Tree $tree): SharedNote |
|
| 80 | + public function new(string $xref, string $gedcom, string | null $pending, Tree $tree): SharedNote |
|
| 81 | 81 | { |
| 82 | 82 | return new SharedNote($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) |