@@ -59,7 +59,7 @@ |
||
59 | 59 | ]; |
60 | 60 | |
61 | 61 | foreach ($given as $name => $count) { |
62 | - $data[] = [ $name, $count ]; |
|
62 | + $data[] = [$name, $count]; |
|
63 | 63 | } |
64 | 64 | |
65 | 65 | $data[] = [ |
@@ -57,7 +57,7 @@ |
||
57 | 57 | $tot_l |
58 | 58 | ]; |
59 | 59 | |
60 | - $data[] = [ |
|
60 | + $data[] = [ |
|
61 | 61 | I18N::translate('Dead'), |
62 | 62 | $tot_d |
63 | 63 | ]; |
@@ -102,9 +102,9 @@ |
||
102 | 102 | ->groupBy(['century', 'sex']); |
103 | 103 | |
104 | 104 | return $male->unionAll($female) |
105 | - ->orderBy('century') |
|
106 | - ->get() |
|
107 | - ->all(); |
|
105 | + ->orderBy('century') |
|
106 | + ->get() |
|
107 | + ->all(); |
|
108 | 108 | } |
109 | 109 | |
110 | 110 | /** |
@@ -145,7 +145,7 @@ discard block |
||
145 | 145 | if ($note->canShow()) { |
146 | 146 | $noterec = $note->gedcom(); |
147 | 147 | $nt = preg_match("/0 @$nmatch[1]@ NOTE (.*)/", $noterec, $n1match); |
148 | - $data .= self::printNoteRecord($tree, ($nt > 0) ? $n1match[1] : '', 1, $noterec); |
|
148 | + $data .= self::printNoteRecord($tree, ($nt > 0) ? $n1match[1] : '', 1, $noterec); |
|
149 | 149 | } |
150 | 150 | } else { |
151 | 151 | $data = '<div class="fact_NOTE"><span class="label">' . I18N::translate('Note') . '</span>: <span class="field error">' . $nmatch[1] . '</span></div>'; |
@@ -362,20 +362,20 @@ discard block |
||
362 | 362 | if (preg_match_all('/\n3 (?:_HEB|ROMN) (.+)/', $placerec, $matches)) { |
363 | 363 | foreach ($matches[1] as $match) { |
364 | 364 | $wt_place = new Place($match, $tree); |
365 | - $html .= ' - ' . $wt_place->fullName(); |
|
365 | + $html .= ' - ' . $wt_place->fullName(); |
|
366 | 366 | } |
367 | 367 | } |
368 | 368 | $map_lati = ''; |
369 | 369 | $cts = preg_match('/\d LATI (.*)/', $placerec, $match); |
370 | 370 | if ($cts > 0) { |
371 | 371 | $map_lati = $match[1]; |
372 | - $html .= '<br><span class="label">' . I18N::translate('Latitude') . ': </span>' . $map_lati; |
|
372 | + $html .= '<br><span class="label">' . I18N::translate('Latitude') . ': </span>' . $map_lati; |
|
373 | 373 | } |
374 | 374 | $map_long = ''; |
375 | 375 | $cts = preg_match('/\d LONG (.*)/', $placerec, $match); |
376 | 376 | if ($cts > 0) { |
377 | 377 | $map_long = $match[1]; |
378 | - $html .= ' <span class="label">' . I18N::translate('Longitude') . ': </span>' . $map_long; |
|
378 | + $html .= ' <span class="label">' . I18N::translate('Longitude') . ': </span>' . $map_long; |
|
379 | 379 | } |
380 | 380 | if ($map_lati && $map_long) { |
381 | 381 | $map_lati = trim(strtr($map_lati, 'NSEW,�', ' - -. ')); // S5,6789 ==> -5.6789 |
@@ -49,7 +49,7 @@ |
||
49 | 49 | */ |
50 | 50 | public function __construct(Tree $tree) |
51 | 51 | { |
52 | - $this->tree = $tree; |
|
52 | + $this->tree = $tree; |
|
53 | 53 | $this->country_service = new CountryService(); |
54 | 54 | } |
55 | 55 |
@@ -3,7 +3,8 @@ |
||
3 | 3 | use Fisharebest\Webtrees\Module\ModuleCustomInterface; |
4 | 4 | use Fisharebest\Webtrees\Module\ModuleCustomTrait; |
5 | 5 | |
6 | -return new class extends AbstractModule implements ModuleCustomInterface { |
|
6 | +return new class extends AbstractModule implements ModuleCustomInterface |
|
7 | +{ |
|
7 | 8 | use ModuleCustomTrait; |
8 | 9 | |
9 | 10 | /** |
@@ -252,7 +252,7 @@ |
||
252 | 252 | [$namespace, $view_name] = explode(self::NAMESPACE_SEPARATOR, $view_name, 2); |
253 | 253 | |
254 | 254 | if ((self::$namespaces[$namespace] ?? null) === null) { |
255 | - throw new RuntimeException('Namespace "' . e($namespace) . '" not found.'); |
|
255 | + throw new RuntimeException('Namespace "' . e($namespace) . '" not found.'); |
|
256 | 256 | } |
257 | 257 | |
258 | 258 | $view_file = self::$namespaces[$namespace] . $view_name . self::TEMPLATE_EXTENSION; |
@@ -156,7 +156,7 @@ discard block |
||
156 | 156 | // Ambiguous dates - don't override calendar escape |
157 | 157 | if ($cal === '') { |
158 | 158 | if (preg_match('/^(JAN|FEB|MAR|APR|MAY|JUN|JUL|AUG|SEP|OCT|NOV|DEC)$/', $m)) { |
159 | - $cal = GregorianDate::ESCAPE; |
|
159 | + $cal = GregorianDate::ESCAPE; |
|
160 | 160 | } elseif (preg_match('/^[345]\d\d\d$/', $y)) { |
161 | 161 | // Year 3000-5999 |
162 | 162 | $cal = JewishDate::ESCAPE; |
@@ -451,7 +451,7 @@ discard block |
||
451 | 451 | public function addYears(int $years, string $qualifier = ''): Date |
452 | 452 | { |
453 | 453 | $tmp = clone $this; |
454 | - $tmp->date1->year += $years; |
|
454 | + $tmp->date1->year += $years; |
|
455 | 455 | $tmp->date1->month = 0; |
456 | 456 | $tmp->date1->day = 0; |
457 | 457 | $tmp->date1->setJdFromYmd(); |
@@ -550,7 +550,7 @@ |
||
550 | 550 | $html = ''; |
551 | 551 | |
552 | 552 | foreach ($list as $id => $facts) { |
553 | - $tmp = GedcomRecord::getInstance($id, $tree); |
|
553 | + $tmp = GedcomRecord::getInstance($id, $tree); |
|
554 | 554 | $html .= $tag1 . '<a href="' . e($tmp->url()) . '">' . $tmp->fullName() . '</a> '; |
555 | 555 | $html .= '<div class="indent">' . $facts . '</div>' . $tag2; |
556 | 556 | } |
@@ -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) { |