@@ -87,7 +87,7 @@ |
||
| 87 | 87 | "\n", |
| 88 | 88 | ' ', |
| 89 | 89 | ], $t); |
| 90 | - $t = strip_tags($t); |
|
| 90 | + $t = strip_tags($t); |
|
| 91 | 91 | $this->text .= $t; |
| 92 | 92 | } |
| 93 | 93 | |
@@ -383,7 +383,7 @@ |
||
| 383 | 383 | $this->upgrade_service->cleanFiles($root_filesystem, $folders_to_clean, $files_to_keep); |
| 384 | 384 | |
| 385 | 385 | $url = route(ControlPanel::class); |
| 386 | - $alert = I18N::translate('The upgrade is complete.'); |
|
| 386 | + $alert = I18N::translate('The upgrade is complete.'); |
|
| 387 | 387 | $button = '<a href="' . e($url) . '" class="btn btn-primary">' . I18N::translate('continue') . '</a>'; |
| 388 | 388 | |
| 389 | 389 | return response(view('components/alert-success', [ |
@@ -485,7 +485,7 @@ discard block |
||
| 485 | 485 | */ |
| 486 | 486 | private function applyFilter(array $facts, string $filterof, string $filtersx): array |
| 487 | 487 | { |
| 488 | - $filtered = []; |
|
| 488 | + $filtered = []; |
|
| 489 | 489 | $hundred_years_ago = Carbon::now()->subYears(100)->julianDay(); |
| 490 | 490 | foreach ($facts as $fact) { |
| 491 | 491 | $record = $fact->record(); |
@@ -558,7 +558,7 @@ discard block |
||
| 558 | 558 | $html = ''; |
| 559 | 559 | |
| 560 | 560 | foreach ($list as $xref => $facts) { |
| 561 | - $tmp = GedcomRecord::getInstance((string) $xref, $tree); |
|
| 561 | + $tmp = GedcomRecord::getInstance((string) $xref, $tree); |
|
| 562 | 562 | $html .= $tag1 . '<a href="' . e($tmp->url()) . '">' . $tmp->fullName() . '</a> '; |
| 563 | 563 | $html .= '<div class="indent">' . $facts . '</div>' . $tag2; |
| 564 | 564 | } |
@@ -219,7 +219,7 @@ |
||
| 219 | 219 | */ |
| 220 | 220 | private function surnamesToAdd(Individual $record): array |
| 221 | 221 | { |
| 222 | - $tree = $record->tree(); |
|
| 222 | + $tree = $record->tree(); |
|
| 223 | 223 | |
| 224 | 224 | $wife_surnames = $this->surnames($record); |
| 225 | 225 | $husb_surnames = []; |
@@ -97,7 +97,7 @@ |
||
| 97 | 97 | 'action' => 'update', |
| 98 | 98 | 'xref' => $row->xref, |
| 99 | 99 | ] + $params); |
| 100 | - $update_url = route(DataFixUpdate::class, [ |
|
| 100 | + $update_url = route(DataFixUpdate::class, [ |
|
| 101 | 101 | 'tree' => $tree->name(), |
| 102 | 102 | 'data_fix' => $module->name(), |
| 103 | 103 | 'action' => 'update', |
@@ -103,7 +103,7 @@ |
||
| 103 | 103 | return $row->xref >= $start && $row->xref <= $end; |
| 104 | 104 | })->map(function (stdClass $row) use ($tree): ?GedcomRecord { |
| 105 | 105 | return $this->data_fix_service->getRecordByType($row->xref, $tree, $row->type); |
| 106 | - })->filter(static function (?GedcomRecord $record) use ($module, $params): bool { |
|
| 106 | + })->filter(static function (?GedcomRecord $record) use ($module, $params) : bool { |
|
| 107 | 107 | return $record instanceof GedcomRecord && !$record->isPendingDeletion() && $module->doesRecordNeedUpdate($record, $params); |
| 108 | 108 | }); |
| 109 | 109 | |
@@ -45,7 +45,7 @@ |
||
| 45 | 45 | { |
| 46 | 46 | use ModuleChartTrait; |
| 47 | 47 | |
| 48 | - protected const ROUTE_URL = '/tree/{tree}/descendants-{style}-{generations}/{xref}'; |
|
| 48 | + protected const ROUTE_URL = '/tree/{tree}/descendants-{style}-{generations}/{xref}'; |
|
| 49 | 49 | |
| 50 | 50 | // Chart styles |
| 51 | 51 | public const CHART_STYLE_TREE = 'tree'; |
@@ -49,7 +49,7 @@ |
||
| 49 | 49 | { |
| 50 | 50 | use ModuleChartTrait; |
| 51 | 51 | |
| 52 | - protected const ROUTE_URL = '/tree/{tree}/fan-chart-{style}-{generations}-{width}/{xref}'; |
|
| 52 | + protected const ROUTE_URL = '/tree/{tree}/fan-chart-{style}-{generations}-{width}/{xref}'; |
|
| 53 | 53 | |
| 54 | 54 | // Chart styles |
| 55 | 55 | private const STYLE_HALF_CIRCLE = '2'; |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | use ModuleChartTrait; |
| 55 | 55 | use ModuleConfigTrait; |
| 56 | 56 | |
| 57 | - protected const ROUTE_URL = '/tree/{tree}/relationships-{ancestors}-{recursion}/{xref}{/xref2}'; |
|
| 57 | + protected const ROUTE_URL = '/tree/{tree}/relationships-{ancestors}-{recursion}/{xref}{/xref2}'; |
|
| 58 | 58 | |
| 59 | 59 | /** It would be more correct to use PHP_INT_MAX, but this isn't friendly in URLs */ |
| 60 | 60 | public const UNLIMITED_RECURSION = 99; |
@@ -332,14 +332,14 @@ discard block |
||
| 332 | 332 | case 'sis': |
| 333 | 333 | case 'sib': |
| 334 | 334 | $table[$x + 1][$y] = '<div style="background:url(' . e(asset('css/images/hline.png')) . ') repeat-x center; width: 94px; text-align: center"><div class="hline-text" style="height: 32px;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $tree), Individual::getInstance($path[$n + 1], $tree)) . '</div><div style="height: 32px;">' . view('icons/arrow-right') . '</div></div>'; |
| 335 | - $x += 2; |
|
| 335 | + $x += 2; |
|
| 336 | 336 | break; |
| 337 | 337 | case 'son': |
| 338 | 338 | case 'dau': |
| 339 | 339 | case 'chi': |
| 340 | 340 | if ($n > 2 && preg_match('/fat|mot|par/', $relationships[$n - 2])) { |
| 341 | 341 | $table[$x + 1][$y - 1] = '<div style="background:url(' . $diagonal2 . '); width: 64px; height: 64px; text-align: center;"><div style="height: 32px; text-align: end;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $tree), Individual::getInstance($path[$n + 1], $tree)) . '</div><div style="height: 32px; text-align: start;">' . view('icons/arrow-down') . '</div></div>'; |
| 342 | - $x += 2; |
|
| 342 | + $x += 2; |
|
| 343 | 343 | } else { |
| 344 | 344 | $table[$x][$y - 1] = '<div style="background:url(' . e('"' . asset('css/images/vline.png') . '"') . ') repeat-y center; height: 64px; text-align: center;"><div class="vline-text" style="display: inline-block; width:50%; line-height: 64px;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $tree), Individual::getInstance($path[$n + 1], $tree)) . '</div><div style="display: inline-block; width:50%; line-height: 64px;">' . view('icons/arrow-down') . '</div></div>'; |
| 345 | 345 | } |
@@ -350,7 +350,7 @@ discard block |
||
| 350 | 350 | case 'par': |
| 351 | 351 | if ($n > 2 && preg_match('/son|dau|chi/', $relationships[$n - 2])) { |
| 352 | 352 | $table[$x + 1][$y + 1] = '<div style="background:url(' . $diagonal1 . '); background-position: top right; width: 64px; height: 64px; text-align: center;"><div style="height: 32px; text-align: start;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $tree), Individual::getInstance($path[$n + 1], $tree)) . '</div><div style="height: 32px; text-align: end;">' . view('icons/arrow-down') . '</div></div>'; |
| 353 | - $x += 2; |
|
| 353 | + $x += 2; |
|
| 354 | 354 | } else { |
| 355 | 355 | $table[$x][$y + 1] = '<div style="background:url(' . e('"' . asset('css/images/vline.png') . '"') . ') repeat-y center; height: 64px; text-align:center; "><div class="vline-text" style="display: inline-block; width: 50%; line-height: 64px;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $tree), Individual::getInstance($path[$n + 1], $tree)) . '</div><div style="display: inline-block; width: 50%; line-height: 32px">' . view('icons/arrow-up') . '</div></div>'; |
| 356 | 356 | } |
@@ -648,17 +648,17 @@ discard block |
||
| 648 | 648 | */ |
| 649 | 649 | private function oldStyleRelationshipPath(Tree $tree, array $path): array |
| 650 | 650 | { |
| 651 | - $spouse_codes = [ |
|
| 651 | + $spouse_codes = [ |
|
| 652 | 652 | 'M' => 'hus', |
| 653 | 653 | 'F' => 'wif', |
| 654 | 654 | 'U' => 'spo', |
| 655 | 655 | ]; |
| 656 | - $parent_codes = [ |
|
| 656 | + $parent_codes = [ |
|
| 657 | 657 | 'M' => 'fat', |
| 658 | 658 | 'F' => 'mot', |
| 659 | 659 | 'U' => 'par', |
| 660 | 660 | ]; |
| 661 | - $child_codes = [ |
|
| 661 | + $child_codes = [ |
|
| 662 | 662 | 'M' => 'son', |
| 663 | 663 | 'F' => 'dau', |
| 664 | 664 | 'U' => 'chi', |