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/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/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 +1 added lines, -1 removed lines

@@ -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/View.php

Spacing +1 added lines, -1 removed lines

@@ -252,7 +252,7 @@
         [$namespace, $view_name] = explode(self::NAMESPACE_SEPARATOR, $view_name, 2);
 
         if ((self::$namespaces[$namespace] ?? null) === null) {
-            throw new RuntimeException('Namespace "' . e($namespace) .  '" not found.');
+            throw new RuntimeException('Namespace "' . e($namespace) . '" not found.');
         }
 
         $view_file = self::$namespaces[$namespace] . $view_name . self::TEMPLATE_EXTENSION;

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 && $individual->childFamilies()->isNotEmpty()) {
                 // The last row/column, and there are more generations.
                 if ($sosa >= 2 ** $generations * 3 / 4) {

app/Http/Controllers/CalendarController.php

Upper-Lower-Casing +4 added lines, -4 removed lines

@@ -93,13 +93,13 @@ 
             if (strlen($match[1]) > strlen($match[2])) {
                 $match[2] = substr($match[1], 0, strlen($match[1]) - strlen($match[2])) . $match[2];
             }
-            $ged_date = new Date("FROM {$cal} {$match[1]} TO {$cal} {$match[2]}");
+            $ged_date = new Date("from {$cal} {$match[1]} TO {$cal} {$match[2]}");
             $view     = 'year';
         } elseif (preg_match('/^(\d+)(\?+)$/', $year, $match)) {
             // advanced-year "decade/century wildcard"
             $y1       = $match[1] . str_replace('?', '0', $match[2]);
             $y2       = $match[1] . str_replace('?', '9', $match[2]);
-            $ged_date = new Date("FROM {$cal} {$y1} TO {$cal} {$y2}");
+            $ged_date = new Date("from {$cal} {$y1} TO {$cal} {$y2}");
             $view     = 'year';
         } else {
             if ($year < 0) {
@@ -210,13 +210,13 @@ 
             if (strlen($match[1]) > strlen($match[2])) {
                 $match[2] = substr($match[1], 0, strlen($match[1]) - strlen($match[2])) . $match[2];
             }
-            $ged_date = new Date("FROM {$cal} {$match[1]} TO {$cal} {$match[2]}");
+            $ged_date = new Date("from {$cal} {$match[1]} TO {$cal} {$match[2]}");
             $view     = 'year';
         } elseif (preg_match('/^(\d+)(\?+)$/', $year, $match)) {
             // advanced-year "decade/century wildcard"
             $y1       = $match[1] . str_replace('?', '0', $match[2]);
             $y2       = $match[1] . str_replace('?', '9', $match[2]);
-            $ged_date = new Date("FROM {$cal} {$y1} TO {$cal} {$y2}");
+            $ged_date = new Date("from {$cal} {$y1} TO {$cal} {$y2}");
             $view     = 'year';
         } else {
             if ($year < 0) {

Spacing +1 added lines, -1 removed lines

@@ -550,7 +550,7 @@
         $html = '';
 
         foreach ($list as $id => $facts) {
-            $tmp  = GedcomRecord::getInstance($id, $tree);
+            $tmp = GedcomRecord::getInstance($id, $tree);
             $html .= $tag1 . '<a href="' . e($tmp->url()) . '">' . $tmp->fullName() . '</a> ';
             $html .= '<div class="indent">' . $facts . '</div>' . $tag2;
         }

app/Module/InteractiveTree/TreeView.php

Spacing +1 added lines, -1 removed lines

@@ -75,7 +75,7 @@
     public function getPersons(Tree $tree, string $request): string
     {
         $json_requests = explode(';', $request);
-        $r    = [];
+        $r = [];
         foreach ($json_requests as $json_request) {
             $firstLetter = substr($json_request, 0, 1);
             $json_request = substr($json_request, 1);

app/Date.php

Spacing +2 added lines, -2 removed lines

@@ -156,7 +156,7 @@ 
         // Ambiguous dates - don't override calendar escape
         if ($cal === '') {
             if (preg_match('/^(JAN|FEB|MAR|APR|MAY|JUN|JUL|AUG|SEP|OCT|NOV|DEC)$/', $m)) {
-                $cal =  GregorianDate::ESCAPE;
+                $cal = GregorianDate::ESCAPE;
             } elseif (preg_match('/^[345]\d\d\d$/', $y)) {
                 // Year 3000-5999
                 $cal = JewishDate::ESCAPE;
@@ -451,7 +451,7 @@ 
     public function addYears(int $years, string $qualifier = ''): Date
     {
         $tmp               = clone $this;
-        $tmp->date1->year  += $years;
+        $tmp->date1->year += $years;
         $tmp->date1->month = 0;
         $tmp->date1->day   = 0;
         $tmp->date1->setJdFromYmd();