@@ -110,7 +110,7 @@ discard block |
||
| 110 | 110 | 'generations' => 3, |
| 111 | 111 | 'layout' => PedigreeChartModule::ORIENTATION_RIGHT, |
| 112 | 112 | ]); |
| 113 | - $content = view('modules/charts/chart', [ |
|
| 113 | + $content = view('modules/charts/chart', [ |
|
| 114 | 114 | 'block_id' => $block_id, |
| 115 | 115 | 'chart_url' => $chart_url, |
| 116 | 116 | ]); |
@@ -125,7 +125,7 @@ discard block |
||
| 125 | 125 | 'generations' => 2, |
| 126 | 126 | 'chart_style' => DescendancyChartModule::CHART_STYLE_LIST, |
| 127 | 127 | ]); |
| 128 | - $content = view('modules/charts/chart', [ |
|
| 128 | + $content = view('modules/charts/chart', [ |
|
| 129 | 129 | 'block_id' => $block_id, |
| 130 | 130 | 'chart_url' => $chart_url, |
| 131 | 131 | ]); |
@@ -139,7 +139,7 @@ discard block |
||
| 139 | 139 | 'ajax' => true, |
| 140 | 140 | 'generations' => 2, |
| 141 | 141 | ]); |
| 142 | - $content = view('modules/charts/chart', [ |
|
| 142 | + $content = view('modules/charts/chart', [ |
|
| 143 | 143 | 'block_id' => $block_id, |
| 144 | 144 | 'chart_url' => $chart_url, |
| 145 | 145 | ]); |
@@ -125,10 +125,10 @@ discard block |
||
| 125 | 125 | switch ($show_marnm) { |
| 126 | 126 | case 'no': |
| 127 | 127 | case 'yes': |
| 128 | - $user->setPreference($families?'family-list-marnm':'individual-list-marnm', $show_marnm); |
|
| 128 | + $user->setPreference($families ? 'family-list-marnm' : 'individual-list-marnm', $show_marnm); |
|
| 129 | 129 | break; |
| 130 | 130 | default: |
| 131 | - $show_marnm = $user->getPreference($families?'family-list-marnm':'individual-list-marnm'); |
|
| 131 | + $show_marnm = $user->getPreference($families ? 'family-list-marnm' : 'individual-list-marnm'); |
|
| 132 | 132 | } |
| 133 | 133 | |
| 134 | 134 | // Make sure selections are consistent. |
@@ -160,7 +160,7 @@ discard block |
||
| 160 | 160 | 'ged' => $tree->name(), |
| 161 | 161 | 'show_all' => 'yes', |
| 162 | 162 | ]; |
| 163 | - $show = $request->get('show', 'surn'); |
|
| 163 | + $show = $request->get('show', 'surn'); |
|
| 164 | 164 | } |
| 165 | 165 | } elseif ($surname) { |
| 166 | 166 | $alpha = $this->localization_service->initialLetter($surname); // so we can highlight the initial letter |
@@ -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 | |
@@ -87,7 +87,7 @@ |
||
| 87 | 87 | public function getMenu(Tree $tree): ?Menu |
| 88 | 88 | { |
| 89 | 89 | $submenus = $this->module_service->findByComponent(ModuleListInterface::class, $tree, Auth::user()) |
| 90 | - ->map(function (ModuleListInterface $module) use ($tree): ?Menu { |
|
| 90 | + ->map(function (ModuleListInterface $module) use ($tree) : ?Menu { |
|
| 91 | 91 | return $module->listMenu($tree); |
| 92 | 92 | }) |
| 93 | 93 | ->filter() |
@@ -2616,7 +2616,7 @@ |
||
| 2616 | 2616 | /** @var ModuleBlockInterface|null $module */ |
| 2617 | 2617 | $module = $this->module_service |
| 2618 | 2618 | ->findByComponent(ModuleBlockInterface::class, $this->tree, Auth::user()) |
| 2619 | - ->filter(function (ModuleInterface $module) use ($block): bool { |
|
| 2619 | + ->filter(function (ModuleInterface $module) use ($block) : bool { |
|
| 2620 | 2620 | return $module->name() === $block && $module->name() !== 'html'; |
| 2621 | 2621 | }) |
| 2622 | 2622 | ->first(); |
@@ -57,8 +57,8 @@ discard block |
||
| 57 | 57 | $size = 75.0 + 125.0 * ($count - $minimum) / ($maximum - $minimum); |
| 58 | 58 | } |
| 59 | 59 | |
| 60 | - $tag = ($module instanceof ModuleListInterface)?'a':'span'; |
|
| 61 | - $html .= '<'.$tag.' style="font-size:' . $size . '%"'; |
|
| 60 | + $tag = ($module instanceof ModuleListInterface) ? 'a' : 'span'; |
|
| 61 | + $html .= '<' . $tag . ' style="font-size:' . $size . '%"'; |
|
| 62 | 62 | if ($module instanceof ModuleListInterface) { |
| 63 | 63 | $url = $module->listUrl($tree, ['surname' => $surn]); |
| 64 | 64 | $html .= ' href="' . e($url) . '"'; |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | } else { |
| 70 | 70 | $html .= $spfxsurn; |
| 71 | 71 | } |
| 72 | - $html .= '</'.$tag.'> '; |
|
| 72 | + $html .= '</' . $tag . '> '; |
|
| 73 | 73 | } |
| 74 | 74 | } |
| 75 | 75 | |
@@ -101,12 +101,12 @@ discard block |
||
| 101 | 101 | } |
| 102 | 102 | // If all the surnames are just case variants, then merge them into one |
| 103 | 103 | // Comment out this block if you want SMITH listed separately from Smith |
| 104 | - $tag = ($module instanceof ModuleListInterface)?'a':'span'; |
|
| 105 | - $subhtml = '<'.$tag; |
|
| 104 | + $tag = ($module instanceof ModuleListInterface) ? 'a' : 'span'; |
|
| 105 | + $subhtml = '<' . $tag; |
|
| 106 | 106 | if ($url !== null) { |
| 107 | 107 | $subhtml .= ' href="' . e($url) . '"'; |
| 108 | 108 | } |
| 109 | - $subhtml .= ' dir="auto">' . e(implode(I18N::$list_separator, array_keys($surns))) . '</'.$tag.'>'; |
|
| 109 | + $subhtml .= ' dir="auto">' . e(implode(I18N::$list_separator, array_keys($surns))) . '</' . $tag . '>'; |
|
| 110 | 110 | |
| 111 | 111 | if ($totals) { |
| 112 | 112 | $subtotal = 0; |
@@ -291,7 +291,7 @@ discard block |
||
| 291 | 291 | if ($kcount == 0) { |
| 292 | 292 | echo "</td><td style='width:", app(ModuleThemeInterface::class)->parameter('chart-box-x'), "px'>"; |
| 293 | 293 | } else { |
| 294 | - echo '<a href="#" title="' . I18N::translate('Children') . '" data-route="Descendants" data-xref="' . e($pid) . '" data-spouses="' . e($show_spouse) . '" data-tree="' . e($individual->tree()->name()) . '">' . view('icons/arrow-left') . '</a>'; |
|
| 294 | + echo '<a href="#" title="' . I18N::translate('Children') . '" data-route="Descendants" data-xref="' . e($pid) . '" data-spouses="' . e($show_spouse) . '" data-tree="' . e($individual->tree()->name()) . '">' . view('icons/arrow-left') . '</a>'; |
|
| 295 | 295 | |
| 296 | 296 | //-- move the arrow up to line up with the correct box |
| 297 | 297 | if ($show_spouse) { |
@@ -372,7 +372,7 @@ discard block |
||
| 372 | 372 | } |
| 373 | 373 | |
| 374 | 374 | // filter out root person from children array so only siblings remain |
| 375 | - $siblings = $family->children()->filter(function (Individual $x) use ($individual): bool { |
|
| 375 | + $siblings = $family->children()->filter(function (Individual $x) use ($individual): bool { |
|
| 376 | 376 | return $x !== $individual; |
| 377 | 377 | }); |
| 378 | 378 | |
@@ -445,7 +445,7 @@ discard block |
||
| 445 | 445 | echo '<td id="td_' . e($ARID) . '">'; |
| 446 | 446 | |
| 447 | 447 | if ($generation == $generations - 1 && $family->husband()->childFamilies()) { |
| 448 | - echo '<a href="#" title="' . I18N::translate('Parents') . '" data-route="Ancestors" data-xref="' . e($ARID) . '" data-spouses="' . e($show_spouse) . '" data-tree="' . e($family->husband()->tree()->name()) . '">' . view('icons/arrow-right') . '</a>'; |
|
| 448 | + echo '<a href="#" title="' . I18N::translate('Parents') . '" data-route="Ancestors" data-xref="' . e($ARID) . '" data-spouses="' . e($show_spouse) . '" data-tree="' . e($family->husband()->tree()->name()) . '">' . view('icons/arrow-right') . '</a>'; |
|
| 449 | 449 | } |
| 450 | 450 | |
| 451 | 451 | $this->printPersonPedigree($family->husband(), $generation + 1, $generations, $show_spouse); |
@@ -476,7 +476,7 @@ discard block |
||
| 476 | 476 | echo '<td id="td_' . e($ARID) . '">'; |
| 477 | 477 | |
| 478 | 478 | if ($generation == $generations - 1 && $family->wife()->childFamilies()) { |
| 479 | - echo '<a href="#" title="' . I18N::translate('Parents') . '" data-route="Ancestors" data-xref="' . e($ARID) . '" data-spouses="' . e($show_spouse) . '" data-tree="' . e($family->wife()->tree()->name()) . '">' . view('icons/arrow-right') . '</a>'; |
|
| 479 | + echo '<a href="#" title="' . I18N::translate('Parents') . '" data-route="Ancestors" data-xref="' . e($ARID) . '" data-spouses="' . e($show_spouse) . '" data-tree="' . e($family->wife()->tree()->name()) . '">' . view('icons/arrow-right') . '</a>'; |
|
| 480 | 480 | } |
| 481 | 481 | |
| 482 | 482 | $this->printPersonPedigree($family->wife(), $generation + 1, $generations, $show_spouse); |
@@ -555,7 +555,7 @@ |
||
| 555 | 555 | public function findByName(string $module_name, bool $include_disabled = false): ?ModuleInterface |
| 556 | 556 | { |
| 557 | 557 | return $this->all($include_disabled) |
| 558 | - ->filter(function (ModuleInterface $module) use ($module_name): bool { |
|
| 558 | + ->filter(function (ModuleInterface $module) use ($module_name) : bool { |
|
| 559 | 559 | return $module->name() === $module_name; |
| 560 | 560 | }) |
| 561 | 561 | ->first(); |