fisharebest / webtrees

app/Statistics/Google/ChartMortality.php

Spacing +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
                 $tot_l
             ];
 
-            $data[] =  [
+            $data[] = [
                 I18N::translate('Dead'),
                 $tot_d
             ];

app/Statistics/Google/ChartMarriageAge.php

Indentation +3 added lines, -3 removed lines

@@ -102,9 +102,9 @@
             ->groupBy(['century', 'sex']);
 
         return $male->unionAll($female)
-           ->orderBy('century')
-           ->get()
-           ->all();
+            ->orderBy('century')
+            ->get()
+            ->all();
     }
 
     /**

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/Functions/FunctionsPrint.php

Spacing +4 added lines, -4 removed lines

@@ -145,7 +145,7 @@ 
                     if ($note->canShow()) {
                         $noterec = $note->gedcom();
                         $nt      = preg_match("/0 @$nmatch[1]@ NOTE (.*)/", $noterec, $n1match);
-                        $data    .= self::printNoteRecord($tree, ($nt > 0) ? $n1match[1] : '', 1, $noterec);
+                        $data .= self::printNoteRecord($tree, ($nt > 0) ? $n1match[1] : '', 1, $noterec);
                     }
                 } else {
                     $data = '<div class="fact_NOTE"><span class="label">' . I18N::translate('Note') . '</span>: <span class="field error">' . $nmatch[1] . '</span></div>';
@@ -362,20 +362,20 @@ 
                 if (preg_match_all('/\n3 (?:_HEB|ROMN) (.+)/', $placerec, $matches)) {
                     foreach ($matches[1] as $match) {
                         $wt_place = new Place($match, $tree);
-                        $html     .= ' - ' . $wt_place->fullName();
+                        $html .= ' - ' . $wt_place->fullName();
                     }
                 }
                 $map_lati = '';
                 $cts      = preg_match('/\d LATI (.*)/', $placerec, $match);
                 if ($cts > 0) {
                     $map_lati = $match[1];
-                    $html     .= '<br><span class="label">' . I18N::translate('Latitude') . ': </span>' . $map_lati;
+                    $html .= '<br><span class="label">' . I18N::translate('Latitude') . ': </span>' . $map_lati;
                 }
                 $map_long = '';
                 $cts      = preg_match('/\d LONG (.*)/', $placerec, $match);
                 if ($cts > 0) {
                     $map_long = $match[1];
-                    $html     .= ' <span class="label">' . I18N::translate('Longitude') . ': </span>' . $map_long;
+                    $html .= ' <span class="label">' . I18N::translate('Longitude') . ': </span>' . $map_long;
                 }
                 if ($map_lati && $map_long) {
                     $map_lati = trim(strtr($map_lati, 'NSEW,�', ' - -. ')); // S5,6789 ==> -5.6789

Indentation +4 added lines, -4 removed lines

@@ -322,10 +322,10 @@
         }
         // print gedcom ages
         foreach ([
-                     I18N::translate('Age')     => $fact_age,
-                     I18N::translate('Husband') => $husb_age,
-                     I18N::translate('Wife')    => $wife_age,
-                 ] as $label => $age) {
+                        I18N::translate('Age')     => $fact_age,
+                        I18N::translate('Husband') => $husb_age,
+                        I18N::translate('Wife')    => $wife_age,
+                    ] as $label => $age) {
             if ($age !== '') {
                 $html .= ' <span class="label">' . $label . ':</span> <span class="age">' . FunctionsDate::getAgeAtEvent($age) . '</span>';
             }

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/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/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/Http/Controllers/ListController.php

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')) {

Spacing +3 added lines, -3 removed lines

@@ -134,10 +134,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.
@@ -169,7 +169,7 @@ 
                     'ged'      => $tree->name(),
                     'show_all' => 'yes',
                 ];
-                $show    = $request->getQueryParams()['show'] ?? 'surn';
+                $show = $request->getQueryParams()['show'] ?? 'surn';
             }
         } elseif ($surname) {
             $alpha    = $this->localization_service->initialLetter($surname); // so we can highlight the initial letter

app/Statistics.php

Spacing +1 added lines, -1 removed lines

@@ -2616,7 +2616,7 @@
         /** @var ModuleBlockInterface|null $module */
         $module = $this->module_service
             ->findByComponent(ModuleBlockInterface::class, $this->tree, Auth::user())
-            ->filter(function (ModuleInterface $module) use ($block): bool {
+            ->filter(function (ModuleInterface $module) use ($block) : bool {
                 return $module->name() === $block && $module->name() !== 'html';
             })
             ->first();