fisharebest / webtrees

app/Http/Controllers/TimelineChartController.php

Spacing +9 added lines, -9 removed lines

@@ -60,11 +60,11 @@ 
     {
         $this->checkModuleIsActive($tree, 'timeline_chart');
 
-        $scale = (int)$request->get('scale', self::SCALE_DEFAULT);
+        $scale = (int) $request->get('scale', self::SCALE_DEFAULT);
         $scale = min($scale, self::SCALE_MAX);
         $scale = max($scale, self::SCALE_MIN);
 
-        $xrefs = (array)$request->get('xrefs', []);
+        $xrefs = (array) $request->get('xrefs', []);
         $xrefs = array_unique($xrefs);
         $xrefs = array_filter($xrefs, function (string $xref) use ($tree): bool {
             $individual = Individual::getInstance($xref, $tree);
@@ -100,14 +100,14 @@ 
 
         $zoom_in_url = route('timeline', [
             'ged'   => $tree->getName(),
-            'scale' => min(self::SCALE_MAX, $scale + (int)($scale * 0.2 + 1)),
+            'scale' => min(self::SCALE_MAX, $scale + (int) ($scale * 0.2 + 1)),
             'xrefs' => $xrefs,
         ]);
 
         $zoom_out_url = route('timeline', [
             'route' => 'timeline',
             'ged'   => $tree->getName(),
-            'scale' => max(self::SCALE_MIN, $scale - (int)($scale * 0.2 + 1)),
+            'scale' => max(self::SCALE_MIN, $scale - (int) ($scale * 0.2 + 1)),
             'xrefs' => $xrefs,
         ]);
 
@@ -132,11 +132,11 @@ 
     {
         $this->checkModuleIsActive($tree, 'timeline_chart');
 
-        $scale = (int)$request->get('scale', self::SCALE_DEFAULT);
+        $scale = (int) $request->get('scale', self::SCALE_DEFAULT);
         $scale = min($scale, self::SCALE_MAX);
         $scale = max($scale, self::SCALE_MIN);
 
-        $xrefs = (array)$request->get('xrefs', []);
+        $xrefs = (array) $request->get('xrefs', []);
         $xrefs = array_unique($xrefs);
 
         /** @var Individual[] $individuals */
@@ -148,7 +148,7 @@ 
             return $individual !== null && $individual->canShow();
         });
 
-        $baseyear    = (int)date('Y');
+        $baseyear    = (int) date('Y');
         $topyear     = 0;
         $indifacts   = [];
         $birthyears  = [];
@@ -183,7 +183,7 @@ 
                         $topyear  = max($topyear, $date->y);
 
                         if (!$individual->isDead()) {
-                            $topyear = max($topyear, (int)date('Y'));
+                            $topyear = max($topyear, (int) date('Y'));
                         }
 
                         // do not add the same fact twice (prevents marriages from being added multiple times)
@@ -196,7 +196,7 @@ 
         }
 
         if ($scale === 0) {
-            $scale = (int)(($topyear - $baseyear) / 20 * count($indifacts) / 4);
+            $scale = (int) (($topyear - $baseyear) / 20 * count($indifacts) / 4);
             if ($scale < 6) {
                 $scale = 6;
             }

app/Services/UpgradeService.php

Spacing +1 added lines, -1 removed lines

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

app/Functions/FunctionsPrintLists.php

Spacing +3 added lines, -3 removed lines

@@ -53,7 +53,7 @@ 
                 } else {
                     $size = 75.0 + 125.0 * ($count - $minimum) / ($maximum - $minimum);
                 }
-                $url  = route($route, [
+                $url = route($route, [
                     'surname' => $surn,
                     'ged'     => $tree->getName(),
                 ]);
@@ -130,13 +130,13 @@ 
                 }
                 $newcol = ceil($count / $col);
                 $html2  = '<table class="list_table"><tr>';
-                $html2  .= '<td class="list_value" style="padding: 14px;">';
+                $html2 .= '<td class="list_value" style="padding: 14px;">';
 
                 foreach ($html as $surns) {
                     $html2 .= $surns . '<br>';
                     $i++;
                     if ($i == $newcol && $i < $count) {
-                        $html2  .= '</td><td class="list_value" style="padding: 14px;">';
+                        $html2 .= '</td><td class="list_value" style="padding: 14px;">';
                         $newcol = $i + ceil($count / $col);
                     }
                 }

app/Module/TopSurnamesModule.php

Indentation +1 added lines, -1 removed lines

@@ -72,7 +72,7 @@
 
         extract($cfg, EXTR_OVERWRITE);
 
-         // Use the count of base surnames.
+            // Use the count of base surnames.
         $top_surnames = Database::prepare(
             "SELECT n_surn FROM `##name`" .
             " WHERE n_file = :tree_id AND n_type != '_MARNM' AND n_surn NOT IN ('@N.N.', '')" .

app/Http/Controllers/Auth/ForgotPasswordController.php

Spacing +2 added lines, -2 removed lines

@@ -69,7 +69,7 @@ 
 
             Log::addAuthenticationLog('Password request was sent to user: ' . $user->getUserName());
 
-            $sender = new User((object)[
+            $sender = new User((object) [
                 'user_id'   => null,
                 'user_name' => '',
                 'real_name' => $tree->getTitle(),
@@ -104,7 +104,7 @@ 
         $max       = strlen($passchars) - 1;
 
         for ($i = 0; $i < 8; $i++) {
-            $index    = random_int(0, $max);
+            $index = random_int(0, $max);
             $password .= $passchars{$index};
         }
 

app/I18N.php

Spacing +5 added lines, -5 removed lines

@@ -841,23 +841,23 @@
         $year   = 365 * $day;
 
         if ($seconds > $year) {
-            $years = (int)($seconds / $year);
+            $years = (int) ($seconds / $year);
 
             return self::plural('%s year ago', '%s years ago', $years, self::number($years));
         } elseif ($seconds > $month) {
-            $months = (int)($seconds / $month);
+            $months = (int) ($seconds / $month);
 
             return self::plural('%s month ago', '%s months ago', $months, self::number($months));
         } elseif ($seconds > $day) {
-            $days = (int)($seconds / $day);
+            $days = (int) ($seconds / $day);
 
             return self::plural('%s day ago', '%s days ago', $days, self::number($days));
         } elseif ($seconds > $hour) {
-            $hours = (int)($seconds / $hour);
+            $hours = (int) ($seconds / $hour);
 
             return self::plural('%s hour ago', '%s hours ago', $hours, self::number($hours));
         } elseif ($seconds > $minute) {
-            $minutes = (int)($seconds / $minute);
+            $minutes = (int) ($seconds / $minute);
 
             return self::plural('%s minute ago', '%s minutes ago', $minutes, self::number($minutes));
         } else {

app/Report/ReportParserGenerate.php

Spacing +9 added lines, -9 removed lines

@@ -1843,7 +1843,7 @@ 
         // Some filters/sorts can be applied using SQL, while others require PHP
         switch ($listname) {
             case 'pending':
-                $rows       = Database::prepare(
+                $rows = Database::prepare(
                     "SELECT xref, CASE new_gedcom WHEN '' THEN old_gedcom ELSE new_gedcom END AS gedcom" .
                     " FROM `##change`" . " WHERE (xref, change_id) IN (" .
                     "  SELECT xref, MAX(change_id)" .
@@ -1882,7 +1882,7 @@ 
                                 $sql_params[$attr . 'date'] = $date->minimumJulianDay();
                             }
                             if ($sortby == $match[1]) {
-                                $sortby       = "";
+                                $sortby = "";
                                 $sql_order_by .= ($sql_order_by ? ", " : " ORDER BY ") . "{$attr}.d_julianday1";
                             }
                             unset($attrs[$attr]); // This filter has been fully processed
@@ -1894,13 +1894,13 @@ 
                                 if ($match[1] != '') {
                                     $names = explode(' ', $match[1]);
                                     foreach ($names as $n => $name) {
-                                        $sql_where                       .= " AND {$attr}.n_full LIKE CONCAT('%', :{$attr}name{$n}, '%')";
+                                        $sql_where .= " AND {$attr}.n_full LIKE CONCAT('%', :{$attr}name{$n}, '%')";
                                         $sql_params[$attr . 'name' . $n] = $name;
                                     }
                                 }
                                 // Let the DB do the name sorting even when no name was entered
                                 if ($sortby == 'NAME') {
-                                    $sortby       = '';
+                                    $sortby = '';
                                     $sql_order_by .= ($sql_order_by ? ', ' : ' ORDER BY ') . "{$attr}.n_sort";
                                 }
                             }
@@ -1917,7 +1917,7 @@ 
                             $sql_params[$attr . 'place'] = $match[1];
                             // Don't unset this filter. This is just initial filtering
                         } elseif (preg_match('/^(\w*):*(\w*) CONTAINS (.+)$/', $value, $match)) {
-                            $sql_where                       .= " AND i_gedcom LIKE CONCAT('%', :{$attr}contains1, '%', :{$attr}contains2, '%', :{$attr}contains3, '%')";
+                            $sql_where .= " AND i_gedcom LIKE CONCAT('%', :{$attr}contains1, '%', :{$attr}contains2, '%', :{$attr}contains3, '%')";
                             $sql_params[$attr . 'contains1'] = $match[1];
                             $sql_params[$attr . 'contains2'] = $match[2];
                             $sql_params[$attr . 'contains3'] = $match[3];
@@ -1959,7 +1959,7 @@ 
                                 $sql_params[$attr . 'date'] = $date->minimumJulianDay();
                             }
                             if ($sortby == $match[1]) {
-                                $sortby       = '';
+                                $sortby = '';
                                 $sql_order_by .= ($sql_order_by ? ', ' : ' ORDER BY ') . "{$attr}.d_julianday1";
                             }
                             unset($attrs[$attr]); // This filter has been fully processed
@@ -1976,13 +1976,13 @@ 
                                 if ($match[1] != '') {
                                     $names = explode(' ', $match[1]);
                                     foreach ($names as $n => $name) {
-                                        $sql_where                       .= " AND {$attr}.n_full LIKE CONCAT('%', :{$attr}name{$n}, '%')";
+                                        $sql_where .= " AND {$attr}.n_full LIKE CONCAT('%', :{$attr}name{$n}, '%')";
                                         $sql_params[$attr . 'name' . $n] = $name;
                                     }
                                 }
                                 // Let the DB do the name sorting even when no name was entered
                                 if ($sortby == 'NAME') {
-                                    $sortby       = '';
+                                    $sortby = '';
                                     $sql_order_by .= ($sql_order_by ? ', ' : ' ORDER BY ') . "{$attr}.n_sort";
                                 }
                             }
@@ -1994,7 +1994,7 @@ 
                             $sql_params[$attr . 'place'] = $match[1];
                             // Don't unset this filter. This is just initial filtering
                         } elseif (preg_match('/^(\w*):*(\w*) CONTAINS (.+)$/', $value, $match)) {
-                            $sql_where                       .= " AND f_gedcom LIKE CONCAT('%', :{$attr}contains1, '%', :{$attr}contains2, '%', :{$attr}contains3, '%')";
+                            $sql_where .= " AND f_gedcom LIKE CONCAT('%', :{$attr}contains1, '%', :{$attr}contains2, '%', :{$attr}contains3, '%')";
                             $sql_params[$attr . 'contains1'] = $match[1];
                             $sql_params[$attr . 'contains2'] = $match[2];
                             $sql_params[$attr . 'contains3'] = $match[3];

app/Http/Controllers/AdminMediaController.php

Spacing +9 added lines, -9 removed lines

@@ -119,8 +119,8 @@ 
         $files  = $request->get('files'); // local|external|unused
         $search = $request->get('search');
         $search = $search['value'];
-        $start  = (int)$request->get('start');
-        $length = (int)$request->get('length');
+        $start  = (int) $request->get('start');
+        $length = (int) $request->get('length');
 
         // family tree setting MEDIA_DIRECTORY
         $media_folders = $this->allMediaFolders();
@@ -156,7 +156,7 @@ 
                     "  OR   descriptive_title LIKE CONCAT('%', :search_2, '%'))" .
                     " AND   multimedia_file_refn NOT LIKE 'http://%'" .
                     " AND   multimedia_file_refn NOT LIKE 'https://%'";
-                $ARGS1   = [
+                $ARGS1 = [
                     'media_path_1' => $media_path,
                     'media_folder' => $media_folder,
                     'media_path_2' => Database::escapeLike($media_path),
@@ -173,7 +173,7 @@ 
                     " AND   multimedia_file_refn LIKE CONCAT(:media_path_3, '%')" .
                     " AND   multimedia_file_refn NOT LIKE 'http://%'" .
                     " AND   multimedia_file_refn NOT LIKE 'https://%'";
-                $ARGS2   = [
+                $ARGS2 = [
                     'media_folder' => $media_folder,
                     'media_path_3' => $media_path,
                 ];
@@ -185,7 +185,7 @@ 
                     $ARGS2['media_path_4'] = Database::escapeLike($media_path);
                 }
 
-                $order   = $request->get('order', []);
+                $order = $request->get('order', []);
                 $SELECT1 .= " ORDER BY ";
                 if ($order) {
                     foreach ($order as $key => $value) {
@@ -209,7 +209,7 @@ 
                 }
 
                 if ($length > 0) {
-                    $SELECT1         .= " LIMIT :length OFFSET :start";
+                    $SELECT1 .= " LIMIT :length OFFSET :start";
                     $ARGS1['length'] = $length;
                     $ARGS1['start']  = $start;
                 }
@@ -242,7 +242,7 @@ 
                     " JOIN  `##media_file` USING (m_id, m_file)" .
                     " WHERE (multimedia_file_refn LIKE 'http://%' OR multimedia_file_refn LIKE 'https://%')" .
                     " AND   (multimedia_file_refn LIKE CONCAT('%', :search_1, '%') OR descriptive_title LIKE CONCAT('%', :search_2, '%'))";
-                $ARGS1   = [
+                $ARGS1 = [
                     'search_1' => Database::escapeLike($search),
                     'search_2' => Database::escapeLike($search),
                 ];
@@ -278,7 +278,7 @@ 
                 }
 
                 if ($length > 0) {
-                    $SELECT1         .= " LIMIT :length OFFSET :start";
+                    $SELECT1 .= " LIMIT :length OFFSET :start";
                     $ARGS1['length'] = $length;
                     $ARGS1['start']  = $start;
                 }
@@ -660,7 +660,7 @@ 
         $full_path = WT_DATA_DIR . $media_folder . $media_path . $file;
         try {
             $size = filesize($full_path);
-            $size = (int)(($size + 1023) / 1024); // Round up to next KB
+            $size = (int) (($size + 1023) / 1024); // Round up to next KB
             /* I18N: size of file in KB */
             $size = I18N::translate('%s KB', I18N::number($size));
             $html .= '<dt>' . I18N::translate('File size') . '</dt>';

app/Http/Controllers/SetupController.php

Spacing +5 added lines, -5 removed lines

@@ -47,7 +47,7 @@ 
     {
         define('WT_LOCALE', I18N::init('en-US'));
 
-        $step     = (int)$request->get('step', '1');
+        $step     = (int) $request->get('step', '1');
         $errors   = $this->serverErrors();
         $warnings = $this->serverWarnings();
         $data     = $this->extractParameters($request);
@@ -364,7 +364,7 @@ 
      */
     private function maxExecutionTime(): int
     {
-        return (int)ini_get('max_execution_time');
+        return (int) ini_get('max_execution_time');
     }
 
     /**
@@ -397,7 +397,7 @@ 
                 $memory_limit = $memory_limit / 1024 / 1024;
         }
 
-        return (int)$memory_limit;
+        return (int) $memory_limit;
     }
 
     /**
@@ -454,11 +454,11 @@ 
             /* I18N: a program feature */
             'simplexml' => I18N::translate('reporting'),
         ];
-        $settings   = [
+        $settings = [
             /* I18N: a program feature */
             'file_uploads' => I18N::translate('file upload capability'),
         ];
-        $warnings   = [];
+        $warnings = [];
 
         foreach ($extensions as $extension => $features) {
             if (!extension_loaded($extension)) {