@@ -174,17 +174,17 @@ |
||
| 174 | 174 | return $tag; |
| 175 | 175 | } |
| 176 | 176 | |
| 177 | - public function readLatitude(string $text): float|null |
|
| 177 | + public function readLatitude(string $text): float | null |
|
| 178 | 178 | { |
| 179 | 179 | return $this->readDegrees($text, Gedcom::LATITUDE_NORTH, Gedcom::LATITUDE_SOUTH); |
| 180 | 180 | } |
| 181 | 181 | |
| 182 | - public function readLongitude(string $text): float|null |
|
| 182 | + public function readLongitude(string $text): float | null |
|
| 183 | 183 | { |
| 184 | 184 | return $this->readDegrees($text, Gedcom::LONGITUDE_EAST, Gedcom::LONGITUDE_WEST); |
| 185 | 185 | } |
| 186 | 186 | |
| 187 | - private function readDegrees(string $text, string $positive, string $negative): float|null |
|
| 187 | + private function readDegrees(string $text, string $positive, string $negative): float | null |
|
| 188 | 188 | { |
| 189 | 189 | $text = trim($text); |
| 190 | 190 | $hemisphere = substr($text, 0, 1); |
@@ -209,7 +209,7 @@ discard block |
||
| 209 | 209 | |
| 210 | 210 | private static Translator $translator; |
| 211 | 211 | |
| 212 | - private static Collator|null $collator = null; |
|
| 212 | + private static Collator | null $collator = null; |
|
| 213 | 213 | |
| 214 | 214 | /** |
| 215 | 215 | * The preferred locales for this site, or a default list if no preference. |
@@ -248,7 +248,7 @@ discard block |
||
| 248 | 248 | * |
| 249 | 249 | * @return string |
| 250 | 250 | */ |
| 251 | - public static function digits(string|int $n): string |
|
| 251 | + public static function digits(string | int $n): string |
|
| 252 | 252 | { |
| 253 | 253 | return self::$locale->digits((string) $n); |
| 254 | 254 | } |
@@ -103,7 +103,7 @@ |
||
| 103 | 103 | * |
| 104 | 104 | * @return array<string>|null [nominative, genitive] or null |
| 105 | 105 | */ |
| 106 | - public function match(array $nodes, array $patterns): array|null |
|
| 106 | + public function match(array $nodes, array $patterns): array | null |
|
| 107 | 107 | { |
| 108 | 108 | $captures = []; |
| 109 | 109 | |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | /** |
| 32 | 32 | * Create a note. |
| 33 | 33 | */ |
| 34 | - public function make(string $xref, Tree $tree, string|null $gedcom = null): Note|null; |
|
| 34 | + public function make(string $xref, Tree $tree, string | null $gedcom = null): Note | null; |
|
| 35 | 35 | |
| 36 | 36 | /** |
| 37 | 37 | * Create a note from a row in the database. |
@@ -53,5 +53,5 @@ discard block |
||
| 53 | 53 | * |
| 54 | 54 | * @return Note |
| 55 | 55 | */ |
| 56 | - public function new(string $xref, string $gedcom, string|null $pending, Tree $tree): Note; |
|
| 56 | + public function new(string $xref, string $gedcom, string | null $pending, Tree $tree): Note; |
|
| 57 | 57 | } |
@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | * |
| 31 | 31 | * @return TimestampInterface |
| 32 | 32 | */ |
| 33 | - public function make(int $timestamp, UserInterface|null $user = null): TimestampInterface; |
|
| 33 | + public function make(int $timestamp, UserInterface | null $user = null): TimestampInterface; |
|
| 34 | 34 | |
| 35 | 35 | /** |
| 36 | 36 | * @param string|null $string YYYY-MM-DD HH:MM:SS (as provided by SQL). |
@@ -39,12 +39,12 @@ discard block |
||
| 39 | 39 | * |
| 40 | 40 | * @return TimestampInterface |
| 41 | 41 | */ |
| 42 | - public function fromString(string|null $string, string $format = 'Y-m-d H:i:s', UserInterface|null $user = null): TimestampInterface; |
|
| 42 | + public function fromString(string | null $string, string $format = 'Y-m-d H:i:s', UserInterface | null $user = null): TimestampInterface; |
|
| 43 | 43 | |
| 44 | 44 | /** |
| 45 | 45 | * @param UserInterface|null $user |
| 46 | 46 | * |
| 47 | 47 | * @return TimestampInterface |
| 48 | 48 | */ |
| 49 | - public function now(UserInterface|null $user = null): TimestampInterface; |
|
| 49 | + public function now(UserInterface | null $user = null): TimestampInterface; |
|
| 50 | 50 | } |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | /** |
| 32 | 32 | * Create a GedcomRecord object. |
| 33 | 33 | */ |
| 34 | - public function make(string $xref, Tree $tree, string|null $gedcom = null): GedcomRecord|null; |
|
| 34 | + public function make(string $xref, Tree $tree, string | null $gedcom = null): GedcomRecord | null; |
|
| 35 | 35 | |
| 36 | 36 | /** |
| 37 | 37 | * Create a GedcomRecord object from raw GEDCOM data. |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | * |
| 45 | 45 | * @return GedcomRecord |
| 46 | 46 | */ |
| 47 | - public function new(string $xref, string $gedcom, string|null $pending, Tree $tree): GedcomRecord; |
|
| 47 | + public function new(string $xref, string $gedcom, string | null $pending, Tree $tree): GedcomRecord; |
|
| 48 | 48 | |
| 49 | 49 | /** |
| 50 | 50 | * Create a GedcomRecord object from a row in the database. |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | /** |
| 32 | 32 | * Create a family. |
| 33 | 33 | */ |
| 34 | - public function make(string $xref, Tree $tree, string|null $gedcom = null): Family|null; |
|
| 34 | + public function make(string $xref, Tree $tree, string | null $gedcom = null): Family | null; |
|
| 35 | 35 | |
| 36 | 36 | /** |
| 37 | 37 | * Create a Family object from a row in the database. |
@@ -53,5 +53,5 @@ discard block |
||
| 53 | 53 | * |
| 54 | 54 | * @return Family |
| 55 | 55 | */ |
| 56 | - public function new(string $xref, string $gedcom, string|null $pending, Tree $tree): Family; |
|
| 56 | + public function new(string $xref, string $gedcom, string | null $pending, Tree $tree): Family; |
|
| 57 | 57 | } |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | /** |
| 32 | 32 | * Create a submission. |
| 33 | 33 | */ |
| 34 | - public function make(string $xref, Tree $tree, string|null $gedcom = null): Submission|null; |
|
| 34 | + public function make(string $xref, Tree $tree, string | null $gedcom = null): Submission | null; |
|
| 35 | 35 | |
| 36 | 36 | /** |
| 37 | 37 | * Create a submission from a row in the database. |
@@ -53,5 +53,5 @@ discard block |
||
| 53 | 53 | * |
| 54 | 54 | * @return Submission |
| 55 | 55 | */ |
| 56 | - public function new(string $xref, string $gedcom, string|null $pending, Tree $tree): Submission; |
|
| 56 | + public function new(string $xref, string $gedcom, string | null $pending, Tree $tree): Submission; |
|
| 57 | 57 | } |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | /** |
| 32 | 32 | * Create a media object. |
| 33 | 33 | */ |
| 34 | - public function make(string $xref, Tree $tree, string|null $gedcom = null): Media|null; |
|
| 34 | + public function make(string $xref, Tree $tree, string | null $gedcom = null): Media | null; |
|
| 35 | 35 | |
| 36 | 36 | /** |
| 37 | 37 | * Create a media object from a row in the database. |
@@ -53,5 +53,5 @@ discard block |
||
| 53 | 53 | * |
| 54 | 54 | * @return Media |
| 55 | 55 | */ |
| 56 | - public function new(string $xref, string $gedcom, string|null $pending, Tree $tree): Media; |
|
| 56 | + public function new(string $xref, string $gedcom, string | null $pending, Tree $tree): Media; |
|
| 57 | 57 | } |