@@ -583,7 +583,7 @@ discard block |
||
583 | 583 | for ($j = 0; $j < $ct; $j++) { |
584 | 584 | if (!str_contains($match[$j][1], '@')) { |
585 | 585 | $source = e($match[$j][1] . preg_replace('/\n\d CONT ?/', "\n", $match[$j][2])); |
586 | - $data .= '<div class="fact_SOUR"><span class="label">' . I18N::translate('Source') . ':</span> <span class="field" dir="auto">' . Filter::formatText($source, $tree) . '</span></div>'; |
|
586 | + $data .= '<div class="fact_SOUR"><span class="label">' . I18N::translate('Source') . ':</span> <span class="field" dir="auto">' . Filter::formatText($source, $tree) . '</span></div>'; |
|
587 | 587 | } |
588 | 588 | } |
589 | 589 | // Find source for each fact |
@@ -601,7 +601,7 @@ discard block |
||
601 | 601 | } |
602 | 602 | $srec = substr($factrec, $spos1, $spos2 - $spos1); |
603 | 603 | $lt = preg_match_all("/$nlevel \w+/", $srec, $matches); |
604 | - $data .= '<div class="fact_SOUR">'; |
|
604 | + $data .= '<div class="fact_SOUR">'; |
|
605 | 605 | $id = 'collapse-' . Uuid::uuid4()->toString(); |
606 | 606 | $expanded = (bool) $tree->getPreference('EXPAND_SOURCES'); |
607 | 607 | if ($lt > 0) { |
@@ -64,7 +64,7 @@ |
||
64 | 64 | { |
65 | 65 | use ModuleListTrait; |
66 | 66 | |
67 | - protected const ROUTE_URL = '/tree/{tree}/branches{/surname}'; |
|
67 | + protected const ROUTE_URL = '/tree/{tree}/branches{/surname}'; |
|
68 | 68 | |
69 | 69 | /** @var ModuleService */ |
70 | 70 | protected $module_service; |
@@ -326,7 +326,8 @@ discard block |
||
326 | 326 | <li class="wt-initials-list-item d-flex"> |
327 | 327 | <?php if ($count > 0) : ?> |
328 | 328 | <a href="<?= e($this->listUrl($tree, ['alpha' => $letter, 'tree' => $tree->name()])) ?>" class="wt-initial px-1<?= $letter === $alpha ? ' active' : '' ?> '" title="<?= I18N::number($count) ?>"><?= $this->surnameInitial((string) $letter) ?></a> |
329 | - <?php else : ?> |
|
329 | + <?php else { |
|
330 | + : ?> |
|
330 | 331 | <span class="wt-initial px-1 text-muted"><?= $this->surnameInitial((string) $letter) ?></span> |
331 | 332 | |
332 | 333 | <?php endif ?> |
@@ -380,6 +381,7 @@ discard block |
||
380 | 381 | |
381 | 382 | if ($show === 'indi' || $show === 'surn') { |
382 | 383 | $surns = $this->surnames($tree, $surname, $alpha, $show_marnm === 'yes', $families, I18N::locale()); |
384 | +} |
|
383 | 385 | if ($show === 'surn') { |
384 | 386 | // Show the surname list |
385 | 387 | switch ($tree->getPreference('SURNAME_LIST_STYLE')) { |
@@ -53,7 +53,7 @@ |
||
53 | 53 | */ |
54 | 54 | public function handle(ServerRequestInterface $request): ResponseInterface |
55 | 55 | { |
56 | - $place_id = (int) $request->getQueryParams()['place_id']; |
|
56 | + $place_id = (int) $request->getQueryParams()['place_id']; |
|
57 | 57 | |
58 | 58 | $place = $this->map_data_service->findById($place_id); |
59 | 59 | $parent = $place->parent(); |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | { |
47 | 47 | use ModuleChartTrait; |
48 | 48 | |
49 | - protected const ROUTE_URL = '/tree/{tree}/timeline-{scale}'; |
|
49 | + protected const ROUTE_URL = '/tree/{tree}/timeline-{scale}'; |
|
50 | 50 | |
51 | 51 | // Defaults |
52 | 52 | protected const DEFAULT_SCALE = 10; |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | '_TODO', |
68 | 68 | 'CHAN', |
69 | 69 | ]; |
70 | - protected const BHEIGHT = 30; |
|
70 | + protected const BHEIGHT = 30; |
|
71 | 71 | |
72 | 72 | // Box height |
73 | 73 | |
@@ -152,7 +152,7 @@ discard block |
||
152 | 152 | |
153 | 153 | $params = (array) $request->getParsedBody(); |
154 | 154 | |
155 | - $add = $params['add'] ?? ''; |
|
155 | + $add = $params['add'] ?? ''; |
|
156 | 156 | |
157 | 157 | Auth::checkComponentAccess($this, ModuleChartInterface::class, $tree, $user); |
158 | 158 |
@@ -52,7 +52,7 @@ |
||
52 | 52 | */ |
53 | 53 | public function find($user_id): ?User |
54 | 54 | { |
55 | - return Registry::cache()->array()->remember('user-' . $user_id, static function () use ($user_id): ?User { |
|
55 | + return Registry::cache()->array()->remember('user-' . $user_id, static function () use ($user_id) : ?User { |
|
56 | 56 | return DB::table('user') |
57 | 57 | ->where('user_id', '=', $user_id) |
58 | 58 | ->get() |
@@ -112,7 +112,7 @@ |
||
112 | 112 | '<div class="gedcom-data" dir="ltr">' . |
113 | 113 | preg_replace_callback( |
114 | 114 | '/@(' . Gedcom::REGEX_XREF . ')@/', |
115 | - static function (array $match) use ($tree): string { |
|
115 | + static function (array $match) use ($tree) : string { |
|
116 | 116 | $record = Registry::gedcomRecordFactory()->make($match[1], $tree); |
117 | 117 | |
118 | 118 | return $record ? '<a href="' . e($record->url()) . '">' . $match[0] . '</a>' : $match[0]; |
@@ -294,7 +294,7 @@ |
||
294 | 294 | { |
295 | 295 | $tmp = round($degrees, self::PRECISION); |
296 | 296 | |
297 | - return ($tmp < 0 ? $negative : $positive) . (string)abs($tmp); |
|
297 | + return ($tmp < 0 ? $negative : $positive) . (string) abs($tmp); |
|
298 | 298 | } |
299 | 299 | |
300 | 300 | /** |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | 'generations' => 3, |
118 | 118 | 'layout' => PedigreeChartModule::STYLE_RIGHT, |
119 | 119 | ]); |
120 | - $content = view('modules/charts/chart', [ |
|
120 | + $content = view('modules/charts/chart', [ |
|
121 | 121 | 'block_id' => $block_id, |
122 | 122 | 'chart_url' => $chart_url, |
123 | 123 | 'class' => 'wt-chart-pedigree', |
@@ -138,7 +138,7 @@ discard block |
||
138 | 138 | 'generations' => 2, |
139 | 139 | 'chart_style' => DescendancyChartModule::CHART_STYLE_TREE, |
140 | 140 | ]); |
141 | - $content = view('modules/charts/chart', [ |
|
141 | + $content = view('modules/charts/chart', [ |
|
142 | 142 | 'block_id' => $block_id, |
143 | 143 | 'chart_url' => $chart_url, |
144 | 144 | 'class' => 'wt-chart-descendants', |
@@ -151,7 +151,7 @@ discard block |
||
151 | 151 | break; |
152 | 152 | |
153 | 153 | case 'hourglass': |
154 | - $module = $this->module_service->findByInterface(HourglassChartModule::class)->first(); |
|
154 | + $module = $this->module_service->findByInterface(HourglassChartModule::class)->first(); |
|
155 | 155 | |
156 | 156 | if ($module instanceof HourglassChartModule) { |
157 | 157 | $title = $module->chartTitle($individual); |
@@ -159,7 +159,7 @@ discard block |
||
159 | 159 | 'ajax' => true, |
160 | 160 | 'generations' => 2, |
161 | 161 | ]); |
162 | - $content = view('modules/charts/chart', [ |
|
162 | + $content = view('modules/charts/chart', [ |
|
163 | 163 | 'block_id' => $block_id, |
164 | 164 | 'chart_url' => $chart_url, |
165 | 165 | 'class' => 'wt-chart-hourglass', |
@@ -265,7 +265,7 @@ discard block |
||
265 | 265 | $default_xref = $gedcomid ?: $PEDIGREE_ROOT_ID; |
266 | 266 | |
267 | 267 | $type = $this->getBlockSetting($block_id, 'type', 'pedigree'); |
268 | - $xref = $this->getBlockSetting($block_id, 'pid', $default_xref); |
|
268 | + $xref = $this->getBlockSetting($block_id, 'pid', $default_xref); |
|
269 | 269 | |
270 | 270 | $charts = [ |
271 | 271 | 'pedigree' => I18N::translate('Pedigree'), |