@@ -85,7 +85,7 @@ |
||
| 85 | 85 | * |
| 86 | 86 | * @return Header |
| 87 | 87 | */ |
| 88 | - public function new(string $xref, string $gedcom, ?string $pending, Tree $tree): Header |
|
| 88 | + public function new(string $xref, string $gedcom, ?string $pending, Tree $tree) : Header |
|
| 89 | 89 | { |
| 90 | 90 | return new Header($xref, $gedcom, $pending, $tree); |
| 91 | 91 | } |
@@ -85,7 +85,7 @@ |
||
| 85 | 85 | * |
| 86 | 86 | * @return Submission |
| 87 | 87 | */ |
| 88 | - public function new(string $xref, string $gedcom, ?string $pending, Tree $tree): Submission |
|
| 88 | + public function new(string $xref, string $gedcom, ?string $pending, Tree $tree) : Submission |
|
| 89 | 89 | { |
| 90 | 90 | return new Submission($xref, $gedcom, $pending, $tree); |
| 91 | 91 | } |
@@ -159,7 +159,7 @@ discard block |
||
| 159 | 159 | if ($note->canShow()) { |
| 160 | 160 | $noterec = $note->gedcom(); |
| 161 | 161 | $nt = preg_match("/0 @$nmatch[1]@ NOTE (.*)/", $noterec, $n1match); |
| 162 | - $data .= self::printNoteRecord($tree, $nt > 0 ? $n1match[1] : '', 1, $noterec); |
|
| 162 | + $data .= self::printNoteRecord($tree, $nt > 0 ? $n1match[1] : '', 1, $noterec); |
|
| 163 | 163 | } |
| 164 | 164 | } else { |
| 165 | 165 | $data = '<div class="fact_NOTE"><span class="label">' . I18N::translate('Note') . '</span>: <span class="field error">' . $nmatch[1] . '</span></div>'; |
@@ -259,7 +259,7 @@ discard block |
||
| 259 | 259 | } |
| 260 | 260 | }, |
| 261 | 261 | $age_string |
| 262 | - ) ; |
|
| 262 | + ); |
|
| 263 | 263 | } |
| 264 | 264 | } |
| 265 | 265 | |
@@ -393,20 +393,20 @@ discard block |
||
| 393 | 393 | if (preg_match_all('/\n3 (?:_HEB|ROMN) (.+)/', $placerec, $matches)) { |
| 394 | 394 | foreach ($matches[1] as $match) { |
| 395 | 395 | $wt_place = new Place($match, $tree); |
| 396 | - $html .= ' - ' . $wt_place->fullName(); |
|
| 396 | + $html .= ' - ' . $wt_place->fullName(); |
|
| 397 | 397 | } |
| 398 | 398 | } |
| 399 | 399 | $map_lati = ''; |
| 400 | 400 | $cts = preg_match('/\d LATI (.*)/', $placerec, $match); |
| 401 | 401 | if ($cts > 0) { |
| 402 | 402 | $map_lati = $match[1]; |
| 403 | - $html .= '<br><span class="label">' . I18N::translate('Latitude') . ': </span>' . $map_lati; |
|
| 403 | + $html .= '<br><span class="label">' . I18N::translate('Latitude') . ': </span>' . $map_lati; |
|
| 404 | 404 | } |
| 405 | 405 | $map_long = ''; |
| 406 | 406 | $cts = preg_match('/\d LONG (.*)/', $placerec, $match); |
| 407 | 407 | if ($cts > 0) { |
| 408 | 408 | $map_long = $match[1]; |
| 409 | - $html .= ' <span class="label">' . I18N::translate('Longitude') . ': </span>' . $map_long; |
|
| 409 | + $html .= ' <span class="label">' . I18N::translate('Longitude') . ': </span>' . $map_long; |
|
| 410 | 410 | } |
| 411 | 411 | if ($map_lati && $map_long) { |
| 412 | 412 | $map_lati = trim(strtr($map_lati, 'NSEW,�', ' - -. ')); // S5,6789 ==> -5.6789 |
@@ -82,7 +82,7 @@ |
||
| 82 | 82 | if (error_get_last() !== null && error_get_last()['type'] & E_ERROR) { |
| 83 | 83 | // If PHP does not display the error, then we must display it. |
| 84 | 84 | if (ini_get('display_errors') !== '1') { |
| 85 | - echo error_get_last()['message'], '<br><br>', error_get_last()['file'] , ': ', error_get_last()['line']; |
|
| 85 | + echo error_get_last()['message'], '<br><br>', error_get_last()['file'], ': ', error_get_last()['line']; |
|
| 86 | 86 | } |
| 87 | 87 | } |
| 88 | 88 | }); |
@@ -59,6 +59,6 @@ |
||
| 59 | 59 | * |
| 60 | 60 | * @return Submission |
| 61 | 61 | */ |
| 62 | - public function new(string $xref, string $gedcom, ?string $pending, Tree $tree): Submission; |
|
| 62 | + public function new(string $xref, string $gedcom, ?string $pending, Tree $tree) : Submission; |
|
| 63 | 63 | |
| 64 | 64 | } |
@@ -59,5 +59,5 @@ |
||
| 59 | 59 | * |
| 60 | 60 | * @return Header |
| 61 | 61 | */ |
| 62 | - public function new(string $xref, string $gedcom, ?string $pending, Tree $tree): Header; |
|
| 62 | + public function new(string $xref, string $gedcom, ?string $pending, Tree $tree) : Header; |
|
| 63 | 63 | } |
@@ -50,7 +50,7 @@ |
||
| 50 | 50 | * |
| 51 | 51 | * @return GedcomRecord |
| 52 | 52 | */ |
| 53 | - public function new(string $xref, string $gedcom, ?string $pending, Tree $tree): GedcomRecord; |
|
| 53 | + public function new(string $xref, string $gedcom, ?string $pending, Tree $tree) : GedcomRecord; |
|
| 54 | 54 | |
| 55 | 55 | /** |
| 56 | 56 | * Create a GedcomRecord object from a row in the database. |
@@ -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 = Factory::gedcomRecord()->make($match[1], $tree); |
| 117 | 117 | |
| 118 | 118 | return $record ? '<a href="' . e($record->url()) . '">' . $match[0] . '</a>' : $match[0]; |
@@ -291,7 +291,7 @@ discard block |
||
| 291 | 291 | $anniversary_facts = $this->calendar_service->getCalendarEvents($ged_year->minimumJulianDay(), $ged_year->maximumJulianDay(), $filterev, $tree); |
| 292 | 292 | } |
| 293 | 293 | |
| 294 | - $anniversary_facts = $this->applyFilter($anniversary_facts, $filterof, $filtersx); |
|
| 294 | + $anniversary_facts = $this->applyFilter($anniversary_facts, $filterof, $filtersx); |
|
| 295 | 295 | $anniversaries = Collection::make($anniversary_facts) |
| 296 | 296 | ->unique() |
| 297 | 297 | ->sort(static function (Fact $x, Fact $y): int { |
@@ -467,7 +467,7 @@ discard block |
||
| 467 | 467 | */ |
| 468 | 468 | private function applyFilter(array $facts, string $filterof, string $filtersx): array |
| 469 | 469 | { |
| 470 | - $filtered = []; |
|
| 470 | + $filtered = []; |
|
| 471 | 471 | $hundred_years_ago = Carbon::now()->subYears(100)->julianDay(); |
| 472 | 472 | foreach ($facts as $fact) { |
| 473 | 473 | $record = $fact->record(); |
@@ -519,7 +519,7 @@ discard block |
||
| 519 | 519 | $html = ''; |
| 520 | 520 | |
| 521 | 521 | foreach ($list as $xref => $facts) { |
| 522 | - $tmp = Factory::gedcomRecord()->make((string) $xref, $tree); |
|
| 522 | + $tmp = Factory::gedcomRecord()->make((string) $xref, $tree); |
|
| 523 | 523 | $html .= $tag1 . '<a href="' . e($tmp->url()) . '">' . $tmp->fullName() . '</a> '; |
| 524 | 524 | $html .= '<div class="indent">' . $facts . '</div>' . $tag2; |
| 525 | 525 | } |