fisharebest / webtrees

app/Http/Controllers/SetupController.php

Braces +1 added lines, -2 removed lines

@@ -82,8 +82,7 @@
         MigrationService $migration_service,
         ServerCheckService $server_check_service,
         UserService $user_service
-    )
-    {
+    ) {
         $this->user_service         = $user_service;
         $this->migration_service    = $migration_service;
         $this->server_check_service = $server_check_service;

app/Module/HourglassChartModule.php

Spacing +4 added lines, -4 removed lines

@@ -291,7 +291,7 @@ 
             if ($kcount == 0) {
                 echo "</td><td style='width:", app(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/Services/ModuleService.php

Spacing +1 added lines, -1 removed lines

@@ -555,7 +555,7 @@
     public function findByName(string $module_name, bool $include_disabled = false): ?ModuleInterface
     {
         return $this->all($include_disabled)
-            ->filter(function (ModuleInterface $module) use ($module_name): bool {
+            ->filter(function (ModuleInterface $module) use ($module_name) : bool {
                 return $module->name() === $module_name;
             })
             ->first();

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/Functions/FunctionsPrintLists.php

Spacing +6 added lines, -6 removed lines

@@ -57,8 +57,8 @@ 
                     $size = 75.0 + 125.0 * ($count - $minimum) / ($maximum - $minimum);
                 }
                 
-                $tag = ($module instanceof ModuleListInterface)?'a':'span';
-                $html .= '<'.$tag.' style="font-size:' . $size . '%"';
+                $tag = ($module instanceof ModuleListInterface) ? 'a' : 'span';
+                $html .= '<' . $tag . ' style="font-size:' . $size . '%"';
                 if ($module instanceof ModuleListInterface) {
                     $url = $module->listUrl($tree, ['surname' => $surn]);
                     $html .= ' href="' . e($url) . '"';
@@ -69,7 +69,7 @@ 
                 } else {
                     $html .= $spfxsurn;
                 }
-                $html .= '</'.$tag.'> ';
+                $html .= '</' . $tag . '> ';
             }
         }
 
@@ -104,12 +104,12 @@ 
 
             // If all the surnames are just case variants, then merge them into one
             // Comment out this block if you want SMITH listed separately from Smith
-            $tag = ($module instanceof ModuleListInterface)?'a':'span';
-            $subhtml = '<'.$tag;
+            $tag = ($module instanceof ModuleListInterface) ? 'a' : 'span';
+            $subhtml = '<' . $tag;
             if ($url !== null) {
                 $subhtml .= ' href="' . e($url) . '"';
             }
-            $subhtml .= ' dir="auto">' . e(implode(I18N::$list_separator, array_keys($surns))) . '</'.$tag.'>';
+            $subhtml .= ' dir="auto">' . e(implode(I18N::$list_separator, array_keys($surns))) . '</' . $tag . '>';
             
             if ($totals) {
                 $subtotal = 0;

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();