fisharebest / webtrees

app/Http/Controllers/ListController.php

Braces +3 added lines, -1 removed lines

@@ -246,7 +246,8 @@ 
                     <li class="wt-initials-list-item d-flex">
                         <?php if ($count > 0) : ?>
                             <a href="<?= e(route('module', ['module' => $module, 'action' => $action, 'alpha' => $letter, 'tree' => $tree->name()])) ?>" class="wt-initial px-1<?= $letter === $alpha ? ' active' : '' ?> '" title="<?= I18N::number($count) ?>"><?= $this->surnameInitial((string) $letter) ?></a>
-                        <?php else : ?>
+                        <?php else {
+    : ?>
                             <span class="wt-initial px-1 text-muted"><?= $this->surnameInitial((string) $letter) ?></span>
 
                         <?php endif ?>
@@ -300,6 +301,7 @@ 
 
             if ($show === 'indi' || $show === 'surn') {
                 $surns = $this->individual_list_service->surnames($surname, $alpha, $show_marnm === 'yes', $families, I18N::locale());
+}
                 if ($show === 'surn') {
                     // Show the surname list
                     switch ($tree->getPreference('SURNAME_LIST_STYLE')) {

Spacing +2 added lines, -2 removed lines

@@ -136,7 +136,7 @@ 
         $alpha = $request->getQueryParams()['alpha'] ?? '';
 
         // All individuals with this surname
-        $surname = $request->getQueryParams()['surname'] ??  '';
+        $surname = $request->getQueryParams()['surname'] ?? '';
 
         // All individuals
         $show_all = $request->getQueryParams()['show_all'] ?? 'no';
@@ -189,7 +189,7 @@ 
                     'tree'      => $tree->name(),
                     'show_all' => 'yes',
                 ];
-                $show    = $request->getQueryParams()['show'] ?? 'surn';
+                $show = $request->getQueryParams()['show'] ?? 'surn';
             }
         } elseif ($surname !== '') {
             $alpha    = $this->localization_service->initialLetter($surname, I18N::locale()); // so we can highlight the initial letter

app/Module/TopPageViewsModule.php

Spacing +1 added lines, -1 removed lines

@@ -75,7 +75,7 @@
 
         $query = DB::table('hit_counter')
             ->where('gedcom_id', '=', $tree->id())
-            ->whereIn('page_name', ['individual.php','family.php','source.php','repo.php','note.php','mediaviewer.php'])
+            ->whereIn('page_name', ['individual.php', 'family.php', 'source.php', 'repo.php', 'note.php', 'mediaviewer.php'])
             ->orderByDesc('page_count');
 
         $results = [];

app/Services/MediaFileService.php

Spacing +1 added lines, -1 removed lines

@@ -80,7 +80,7 @@
         $sizePostMax = $this->parseIniFileSize(ini_get('post_max_size'));
         $sizeUploadMax = $this->parseIniFileSize(ini_get('upload_max_filesize'));
 
-        $bytes =  min($sizePostMax, $sizeUploadMax);
+        $bytes = min($sizePostMax, $sizeUploadMax);
         $kb    = intdiv($bytes + 1023, 1024);
 
         return I18N::translate('%s KB', I18N::number($kb));

app/Webtrees.php

Spacing +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
     // The system files are always in this location.
     // It is also the default location of user data, such as media and GEDCOM files.
     // The user files could be anywhere supported by Flysystem.
-    public const DATA_DIR  = self::ROOT_DIR . 'data/';
+    public const DATA_DIR = self::ROOT_DIR . 'data/';
 
     // Location of the file containing the database connection details.
     public const CONFIG_FILE = self::DATA_DIR . 'config.ini.php';

app/Http/Controllers/Admin/MediaController.php

Spacing +4 added lines, -4 removed lines

@@ -149,7 +149,7 @@ 
         $data_filesystem = $request->getAttribute('filesystem.data');
         assert($data_filesystem instanceof FilesystemInterface);
 
-        $files  = $request->getQueryParams()['files']; // local|external|unused
+        $files = $request->getQueryParams()['files']; // local|external|unused
 
         // Files within this folder
         $media_folder = $request->getQueryParams()['media_folder'];
@@ -264,7 +264,7 @@ 
                     $create_form = '';
                     foreach ($media_trees as $media_tree => $media_directory) {
                         if (Str::startsWith($row[0], $media_directory)) {
-                            $tmp         = substr($row[0], strlen($media_directory));
+                            $tmp = substr($row[0], strlen($media_directory));
                             $create_form .=
                                 '<p><a href="#" data-toggle="modal" data-target="#modal-create-media-from-file" data-file="' . e($tmp) . '" data-url="' . e(route('create-media-from-file', ['tree' => $media_tree])) . '" onclick="document.getElementById(\'modal-create-media-from-file-form\').action=this.dataset.url; document.getElementById(\'file\').value=this.dataset.file;">' . I18N::translate('Create') . '</a> — ' . e($media_tree) . '<p>';
                         }
@@ -355,8 +355,8 @@ 
             try {
                 // This will work for local filesystems.  For remote filesystems, we will
                 // need to copy the file locally to work out the image size.
-                $imgsize = getimagesize(Webtrees::DATA_DIR .  $file);
-                $html    .= '<dt>' . I18N::translate('Image dimensions') . '</dt>';
+                $imgsize = getimagesize(Webtrees::DATA_DIR . $file);
+                $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/Services/UserService.php

Spacing +1 added lines, -1 removed lines

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

app/Module/ModuleThemeTrait.php

Spacing +1 added lines, -1 removed lines

@@ -283,7 +283,7 @@
         }
 
         // Stay on the same tree page
-        $url  = route(LoginPage::class, ['tree' => $tree instanceof Tree ? $tree->name() : null, 'url' => $redirect]);
+        $url = route(LoginPage::class, ['tree' => $tree instanceof Tree ? $tree->name() : null, 'url' => $redirect]);
 
         return new Menu(I18N::translate('Sign in'), $url, 'menu-login', ['rel' => 'nofollow']);
     }

resources/lang/en-US/messages.php

Indentation +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@
 <?php
 
 return array (
-  '%H:%i:%s' => '%g:%i:%s %a',
-  '%j %F %Y' => '%F %j, %Y',
+    '%H:%i:%s' => '%g:%i:%s %a',
+    '%j %F %Y' => '%F %j, %Y',
 );

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-return array (
+return array(
   '%H:%i:%s' => '%g:%i:%s %a',
   '%j %F %Y' => '%F %j, %Y',
 );

app/Services/HomePageService.php

Spacing +1 added lines, -1 removed lines

@@ -907,7 +907,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();
         })->filter();