fisharebest / webtrees

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

app/Http/Controllers/CalendarController.php

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/FanChartModule.php

Spacing +1 added lines, -1 removed lines

@@ -344,7 +344,7 @@
                     $html  .= '<div id="' . $person->xref() . '" class="fan_chart_menu">';
                     $html  .= '<div class="person_box"><div class="details1">';
                     $html .= '<div class="charts">';
-                    $html  .= '<a href="' . e($person->url()) . '" class="dropdown-item">' . $name. '</a>';
+                    $html  .= '<a href="' . e($person->url()) . '" class="dropdown-item">' . $name . '</a>';
                     foreach ($theme->individualBoxMenu($person) as $menu) {
                         $html .= '<a href="' . e($menu->getLink()) . '" class="dropdown-item p-1 ' . e($menu->getClass()) . '">' . $menu->getLabel() . '</a>';
                     }

app/Functions/FunctionsEdit.php

Spacing +1 added lines, -1 removed lines

@@ -575,7 +575,7 @@
             $html .= view('components/select', ['id' => $id, 'name' => $name, 'selected' => $value, 'options' => GedcomCodeName::getValues()]);
         } elseif ($fact === 'TYPE' && $level === '3') {
             //-- Build the selector for the Media 'TYPE' Fact
-            $html          .= '<select name="text[]"><option selected value="" ></option>';
+            $html .= '<select name="text[]"><option selected value="" ></option>';
             $selectedValue = strtolower($value);
             if (!array_key_exists($selectedValue, GedcomTag::getFileFormTypes())) {
                 $html .= '<option selected value="' . e($value) . '" >' . e($value) . '</option>';

app/Services/UserService.php

Spacing +1 added lines, -1 removed lines

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

app/Module/RelationshipsChartModule.php

Spacing +6 added lines, -6 removed lines

@@ -321,14 +321,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>';
                             }
@@ -339,7 +339,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(' . 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>';
                             }
@@ -550,17 +550,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/Http/Controllers/Admin/MediaController.php

Spacing +2 added lines, -2 removed lines

@@ -335,7 +335,7 @@ 
                     $create_form = '';
                     foreach ($media_trees as $media_tree => $media_directory) {
                         if (Str::startsWith($media_folder . $unused_file, $media_directory)) {
-                            $tmp         = substr($media_folder . $unused_file, strlen($media_directory));
+                            $tmp = substr($media_folder . $unused_file, strlen($media_directory));
                             $create_form .=
                                 '<p><a href="#" data-toggle="modal" data-target="#modal-create-media-from-file" data-file="' . e($tmp) . '" data-tree="' . e($media_tree) . '" onclick="document.getElementById(\'file\').value=this.dataset.file; document.getElementById(\'ged\').value=this.dataset.tree;">' . I18N::translate('Create') . '</a> — ' . e($media_tree) . '<p>';
                         }
@@ -461,7 +461,7 @@ 
 
             try {
                 $imgsize = getimagesize($full_path);
-                $html    .= '<dt>' . I18N::translate('Image dimensions') . '</dt>';
+                $html .= '<dt>' . I18N::translate('Image dimensions') . '</dt>';
                 /* I18N: image dimensions, width × height */
                 $html .= '<dd>' . I18N::translate('%1$s × %2$s pixels', I18N::number($imgsize['0']), I18N::number($imgsize['1'])) . '</dd>';
             } catch (Throwable $ex) {

app/Http/Controllers/HomePageController.php

Spacing +1 added lines, -1 removed lines

@@ -908,7 +908,7 @@
     private function filterActiveBlocks(Collection $blocks, Collection $active_blocks): Collection
     {
         return $blocks->map(static function (string $block_name) use ($active_blocks): ?ModuleBlockInterface {
-            return $active_blocks->filter(static function (ModuleInterface $block) use ($block_name): bool {
+            return $active_blocks->filter(static function (ModuleInterface $block) use ($block_name) : bool {
                 return $block->name() === $block_name;
             })->first();
         })