fisharebest / webtrees

app/Services/UserService.php

Spacing +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
      */
     public function find($user_id): ?User
     {
-        return Registry::cache()->array()->remember('user-' . $user_id, static function () use ($user_id): ?User {
+        return Registry::cache()->array()->remember('user-' . $user_id, static function () use ($user_id) : ?User {
             return DB::table('user')
                 ->where('user_id', '=', $user_id)
                 ->get()

app/Http/RequestHandlers/PendingChangesLogData.php

Spacing +1 added lines, -1 removed lines

@@ -112,7 +112,7 @@
                 '<div class="gedcom-data" dir="ltr">' .
                 preg_replace_callback(
                     '/@(' . Gedcom::REGEX_XREF . ')@/',
-                    static function (array $match) use ($tree): string {
+                    static function (array $match) use ($tree) : string {
                         $record = Registry::gedcomRecordFactory()->make($match[1], $tree);
 
                         return $record ? '<a href="' . e($record->url()) . '">' . $match[0] . '</a>' : $match[0];

app/Http/RequestHandlers/CalendarEvents.php

Spacing +2 added lines, -2 removed lines

@@ -106,7 +106,7 @@ 
                 $anniversary_facts = $this->calendar_service->getCalendarEvents($ged_year->minimumJulianDay(), $ged_year->maximumJulianDay(), $filterev, $tree, $filterof, $filtersx);
             }
 
-            $anniversaries     = Collection::make($anniversary_facts)
+            $anniversaries = Collection::make($anniversary_facts)
                 ->unique()
                 ->sort(static function (Fact $x, Fact $y): int {
                     return $x->date()->minimumJulianDay() <=> $y->date()->minimumJulianDay();
@@ -287,7 +287,7 @@ 
         $html = '';
 
         foreach ($list as $xref => $facts) {
-            $tmp  = Registry::gedcomRecordFactory()->make((string) $xref, $tree);
+            $tmp = Registry::gedcomRecordFactory()->make((string) $xref, $tree);
             $html .= $tag1 . '<a href="' . e($tmp->url()) . '">' . $tmp->fullName() . '</a> ';
             $html .= '<div class="indent">' . $facts . '</div>' . $tag2;
         }

app/Module/LifespansChartModule.php

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
 {
     use ModuleChartTrait;
 
-    protected const ROUTE_URL  = '/tree/{tree}/lifespans';
+    protected const ROUTE_URL = '/tree/{tree}/lifespans';
 
     // In theory, only "@" is a safe separator, but it gives longer and uglier URLs.
     // Unless some other application generates XREFs with a ".", we are safe.

app/Module/StoriesModule.php

Spacing +1 added lines, -1 removed lines

@@ -308,7 +308,7 @@
             $title = I18N::translate('Edit the story') . ' — ' . e($tree->title());
         }
 
-        $individual  = Registry::individualFactory()->make($xref, $tree);
+        $individual = Registry::individualFactory()->make($xref, $tree);
 
         return $this->viewResponse('modules/stories/edit', [
             'block_id'    => $block_id,

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;
@@ -330,14 +330,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], Registry::individualFactory()->make($path[$n - 1], $tree), Registry::individualFactory()->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], Registry::individualFactory()->make($path[$n - 1], $tree), Registry::individualFactory()->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], Registry::individualFactory()->make($path[$n - 1], $tree), Registry::individualFactory()->make($path[$n + 1], $tree)) . '</div><div style="display: inline-block; width:50%; line-height: 64px;">' . view('icons/arrow-down') . '</div></div>';
                             }
@@ -348,7 +348,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], Registry::individualFactory()->make($path[$n - 1], $tree), Registry::individualFactory()->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], Registry::individualFactory()->make($path[$n - 1], $tree), Registry::individualFactory()->make($path[$n + 1], $tree)) . '</div><div style="display: inline-block; width: 50%; line-height: 32px">' . view('icons/arrow-up') . '</div></div>';
                             }
@@ -646,17 +646,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',