@@ -46,8 +46,8 @@ |
||
46 | 46 | string $color_male = null, |
47 | 47 | string $color_unknown = null |
48 | 48 | ): string { |
49 | - $color_female = $color_female ?? '#ffd1dc'; |
|
50 | - $color_male = $color_male ?? '#84beff'; |
|
49 | + $color_female = $color_female ?? '#ffd1dc'; |
|
50 | + $color_male = $color_male ?? '#84beff'; |
|
51 | 51 | $color_unknown = $color_unknown ?? '#777777'; |
52 | 52 | |
53 | 53 | $data = [ |
@@ -79,7 +79,7 @@ |
||
79 | 79 | ->select(['d_gid as id', 'd_year as year', 'd_fact AS fact', 'd_type AS type']) |
80 | 80 | ->where('d_file', '=', $this->tree->id()) |
81 | 81 | ->where('d_fact', '=', $fact) |
82 | - ->where('d_julianday1', '=', function (Builder $query) use ($operation, $fact): void { |
|
82 | + ->where('d_julianday1', '=', function (Builder $query) use ($operation, $fact) : void { |
|
83 | 83 | $query->selectRaw($operation . '(d_julianday1)') |
84 | 84 | ->from('dates') |
85 | 85 | ->where('d_file', '=', $this->tree->id()) |
@@ -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')) { |
@@ -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]; |
@@ -52,7 +52,7 @@ |
||
52 | 52 | */ |
53 | 53 | public function find(?int $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() |
@@ -57,7 +57,7 @@ |
||
57 | 57 | string $color_dead = null |
58 | 58 | ): string { |
59 | 59 | $color_living = $color_living ?? '#ffffff'; |
60 | - $color_dead = $color_dead ?? '#cccccc'; |
|
60 | + $color_dead = $color_dead ?? '#cccccc'; |
|
61 | 61 | |
62 | 62 | $data = [ |
63 | 63 | [ |
@@ -457,7 +457,7 @@ |
||
457 | 457 | public function addYears(int $years, string $qualifier = ''): Date |
458 | 458 | { |
459 | 459 | $tmp = clone $this; |
460 | - $tmp->date1->year += $years; |
|
460 | + $tmp->date1->year += $years; |
|
461 | 461 | $tmp->date1->month = 0; |
462 | 462 | $tmp->date1->day = 0; |
463 | 463 | $tmp->date1->setJdFromYmd(); |
@@ -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 | ]); |
@@ -137,7 +137,7 @@ discard block |
||
137 | 137 | 'generations' => 2, |
138 | 138 | 'chart_style' => DescendancyChartModule::CHART_STYLE_TREE, |
139 | 139 | ]); |
140 | - $content = view('modules/charts/chart', [ |
|
140 | + $content = view('modules/charts/chart', [ |
|
141 | 141 | 'block_id' => $block_id, |
142 | 142 | 'chart_url' => $chart_url, |
143 | 143 | ]); |
@@ -157,7 +157,7 @@ discard block |
||
157 | 157 | 'ajax' => true, |
158 | 158 | 'generations' => 2, |
159 | 159 | ]); |
160 | - $content = view('modules/charts/chart', [ |
|
160 | + $content = view('modules/charts/chart', [ |
|
161 | 161 | 'block_id' => $block_id, |
162 | 162 | 'chart_url' => $chart_url, |
163 | 163 | ]); |
@@ -179,7 +179,7 @@ |
||
179 | 179 | throw new HttpNotFoundException(I18N::translate('%s does not exist.', 'news_id:' . $news_id)); |
180 | 180 | } |
181 | 181 | } else { |
182 | - $row = (object)['body' => '', 'subject' => '']; |
|
182 | + $row = (object) ['body' => '', 'subject' => '']; |
|
183 | 183 | } |
184 | 184 | |
185 | 185 | $title = I18N::translate('Add/edit a journal/news entry'); |