@@ -59,5 +59,5 @@ |
||
59 | 59 | * |
60 | 60 | * @return SharedNote |
61 | 61 | */ |
62 | - public function new(string $xref, string $gedcom, ?string $pending, Tree $tree): SharedNote; |
|
62 | + public function new(string $xref, string $gedcom, ?string $pending, Tree $tree) : SharedNote; |
|
63 | 63 | } |
@@ -1090,7 +1090,7 @@ |
||
1090 | 1090 | } else { |
1091 | 1091 | $value = strip_tags(Registry::markdownFactory()->autolink($value, $this->tree), ['br']); |
1092 | 1092 | } |
1093 | - $value = strtr($value, [MarkdownFactory::BREAK => ' ']); |
|
1093 | + $value = strtr($value, [MarkdownFactory::break => ' ']); |
|
1094 | 1094 | } |
1095 | 1095 | |
1096 | 1096 | if (!empty($attrs['truncate'])) { |
@@ -94,7 +94,7 @@ |
||
94 | 94 | 'hu' => ['CS' => 'CS', 'DZS' => 'DZS', 'DZ' => 'DZ', 'GY' => 'GY', 'LY' => 'LY', 'NY' => 'NY', 'SZ' => 'SZ', 'TY' => 'TY', 'ZS' => 'ZS'], |
95 | 95 | 'nl' => ['IJ' => 'IJ'], |
96 | 96 | 'nn' => ['AA' => 'Å'], |
97 | - 'sk' => ['DZ' => 'DZ', 'DŽ' => 'DŽ','CH' => 'CH'], |
|
97 | + 'sk' => ['DZ' => 'DZ', 'DŽ' => 'DŽ', 'CH' => 'CH'], |
|
98 | 98 | ]; |
99 | 99 | |
100 | 100 | /** |
@@ -3,6 +3,6 @@ |
||
3 | 3 | declare(strict_types=1); |
4 | 4 | |
5 | 5 | return array ( |
6 | - '%H:%i:%s' => '%g:%i:%s %a', |
|
7 | - '%j %F %Y' => '%F %j, %Y', |
|
6 | + '%H:%i:%s' => '%g:%i:%s %a', |
|
7 | + '%j %F %Y' => '%F %j, %Y', |
|
8 | 8 | ); |
@@ -2,7 +2,7 @@ |
||
2 | 2 | |
3 | 3 | declare(strict_types=1); |
4 | 4 | |
5 | -return array ( |
|
5 | +return array( |
|
6 | 6 | '%H:%i:%s' => '%g:%i:%s %a', |
7 | 7 | '%j %F %Y' => '%F %j, %Y', |
8 | 8 | ); |
@@ -199,7 +199,7 @@ discard block |
||
199 | 199 | $currentLen = $endPos + 2; |
200 | 200 | $directive = substr($workingText, 0, $currentLen); |
201 | 201 | $workingText = substr($workingText, $currentLen); |
202 | - $result .= self::$waitingText . $directive; |
|
202 | + $result .= self::$waitingText . $directive; |
|
203 | 203 | self::$waitingText = ''; |
204 | 204 | break; |
205 | 205 | } |
@@ -308,7 +308,7 @@ discard block |
||
308 | 308 | break; |
309 | 309 | } |
310 | 310 | self::$waitingText .= $currentLetter; |
311 | - $workingText = substr($workingText, $currentLen); |
|
311 | + $workingText = substr($workingText, $currentLen); |
|
312 | 312 | if ($openParIndex !== false) { |
313 | 313 | // Opening parentheses always inherit the following directionality |
314 | 314 | while (true) { |
@@ -318,13 +318,13 @@ discard block |
||
318 | 318 | if (str_starts_with($workingText, ' ')) { |
319 | 319 | // Spaces following this left parenthesis inherit the following directionality too |
320 | 320 | self::$waitingText .= ' '; |
321 | - $workingText = substr($workingText, 1); |
|
321 | + $workingText = substr($workingText, 1); |
|
322 | 322 | continue; |
323 | 323 | } |
324 | 324 | if (str_starts_with($workingText, ' ')) { |
325 | 325 | // Spaces following this left parenthesis inherit the following directionality too |
326 | 326 | self::$waitingText .= ' '; |
327 | - $workingText = substr($workingText, 6); |
|
327 | + $workingText = substr($workingText, 6); |
|
328 | 328 | continue; |
329 | 329 | } |
330 | 330 | break; |
@@ -341,7 +341,7 @@ discard block |
||
341 | 341 | // Exceptions to this rule will be handled later during final clean-up. |
342 | 342 | // |
343 | 343 | if (self::$currentState !== '') { |
344 | - $result .= self::$waitingText; |
|
344 | + $result .= self::$waitingText; |
|
345 | 345 | self::$waitingText = ''; |
346 | 346 | } |
347 | 347 | break 2; // double break because we're waiting for more information |
@@ -470,7 +470,7 @@ discard block |
||
470 | 470 | } |
471 | 471 | if (substr($result . "\n", 0, self::LENGTH_START) !== self::START_LTR && substr($result . "\n", 0, self::LENGTH_START) !== self::START_RTL) { |
472 | 472 | $leadingText .= substr($result, 0, 1); |
473 | - $result = substr($result, 1); |
|
473 | + $result = substr($result, 1); |
|
474 | 474 | continue; |
475 | 475 | } |
476 | 476 | $result = substr($result, 0, self::LENGTH_START) . $leadingText . substr($result, self::LENGTH_START); |
@@ -612,11 +612,11 @@ discard block |
||
612 | 612 | private static function breakCurrentSpan(string &$result): void |
613 | 613 | { |
614 | 614 | // Interrupt the current span, insert that <br>, and then continue the current span |
615 | - $result .= self::$waitingText; |
|
615 | + $result .= self::$waitingText; |
|
616 | 616 | self::$waitingText = ''; |
617 | 617 | |
618 | 618 | $breakString = '<' . self::$currentState . 'br>'; |
619 | - $result .= $breakString; |
|
619 | + $result .= $breakString; |
|
620 | 620 | } |
621 | 621 | |
622 | 622 | /** |
@@ -673,7 +673,7 @@ discard block |
||
673 | 673 | break; |
674 | 674 | } // No more numeric strings |
675 | 675 | |
676 | - $tempResult .= substr($textSpan, 0, $posLRE + 3); // Copy everything preceding the numeric string |
|
676 | + $tempResult .= substr($textSpan, 0, $posLRE + 3); // Copy everything preceding the numeric string |
|
677 | 677 | $numericString = substr($textSpan, $posLRE + 3, $posPDF - $posLRE); // Separate the entire numeric string |
678 | 678 | $textSpan = substr($textSpan, $posPDF + 3); |
679 | 679 | $posColon = strpos($numericString, ':'); |
@@ -1140,7 +1140,7 @@ discard block |
||
1140 | 1140 | |
1141 | 1141 | // We're done: finish the span |
1142 | 1142 | $textSpan = self::starredName($textSpan, 'RTL'); // Wrap starred name in <u> and </u> tags |
1143 | - $result .= $textSpan . self::END_RTL; |
|
1143 | + $result .= $textSpan . self::END_RTL; |
|
1144 | 1144 | } |
1145 | 1145 | |
1146 | 1146 | if (self::$currentState !== 'LTR' && self::$currentState !== 'RTL') { |
@@ -36,7 +36,7 @@ |
||
36 | 36 | */ |
37 | 37 | public function equivalentLetters(): array |
38 | 38 | { |
39 | - return ['ä' => 'ae', 'ö' => 'oe', 'ü' => 'ue', 'ẞ' => 'ss', 'Ä' => 'AE', 'Ö' => 'OE', 'Ü' => 'UE', 'ß' => 'SS']; |
|
39 | + return ['ä' => 'ae', 'ö' => 'oe', 'ü' => 'ue', 'ẞ' => 'ss', 'Ä' => 'AE', 'Ö' => 'OE', 'Ü' => 'UE', 'ß' => 'SS']; |
|
40 | 40 | } |
41 | 41 | |
42 | 42 | /** |