@@ -2618,7 +2618,7 @@ |
||
2618 | 2618 | /** @var ModuleBlockInterface|null $module */ |
2619 | 2619 | $module = $this->module_service |
2620 | 2620 | ->findByComponent(ModuleBlockInterface::class, $this->tree, Auth::user()) |
2621 | - ->first(static function (ModuleInterface $module) use ($block): bool { |
|
2621 | + ->first(static function (ModuleInterface $module) use ($block) : bool { |
|
2622 | 2622 | return $module->name() === $block && $module->name() !== 'html'; |
2623 | 2623 | }); |
2624 | 2624 |
@@ -402,7 +402,7 @@ |
||
402 | 402 | $NAME = $params['NAME'] ?? ''; |
403 | 403 | |
404 | 404 | if ($NAME !== '') { |
405 | - $newged .= "\n1 NAME " . $NAME; |
|
405 | + $newged .= "\n1 NAME " . $NAME; |
|
406 | 406 | $name_facts = [ |
407 | 407 | 'TYPE', |
408 | 408 | 'NPFX', |
@@ -192,13 +192,13 @@ |
||
192 | 192 | if (strlen($match[1]) > strlen($match[2])) { |
193 | 193 | $match[2] = substr($match[1], 0, strlen($match[1]) - strlen($match[2])) . $match[2]; |
194 | 194 | } |
195 | - $ged_date = new Date("FROM {$cal} {$match[1]} TO {$cal} {$match[2]}"); |
|
195 | + $ged_date = new Date("from {$cal} {$match[1]} TO {$cal} {$match[2]}"); |
|
196 | 196 | $view = 'year'; |
197 | 197 | } elseif (preg_match('/^(\d+)(\?+)$/', $year, $match)) { |
198 | 198 | // advanced-year "decade/century wildcard" |
199 | 199 | $y1 = $match[1] . str_replace('?', '0', $match[2]); |
200 | 200 | $y2 = $match[1] . str_replace('?', '9', $match[2]); |
201 | - $ged_date = new Date("FROM {$cal} {$y1} TO {$cal} {$y2}"); |
|
201 | + $ged_date = new Date("from {$cal} {$y1} TO {$cal} {$y2}"); |
|
202 | 202 | $view = 'year'; |
203 | 203 | } else { |
204 | 204 | if ($year < 0) { |
@@ -485,7 +485,7 @@ discard block |
||
485 | 485 | */ |
486 | 486 | private function applyFilter(array $facts, string $filterof, string $filtersx): array |
487 | 487 | { |
488 | - $filtered = []; |
|
488 | + $filtered = []; |
|
489 | 489 | $hundred_years_ago = Carbon::now()->subYears(100)->julianDay(); |
490 | 490 | foreach ($facts as $fact) { |
491 | 491 | $record = $fact->record(); |
@@ -558,7 +558,7 @@ discard block |
||
558 | 558 | $html = ''; |
559 | 559 | |
560 | 560 | foreach ($list as $xref => $facts) { |
561 | - $tmp = GedcomRecord::getInstance((string) $xref, $tree); |
|
561 | + $tmp = GedcomRecord::getInstance((string) $xref, $tree); |
|
562 | 562 | $html .= $tag1 . '<a href="' . e($tmp->url()) . '">' . $tmp->fullName() . '</a> '; |
563 | 563 | $html .= '<div class="indent">' . $facts . '</div>' . $tag2; |
564 | 564 | } |
@@ -261,7 +261,7 @@ |
||
261 | 261 | |
262 | 262 | // Create a source, to indicate the source of the data. |
263 | 263 | $filetext .= "0 @WEBTREES@ SOUR\n1 TITL " . $base_url . "\n"; |
264 | - $author = $this->user_service->find((int) $tree->getPreference('CONTACT_USER_ID')); |
|
264 | + $author = $this->user_service->find((int) $tree->getPreference('CONTACT_USER_ID')); |
|
265 | 265 | if ($author !== null) { |
266 | 266 | $filetext .= '1 AUTH ' . $author->realName() . "\n"; |
267 | 267 | } |
@@ -13,7 +13,8 @@ |
||
13 | 13 | use Fisharebest\Webtrees\Module\ModuleCustomTrait; |
14 | 14 | use Fisharebest\Webtrees\View; |
15 | 15 | |
16 | -return new class extends MinimalTheme implements ModuleCustomInterface { |
|
16 | +return new class extends MinimalTheme implements ModuleCustomInterface |
|
17 | +{ |
|
17 | 18 | use ModuleCustomTrait; |
18 | 19 | |
19 | 20 | /** |
@@ -108,7 +108,7 @@ discard block |
||
108 | 108 | 'generations' => 3, |
109 | 109 | 'layout' => PedigreeChartModule::STYLE_RIGHT, |
110 | 110 | ]); |
111 | - $content = view('modules/charts/chart', [ |
|
111 | + $content = view('modules/charts/chart', [ |
|
112 | 112 | 'block_id' => $block_id, |
113 | 113 | 'chart_url' => $chart_url, |
114 | 114 | 'class' => 'wt-chart-pedigree', |
@@ -124,7 +124,7 @@ discard block |
||
124 | 124 | 'generations' => 2, |
125 | 125 | 'chart_style' => DescendancyChartModule::CHART_STYLE_TREE, |
126 | 126 | ]); |
127 | - $content = view('modules/charts/chart', [ |
|
127 | + $content = view('modules/charts/chart', [ |
|
128 | 128 | 'block_id' => $block_id, |
129 | 129 | 'chart_url' => $chart_url, |
130 | 130 | 'class' => 'wt-chart-descendants', |
@@ -139,7 +139,7 @@ discard block |
||
139 | 139 | 'ajax' => true, |
140 | 140 | 'generations' => 2, |
141 | 141 | ]); |
142 | - $content = view('modules/charts/chart', [ |
|
142 | + $content = view('modules/charts/chart', [ |
|
143 | 143 | 'block_id' => $block_id, |
144 | 144 | 'chart_url' => $chart_url, |
145 | 145 | 'class' => 'wt-chart-hourglass', |
@@ -233,7 +233,7 @@ discard block |
||
233 | 233 | $default_xref = $gedcomid ?: $PEDIGREE_ROOT_ID; |
234 | 234 | |
235 | 235 | $type = $this->getBlockSetting($block_id, 'type', 'pedigree'); |
236 | - $xref = $this->getBlockSetting($block_id, 'pid', $default_xref); |
|
236 | + $xref = $this->getBlockSetting($block_id, 'pid', $default_xref); |
|
237 | 237 | |
238 | 238 | $charts = [ |
239 | 239 | 'pedigree' => I18N::translate('Pedigree'), |
@@ -183,7 +183,7 @@ discard block |
||
183 | 183 | $currentLen = $endPos + 2; |
184 | 184 | $directive = substr($workingText, 0, $currentLen); |
185 | 185 | $workingText = substr($workingText, $currentLen); |
186 | - $result .= self::$waitingText . $directive; |
|
186 | + $result .= self::$waitingText . $directive; |
|
187 | 187 | self::$waitingText = ''; |
188 | 188 | break; |
189 | 189 | } |
@@ -1125,7 +1125,7 @@ discard block |
||
1125 | 1125 | |
1126 | 1126 | // We're done: finish the span |
1127 | 1127 | $textSpan = self::starredName($textSpan, 'RTL'); // Wrap starred name in <u> and </u> tags |
1128 | - $result .= $textSpan . self::END_RTL; |
|
1128 | + $result .= $textSpan . self::END_RTL; |
|
1129 | 1129 | } |
1130 | 1130 | |
1131 | 1131 | if (self::$currentState !== 'LTR' && self::$currentState !== 'RTL') { |
@@ -299,6 +299,6 @@ |
||
299 | 299 | */ |
300 | 300 | private function dmyOrder(): string |
301 | 301 | { |
302 | - return preg_replace('/[^DMY]/', '', str_replace(['J', 'F',], ['D', 'M',], I18N::dateFormat())); |
|
302 | + return preg_replace('/[^DMY]/', '', str_replace(['J', 'F', ], ['D', 'M', ], I18N::dateFormat())); |
|
303 | 303 | } |
304 | 304 | } |
@@ -188,7 +188,7 @@ |
||
188 | 188 | $params['tree'] = $media_file->media()->tree()->name(); |
189 | 189 | $this->glideSignature()->validateRequest('', $params); |
190 | 190 | |
191 | - $path = $media_file->media()->tree()->getPreference('MEDIA_DIRECTORY', 'media/') . $media_file->filename(); |
|
191 | + $path = $media_file->media()->tree()->getPreference('MEDIA_DIRECTORY', 'media/') . $media_file->filename(); |
|
192 | 192 | $folder = dirname($path); |
193 | 193 | |
194 | 194 | $cache_path = 'thumbnail-cache/' . md5($folder); |