@@ -172,5 +172,5 @@ |
||
| 172 | 172 | * |
| 173 | 173 | * @return string |
| 174 | 174 | */ |
| 175 | - public function chartMedia(string|null $color_from = null, string|null $color_to = null): string; |
|
| 175 | + public function chartMedia(string | null $color_from = null, string | null $color_to = null): string; |
|
| 176 | 176 | } |
@@ -110,7 +110,7 @@ discard block |
||
| 110 | 110 | * |
| 111 | 111 | * @return string |
| 112 | 112 | */ |
| 113 | - public function latestUserRegDate(string|null $format = null): string |
|
| 113 | + public function latestUserRegDate(string | null $format = null): string |
|
| 114 | 114 | { |
| 115 | 115 | $format ??= I18N::dateFormat(); |
| 116 | 116 | $user = $this->latestUserQuery(); |
@@ -124,7 +124,7 @@ discard block |
||
| 124 | 124 | * |
| 125 | 125 | * @return string |
| 126 | 126 | */ |
| 127 | - public function latestUserRegTime(string|null $format = null): string |
|
| 127 | + public function latestUserRegTime(string | null $format = null): string |
|
| 128 | 128 | { |
| 129 | 129 | $format ??= str_replace('%', '', I18N::timeFormat()); |
| 130 | 130 | $user = $this->latestUserQuery(); |
@@ -138,7 +138,7 @@ discard block |
||
| 138 | 138 | * |
| 139 | 139 | * @return string |
| 140 | 140 | */ |
| 141 | - public function latestUserLoggedin(string|null $yes = null, string|null $no = null): string |
|
| 141 | + public function latestUserLoggedin(string | null $yes = null, string | null $no = null): string |
|
| 142 | 142 | { |
| 143 | 143 | $yes ??= I18N::translate('yes'); |
| 144 | 144 | $no ??= I18N::translate('no'); |
@@ -50,7 +50,7 @@ |
||
| 50 | 50 | * |
| 51 | 51 | * @return T |
| 52 | 52 | */ |
| 53 | - public function remember(string $key, Closure $closure, int|null $ttl = null) |
|
| 53 | + public function remember(string $key, Closure $closure, int | null $ttl = null) |
|
| 54 | 54 | { |
| 55 | 55 | return $this->cache->get(md5($key), static function (ItemInterface $item) use ($closure, $ttl) { |
| 56 | 56 | $item->expiresAfter($ttl); |
@@ -30,7 +30,7 @@ |
||
| 30 | 30 | /** |
| 31 | 31 | * @param string|null $message |
| 32 | 32 | */ |
| 33 | - public function __construct(string|null $message = null) |
|
| 33 | + public function __construct(string | null $message = null) |
|
| 34 | 34 | { |
| 35 | 35 | $message ??= I18N::translate('You do not have permission to view this page.'); |
| 36 | 36 | |
@@ -80,7 +80,7 @@ discard block |
||
| 80 | 80 | * |
| 81 | 81 | * @param array<string>|int|AbstractCalendarDate $date |
| 82 | 82 | */ |
| 83 | - public function __construct(array|int|AbstractCalendarDate $date) |
|
| 83 | + public function __construct(array | int | AbstractCalendarDate $date) |
|
| 84 | 84 | { |
| 85 | 85 | // Construct from an integer (a julian day number) |
| 86 | 86 | if (is_int($date)) { |
@@ -97,7 +97,7 @@ discard block |
||
| 97 | 97 | $this->month = static::MONTH_TO_NUMBER[$date[1]] ?? 0; |
| 98 | 98 | |
| 99 | 99 | if ($this->month === 0) { |
| 100 | - $this->day = 0; |
|
| 100 | + $this->day = 0; |
|
| 101 | 101 | } |
| 102 | 102 | |
| 103 | 103 | $this->year = $this->extractYear($date[0]); |
@@ -42,7 +42,7 @@ |
||
| 42 | 42 | /** |
| 43 | 43 | * @param UploadedFileInterface|null $uploaded_file |
| 44 | 44 | */ |
| 45 | - public function __construct(UploadedFileInterface|null $uploaded_file) |
|
| 45 | + public function __construct(UploadedFileInterface | null $uploaded_file) |
|
| 46 | 46 | { |
| 47 | 47 | if ($uploaded_file === null) { |
| 48 | 48 | parent::__construct(I18N::translate('No file was received. Please try again.')); |
@@ -46,7 +46,7 @@ |
||
| 46 | 46 | /** |
| 47 | 47 | * Since we know the type, this is quicker than calling Registry::gedcomRecordFactory()->make(). |
| 48 | 48 | */ |
| 49 | - public function getRecordByType(string $xref, Tree $tree, string $type): GedcomRecord|null |
|
| 49 | + public function getRecordByType(string $xref, Tree $tree, string $type): GedcomRecord | null |
|
| 50 | 50 | { |
| 51 | 51 | switch ($type) { |
| 52 | 52 | case Family::RECORD_TYPE: |
@@ -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 | } |