fisharebest / webtrees

app/Module/RelationshipsChartModule.php

Spacing +7 added lines, -7 removed lines

@@ -320,14 +320,14 @@ 
                         case 'sis':
                         case 'sib':
                             $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>';
-                            $x                 += 2;
+                            $x += 2;
                             break;
                         case 'son':
                         case 'dau':
                         case 'chi':
                             if ($n > 2 && preg_match('/fat|mot|par/', $relationships[$n - 2])) {
                                 $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>';
-                                $x                     += 2;
+                                $x += 2;
                             } else {
                                 $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>';
                             }
@@ -338,9 +338,9 @@ 
                         case 'par':
                             if ($n > 2 && preg_match('/son|dau|chi/', $relationships[$n - 2])) {
                                 $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>';
-                                $x                     += 2;
+                                $x += 2;
                             } else {
-                                $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>';
+                                $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>';
                             }
                             $y += 2;
                             break;
@@ -478,17 +478,17 @@ 
      */
     private function oldStyleRelationshipPath(Tree $tree, array $path): array
     {
-        $spouse_codes  = [
+        $spouse_codes = [
             'M' => 'hus',
             'F' => 'wif',
             'U' => 'spo',
         ];
-        $parent_codes  = [
+        $parent_codes = [
             'M' => 'fat',
             'F' => 'mot',
             'U' => 'par',
         ];
-        $child_codes   = [
+        $child_codes = [
             'M' => 'son',
             'F' => 'dau',
             'U' => 'chi',

app/Statistics/Google/ChartCommonGiven.php

Spacing +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
         ];
 
         foreach ($given as $name => $count) {
-            $data[] = [ $name, $count ];
+            $data[] = [$name, $count];
         }
 
         $data[] = [

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