fisharebest / webtrees

app/Module/PedigreeChartModule.php

Spacing +2 added lines, -2 removed lines

@@ -416,7 +416,7 @@ 
             $html = sprintf('<div id="childarrow"><a href="#" class="menuselect %s"></a><div id="childbox-pedigree">', $this->arrows->menu);
 
             foreach ($families as $family) {
-                $html   .= '<span class="name1">' . I18N::translate('Family') . '</span>';
+                $html .= '<span class="name1">' . I18N::translate('Family') . '</span>';
                 $spouse = $family->getSpouse($root);
                 if ($spouse) {
                     $html .= '<a class="name1" href="' . e($this->chartUrl($spouse, ['generations' => $generations, 'orientation' => $orientation])) . '">' . $spouse->getFullName() . '</a>';
@@ -462,7 +462,7 @@ 
         $html = '';
         if ($chart_has_ancestors) {
             if ($this->nodes[$index]['indi'] && $this->nodes[$index]['indi']->getChildFamilies()) {
-                $html         .= '<div class="ancestorarrow">';
+                $html .= '<div class="ancestorarrow">';
                 $rootParentId = 1;
                 if ($index > (int) ($this->treesize / 2) + (int) ($this->treesize / 4)) {
                     $rootParentId++;

app/Module/ChartsBlockModule.php

Spacing +3 added lines, -3 removed lines

@@ -95,7 +95,7 @@ 
                         'generations' => 3,
                         'layout'      => PedigreeChartModule::PORTRAIT,
                     ]);
-                    $content   = view('modules/charts/chart', [
+                    $content = view('modules/charts/chart', [
                         'block_id'  => $block_id,
                         'chart_url' => $chart_url,
                     ]);
@@ -110,7 +110,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,
                     ]);
@@ -124,7 +124,7 @@ 
                         'ajax'        => true,
                         'generations' => 2,
                     ]);
-                    $content   = view('modules/charts/chart', [
+                    $content = view('modules/charts/chart', [
                         'block_id'  => $block_id,
                         'chart_url' => $chart_url,
                     ]);

app/Functions/FunctionsExport.php

Spacing +3 added lines, -3 removed lines

@@ -103,11 +103,11 @@
         $record = GedcomRecord::getInstance('HEAD', $tree);
         $fact = $record->getFirstFact('COPR');
         if ($fact instanceof Fact) {
-            $COPR = "\n1 COPR " .$fact->value();
+            $COPR = "\n1 COPR " . $fact->value();
         }
-        $fact   = $record->getFirstFact('LANG');
+        $fact = $record->getFirstFact('LANG');
         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/Census/CensusColumnNationality.php

Spacing +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
         }
 
         // Did we emigrate or naturalise?
-        foreach ($individual->facts(['IMMI' ,'EMIG', 'NATU'], true) as $fact) {
+        foreach ($individual->facts(['IMMI', 'EMIG', 'NATU'], true) as $fact) {
             if (Date::compare($fact->date(), $this->date()) <= 0) {
                 $place = $fact->place()->gedcomName();
             }

app/Statistics/Google/ChartIndividual.php

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
         $color_from = $color_from ?? $chart_color1;
         $color_to   = $color_to ?? $chart_color2;
 
-        $sizes    = explode('x', $size);
+        $sizes = explode('x', $size);
 
         if ($tot_indi === 0) {
             return '';

app/Statistics/Google/ChartAge.php

Spacing +1 added lines, -1 removed lines

@@ -135,7 +135,7 @@
             $decades .= '|' . I18N::number($i);
         }
 
-        $chxl  .= '1:||' . I18N::translate('century') . '|2:' . $decades . '|3:||' . I18N::translate('Age') . '|';
+        $chxl .= '1:||' . I18N::translate('century') . '|2:' . $decades . '|3:||' . I18N::translate('Age') . '|';
         $title = I18N::translate('Average age related to death century');
 
         if (\count($rows) > 6 || mb_strlen($title) < 30) {

Indentation +7 added lines, -7 removed lines

@@ -65,11 +65,11 @@ 
                     ->on('birth.d_file', '=', 'i_file')
                     ->on('birth.d_gid', '=', 'i_id');
             })
-           ->join('dates AS death', function (JoinClause $join): void {
-               $join
+            ->join('dates AS death', function (JoinClause $join): void {
+                $join
                     ->on('death.d_file', '=', 'i_file')
                     ->on('death.d_gid', '=', 'i_id');
-           })
+            })
             ->where('i_file', '=', $this->tree->id())
             ->where('birth.d_fact', '=', 'BIRT')
             ->where('death.d_fact', '=', 'DEAT')
@@ -162,10 +162,10 @@ 
         }
 
         $chart_url = 'https://chart.googleapis.com/chart?cht=bvg&chs=' . $sizes[0] . 'x' . $sizes[1]
-             . '&chm=D,FF0000,2,0,3,1|N*f1*,000000,0,-1,11,1|N*f1*,000000,1,-1,11,1&chf=bg,s,ffffff00|c,s,ffffff00&chtt='
-             . rawurlencode($chtt) . '&chd=' . $chd . '&chco=0000FF,FFA0CB,FF0000&chbh=20,3&chxt=x,x,y,y&chxl='
-             . rawurlencode($chxl) . '&chdl='
-             . rawurlencode(I18N::translate('Males') . '|' . I18N::translate('Females') . '|' . I18N::translate('Average age at death'));
+                . '&chm=D,FF0000,2,0,3,1|N*f1*,000000,0,-1,11,1|N*f1*,000000,1,-1,11,1&chf=bg,s,ffffff00|c,s,ffffff00&chtt='
+                . rawurlencode($chtt) . '&chd=' . $chd . '&chco=0000FF,FFA0CB,FF0000&chbh=20,3&chxt=x,x,y,y&chxl='
+                . rawurlencode($chxl) . '&chdl='
+                . rawurlencode(I18N::translate('Males') . '|' . I18N::translate('Females') . '|' . I18N::translate('Average age at death'));
 
         return view(
             'statistics/other/chart-google',

app/Module/FabTheme.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
     /**
      * Where are our CSS, JS and other assets?
      */
-    public const    ASSET_DIR  = 'themes/fab/css-2.0.0/';
+    public const    ASSET_DIR = 'themes/fab/css-2.0.0/';
 
     protected const PERSON_BOX_CLASSES = [
         'M' => 'person_box',

app/Module/RelationshipsChartModule.php

Spacing +6 added lines, -6 removed lines

@@ -322,14 +322,14 @@ 
                         case 'sis':
                         case 'sib':
                             $table[$x + 1][$y] = '<div style="background:url(' . app()->make(ModuleThemeInterface::class)->parameter('image-hline') . ') 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-end') . '</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(' . app()->make(ModuleThemeInterface::class)
                                         ->parameter('image-vline') . ') 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>';
@@ -341,7 +341,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], 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(' . app()->make(ModuleThemeInterface::class)
                                         ->parameter('image-vline') . ') 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>';
@@ -482,17 +482,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.php

Spacing +1 added lines, -1 removed lines

@@ -2591,7 +2591,7 @@
         /** @var ModuleBlockInterface $module */
         $module = $this->module_service
             ->findByComponent('block', $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();