fisharebest / webtrees

app/Http/Controllers/ListController.php

Spacing +3 added lines, -3 removed lines

@@ -125,10 +125,10 @@ 
         switch ($show_marnm) {
             case 'no':
             case 'yes':
-                $user->setPreference($families?'family-list-marnm':'individual-list-marnm', $show_marnm);
+                $user->setPreference($families ? 'family-list-marnm' : 'individual-list-marnm', $show_marnm);
                 break;
             default:
-                $show_marnm = $user->getPreference($families?'family-list-marnm':'individual-list-marnm');
+                $show_marnm = $user->getPreference($families ? 'family-list-marnm' : 'individual-list-marnm');
         }
 
         // Make sure selections are consistent.
@@ -160,7 +160,7 @@ 
                     'ged'      => $tree->name(),
                     'show_all' => 'yes',
                 ];
-                $show    = $request->get('show', 'surn');
+                $show = $request->get('show', 'surn');
             }
         } elseif ($surname) {
             $alpha    = $this->localization_service->initialLetter($surname); // so we can highlight the initial letter

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/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) {