@@ -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')) { |
@@ -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]; |
@@ -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'), |
@@ -94,7 +94,7 @@ |
||
94 | 94 | /** @var Collection<GedcomRecord> $records */ |
95 | 95 | $records = $rows->map(function (stdClass $row) use ($tree): ?GedcomRecord { |
96 | 96 | return $this->data_fix_service->getRecordByType($row->xref, $tree, $row->type); |
97 | - })->filter(static function (?GedcomRecord $record) use ($module, $params): bool { |
|
97 | + })->filter(static function (?GedcomRecord $record) use ($module, $params) : bool { |
|
98 | 98 | return $record instanceof GedcomRecord && !$record->isPendingDeletion() && $module->doesRecordNeedUpdate($record, $params); |
99 | 99 | }); |
100 | 100 |
@@ -232,7 +232,7 @@ discard block |
||
232 | 232 | $create_form = ''; |
233 | 233 | foreach ($media_trees as $media_tree => $media_directory) { |
234 | 234 | if (str_starts_with($row[0], $media_directory)) { |
235 | - $tmp = substr($row[0], strlen($media_directory)); |
|
235 | + $tmp = substr($row[0], strlen($media_directory)); |
|
236 | 236 | $create_form .= |
237 | 237 | '<p><a href="#" data-toggle="modal" data-backdrop="static" data-target="#modal-create-media-from-file" data-file="' . e($tmp) . '" data-url="' . e(route(CreateMediaObjectFromFile::class, ['tree' => $media_tree])) . '" onclick="document.getElementById(\'modal-create-media-from-file-form\').action=this.dataset.url; document.getElementById(\'file\').value=this.dataset.file;">' . I18N::translate('Create') . '</a> — ' . e($media_tree) . '<p>'; |
238 | 238 | } |
@@ -327,7 +327,7 @@ discard block |
||
327 | 327 | // This will work for local filesystems. For remote filesystems, we will |
328 | 328 | // need to copy the file locally to work out the image size. |
329 | 329 | $imgsize = getimagesize(Webtrees::DATA_DIR . $file); |
330 | - $html .= '<dt>' . I18N::translate('Image dimensions') . '</dt>'; |
|
330 | + $html .= '<dt>' . I18N::translate('Image dimensions') . '</dt>'; |
|
331 | 331 | /* I18N: image dimensions, width × height */ |
332 | 332 | $html .= '<dd>' . I18N::translate('%1$s × %2$s pixels', I18N::number($imgsize['0']), I18N::number($imgsize['1'])) . '</dd>'; |
333 | 333 | } catch (Throwable $ex) { |
@@ -85,7 +85,7 @@ |
||
85 | 85 | } |
86 | 86 | |
87 | 87 | // Request for a non-existent location? |
88 | - if ($parent_id !== null && $parent->id() === null) { |
|
88 | + if ($parent_id !== null && $parent->id() === null) { |
|
89 | 89 | return redirect(route(__CLASS__)); |
90 | 90 | } |
91 | 91 |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | $user_service = new UserService(); |
90 | 90 | |
91 | 91 | if ($key !== '') { |
92 | - $url = self::OPENROUTE_URL; |
|
92 | + $url = self::OPENROUTE_URL; |
|
93 | 93 | $qry = [ |
94 | 94 | 'api_key' => $key, |
95 | 95 | 'text' => rawurlencode($query), |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | 'size' => self::SEARCH_LIMIT, |
98 | 98 | ]; |
99 | 99 | } else { |
100 | - $url = self::NOMINATIM_URL; |
|
100 | + $url = self::NOMINATIM_URL; |
|
101 | 101 | $qry = [ |
102 | 102 | 'q' => rawurlencode($query), |
103 | 103 | 'format' => 'jsonv2', |