fisharebest / webtrees

app/Http/Controllers/Admin/LocationController.php

Spacing +3 added lines, -3 removed lines

@@ -87,7 +87,7 @@ 
      */
     public function __construct(GedcomService $gedcom_service)
     {
-        $this->gedcom_service   = $gedcom_service;
+        $this->gedcom_service = $gedcom_service;
     }
 
     /**
@@ -161,13 +161,13 @@ 
 
         if ($place_id === 0) {
             $breadcrumbs[]   = I18N::translate('Add');
-            $title           .= ' — ' . I18N::translate('Add');
+            $title .= ' — ' . I18N::translate('Add');
             $latitude        = 0.0;
             $longitude       = 0.0;
             $map_bounds      = $parent->boundingRectangle();
         } else {
             $breadcrumbs[]   = I18N::translate('Edit');
-            $title           .= ' — ' . I18N::translate('Edit');
+            $title .= ' — ' . I18N::translate('Edit');
             $latitude        = $location->latitude();
             $longitude       = $location->longitude();
             $map_bounds      = $location->boundingRectangle();

app/Module/TimelineChartModule.php

Spacing +3 added lines, -3 removed lines

@@ -46,7 +46,7 @@ 
 {
     use ModuleChartTrait;
 
-    protected const ROUTE_URL  = '/tree/{tree}/timeline-{scale}';
+    protected const ROUTE_URL = '/tree/{tree}/timeline-{scale}';
 
     // Defaults
     protected const DEFAULT_SCALE      = 10;
@@ -67,7 +67,7 @@ 
         '_TODO',
         'CHAN',
     ];
-    protected const BHEIGHT   = 30;
+    protected const BHEIGHT = 30;
 
     // Box height
 
@@ -152,7 +152,7 @@ 
 
         $params = (array) $request->getParsedBody();
 
-        $add  = $params['add'] ?? '';
+        $add = $params['add'] ?? '';
 
         Auth::checkComponentAccess($this, ModuleChartInterface::class, $tree, $user);
 

app/Http/Controllers/Admin/MediaController.php

Spacing +3 added lines, -3 removed lines

@@ -272,7 +272,7 @@ 
                     $create_form = '';
                     foreach ($media_trees as $media_tree => $media_directory) {
                         if (str_starts_with($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-backdrop="static" 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>';
                         }
@@ -366,8 +366,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 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/Functions/FunctionsPrint.php

Spacing +6 added lines, -6 removed lines

@@ -172,7 +172,7 @@ 
                     if ($note->canShow()) {
                         $noterec = $note->gedcom();
                         $nt      = preg_match("/0 @$nmatch[1]@ NOTE (.*)/", $noterec, $n1match);
-                        $data    .= self::printNoteRecord($tree, $nt > 0 ? $n1match[1] : '', 1, $noterec);
+                        $data .= self::printNoteRecord($tree, $nt > 0 ? $n1match[1] : '', 1, $noterec);
                     }
                 } else {
                     $data = '<div class="fact_NOTE"><span class="label">' . I18N::translate('Note') . '</span>: <span class="field error">' . $nmatch[1] . '</span></div>';
@@ -272,7 +272,7 @@ 
                         }
                     },
                     $age_string
-                ) ;
+                );
         }
     }
 
@@ -336,7 +336,7 @@ 
                     $ageText = '';
                     if ($fact === 'DEAT' || Date::compare($date, $death_date) <= 0 || !$record->isDead()) {
                         // Before death, print age
-                        $age = (new Age($birth_date, $date))->ageAtEvent(false,$record->sex());
+                        $age = (new Age($birth_date, $date))->ageAtEvent(false, $record->sex());
                         // Only show calculated age if it differs from recorded age
                         if ($age !== '') {
                             if ($fact_age !== '' && $fact_age !== $age) {
@@ -406,20 +406,20 @@ 
                 if (preg_match_all('/\n3 (?:_HEB|ROMN) (.+)/', $placerec, $matches)) {
                     foreach ($matches[1] as $match) {
                         $wt_place = new Place($match, $tree);
-                        $html     .= ' - ' . $wt_place->fullName();
+                        $html .= ' - ' . $wt_place->fullName();
                     }
                 }
                 $map_lati = '';
                 $cts      = preg_match('/\d LATI (.*)/', $placerec, $match);
                 if ($cts > 0) {
                     $map_lati = $match[1];
-                    $html     .= '<br><span class="label">' . I18N::translate('Latitude') . ': </span>' . $map_lati;
+                    $html .= '<br><span class="label">' . I18N::translate('Latitude') . ': </span>' . $map_lati;
                 }
                 $map_long = '';
                 $cts      = preg_match('/\d LONG (.*)/', $placerec, $match);
                 if ($cts > 0) {
                     $map_long = $match[1];
-                    $html     .= ' <span class="label">' . I18N::translate('Longitude') . ': </span>' . $map_long;
+                    $html .= ' <span class="label">' . I18N::translate('Longitude') . ': </span>' . $map_long;
                 }
                 if ($map_lati && $map_long) {
                     $map_lati = trim(strtr($map_lati, 'NSEW,�', ' - -. ')); // S5,6789 ==> -5.6789

app/Http/RequestHandlers/IndividualPage.php

Spacing +2 added lines, -2 removed lines

@@ -111,11 +111,11 @@
 
         if ($individual->isDead()) {
             // If dead, show age at death
-            $age = (new Age($bdate, $ddate))->ageAtEvent(false,$individual->sex());
+            $age = (new Age($bdate, $ddate))->ageAtEvent(false, $individual->sex());
         } else {
             // If living, show age today
             $today = strtoupper(date('d M Y'));
-            $age   = (new Age($bdate, new Date($today)))->ageAtEvent(true,$individual->sex());
+            $age   = (new Age($bdate, new Date($today)))->ageAtEvent(true, $individual->sex());
         }
 
         // What images are linked to this individual

app/Functions/FunctionsPrintFacts.php

Spacing +4 added lines, -4 removed lines

@@ -531,14 +531,14 @@ 
                 }
 
                 // Compute age of associated Person at the event (Person BIRT is mandatory )
-                $ageOfAssociated ="";
+                $ageOfAssociated = "";
                 if (preg_match('/\n2 DATE (.+)/', $event->gedcom(), $match1)) {
                     if (preg_match('/\n1 BIRT/', $person->gedcom(), $match)) {
                         preg_match('/\n2 DATE (.+)/', $person->gedcom(), $match2);
                         $isLiving = !preg_match('/\n1 DEAT/', $person->gedcom(), $match3);
                         $dateEvent = new Date($match1[1]);
                         $dateAssoP = new Date($match2[1]);
-                        $ageOfAssociated   = (new Age($dateAssoP, $dateEvent))->ageAtEvent($isLiving,$person->sex());
+                        $ageOfAssociated = (new Age($dateAssoP, $dateEvent))->ageAtEvent($isLiving, $person->sex());
                     }
                 }
                 $values = ['<a href="' . e($person->url()) . '">' . $person->fullName() . '<i> ' . $ageOfAssociated . '</i>' . '</a>'];
@@ -602,7 +602,7 @@ 
         for ($j = 0; $j < $ct; $j++) {
             if (!str_contains($match[$j][1], '@')) {
                 $source = e($match[$j][1] . preg_replace('/\n\d CONT ?/', "\n", $match[$j][2]));
-                $data   .= '<div class="fact_SOUR"><span class="label">' . I18N::translate('Source') . ':</span> <span class="field" dir="auto">' . Filter::formatText($source, $tree) . '</span></div>';
+                $data .= '<div class="fact_SOUR"><span class="label">' . I18N::translate('Source') . ':</span> <span class="field" dir="auto">' . Filter::formatText($source, $tree) . '</span></div>';
             }
         }
         // Find source for each fact
@@ -620,7 +620,7 @@ 
                     }
                     $srec     = substr($factrec, $spos1, $spos2 - $spos1);
                     $lt       = preg_match_all("/$nlevel \w+/", $srec, $matches);
-                    $data     .= '<div class="fact_SOUR">';
+                    $data .= '<div class="fact_SOUR">';
                     $id       = 'collapse-' . Uuid::uuid4()->toString();
                     $expanded = (bool) $tree->getPreference('EXPAND_SOURCES');
                     if ($lt > 0) {