fisharebest / webtrees

app/Http/Controllers/AdminLocationController.php

Braces +4 added lines, -2 removed lines

@@ -342,9 +342,11 @@
             'fqpn',
         ];
 
-        if ($serverfile !== '') {  // first choice is file on server
+        if ($serverfile !== '') {
+// first choice is file on server
             $filename = WT_DATA_DIR . 'places/' . $serverfile;
-        } elseif ($_FILES['localfile']['error'] === UPLOAD_ERR_OK) { // 2nd choice is local file
+        } elseif ($_FILES['localfile']['error'] === UPLOAD_ERR_OK) {
+// 2nd choice is local file
             $filename = $_FILES['localfile']['tmp_name'];
         }
 

Spacing +1 added lines, -1 removed lines

@@ -494,7 +494,7 @@
         // ... and process the differences
         $inserted = 0;
         if (!empty($diff)) {
-            $nextRecordId    = 1 + (int) DB::table('placelocation')->max('pl_id');
+            $nextRecordId = 1 + (int) DB::table('placelocation')->max('pl_id');
 
             foreach ($diff as $place) {
                 // For Westminster, London, England, we must also create England and London, England

app/Http/Controllers/PendingChangesController.php

Spacing +2 added lines, -2 removed lines

@@ -98,7 +98,7 @@ 
     {
         $url       = $request->get('url', '');
         $xref      = $request->get('xref', '');
-        $change_id = (int)$request->get('change_id');
+        $change_id = (int) $request->get('change_id');
 
         $changes = Database::prepare(
             "SELECT change_id, xref, old_gedcom, new_gedcom" .
@@ -204,7 +204,7 @@ 
     {
         $url       = $request->get('url', '');
         $xref      = $request->get('xref', '');
-        $change_id = (int)$request->get('change_id');
+        $change_id = (int) $request->get('change_id');
 
         // Reject a change, and subsequent changes to the same record
         Database::prepare(

app/Date/JulianDate.php

Spacing +1 added lines, -1 removed lines

@@ -74,7 +74,7 @@
         }
 
         if (preg_match('/^(\d+) B\.C\.$/', $year, $match)) {
-            return - (int) $match[1];
+            return -(int) $match[1];
         }
 
         return (int) $year;

app/Date.php

Spacing +2 added lines, -2 removed lines

@@ -162,7 +162,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;
             } else {
                 if (preg_match('/^[345]\d\d\d$/', $y)) {
                     // Year 3000-5999
@@ -460,7 +460,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/Functions/Functions.php

Spacing +4 added lines, -4 removed lines

@@ -320,7 +320,7 @@ 
                                 return $new_path;
                             }
 
-                            $paths[]                     = $new_path;
+                            $paths[] = $new_path;
                             $visited[$spouse->xref()] = true;
                         }
                     }
@@ -334,7 +334,7 @@ 
                                 return $new_path;
                             }
 
-                            $paths[]                    = $new_path;
+                            $paths[] = $new_path;
                             $visited[$child->xref()] = true;
                         }
                     }
@@ -353,7 +353,7 @@ 
                                 return $new_path;
                             }
 
-                            $paths[]                     = $new_path;
+                            $paths[] = $new_path;
                             $visited[$spouse->xref()] = true;
                         }
                     }
@@ -367,7 +367,7 @@ 
                                 return $new_path;
                             }
 
-                            $paths[]                    = $new_path;
+                            $paths[] = $new_path;
                             $visited[$child->xref()] = true;
                         }
                     }

app/Module/OnThisDayModule.php

Spacing +1 added lines, -1 removed lines

@@ -121,7 +121,7 @@
 
         // If we are only showing living individuals, then we don't need to search for DEAT events.
         if ($filter) {
-            $event_array  = array_diff($event_array, Gedcom::DEATH_EVENTS);
+            $event_array = array_diff($event_array, Gedcom::DEATH_EVENTS);
         }
 
         $events_filter = implode('|', $event_array);

app/Census/CensusColumnNationality.php

Spacing +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
         }
 
         // Did we emigrate or naturalise?
-        foreach ($individual->facts(['IMMI' ,'EMIG', 'NATU'], true) as $fact) {
+        foreach ($individual->facts(['IMMI', 'EMIG', 'NATU'], true) as $fact) {
             if (Date::compare($fact->date(), $this->date()) <= 0) {
                 $place = $fact->place()->getGedcomName();
             }

app/Module/UpcomingAnniversariesModule.php

Spacing +1 added lines, -1 removed lines

@@ -121,7 +121,7 @@
 
         // If we are only showing living individuals, then we don't need to search for DEAT events.
         if ($filter) {
-            $event_array  = array_diff($event_array, Gedcom::DEATH_EVENTS);
+            $event_array = array_diff($event_array, Gedcom::DEATH_EVENTS);
         }
 
         $events_filter = implode('|', $event_array);

app/Services/UpgradeService.php

Spacing +1 added lines, -1 removed lines

@@ -76,7 +76,7 @@
     {
         $latest_version = $this->fetchLatestVersion();
 
-        [, , $url] = explode('|', $latest_version . '||');
+        [,, $url] = explode('|', $latest_version . '||');
 
         return $url;
     }