fisharebest / webtrees

app/Module/StatisticsChartModule.php

Spacing +2 added lines, -2 removed lines

@@ -962,7 +962,7 @@ 
 
         $data = [
             array_merge(
-                [ I18N::translate('Century') ],
+                [I18N::translate('Century')],
                 array_values($z_axis)
             )
         ];
@@ -979,7 +979,7 @@ 
 
         foreach ($intermediate as $key => $values) {
             $data[] = array_merge(
-                [ $x_axis[$key] ],
+                [$x_axis[$key]],
                 $values
             );
         }

app/Module/PedigreeChartModule.php

Spacing +1 added lines, -1 removed lines

@@ -177,7 +177,7 @@
 
         // Father’s ancestors link to the father’s pedigree
         // Mother’s ancestors link to the mother’s pedigree..
-        $links = $ancestors->map(function (?Individual $individual, $sosa) use ($ancestors, $orientation, $generations): string {
+        $links = $ancestors->map(function (?Individual $individual, $sosa) use ($ancestors, $orientation, $generations) : string {
             if ($individual instanceof Individual && $sosa >= 2 ** $generations / 2 && !empty($individual->childFamilies())) {
                 // The last row/column, and there are more generations.
                 if ($sosa >= 2 ** $generations * 3 / 4) {

app/Module/DescendancyChartModule.php

Spacing +2 added lines, -2 removed lines

@@ -259,7 +259,7 @@ 
         echo '<td>';
         foreach ($person->childFamilies() as $cfamily) {
             foreach ($cfamily->spouses() as $parent) {
-                echo '<a href="' . e($this->chartUrl($parent, ['generations' => $generations])) . '" title="' .  I18N::translate('Start at parents') . '">' . view('icons/arrow-up') . '<span class="sr-only">' .  I18N::translate('Start at parents') . '</span></a>';
+                echo '<a href="' . e($this->chartUrl($parent, ['generations' => $generations])) . '" title="' . I18N::translate('Start at parents') . '">' . view('icons/arrow-up') . '<span class="sr-only">' . I18N::translate('Start at parents') . '</span></a>';
                 // only show the arrow for one of the parents
                 break;
             }
@@ -338,7 +338,7 @@ 
         if ($spouse) {
             foreach ($spouse->childFamilies() as $cfamily) {
                 foreach ($cfamily->spouses() as $parent) {
-                    echo '<a href="' . e($this->chartUrl($parent, ['generations' => $generations])) . '" title="' .  strip_tags($this->chartTitle($parent)) . '">' . view('icons/arrow-up') . '<span class="sr-only">' .  strip_tags($this->chartTitle($parent)) . '</span></a>';
+                    echo '<a href="' . e($this->chartUrl($parent, ['generations' => $generations])) . '" title="' . strip_tags($this->chartTitle($parent)) . '">' . view('icons/arrow-up') . '<span class="sr-only">' . strip_tags($this->chartTitle($parent)) . '</span></a>';
                     // only show the arrow for one of the parents
                     break;
                 }

app/Module/HourglassChartModule.php

Spacing +4 added lines, -4 removed lines

@@ -291,7 +291,7 @@ 
             if ($kcount == 0) {
                 echo "</td><td style='width:", app()->make(ModuleThemeInterface::class)->parameter('chart-box-x'), "px'>";
             } else {
-                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>';
+                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>';
 
                 //-- move the arrow up to line up with the correct box
                 if ($show_spouse) {
@@ -372,7 +372,7 @@ 
                 }
 
                 // filter out root person from children array so only siblings remain
-                $siblings       = $family->children()->filter(function (Individual $x) use ($individual): bool {
+                $siblings = $family->children()->filter(function (Individual $x) use ($individual): bool {
                     return $x !== $individual;
                 });
 
@@ -445,7 +445,7 @@ 
                 echo '<td id="td_' . e($ARID) . '">';
 
                 if ($generation == $generations - 1 && $family->husband()->childFamilies()) {
-                    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>';
+                    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>';
                 }
 
                 $this->printPersonPedigree($family->husband(), $generation + 1, $generations, $show_spouse);
@@ -476,7 +476,7 @@ 
                 echo '<td id="td_' . e($ARID) . '">';
 
                 if ($generation == $generations - 1 && $family->wife()->childFamilies()) {
-                    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>';
+                    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>';
                 }
 
                 $this->printPersonPedigree($family->wife(), $generation + 1, $generations, $show_spouse);

app/Functions/FunctionsExport.php

Spacing +3 added lines, -3 removed lines

@@ -103,11 +103,11 @@
         $record = GedcomRecord::getInstance('HEAD', $tree);
         $fact = $record->facts(['COPR'])->first();
         if ($fact instanceof Fact) {
-            $COPR = "\n1 COPR " .$fact->value();
+            $COPR = "\n1 COPR " . $fact->value();
         }
-        $fact   = $record->facts(['LANG'])->first();
+        $fact = $record->facts(['LANG'])->first();
         if ($fact instanceof Fact) {
-            $LANG = "\n1 LANG " .$fact->value();
+            $LANG = "\n1 LANG " . $fact->value();
         }
         // Link to actual SUBM/SUBN records, if they exist
         $subn = DB::table('other')

app/Module/ChartsBlockModule.php

Spacing +3 added lines, -3 removed lines

@@ -110,7 +110,7 @@ 
                         'generations' => 3,
                         'layout'      => PedigreeChartModule::ORIENTATION_RIGHT,
                     ]);
-                    $content   = view('modules/charts/chart', [
+                    $content = view('modules/charts/chart', [
                         'block_id'  => $block_id,
                         'chart_url' => $chart_url,
                     ]);
@@ -125,7 +125,7 @@ 
                         'generations' => 2,
                         'chart_style' => DescendancyChartModule::CHART_STYLE_LIST,
                     ]);
-                    $content   = view('modules/charts/chart', [
+                    $content = view('modules/charts/chart', [
                         'block_id'  => $block_id,
                         'chart_url' => $chart_url,
                     ]);
@@ -139,7 +139,7 @@ 
                         'ajax'        => true,
                         'generations' => 2,
                     ]);
-                    $content   = view('modules/charts/chart', [
+                    $content = view('modules/charts/chart', [
                         'block_id'  => $block_id,
                         'chart_url' => $chart_url,
                     ]);

app/Http/Controllers/ListController.php

Spacing +3 added lines, -3 removed lines

@@ -125,10 +125,10 @@ 
         switch ($show_marnm) {
             case 'no':
             case 'yes':
-                $user->setPreference($families?'family-list-marnm':'individual-list-marnm', $show_marnm);
+                $user->setPreference($families ? 'family-list-marnm' : 'individual-list-marnm', $show_marnm);
                 break;
             default:
-                $show_marnm = $user->getPreference($families?'family-list-marnm':'individual-list-marnm');
+                $show_marnm = $user->getPreference($families ? 'family-list-marnm' : 'individual-list-marnm');
         }
 
         // Make sure selections are consistent.
@@ -160,7 +160,7 @@ 
                     'ged'      => $tree->name(),
                     'show_all' => 'yes',
                 ];
-                $show    = $request->get('show', 'surn');
+                $show = $request->get('show', 'surn');
             }
         } elseif ($surname) {
             $alpha    = $this->localization_service->initialLetter($surname); // so we can highlight the initial letter

Braces +3 added lines, -1 removed lines

@@ -233,7 +233,8 @@ 
                     <li class="wt-initials-list-item d-flex">
                         <?php if ($count > 0) : ?>
                             <a href="<?= e(route('module', ['module' => $module, 'action' => $action, 'alpha' => $letter, 'ged' => $tree->name()])) ?>" class="wt-initial px-1<?= $letter === $alpha ? ' active' : '' ?> '" title="<?= I18N::number($count) ?>"><?= $this->surnameInitial((string) $letter) ?></a>
-                        <?php else : ?>
+                        <?php else {
+    : ?>
                             <span class="wt-initial px-1 text-muted"><?= $this->surnameInitial((string) $letter) ?></span>
 
                         <?php endif ?>
@@ -287,6 +288,7 @@ 
 
             if ($show === 'indi' || $show === 'surn') {
                 $surns = $this->individual_list_service->surnames($surname, $alpha, $show_marnm === 'yes', $families, WT_LOCALE, I18N::collation());
+}
                 if ($show === 'surn') {
                     // Show the surname list
                     switch ($tree->getPreference('SURNAME_LIST_STYLE')) {

app/Statistics/Repository/PlaceRepository.php

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
      */
     public function __construct(Tree $tree)
     {
-        $this->tree          = $tree;
+        $this->tree = $tree;
         $this->country_service = new CountryService();
     }
 

app/Module/ListsMenuModule.php

Spacing +1 added lines, -1 removed lines

@@ -87,7 +87,7 @@
     public function getMenu(Tree $tree): ?Menu
     {
         $submenus = $this->module_service->findByComponent(ModuleListInterface::class, $tree, Auth::user())
-            ->map(function (ModuleListInterface $module) use ($tree): ?Menu {
+            ->map(function (ModuleListInterface $module) use ($tree) : ?Menu {
                 return $module->listMenu($tree);
             })
             ->filter()