fisharebest / webtrees

app/Module/RelationshipsChartModule.php

Spacing +7 added lines, -7 removed lines

@@ -54,7 +54,7 @@ 
     use ModuleChartTrait;
     use ModuleConfigTrait;
 
-    protected const ROUTE_URL  = '/tree/{tree}/relationships-{ancestors}-{recursion}/{xref}{/xref2}';
+    protected const ROUTE_URL = '/tree/{tree}/relationships-{ancestors}-{recursion}/{xref}{/xref2}';
 
     /** It would be more correct to use PHP_INT_MAX, but this isn't friendly in URLs */
     public const UNLIMITED_RECURSION = 99;
@@ -332,14 +332,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], Factory::individual()->make($path[$n - 1], $tree), Factory::individual()->make($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], Factory::individual()->make($path[$n - 1], $tree), Factory::individual()->make($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], Factory::individual()->make($path[$n - 1], $tree), Factory::individual()->make($path[$n + 1], $tree)) . '</div><div style="display: inline-block; width:50%; line-height: 64px;">' . view('icons/arrow-down') . '</div></div>';
                             }
@@ -350,7 +350,7 @@ 
                         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], Factory::individual()->make($path[$n - 1], $tree), Factory::individual()->make($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], Factory::individual()->make($path[$n - 1], $tree), Factory::individual()->make($path[$n + 1], $tree)) . '</div><div style="display: inline-block; width: 50%; line-height: 32px">' . view('icons/arrow-up') . '</div></div>';
                             }
@@ -648,17 +648,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/Contracts/LocationFactoryInterface.php

Spacing +1 added lines, -1 removed lines

@@ -59,5 +59,5 @@
      *
      * @return Location
      */
-    public function new(string $xref, string $gedcom, ?string $pending, Tree $tree): Location;
+    public function new(string $xref, string $gedcom, ?string $pending, Tree $tree) : Location;
 }

app/Factories/LocationFactory.php

Spacing +1 added lines, -1 removed lines

@@ -89,7 +89,7 @@
      *
      * @return Location
      */
-    public function new(string $xref, string $gedcom, ?string $pending, Tree $tree): Location
+    public function new(string $xref, string $gedcom, ?string $pending, Tree $tree) : Location
     {
         return new Location($xref, $gedcom, $pending, $tree);
     }

app/Http/Controllers/ListController.php

Spacing +2 added lines, -2 removed lines

@@ -136,7 +136,7 @@ 
         $alpha = $request->getQueryParams()['alpha'] ?? '';
 
         // All individuals with this surname
-        $surname = $request->getQueryParams()['surname'] ??  '';
+        $surname = $request->getQueryParams()['surname'] ?? '';
 
         // All individuals
         $show_all = $request->getQueryParams()['show_all'] ?? 'no';
@@ -189,7 +189,7 @@ 
                     'tree'      => $tree->name(),
                     'show_all' => 'yes',
                 ];
-                $show    = $request->getQueryParams()['show'] ?? 'surn';
+                $show = $request->getQueryParams()['show'] ?? 'surn';
             }
         } elseif ($surname !== '') {
             $alpha    = $this->localization_service->initialLetter($surname, I18N::locale()); // so we can highlight the initial letter

app/Statistics/Google/ChartSex.php

Spacing +2 added lines, -2 removed lines

@@ -46,8 +46,8 @@
         string $color_male = null,
         string $color_unknown = null
     ): string {
-        $color_female  = $color_female  ?? '#ffd1dc';
-        $color_male    = $color_male    ?? '#84beff';
+        $color_female  = $color_female ?? '#ffd1dc';
+        $color_male    = $color_male ?? '#84beff';
         $color_unknown = $color_unknown ?? '#777777';
 
         $data = [

app/Statistics/Google/ChartBirth.php

Spacing +1 added lines, -1 removed lines

@@ -101,7 +101,7 @@
         $chart_color1 = (string) $this->theme->parameter('distribution-chart-no-values');
         $chart_color2 = (string) $this->theme->parameter('distribution-chart-high-values');
         $color_from   = $color_from ?? $chart_color1;
-        $color_to     = $color_to   ?? $chart_color2;
+        $color_to     = $color_to ?? $chart_color2;
 
         $data = [
             [

app/Statistics/Google/ChartMortality.php

Spacing +2 added lines, -2 removed lines

@@ -59,7 +59,7 @@ 
         string $color_dead = null
     ): string {
         $color_living = $color_living ?? '#ffffff';
-        $color_dead   = $color_dead   ?? '#cccccc';
+        $color_dead   = $color_dead ?? '#cccccc';
 
         $data = [
             [
@@ -74,7 +74,7 @@ 
                 $tot_l
             ];
 
-            $data[] =  [
+            $data[] = [
                 I18N::translate('Dead'),
                 $tot_d
             ];

app/Statistics/Google/ChartCommonGiven.php

Spacing +2 added lines, -2 removed lines

@@ -69,7 +69,7 @@ 
         $chart_color1 = (string) $this->theme->parameter('distribution-chart-no-values');
         $chart_color2 = (string) $this->theme->parameter('distribution-chart-high-values');
         $color_from   = $color_from ?? $chart_color1;
-        $color_to     = $color_to   ?? $chart_color2;
+        $color_to     = $color_to ?? $chart_color2;
 
         $tot = 0;
         foreach ($given as $count) {
@@ -84,7 +84,7 @@ 
         ];
 
         foreach ($given as $name => $count) {
-            $data[] = [ $name, $count ];
+            $data[] = [$name, $count];
         }
 
         $data[] = [

app/Statistics/Google/ChartCommonSurname.php

Spacing +1 added lines, -1 removed lines

@@ -128,7 +128,7 @@
         $chart_color1 = (string) $this->theme->parameter('distribution-chart-no-values');
         $chart_color2 = (string) $this->theme->parameter('distribution-chart-high-values');
         $color_from   = $color_from ?? $chart_color1;
-        $color_to     = $color_to   ?? $chart_color2;
+        $color_to     = $color_to ?? $chart_color2;
 
         $tot = 0;
         foreach ($all_surnames as $surn => $surnames) {