fisharebest / webtrees

app/Services/ModuleService.php

Spacing +2 added lines, -2 removed lines

@@ -504,7 +504,7 @@ 
     public function findByName(string $module_name): ?ModuleInterface
     {
         return $this->all()
-            ->filter(function (ModuleInterface $module) use ($module_name): bool {
+            ->filter(function (ModuleInterface $module) use ($module_name) : bool {
                 return $module->isEnabled() && $module->name() === $module_name;
             })
             ->first();
@@ -520,7 +520,7 @@ 
     public function findByClass(string $class_name): ?ModuleInterface
     {
         return $this->all()
-            ->filter(function (ModuleInterface $module) use ($class_name): bool {
+            ->filter(function (ModuleInterface $module) use ($class_name) : bool {
                 return $module->isEnabled() && $module instanceof $class_name;
             })
             ->first();

app/Http/Controllers/Admin/ImportThumbnailsController.php

Spacing +1 added lines, -1 removed lines

@@ -560,7 +560,7 @@
         $data = array_map(function (string $thumbnail): array {
             $original = $this->findOriginalFileFromThumbnail($thumbnail);
 
-            $original_url  = route('unused-media-thumbnail', [
+            $original_url = route('unused-media-thumbnail', [
                 'folder' => dirname($original),
                 'file'   => basename($original),
                 'w'      => 100,

app/Http/Controllers/Admin/MediaController.php

Spacing +1 added lines, -1 removed lines

@@ -120,7 +120,7 @@
         $length = (int) $request->get('length');
 
         // Files within this folder
-        $media_folder  = $request->get('media_folder', '');
+        $media_folder = $request->get('media_folder', '');
 
         // subfolders within $media_path
         $subfolders = $request->get('subfolders', ''); // include|exclude

app/Http/Controllers/ReportEngineController.php

Spacing +3 added lines, -3 removed lines

@@ -135,7 +135,7 @@ 
                     break;
 
                 case 'DATE':
-                    $attributes       += [
+                    $attributes += [
                         'type'  => 'text',
                         'value' => $input['default'],
                         'dir'   => 'ltr',
@@ -148,7 +148,7 @@ 
                 default:
                     switch ($input['type']) {
                         case 'text':
-                            $attributes       += [
+                            $attributes += [
                                 'type'  => 'text',
                                 'value' => $input['default'],
                             ];
@@ -156,7 +156,7 @@ 
                             break;
 
                         case 'checkbox':
-                            $attributes       += [
+                            $attributes += [
                                 'type'    => 'checkbox',
                                 'checked' => (bool) $input['default'],
                             ];

app/Module/HourglassChartModule.php

Spacing +3 added lines, -3 removed lines

@@ -293,7 +293,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) {
@@ -447,7 +447,7 @@ 
                 echo '<td id="td_' . e($ARID) . '">';
 
                 if ($generation == $generations - 1 && $family->getHusband()->getChildFamilies()) {
-                    echo '<a href="#" title="' . I18N::translate('Parents') . '" data-route="Ancestors" data-xref="' .  e($ARID) . '" data-spouses="' .  e($show_spouse) . '" data-tree="' .  e($family->getHusband()->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->getHusband()->tree()->name()) . '">' . view('icons/arrow-right') . '</a>';
                 }
 
                 $this->printPersonPedigree($family->getHusband(), $generation + 1, $generations, $show_spouse);
@@ -478,7 +478,7 @@ 
                 echo '<td id="td_' . e($ARID) . '">';
 
                 if ($generation == $generations - 1 && $family->getWife()->getChildFamilies()) {
-                    echo '<a href="#" title="' . I18N::translate('Parents') . '" data-route="Ancestors" data-xref="' .  e($ARID) . '" data-spouses="' .  e($show_spouse) . '" data-tree="' .  e($family->getWife()->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->getWife()->tree()->name()) . '">' . view('icons/arrow-right') . '</a>';
                 }
 
                 $this->printPersonPedigree($family->getWife(), $generation + 1, $generations, $show_spouse);

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/Module/DescendancyChartModule.php

Spacing +2 added lines, -2 removed lines

@@ -264,7 +264,7 @@ 
         echo '<td>';
         foreach ($person->getChildFamilies() as $cfamily) {
             foreach ($cfamily->getSpouses() 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;
             }
@@ -343,7 +343,7 @@ 
         if ($spouse) {
             foreach ($spouse->getChildFamilies() as $cfamily) {
                 foreach ($cfamily->getSpouses() 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/PedigreeChartModule.php

Spacing +2 added lines, -2 removed lines

@@ -419,7 +419,7 @@ 
             $html = '<div id="childarrow"><a href="#" class="menuselect">' . $this->arrows->menu . '</a><div id="childbox-pedigree">';
 
             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>';
@@ -465,7 +465,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/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[] = [