fisharebest / webtrees

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/Http/RequestHandlers/RepositoryPage.php

Spacing +1 added lines, -1 removed lines

@@ -88,7 +88,7 @@
         $repository = Auth::checkRepositoryAccess($repository, false);
 
         // Redirect to correct xref/slug
-        if ($repository->xref() !== $xref ||  $request->getAttribute('slug') !== $repository->slug()) {
+        if ($repository->xref() !== $xref || $request->getAttribute('slug') !== $repository->slug()) {
             return redirect($repository->url(), StatusCodeInterface::STATUS_MOVED_PERMANENTLY);
         }
 

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

app/Report/ReportBaseElement.php

Spacing +1 added lines, -1 removed lines

@@ -87,7 +87,7 @@
             "\n",
             ' ',
         ], $t);
-        $t          = strip_tags($t);
+        $t = strip_tags($t);
         $this->text .= $t;
     }
 

app/Http/Controllers/Admin/UpgradeController.php

Spacing +1 added lines, -1 removed lines

@@ -383,7 +383,7 @@
         $this->upgrade_service->cleanFiles($root_filesystem, $folders_to_clean, $files_to_keep);
 
         $url    = route(ControlPanel::class);
-        $alert  =  I18N::translate('The upgrade is complete.');
+        $alert  = I18N::translate('The upgrade is complete.');
         $button = '<a href="' . e($url) . '" class="btn btn-primary">' . I18N::translate('continue') . '</a>';
 
         return response(view('components/alert-success', [

app/Module/FixMissingMarriedNames.php

Spacing +1 added lines, -1 removed lines

@@ -219,7 +219,7 @@
      */
     private function surnamesToAdd(Individual $record): array
     {
-        $tree   = $record->tree();
+        $tree = $record->tree();
 
         $wife_surnames    = $this->surnames($record);
         $husb_surnames    = [];