@@ -52,7 +52,7 @@ |
||
52 | 52 | $this->register(self::POLISH, new PolishSurnameTradition()); |
53 | 53 | $this->register(self::LITHUANIAN, new LithuanianSurnameTradition()); |
54 | 54 | $this->register(self::ICELANDIC, new IcelandicSurnameTradition()); |
55 | - $this->register(self::DEFAULT, new DefaultSurnameTradition()); |
|
55 | + $this->register(self::default, new DefaultSurnameTradition()); |
|
56 | 56 | } |
57 | 57 | |
58 | 58 | /** |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | * |
100 | 100 | * @return ResponseInterface |
101 | 101 | */ |
102 | - public function response(string|array|object $content = '', int $code = StatusCodeInterface::STATUS_OK, array $headers = []): ResponseInterface |
|
102 | + public function response(string | array | object $content = '', int $code = StatusCodeInterface::STATUS_OK, array $headers = []): ResponseInterface |
|
103 | 103 | { |
104 | 104 | if ($content === '' && $code === StatusCodeInterface::STATUS_OK) { |
105 | 105 | $code = StatusCodeInterface::STATUS_NO_CONTENT; |
@@ -108,7 +108,7 @@ discard block |
||
108 | 108 | if (is_string($content)) { |
109 | 109 | $headers['content-type'] ??= 'text/html; charset=UTF-8'; |
110 | 110 | } else { |
111 | - $content = json_encode($content, JSON_THROW_ON_ERROR | JSON_UNESCAPED_UNICODE); |
|
111 | + $content = json_encode($content, JSON_THROW_ON_ERROR | JSON_UNESCAPED_UNICODE); |
|
112 | 112 | $headers['content-type'] ??= 'application/json'; |
113 | 113 | } |
114 | 114 |
@@ -50,13 +50,13 @@ discard block |
||
50 | 50 | class MarkdownFactory implements MarkdownFactoryInterface |
51 | 51 | { |
52 | 52 | // Commonmark uses the self-closing form of this tag, so we do the same for consistency. |
53 | - public const BREAK = '<br />'; |
|
53 | + public const break = '<br />'; |
|
54 | 54 | |
55 | 55 | protected const CONFIG_AUTOLINK = [ |
56 | 56 | 'allow_unsafe_links' => false, |
57 | 57 | 'html_input' => HtmlFilter::ESCAPE, |
58 | 58 | 'renderer' => [ |
59 | - 'soft_break' => self::BREAK, |
|
59 | + 'soft_break' => self::break, |
|
60 | 60 | ], |
61 | 61 | ]; |
62 | 62 | |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | 'allow_unsafe_links' => false, |
65 | 65 | 'html_input' => HtmlFilter::ESCAPE, |
66 | 66 | 'renderer' => [ |
67 | - 'soft_break' => self::BREAK, |
|
67 | + 'soft_break' => self::break, |
|
68 | 68 | ], |
69 | 69 | 'table' => [ |
70 | 70 | 'wrap' => [ |
@@ -114,24 +114,24 @@ |
||
114 | 114 | public static function firstLineOfTextFromHtml(string $html): string |
115 | 115 | { |
116 | 116 | $html = strtr($html, [ |
117 | - '</blockquote>' => MarkdownFactory::BREAK, |
|
118 | - '</h1>' => MarkdownFactory::BREAK, |
|
119 | - '</h2>' => MarkdownFactory::BREAK, |
|
120 | - '</h3>' => MarkdownFactory::BREAK, |
|
121 | - '</h4>' => MarkdownFactory::BREAK, |
|
122 | - '</h5>' => MarkdownFactory::BREAK, |
|
123 | - '</h6>' => MarkdownFactory::BREAK, |
|
124 | - '</li>' => MarkdownFactory::BREAK, |
|
125 | - '</p>' => MarkdownFactory::BREAK, |
|
126 | - '</pre>' => MarkdownFactory::BREAK, |
|
117 | + '</blockquote>' => MarkdownFactory::break, |
|
118 | + '</h1>' => MarkdownFactory::break, |
|
119 | + '</h2>' => MarkdownFactory::break, |
|
120 | + '</h3>' => MarkdownFactory::break, |
|
121 | + '</h4>' => MarkdownFactory::break, |
|
122 | + '</h5>' => MarkdownFactory::break, |
|
123 | + '</h6>' => MarkdownFactory::break, |
|
124 | + '</li>' => MarkdownFactory::break, |
|
125 | + '</p>' => MarkdownFactory::break, |
|
126 | + '</pre>' => MarkdownFactory::break, |
|
127 | 127 | '</td>' => ' ', |
128 | 128 | '</th>' => ' ', |
129 | - '<hr>' => MarkdownFactory::BREAK, |
|
129 | + '<hr>' => MarkdownFactory::break, |
|
130 | 130 | ]); |
131 | 131 | |
132 | 132 | $html = strip_tags($html, ['br']); |
133 | 133 | |
134 | - [$first] = explode(MarkdownFactory::BREAK, $html, 2); |
|
134 | + [$first] = explode(MarkdownFactory::break, $html, 2); |
|
135 | 135 | |
136 | 136 | return htmlspecialchars_decode($first, ENT_QUOTES); |
137 | 137 | } |
@@ -126,7 +126,7 @@ |
||
126 | 126 | ->flatten(); |
127 | 127 | |
128 | 128 | // Don't show family meta-data tags |
129 | - $exclude_facts = new Collection(['FAM:CHAN', 'FAM:_UID']); |
|
129 | + $exclude_facts = new Collection(['FAM:CHAN', 'FAM:_UID']); |
|
130 | 130 | // Don't show tags that are shown in tabs or sidebars |
131 | 131 | $exclude_facts = $exclude_facts->merge($sidebar_facts)->merge($tab_facts); |
132 | 132 |
@@ -89,7 +89,7 @@ |
||
89 | 89 | * |
90 | 90 | * @return SharedNote |
91 | 91 | */ |
92 | - public function new(string $xref, string $gedcom, ?string $pending, Tree $tree): SharedNote |
|
92 | + public function new(string $xref, string $gedcom, ?string $pending, Tree $tree) : SharedNote |
|
93 | 93 | { |
94 | 94 | return new SharedNote($xref, $gedcom, $pending, $tree); |
95 | 95 | } |
@@ -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 | /** |