fisharebest / webtrees

app/Http/Controllers/Auth/RegisterController.php

Spacing +2 added lines, -2 removed lines

@@ -118,7 +118,7 @@ 
             ->setPreference('sessiontime', '0');
 
         // Create a dummy user, so we can send messages from the tree.
-        $sender = new User((object)[
+        $sender = new User((object) [
             'user_id'   => null,
             'user_name' => '',
             'real_name' => $tree->getTitle(),
@@ -137,7 +137,7 @@ 
         );
 
         // Tell the genealogy contact about the registration.
-        $webmaster = User::find((int)$tree->getPreference('WEBMASTER_USER_ID'));
+        $webmaster = User::find((int) $tree->getPreference('WEBMASTER_USER_ID'));
 
         if ($webmaster !== null) {
             I18N::init($webmaster->getPreference('language'));

app/Http/Controllers/FanChartController.php

Spacing +17 added lines, -17 removed lines

@@ -62,9 +62,9 @@ 
 
         $this->checkIndividualAccess($individual);
 
-        $chart_style = (int)$request->get('chart_style', self::DEFAULT_STYLE);
-        $fan_width   = (int)$request->get('fan_width', self::DEFAULT_WIDTH);
-        $generations = (int)$request->get('generations', self::DEFAULT_GENERATIONS);
+        $chart_style = (int) $request->get('chart_style', self::DEFAULT_STYLE);
+        $fan_width   = (int) $request->get('fan_width', self::DEFAULT_WIDTH);
+        $generations = (int) $request->get('generations', self::DEFAULT_GENERATIONS);
 
         $fan_width = min($fan_width, self::MAXIMUM_WIDTH);
         $fan_width = max($fan_width, self::MINIMUM_WIDTH);
@@ -106,9 +106,9 @@ 
 
         $this->checkIndividualAccess($individual);
 
-        $chart_style = (int)$request->get('chart_style', self::DEFAULT_STYLE);
-        $fan_width   = (int)$request->get('fan_width', self::DEFAULT_WIDTH);
-        $generations = (int)$request->get('generations', self::DEFAULT_GENERATIONS);
+        $chart_style = (int) $request->get('chart_style', self::DEFAULT_STYLE);
+        $fan_width   = (int) $request->get('fan_width', self::DEFAULT_WIDTH);
+        $generations = (int) $request->get('generations', self::DEFAULT_GENERATIONS);
 
         $fan_width = min($fan_width, self::MAXIMUM_WIDTH);
         $fan_width = max($fan_width, self::MINIMUM_WIDTH);
@@ -137,7 +137,7 @@ 
         $scale = $fanw / 640;
 
         // Create the image
-        $image = imagecreate((int)$fanw, (int)$fanh);
+        $image = imagecreate((int) $fanw, (int) $fanh);
 
         // Create colors
         $transparent = imagecolorallocate($image, 0, 0, 0);
@@ -154,7 +154,7 @@ 
         ];
 
 
-        imagefilledrectangle($image, 0, 0, (int)$fanw, (int)$fanh, $transparent);
+        imagefilledrectangle($image, 0, 0, (int) $fanw, (int) $fanh, $transparent);
 
         $fandeg = 90 * $chart_style;
 
@@ -169,7 +169,7 @@ 
             // clean current generation area
             $deg2 = 360 + ($fandeg - 180) / 2;
             $deg1 = $deg2 - $fandeg;
-            imagefilledarc($image, (int)$cx, (int)$cy, (int)$rx, (int)$rx, (int)$deg1, (int)$deg2, $backgrounds['U'], IMG_ARC_PIE);
+            imagefilledarc($image, (int) $cx, (int) $cy, (int) $rx, (int) $rx, (int) $deg1, (int) $deg2, $backgrounds['U'], IMG_ARC_PIE);
             $rx -= 3;
 
             // calculate new angle
@@ -199,15 +199,15 @@ 
 
                     $background = $backgrounds[$person->getSex()];
 
-                    imagefilledarc($image, (int)$cx, (int)$cy, (int)$rx, (int)$rx, (int)$deg1, (int)$deg2, $background, IMG_ARC_PIE);
+                    imagefilledarc($image, (int) $cx, (int) $cy, (int) $rx, (int) $rx, (int) $deg1, (int) $deg2, $background, IMG_ARC_PIE);
 
                     // split and center text by lines
-                    $wmax = (int)($angle * 7 / 7 * $scale);
+                    $wmax = (int) ($angle * 7 / 7 * $scale);
                     $wmax = min($wmax, 35 * $scale);
                     if ($gen == 0) {
                         $wmax = min($wmax, 17 * $scale);
                     }
-                    $text = $this->splitAlignText($text, (int)$wmax);
+                    $text = $this->splitAlignText($text, (int) $wmax);
 
                     // text angle
                     $tangle = 270 - ($deg1 + $angle / 2);
@@ -376,7 +376,7 @@ 
                     }
                     $line .= "$word";
                 } else {
-                    $p = max(0, (int)(($maxlen - $len) / 2));
+                    $p = max(0, (int) (($maxlen - $len) / 2));
                     if (!empty($line)) {
                         $line = str_repeat(' ', $p) . $line; // center alignment using spaces
                         $text .= $line . "\n";
@@ -391,7 +391,7 @@ 
             if (in_array(ord($line{0}), $RTLOrd)) {
                 $len /= 2;
             }
-            $p    = max(0, (int)(($maxlen - $len) / 2));
+            $p    = max(0, (int) (($maxlen - $len) / 2));
             $line = str_repeat(' ', $p) . $line; // center alignment using spaces
             $text .= $line;
         }
@@ -411,9 +411,9 @@ 
     {
         return imagecolorallocate(
             $image,
-            (int)hexdec(substr($css_color, 0, 2)),
-            (int)hexdec(substr($css_color, 2, 2)),
-            (int)hexdec(substr($css_color, 4, 2))
+            (int) hexdec(substr($css_color, 0, 2)),
+            (int) hexdec(substr($css_color, 2, 2)),
+            (int) hexdec(substr($css_color, 4, 2))
         );
     }
 

app/Http/Controllers/StatisticsChartController.php

Spacing +3 added lines, -3 removed lines

@@ -576,7 +576,7 @@ 
                         $z_axis = $this->axisAll();
                         // The stats query doesn't have an "all" function, so query M/F/U separately
                         foreach (['M', 'F', 'U'] as $sex) {
-                            $rows  = $stats->statsMarrAgeQuery(false, $sex);
+                            $rows = $stats->statsMarrAgeQuery(false, $sex);
                             $indi = [];
                             foreach ($rows as $row) {
                                 if (!in_array($row->d_gid, $indi)) {
@@ -589,7 +589,7 @@ 
                     case self::Z_AXIS_SEX:
                         $z_axis = $this->axisSexes();
                         foreach (array_keys($z_axis) as $sex) {
-                            $rows  = $stats->statsMarrAgeQuery(false, $sex);
+                            $rows = $stats->statsMarrAgeQuery(false, $sex);
                             $indi = [];
                             foreach ($rows as $row) {
                                 if (!in_array($row->d_gid, $indi)) {
@@ -605,7 +605,7 @@ 
                         // The stats query doesn't have an "all" function, so query M/F/U separately
                         foreach (['M', 'F', 'U'] as $sex) {
                             $prev_boundary = 0;
-                            $indi   = [];
+                            $indi = [];
                             foreach (array_keys($z_axis) as $boundary) {
                                 $rows = $stats->statsMarrAgeQuery(false, $sex, $prev_boundary, $boundary);
                                 foreach ($rows as $row) {

app/Stats.php

Spacing +104 added lines, -104 removed lines

@@ -157,7 +157,7 @@ 
     private function getTags($text)
     {
         // Extract all tags from the provided text
-        preg_match_all('/#([^#]+)(?=#)/', (string)$text, $match);
+        preg_match_all('/#([^#]+)(?=#)/', (string) $text, $match);
         $tags       = $match[1];
         $c          = count($tags);
         $new_tags   = []; // tag to replace
@@ -396,7 +396,7 @@ 
      */
     private function totalIndividualsQuery()
     {
-        return (int)Database::prepare(
+        return (int) Database::prepare(
             "SELECT COUNT(*) FROM `##individuals` WHERE i_file = :tree_id"
         )->execute([
             'tree_id' => $this->tree->getTreeId(),
@@ -420,7 +420,7 @@ 
      */
     private function totalIndisWithSourcesQuery()
     {
-        return (int)Database::prepare(
+        return (int) Database::prepare(
             "SELECT COUNT(DISTINCT i_id)" .
             " FROM `##individuals` JOIN `##link` ON i_id = l_from AND i_file = l_file" .
             " WHERE l_file = :tree_id AND l_type = 'SOUR'"
@@ -503,7 +503,7 @@ 
      */
     private function totalFamiliesQuery()
     {
-        return (int)Database::prepare(
+        return (int) Database::prepare(
             "SELECT COUNT(*) FROM `##families` WHERE f_file = :tree_id"
         )->execute([
             'tree_id' => $this->tree->getTreeId(),
@@ -527,7 +527,7 @@ 
      */
     private function totalFamsWithSourcesQuery()
     {
-        return (int)Database::prepare(
+        return (int) Database::prepare(
             "SELECT COUNT(DISTINCT f_id)" .
             " FROM `##families` JOIN `##link` ON f_id = l_from AND f_file = l_file" .
             " WHERE l_file = :tree_id AND l_type = 'SOUR'"
@@ -610,7 +610,7 @@ 
      */
     private function totalSourcesQuery()
     {
-        return (int)Database::prepare(
+        return (int) Database::prepare(
             "SELECT COUNT(*) FROM `##sources` WHERE s_file = :tree_id"
         )->execute([
             'tree_id' => $this->tree->getTreeId(),
@@ -644,7 +644,7 @@ 
      */
     private function totalNotesQuery()
     {
-        return (int)Database::prepare(
+        return (int) Database::prepare(
             "SELECT COUNT(*) FROM `##other` WHERE o_type='NOTE' AND o_file = :tree_id"
         )->execute([
             'tree_id' => $this->tree->getTreeId(),
@@ -678,7 +678,7 @@ 
      */
     private function totalRepositoriesQuery()
     {
-        return (int)Database::prepare(
+        return (int) Database::prepare(
             "SELECT COUNT(*) FROM `##other` WHERE o_type='REPO' AND o_file = :tree_id"
         )->execute([
             'tree_id' => $this->tree->getTreeId(),
@@ -787,11 +787,11 @@ 
                 }
             }
             if ($types) {
-                $sql  .= ' AND d_fact IN (' . implode(', ', array_fill(0, count($types), '?')) . ')';
+                $sql .= ' AND d_fact IN (' . implode(', ', array_fill(0, count($types), '?')) . ')';
                 $vars = array_merge($vars, $types);
             }
         }
-        $sql  .= ' AND d_fact NOT IN (' . implode(', ', array_fill(0, count($no_types), '?')) . ')';
+        $sql .= ' AND d_fact NOT IN (' . implode(', ', array_fill(0, count($no_types), '?')) . ')';
         $vars = array_merge($vars, $no_types);
 
         return I18N::number(Database::prepare($sql)->execute($vars)->fetchOne());
@@ -901,7 +901,7 @@ 
      */
     private function totalSexMalesQuery()
     {
-        return (int)Database::prepare(
+        return (int) Database::prepare(
             "SELECT COUNT(*) FROM `##individuals` WHERE i_file = :tree_id AND i_sex = 'M'"
         )->execute([
             'tree_id' => $this->tree->getTreeId(),
@@ -935,7 +935,7 @@ 
      */
     private function totalSexFemalesQuery()
     {
-        return (int)Database::prepare(
+        return (int) Database::prepare(
             "SELECT COUNT(*) FROM `##individuals` WHERE i_file = :tree_id AND i_sex = 'F'"
         )->execute([
             'tree_id' => $this->tree->getTreeId(),
@@ -969,7 +969,7 @@ 
      */
     private function totalSexUnknownQuery()
     {
-        return (int)Database::prepare(
+        return (int) Database::prepare(
             "SELECT COUNT(*) FROM `##individuals` WHERE i_file = :tree_id AND i_sex = 'U'"
         )->execute([
             'tree_id' => $this->tree->getTreeId(),
@@ -1041,12 +1041,12 @@ 
         if ($tot == 0) {
             return '';
         } elseif ($tot_u > 0) {
-            $chd         = $this->arrayToExtendedEncoding([
+            $chd = $this->arrayToExtendedEncoding([
                 4095 * $tot_u / $tot,
                 4095 * $tot_f / $tot,
                 4095 * $tot_m / $tot,
             ]);
-            $chl         =
+            $chl =
                 I18N::translateContext('unknown people', 'Unknown') . ' - ' . $per_u . '|' .
                 I18N::translate('Females') . ' - ' . $per_f . '|' .
                 I18N::translate('Males') . ' - ' . $per_m;
@@ -1057,7 +1057,7 @@ 
 
             return "<img src=\"https://chart.googleapis.com/chart?cht=p3&amp;chd=e:{$chd}&amp;chs={$size}&amp;chco={$color_unknown},{$color_female},{$color_male}&amp;chf=bg,s,ffffff00&amp;chl={$chl}\" width=\"{$sizes[0]}\" height=\"{$sizes[1]}\" alt=\"" . $chart_title . '" title="' . $chart_title . '" />';
         } else {
-            $chd         = $this->arrayToExtendedEncoding([
+            $chd = $this->arrayToExtendedEncoding([
                 4095 * $tot_f / $tot,
                 4095 * $tot_m / $tot,
             ]);
@@ -1083,7 +1083,7 @@ 
      */
     private function totalLivingQuery()
     {
-        return (int)Database::prepare(
+        return (int) Database::prepare(
             "SELECT COUNT(*) FROM `##individuals` WHERE i_file = :tree_id AND i_gedcom NOT REGEXP '\\n1 (" . WT_EVENTS_DEAT . ")'"
         )->execute([
             'tree_id' => $this->tree->getTreeId(),
@@ -1117,7 +1117,7 @@ 
      */
     private function totalDeceasedQuery()
     {
-        return (int)Database::prepare(
+        return (int) Database::prepare(
             "SELECT COUNT(*) FROM `##individuals` WHERE i_file = :tree_id AND i_gedcom REGEXP '\\n1 (" . WT_EVENTS_DEAT . ")'"
         )->execute([
             'tree_id' => $this->tree->getTreeId(),
@@ -1182,7 +1182,7 @@ 
         if ($tot == 0) {
             return '';
         } else {
-            $chd         = $this->arrayToExtendedEncoding([
+            $chd = $this->arrayToExtendedEncoding([
                 4095 * $tot_l / $tot,
                 4095 * $tot_d / $tot,
             ]);
@@ -1206,7 +1206,7 @@ 
     public function totalUsers($params = [])
     {
         if (isset($params[0])) {
-            $total = count(User::all()) + (int)$params[0];
+            $total = count(User::all()) + (int) $params[0];
         } else {
             $total = count(User::all());
         }
@@ -1253,18 +1253,18 @@ 
             if ($type == 'unknown') {
                 // There has to be a better way then this :(
                 foreach ($this->media_types as $t) {
-                    $sql    .= " AND (m_gedcom NOT LIKE ? AND m_gedcom NOT LIKE ?)";
+                    $sql .= " AND (m_gedcom NOT LIKE ? AND m_gedcom NOT LIKE ?)";
                     $vars[] = "%3 TYPE {$t}%";
                     $vars[] = "%1 _TYPE {$t}%";
                 }
             } else {
-                $sql    .= " AND (m_gedcom LIKE ? OR m_gedcom LIKE ?)";
+                $sql .= " AND (m_gedcom LIKE ? OR m_gedcom LIKE ?)";
                 $vars[] = "%3 TYPE {$type}%";
                 $vars[] = "%1 _TYPE {$type}%";
             }
         }
 
-        return (int)Database::prepare($sql)->execute($vars)->fetchOne();
+        return (int) Database::prepare($sql)->execute($vars)->fetchOne();
     }
 
     /**
@@ -1725,7 +1725,7 @@ 
     private function totalPlacesQuery()
     {
         return
-            (int)Database::prepare("SELECT COUNT(*) FROM `##places` WHERE p_file=?")
+            (int) Database::prepare("SELECT COUNT(*) FROM `##places` WHERE p_file=?")
                 ->execute([$this->tree->getTreeId()])
                 ->fetchOne();
     }
@@ -1895,7 +1895,7 @@ 
         $chart_url .= '&amp;chs=' . $WT_STATS_MAP_X . 'x' . $WT_STATS_MAP_Y;
         $chart_url .= '&amp;chld=' . implode('', array_keys($surn_countries)) . '&amp;chd=s:';
         foreach ($surn_countries as $count) {
-            $chart_url .= substr(self::GOOGLE_CHART_ENCODING, (int)($count / max($surn_countries) * 61), 1);
+            $chart_url .= substr(self::GOOGLE_CHART_ENCODING, (int) ($count / max($surn_countries) * 61), 1);
         }
         $chart = '<div id="google_charts" class="center">';
         $chart .= '<p>' . $chart_title . '</p>';
@@ -1937,9 +1937,9 @@ 
             $country = trim($place->country);
             if (array_key_exists($country, $country_names)) {
                 if (!isset($all_db_countries[$country_names[$country]][$country])) {
-                    $all_db_countries[$country_names[$country]][$country] = (int)$place->tot;
+                    $all_db_countries[$country_names[$country]][$country] = (int) $place->tot;
                 } else {
-                    $all_db_countries[$country_names[$country]][$country] += (int)$place->tot;
+                    $all_db_countries[$country_names[$country]][$country] += (int) $place->tot;
                 }
             }
         }
@@ -2116,7 +2116,7 @@ 
             $centuries = '';
             $counts    = [];
             foreach ($rows as $values) {
-                $counts[]  = round(100 * $values->total / $tot, 0);
+                $counts[] = round(100 * $values->total / $tot, 0);
                 $centuries .= $this->centuryName($values->century) . ' - ' . I18N::number($values->total) . '|';
             }
             $chd = $this->arrayToExtendedEncoding($counts);
@@ -2210,7 +2210,7 @@ 
             $centuries = '';
             $counts    = [];
             foreach ($rows as $values) {
-                $counts[]  = round(100 * $values->total / $tot, 0);
+                $counts[] = round(100 * $values->total / $tot, 0);
                 $centuries .= $this->centuryName($values->century) . ' - ' . I18N::number($values->total) . '|';
             }
             $chd = $this->arrayToExtendedEncoding($counts);
@@ -2460,7 +2460,7 @@ 
                 }
                 break;
             case 'age':
-                $result = I18N::number((int)($row->age / 365.25));
+                $result = I18N::number((int) ($row->age / 365.25));
                 break;
             case 'name':
                 $result = '<a href="' . e($person->url()) . '">' . $person->getFullName() . '</a>';
@@ -2489,7 +2489,7 @@ 
             $sex_search = '';
         }
         if (isset($params[0])) {
-            $total = (int)$params[0];
+            $total = (int) $params[0];
         } else {
             $total = 10;
         }
@@ -2523,10 +2523,10 @@ 
         foreach ($rows as $row) {
             $person = Individual::getInstance($row->deathdate, $this->tree);
             $age    = $row->age;
-            if ((int)($age / 365.25) > 0) {
-                $age = (int)($age / 365.25) . 'y';
-            } elseif ((int)($age / 30.4375) > 0) {
-                $age = (int)($age / 30.4375) . 'm';
+            if ((int) ($age / 365.25) > 0) {
+                $age = (int) ($age / 365.25) . 'y';
+            } elseif ((int) ($age / 30.4375) > 0) {
+                $age = (int) ($age / 30.4375) . 'm';
             } else {
                 $age = $age . 'd';
             }
@@ -2588,11 +2588,11 @@ 
             $sex_search = '';
         }
         if (isset($params[0])) {
-            $total = (int)$params[0];
+            $total = (int) $params[0];
         } else {
             $total = 10;
         }
-        $rows  = $this->runSql(
+        $rows = $this->runSql(
             "SELECT" .
             " birth.d_gid AS id," .
             " MIN(birth.d_julianday1) AS age" .
@@ -2615,10 +2615,10 @@ 
         foreach ($rows as $row) {
             $person = Individual::getInstance($row->id, $this->tree);
             $age    = (WT_CLIENT_JD - $row->age);
-            if ((int)($age / 365.25) > 0) {
-                $age = (int)($age / 365.25) . 'y';
-            } elseif ((int)($age / 30.4375) > 0) {
-                $age = (int)($age / 30.4375) . 'm';
+            if ((int) ($age / 365.25) > 0) {
+                $age = (int) ($age / 365.25) . 'y';
+            } elseif ((int) ($age / 30.4375) > 0) {
+                $age = (int) ($age / 30.4375) . 'm';
             } else {
                 $age = $age . 'd';
             }
@@ -2695,10 +2695,10 @@ 
 
         $age = $rows[0]->age;
         if ($show_years) {
-            if ((int)($age / 365.25) > 0) {
-                $age = (int)($age / 365.25) . 'y';
-            } elseif ((int)($age / 30.4375) > 0) {
-                $age = (int)($age / 30.4375) . 'm';
+            if ((int) ($age / 365.25) > 0) {
+                $age = (int) ($age / 365.25) . 'y';
+            } elseif ((int) ($age / 30.4375) > 0) {
+                $age = (int) ($age / 30.4375) . 'm';
             } elseif (!empty($age)) {
                 $age = $age . 'd';
             }
@@ -2768,7 +2768,7 @@ 
                 if ($sizes[0] < 980) {
                     $sizes[0] += 50;
                 }
-                $chxl    .= $this->centuryName($century) . '|';
+                $chxl .= $this->centuryName($century) . '|';
                 $average = 0;
                 if (isset($values['F'])) {
                     $countsf .= $values['F'] . ',';
@@ -2810,7 +2810,7 @@ 
                 while ($offset = strpos($title, ' ', $offset + 1)) {
                     $counter[] = $offset;
                 }
-                $half = (int)(count($counter) / 2);
+                $half = (int) (count($counter) / 2);
                 $chtt = substr_replace($title, '|', $counter[$half], 1);
             }
 
@@ -3386,16 +3386,16 @@ 
             case 'age':
                 $age = $row->age;
                 if ($show_years) {
-                    if ((int)($age / 365.25) > 0) {
-                        $age = (int)($age / 365.25) . 'y';
-                    } elseif ((int)($age / 30.4375) > 0) {
-                        $age = (int)($age / 30.4375) . 'm';
+                    if ((int) ($age / 365.25) > 0) {
+                        $age = (int) ($age / 365.25) . 'y';
+                    } elseif ((int) ($age / 30.4375) > 0) {
+                        $age = (int) ($age / 30.4375) . 'm';
                     } else {
                         $age = $age . 'd';
                     }
                     $result = FunctionsDate::getAgeAtEvent($age);
                 } else {
-                    $result = I18N::number((int)($age / 365.25));
+                    $result = I18N::number((int) ($age / 365.25));
                 }
                 break;
         }
@@ -3415,7 +3415,7 @@ 
     private function ageOfMarriageQuery($type = 'list', $age_dir = 'ASC', $params = [])
     {
         if (isset($params[0])) {
-            $total = (int)$params[0];
+            $total = (int) $params[0];
         } else {
             $total = 10;
         }
@@ -3501,10 +3501,10 @@ 
             if ($type === 'name') {
                 return $family->formatList();
             }
-            if ((int)($age / 365.25) > 0) {
-                $age = (int)($age / 365.25) . 'y';
-            } elseif ((int)($age / 30.4375) > 0) {
-                $age = (int)($age / 30.4375) . 'm';
+            if ((int) ($age / 365.25) > 0) {
+                $age = (int) ($age / 365.25) . 'y';
+            } elseif ((int) ($age / 30.4375) > 0) {
+                $age = (int) ($age / 30.4375) . 'm';
             } else {
                 $age = $age . 'd';
             }
@@ -3566,7 +3566,7 @@ 
     private function ageBetweenSpousesQuery($type = 'list', $age_dir = 'DESC', $params = [])
     {
         if (isset($params[0])) {
-            $total = (int)$params[0];
+            $total = (int) $params[0];
         } else {
             $total = 10;
         }
@@ -3611,10 +3611,10 @@ 
                 break;
             }
             $age = $fam->age;
-            if ((int)($age / 365.25) > 0) {
-                $age = (int)($age / 365.25) . 'y';
-            } elseif ((int)($age / 30.4375) > 0) {
-                $age = (int)($age / 30.4375) . 'm';
+            if ((int) ($age / 365.25) > 0) {
+                $age = (int) ($age / 365.25) . 'y';
+            } elseif ((int) ($age / 30.4375) > 0) {
+                $age = (int) ($age / 30.4375) . 'm';
             } else {
                 $age = $age . 'd';
             }
@@ -3702,16 +3702,16 @@ 
             case 'age':
                 $age = $row->age;
                 if ($show_years) {
-                    if ((int)($age / 365.25) > 0) {
-                        $age = (int)($age / 365.25) . 'y';
-                    } elseif ((int)($age / 30.4375) > 0) {
-                        $age = (int)($age / 30.4375) . 'm';
+                    if ((int) ($age / 365.25) > 0) {
+                        $age = (int) ($age / 365.25) . 'y';
+                    } elseif ((int) ($age / 30.4375) > 0) {
+                        $age = (int) ($age / 30.4375) . 'm';
                     } else {
                         $age = $age . 'd';
                     }
                     $result = FunctionsDate::getAgeAtEvent($age);
                 } else {
-                    $result = (int)($age / 365.25);
+                    $result = (int) ($age / 365.25);
                 }
                 break;
         }
@@ -3797,7 +3797,7 @@ 
             $sizes = explode('x', $size);
             $tot   = 0;
             foreach ($rows as $values) {
-                $tot += (int)$values->total;
+                $tot += (int) $values->total;
             }
             // Beware divide by zero
             if ($tot === 0) {
@@ -3806,7 +3806,7 @@ 
             $centuries = '';
             $counts    = [];
             foreach ($rows as $values) {
-                $counts[]  = round(100 * $values->total / $tot, 0);
+                $counts[] = round(100 * $values->total / $tot, 0);
                 $centuries .= $this->centuryName($values->century) . ' - ' . I18N::number($values->total) . '|';
             }
             $chd = $this->arrayToExtendedEncoding($counts);
@@ -3904,7 +3904,7 @@ 
             $centuries = '';
             $counts    = [];
             foreach ($rows as $values) {
-                $counts[]  = round(100 * $values->total / $tot, 0);
+                $counts[] = round(100 * $values->total / $tot, 0);
                 $centuries .= $this->centuryName($values->century) . ' - ' . I18N::number($values->total) . '|';
             }
             $chd = $this->arrayToExtendedEncoding($counts);
@@ -4173,7 +4173,7 @@ 
                 if ($sizes[0] < 1000) {
                     $sizes[0] += 50;
                 }
-                $chxl    .= $this->centuryName($century) . '|';
+                $chxl .= $this->centuryName($century) . '|';
                 $average = 0;
                 if (isset($values['F'])) {
                     if ($max <= 50) {
@@ -4230,7 +4230,7 @@ 
                 while ($offset = strpos(I18N::translate('Average age in century of marriage'), ' ', $offset + 1)) {
                     $counter[] = $offset;
                 }
-                $half = (int)(count($counter) / 2);
+                $half = (int) (count($counter) / 2);
                 $chtt = substr_replace(I18N::translate('Average age in century of marriage'), '|', $counter[$half], 1);
             }
 
@@ -4762,7 +4762,7 @@ 
     private function topTenFamilyQuery($type = 'list', $params = [])
     {
         if (isset($params[0])) {
-            $total = (int)$params[0];
+            $total = (int) $params[0];
         } else {
             $total = 10;
         }
@@ -4829,7 +4829,7 @@ 
     private function ageBetweenSiblingsQuery($type = 'list', $params = [])
     {
         if (isset($params[0])) {
-            $total = (int)$params[0];
+            $total = (int) $params[0];
         } else {
             $total = 10;
         }
@@ -4885,10 +4885,10 @@ 
                 return $return;
             }
             $age = $fam->age;
-            if ((int)($age / 365.25) > 0) {
-                $age = (int)($age / 365.25) . 'y';
-            } elseif ((int)($age / 30.4375) > 0) {
-                $age = (int)($age / 30.4375) . 'm';
+            if ((int) ($age / 365.25) > 0) {
+                $age = (int) ($age / 365.25) . 'y';
+            } elseif ((int) ($age / 30.4375) > 0) {
+                $age = (int) ($age / 30.4375) . 'm';
             } else {
                 $age = $age . 'd';
             }
@@ -4899,7 +4899,7 @@ 
             if ($type == 'list') {
                 if ($one && !in_array($fam->family, $dist)) {
                     if ($child1->canShow() && $child2->canShow()) {
-                        $return  = '<li>';
+                        $return = '<li>';
                         $return  .= '<a href="' . e($child2->url()) . '">' . $child2->getFullName() . '</a> ';
                         $return  .= I18N::translate('and') . ' ';
                         $return  .= '<a href="' . e($child1->url()) . '">' . $child1->getFullName() . '</a>';
@@ -4910,7 +4910,7 @@ 
                         $dist[]  = $fam->family;
                     }
                 } elseif (!$one && $child1->canShow() && $child2->canShow()) {
-                    $return  = '<li>';
+                    $return = '<li>';
                     $return  .= '<a href="' . e($child2->url()) . '">' . $child2->getFullName() . '</a> ';
                     $return  .= I18N::translate('and') . ' ';
                     $return  .= '<a href="' . e($child1->url()) . '">' . $child1->getFullName() . '</a>';
@@ -5185,7 +5185,7 @@ 
             $total = 10;
         }
         $sizes = explode('x', $size);
-        $total = (int)$total;
+        $total = (int) $total;
         $rows  = $this->runSql(
             " SELECT f_numchil AS tot, f_id AS id" .
             " FROM `##families`" .
@@ -5198,7 +5198,7 @@ 
         }
         $tot = 0;
         foreach ($rows as $row) {
-            $tot += (int)$row->tot;
+            $tot += (int) $row->tot;
         }
         $chd = '';
         $chl = [];
@@ -5210,7 +5210,7 @@ 
                 } else {
                     $per = round(100 * $row->tot / $tot, 0);
                 }
-                $chd   .= $this->arrayToExtendedEncoding([$per]);
+                $chd .= $this->arrayToExtendedEncoding([$per]);
                 $chl[] = htmlspecialchars_decode(strip_tags($family->getFullName())) . ' - ' . I18N::number($row->tot);
             }
         }
@@ -5556,7 +5556,7 @@ 
             if ($max < $values->count) {
                 $max = $values->count;
             }
-            $tot += (int)$values->count;
+            $tot += (int) $values->count;
         }
         $unknown = $this->noChildrenFamiliesQuery() - $tot;
         if ($unknown > $max) {
@@ -5580,13 +5580,13 @@ 
         $chm      .= 't' . $unknown . ',000000,0,' . $i . ',11,1';
         $chxl     .= I18N::translateContext('unknown century', 'Unknown') . '|1:||' . I18N::translate('century') . '|2:|0|';
         $step     = $max + 1;
-        for ($d = (int)($max + 1); $d > 0; $d--) {
+        for ($d = (int) ($max + 1); $d > 0; $d--) {
             if (($max + 1) < ($d * 10 + 1) && fmod(($max + 1), $d) == 0) {
                 $step = $d;
             }
         }
-        if ($step == (int)($max + 1)) {
-            for ($d = (int)($max); $d > 0; $d--) {
+        if ($step == (int) ($max + 1)) {
+            for ($d = (int) ($max); $d > 0; $d--) {
                 if ($max < ($d * 10 + 1) && fmod($max, $d) == 0) {
                     $step = $d;
                 }
@@ -5611,7 +5611,7 @@ 
     private function topTenGrandFamilyQuery($type = 'list', $params = [])
     {
         if (isset($params[0])) {
-            $total = (int)$params[0];
+            $total = (int) $params[0];
         } else {
             $total = 10;
         }
@@ -5709,8 +5709,8 @@ 
      */
     private function commonSurnamesQuery($type = 'list', $show_tot = false, $params = [])
     {
-        $threshold          = empty($params[0]) ? 10 : (int)$params[0];
-        $number_of_surnames = empty($params[1]) ? 10 : (int)$params[1];
+        $threshold          = empty($params[0]) ? 10 : (int) $params[0];
+        $number_of_surnames = empty($params[1]) ? 10 : (int) $params[1];
         $sorting            = empty($params[2]) ? 'alpha' : $params[2];
 
         $surnames = $this->topSurnames($number_of_surnames, $threshold);
@@ -5886,7 +5886,7 @@ 
             $max_name  = 0;
             $top_name  = '';
             foreach ($surns as $spfxsurn => $count) {
-                $per       = $count;
+                $per = $count;
                 $count_per += $per;
                 // select most common surname from all variants
                 if ($per > $max_name) {
@@ -5910,11 +5910,11 @@ 
                     ], $top_name);
             }
             $per   = round(100 * $count_per / $tot_indi, 0);
-            $chd   .= $this->arrayToExtendedEncoding([$per]);
+            $chd .= $this->arrayToExtendedEncoding([$per]);
             $chl[] = $top_name . ' - ' . I18N::number($count_per);
         }
         $per   = round(100 * ($tot_indi - $tot) / $tot_indi, 0);
-        $chd   .= $this->arrayToExtendedEncoding([$per]);
+        $chd .= $this->arrayToExtendedEncoding([$per]);
         $chl[] = I18N::translate('Other') . ' - ' . I18N::number($tot_indi - $tot);
 
         $chart_title = implode(I18N::$list_separator, $chl);
@@ -5936,12 +5936,12 @@ 
     private function commonGivenQuery($sex = 'B', $type = 'list', $show_tot = false, $params = [])
     {
         if (isset($params[0]) && $params[0] != '' && $params[0] >= 0) {
-            $threshold = (int)$params[0];
+            $threshold = (int) $params[0];
         } else {
             $threshold = 1;
         }
         if (isset($params[1]) && $params[1] != '' && $params[1] >= 0) {
-            $maxtoshow = (int)$params[1];
+            $maxtoshow = (int) $params[1];
         } else {
             $maxtoshow = 10;
         }
@@ -6414,11 +6414,11 @@ 
             } else {
                 $per = round(100 * $count / $tot_indi, 0);
             }
-            $chd   .= $this->arrayToExtendedEncoding([$per]);
+            $chd .= $this->arrayToExtendedEncoding([$per]);
             $chl[] = $givn . ' - ' . I18N::number($count);
         }
         $per   = round(100 * ($tot_indi - $tot) / $tot_indi, 0);
-        $chd   .= $this->arrayToExtendedEncoding([$per]);
+        $chd .= $this->arrayToExtendedEncoding([$per]);
         $chl[] = I18N::translate('Other') . ' - ' . I18N::number($tot_indi - $tot);
 
         $chart_title = implode(I18N::$list_separator, $chl);
@@ -6645,7 +6645,7 @@ 
                     $datestamp = I18N::dateFormat();
                 }
 
-                return FunctionsDate::timestampToGedcomDate((int)$user->getPreference('reg_timestamp'))->display(false, $datestamp);
+                return FunctionsDate::timestampToGedcomDate((int) $user->getPreference('reg_timestamp'))->display(false, $datestamp);
             case 'regtime':
                 if (is_array($params) && isset($params[0]) && $params[0] != '') {
                     $datestamp = $params[0];
@@ -6653,7 +6653,7 @@ 
                     $datestamp = str_replace('%', '', I18N::timeFormat());
                 }
 
-                return date($datestamp, (int)$user->getPreference('reg_timestamp'));
+                return date($datestamp, (int) $user->getPreference('reg_timestamp'));
             case 'loggedin':
                 if (is_array($params) && isset($params[0]) && $params[0] != '') {
                     $yes = $params[0];
@@ -6993,9 +6993,9 @@ 
             if ($value < 0) {
                 $value = 0;
             }
-            $first    = (int)($value / 64);
+            $first    = (int) ($value / 64);
             $second   = $value % 64;
-            $encoding .= $xencoding[(int)$first] . $xencoding[(int)$second];
+            $encoding .= $xencoding[(int) $first] . $xencoding[(int) $second];
         }
 
         return $encoding;
@@ -7140,7 +7140,7 @@ 
      */
     public function totalUserMessages()
     {
-        $total = (int)Database::prepare("SELECT COUNT(*) FROM `##message` WHERE user_id = ?")
+        $total = (int) Database::prepare("SELECT COUNT(*) FROM `##message` WHERE user_id = ?")
             ->execute([Auth::id()])
             ->fetchOne();
 
@@ -7155,7 +7155,7 @@ 
     public function totalUserJournal()
     {
         try {
-            $number = (int)Database::prepare("SELECT COUNT(*) FROM `##news` WHERE user_id = ?")
+            $number = (int) Database::prepare("SELECT COUNT(*) FROM `##news` WHERE user_id = ?")
                 ->execute([Auth::id()])
                 ->fetchOne();
         } catch (PDOException $ex) {
@@ -7176,7 +7176,7 @@ 
     public function totalGedcomNews()
     {
         try {
-            $number = (int)Database::prepare("SELECT COUNT(*) FROM `##news` WHERE gedcom_id = ?")
+            $number = (int) Database::prepare("SELECT COUNT(*) FROM `##news` WHERE gedcom_id = ?")
                 ->execute([$this->tree->getTreeId()])
                 ->fetchOne();
         } catch (PDOException $ex) {

app/Http/Controllers/AdminLocationController.php

Spacing +7 added lines, -7 removed lines

@@ -106,7 +106,7 @@ 
             $breadcrumbs[] = I18N::translate('Add');
         } else {
             $breadcrumbs[] = I18N::translate('Edit');
-            $title         .= ' — ' . I18N::translate('Edit');
+            $title .= ' — ' . I18N::translate('Edit');
         }
 
         return $this->viewResponse('admin/location-edit', [
@@ -240,7 +240,7 @@ 
      */
     public function exportLocations(Request $request): Response
     {
-        $parent_id = (int)$request->get('parent_id');
+        $parent_id = (int) $request->get('parent_id');
         $format    = $request->get('format');
         $maxlevel  = (int) Database::prepare("SELECT max(pl_level) FROM `##placelocation`")->execute()->fetchOne();
         $startfqpn = [];
@@ -298,7 +298,7 @@ 
      */
     public function importLocations(Request $request): Response
     {
-        $parent_id   = (int) $request->get('parent_id');
+        $parent_id = (int) $request->get('parent_id');
 
         $files = array_merge(
             glob(WT_DATA_DIR . 'places/*.csv'),
@@ -351,7 +351,7 @@ 
         }
 
         if (is_file($filename)) {
-            $string   = file_get_contents($filename);
+            $string = file_get_contents($filename);
 
             // Check the filetype
             if (stripos($string, 'FeatureCollection') !== false) {
@@ -401,10 +401,10 @@ 
             usort(
                 $places,
                 function (array $a, array $b) {
-                    if ((int)$a['pl_level'] === (int)$b['pl_level']) {
+                    if ((int) $a['pl_level'] === (int) $b['pl_level']) {
                         return I18N::strcasecmp($a['fqpn'], $b['fqpn']);
                     } else {
-                        return (int)$a['pl_level'] - (int)$b['pl_level'];
+                        return (int) $a['pl_level'] - (int) $b['pl_level'];
                     }
                 }
             );
@@ -521,7 +521,7 @@ 
                 "INSERT INTO `##placelocation` (pl_id, pl_parent_id, pl_level, pl_place)" .
                 " VALUES (:id, :parent, :level, :place)"
             );
-            $checkRecordQry  = Database::prepare(
+            $checkRecordQry = Database::prepare(
                 "SELECT pl1.pl_id" .
                 " FROM	  `##placelocation` AS pl1" .
                 " LEFT JOIN `##placelocation` AS pl2 ON (pl1.pl_parent_id = pl2.pl_id)" .

app/Census/CensusColumnAge.php

Spacing +1 added lines, -1 removed lines

@@ -34,6 +34,6 @@
      */
     public function generate(Individual $individual, Individual $head)
     {
-        return (string)Date::getAge($individual->getEstimatedBirthDate(), $this->date(), 0);
+        return (string) Date::getAge($individual->getEstimatedBirthDate(), $this->date(), 0);
     }
 }

app/Theme/AbstractTheme.php

Spacing +3 added lines, -3 removed lines

@@ -214,7 +214,7 @@ 
     {
         if ($analytics_id) {
             // Add extra dimensions (i.e. filtering categories)
-            $dimensions = (object)[
+            $dimensions = (object) [
                 'dimension1' => $this->tree ? $this->tree->getName() : '-',
                 'dimension2' => $this->tree ? Auth::accessLevel($this->tree) : '-',
             ];
@@ -276,7 +276,7 @@ 
         if ($project_id && $security_id) {
             return
                 '<script>' .
-                'var sc_project=' . (int)$project_id . ',sc_invisible=1,sc_security="' . $security_id .
+                'var sc_project=' . (int) $project_id . ',sc_invisible=1,sc_security="' . $security_id .
                 '",scJsHost = (("https:"===document.location.protocol)?"https://secure.":"http://www.");' .
                 'document.write("<sc"+"ript src=\'"+scJsHost+"statcounter.com/counter/counter.js\'></"+"script>");' .
                 '</script>';
@@ -1803,7 +1803,7 @@ 
     public function menuSearchPhonetic()
     {
         /* I18N: search using “sounds like”, rather than exact spelling */
-        return new Menu(I18N::translate('Phonetic search'), route('search-phonetic', ['ged'    => $this->tree->getName(), 'action' => 'soundex',]), 'menu-search-soundex', ['rel' => 'nofollow']);
+        return new Menu(I18N::translate('Phonetic search'), route('search-phonetic', ['ged'    => $this->tree->getName(), 'action' => 'soundex', ]), 'menu-search-soundex', ['rel' => 'nofollow']);
     }
 
     /**

app/Http/Controllers/EditIndividualController.php

Spacing +9 added lines, -9 removed lines

@@ -62,7 +62,7 @@ 
     public function reorderMediaAction(Request $request, Tree $tree): Response
     {
         $xref       = $request->get('xref');
-        $order      = (array)$request->get('order', []);
+        $order      = (array) $request->get('order', []);
         $individual = Individual::getInstance($xref, $tree);
 
         $this->checkIndividualAccess($individual, true);
@@ -123,7 +123,7 @@ 
     public function reorderNamesAction(Request $request, Tree $tree): Response
     {
         $xref       = $request->get('xref');
-        $order      = (array)$request->get('order', []);
+        $order      = (array) $request->get('order', []);
         $individual = Individual::getInstance($xref, $tree);
 
         $this->checkIndividualAccess($individual, true);
@@ -184,7 +184,7 @@ 
     public function reorderSpousesAction(Request $request, Tree $tree): Response
     {
         $xref       = $request->get('xref');
-        $order      = (array)$request->get('order', []);
+        $order      = (array) $request->get('order', []);
         $individual = Individual::getInstance($xref, $tree);
 
         $this->checkIndividualAccess($individual, true);
@@ -291,7 +291,7 @@ 
                 $gedcom .= $this->addNewFact($tree, $match);
             }
         }
-        if ((bool)$request->get('SOUR_INDI')) {
+        if ((bool) $request->get('SOUR_INDI')) {
             $gedcom = $this->handleUpdates($gedcom);
         } else {
             $gedcom = $this->updateRest($gedcom);
@@ -383,7 +383,7 @@ 
                 $gedcom .= $this->addNewFact($tree, $match);
             }
         }
-        if ((bool)$request->get('SOUR_INDI')) {
+        if ((bool) $request->get('SOUR_INDI')) {
             $gedcom = $this->handleUpdates($gedcom);
         } else {
             $gedcom = $this->updateRest($gedcom);
@@ -416,7 +416,7 @@ 
      */
     public function addSpouse(Request $request, Tree $tree): Response
     {
-        $xref   = $request->get('xref', '');
+        $xref = $request->get('xref', '');
 
         $individual = Individual::getInstance($xref, $tree);
 
@@ -474,7 +474,7 @@ 
                 $indi_gedcom .= $this->addNewFact($tree, $match);
             }
         }
-        if ((bool)$request->get('SOUR_INDI')) {
+        if ((bool) $request->get('SOUR_INDI')) {
             $indi_gedcom = $this->handleUpdates($indi_gedcom);
         } else {
             $indi_gedcom = $this->updateRest($indi_gedcom);
@@ -486,7 +486,7 @@ 
                 $fam_gedcom .= $this->addNewFact($tree, $match);
             }
         }
-        if ((bool)$request->get('SOUR_FAM')) {
+        if ((bool) $request->get('SOUR_FAM')) {
             $fam_gedcom = $this->handleUpdates($fam_gedcom);
         } else {
             $fam_gedcom = $this->updateRest($fam_gedcom);
@@ -560,7 +560,7 @@ 
                 $gedrec .= $this->addNewFact($tree, $match);
             }
         }
-        if ((bool)$request->get('SOUR_INDI')) {
+        if ((bool) $request->get('SOUR_INDI')) {
             $gedrec = $this->handleUpdates($gedrec);
         } else {
             $gedrec = $this->updateRest($gedrec);

app/Http/Controllers/AdminController.php

Spacing +38 added lines, -38 removed lines

@@ -165,7 +165,7 @@ 
             $user_list[$tmp_user->getUserName()] = $tmp_user->getUserName();
         }
 
-        $action   = $request->get('action');
+        $action = $request->get('action');
 
         // @TODO This ought to be a POST action
         if ($action === 'delete') {
@@ -231,7 +231,7 @@ 
      */
     public function changesLogData(Request $request): Response
     {
-        list($select, , $where, $args1) = $this->changesQuery($request);
+        list($select,, $where, $args1) = $this->changesQuery($request);
         list($order_by, $limit, $args2) = $this->dataTablesPagination($request);
 
         $rows = Database::prepare(
@@ -239,8 +239,8 @@ 
         )->execute(array_merge($args1, $args2))->fetchAll();
 
         // Total filtered/unfiltered rows
-        $recordsFiltered = (int)Database::prepare("SELECT FOUND_ROWS()")->fetchOne();
-        $recordsTotal    = (int)Database::prepare("SELECT COUNT(*) FROM `##change`")->fetchOne();
+        $recordsFiltered = (int) Database::prepare("SELECT FOUND_ROWS()")->fetchOne();
+        $recordsTotal    = (int) Database::prepare("SELECT COUNT(*) FROM `##change`")->fetchOne();
 
         $data      = [];
         $algorithm = new MyersDiff();
@@ -291,7 +291,7 @@ 
 
         // See http://www.datatables.net/usage/server-side
         return new JsonResponse([
-            'draw'            => (int)$request->get('draw'),
+            'draw'            => (int) $request->get('draw'),
             'recordsTotal'    => $recordsTotal,
             'recordsFiltered' => $recordsFiltered,
             'data'            => $data,
@@ -307,7 +307,7 @@ 
      */
     public function changesLogDownload(Request $request): Response
     {
-        list($select, , $where, $args) = $this->changesQuery($request);
+        list($select,, $where, $args) = $this->changesQuery($request);
 
         $rows = Database::prepare($select . $where)->execute($args)->fetchAll();
 
@@ -449,8 +449,8 @@ 
             'RESN',
         ];
 
-        $start  = (int)$request->get('start', 0);
-        $length = (int)$request->get('length', 20);
+        $start  = (int) $request->get('start', 0);
+        $length = (int) $request->get('length', 20);
         $search = $request->get('search', []);
         $search = $search['value'] ?? '';
 
@@ -470,7 +470,7 @@ 
         $args  = [];
 
         if ($search !== '') {
-            $where           .= " AND (multimedia_file_refn LIKE CONCAT('%', :search1, '%') OR multimedia_file_refn LIKE CONCAT('%', :search2, '%'))";
+            $where .= " AND (multimedia_file_refn LIKE CONCAT('%', :search1, '%') OR multimedia_file_refn LIKE CONCAT('%', :search2, '%'))";
             $args['search1'] = $search;
             $args['search2'] = $search;
         }
@@ -489,8 +489,8 @@ 
         )->fetchAll();
 
         // Total filtered/unfiltered rows
-        $recordsFiltered = (int)Database::prepare("SELECT FOUND_ROWS()")->fetchOne();
-        $recordsTotal    = (int)Database::prepare($select2)->fetchOne();
+        $recordsFiltered = (int) Database::prepare("SELECT FOUND_ROWS()")->fetchOne();
+        $recordsTotal    = (int) Database::prepare($select2)->fetchOne();
 
         // Turn each row from the query into a row for the table
         $data = array_map(function (stdClass $datum) use ($ignore_facts) {
@@ -532,7 +532,7 @@ 
         }, $data);
 
         return new JsonResponse([
-            'draw'            => (int)$request->get('draw'),
+            'draw'            => (int) $request->get('draw'),
             'recordsTotal'    => $recordsTotal,
             'recordsFiltered' => $recordsFiltered,
             'data'            => $data,
@@ -621,8 +621,8 @@ 
      */
     public function webtrees1ThumbnailsData(Request $request): JsonResponse
     {
-        $start  = (int)$request->get('start', 0);
-        $length = (int)$request->get('length', 20);
+        $start  = (int) $request->get('start', 0);
+        $length = (int) $request->get('length', 20);
         $search = $request->get('search', []);
         $search = $search['value'] ?? '';
 
@@ -653,7 +653,7 @@ 
         $data = array_map(function (string $thumbnail) {
             $original = $this->findOriginalFileFromThumbnail($thumbnail);
 
-            $original_url  = route('unused-media-thumbnail', [
+            $original_url = route('unused-media-thumbnail', [
                 'folder' => dirname($original),
                 'file'   => basename($original),
                 'w'      => 100,
@@ -695,7 +695,7 @@ 
         }, $thumbnails);
 
         return new JsonResponse([
-            'draw'            => (int)$request->get('draw'),
+            'draw'            => (int) $request->get('draw'),
             'recordsTotal'    => $recordsTotal,
             'recordsFiltered' => $recordsFiltered,
             'data'            => $data,
@@ -1021,7 +1021,7 @@ 
      */
     public function treePrivacyUpdate(Request $request, Tree $tree): RedirectResponse
     {
-        foreach ((array)$request->get('delete') as $default_resn_id) {
+        foreach ((array) $request->get('delete') as $default_resn_id) {
             Database::prepare(
                 "DELETE FROM `##default_resn` WHERE default_resn_id = :default_resn_id"
             )->execute([
@@ -1029,13 +1029,13 @@ 
             ]);
         }
 
-        $xrefs     = (array)$request->get('xref');
-        $tag_types = (array)$request->get('tag_type');
-        $resns     = (array)$request->get('resn');
+        $xrefs     = (array) $request->get('xref');
+        $tag_types = (array) $request->get('tag_type');
+        $resns     = (array) $request->get('resn');
 
         foreach ($xrefs as $n => $xref) {
-            $tag_type = (string)$tag_types[$n];
-            $resn     = (string)$resns[$n];
+            $tag_type = (string) $tag_types[$n];
+            $resn     = (string) $resns[$n];
 
             if ($tag_type !== '' || $xref !== '') {
                 // Delete any existing data
@@ -1081,10 +1081,10 @@ 
         FlashMessages::addMessage(I18N::translate('The preferences for the family tree “%s” have been updated.', e($tree->getTitle()), 'success'));
 
         // Coming soon...
-        if ((bool)$request->get('all_trees')) {
+        if ((bool) $request->get('all_trees')) {
             FlashMessages::addMessage(I18N::translate('The preferences for all family trees have been updated.', e($tree->getTitle())), 'success');
         }
-        if ((bool)$request->get('new_trees')) {
+        if ((bool) $request->get('new_trees')) {
             FlashMessages::addMessage(I18N::translate('The preferences for new family trees have been updated.', e($tree->getTitle())), 'success');
         }
 
@@ -1107,7 +1107,7 @@ 
         foreach ($modules as $module) {
             foreach (Tree::getAll() as $tree) {
                 $key          = 'access-' . $module->getName() . '-' . $tree->getTreeId();
-                $access_level = (int)$request->get($key, $module->defaultAccessLevel());
+                $access_level = (int) $request->get($key, $module->defaultAccessLevel());
 
                 Database::prepare("REPLACE INTO `##module_privacy` (module_name, gedcom_id, component, access_level) VALUES (:module_name, :tree_id, :component, :access_level)")->execute([
                     'module_name'  => $module->getName(),
@@ -1134,7 +1134,7 @@ 
         $module_status = Database::prepare("SELECT module_name, status FROM `##module`")->fetchAssoc();
 
         foreach ($modules as $module) {
-            $new_status = (bool)$request->get('status-' . $module->getName()) ? 'enabled' : 'disabled';
+            $new_status = (bool) $request->get('status-' . $module->getName()) ? 'enabled' : 'disabled';
             $old_status = $module_status[$module->getName()];
 
             if ($new_status !== $old_status) {
@@ -1197,36 +1197,36 @@ 
         $where = ' WHERE 1';
         $args  = [];
         if ($search !== '') {
-            $where            .= " AND (old_gedcom LIKE CONCAT('%', :search_1, '%') OR new_gedcom LIKE CONCAT('%', :search_2, '%'))";
+            $where .= " AND (old_gedcom LIKE CONCAT('%', :search_1, '%') OR new_gedcom LIKE CONCAT('%', :search_2, '%'))";
             $args['search_1'] = $search;
             $args['search_2'] = $search;
         }
         if ($from !== '') {
-            $where        .= " AND change_time >= :from";
+            $where .= " AND change_time >= :from";
             $args['from'] = $from;
         }
         if ($to !== '') {
-            $where      .= ' AND change_time < TIMESTAMPADD(DAY, 1 , :to)'; // before end of the day
+            $where .= ' AND change_time < TIMESTAMPADD(DAY, 1 , :to)'; // before end of the day
             $args['to'] = $to;
         }
         if ($type !== '') {
-            $where          .= ' AND status = :status';
+            $where .= ' AND status = :status';
             $args['status'] = $type;
         }
         if ($oldged !== '') {
-            $where           .= " AND old_gedcom LIKE CONCAT('%', :old_ged, '%')";
+            $where .= " AND old_gedcom LIKE CONCAT('%', :old_ged, '%')";
             $args['old_ged'] = $oldged;
         }
         if ($newged !== '') {
-            $where           .= " AND new_gedcom LIKE CONCAT('%', :new_ged, '%')";
+            $where .= " AND new_gedcom LIKE CONCAT('%', :new_ged, '%')";
             $args['new_ged'] = $newged;
         }
         if ($xref !== '') {
-            $where        .= " AND xref = :xref";
+            $where .= " AND xref = :xref";
             $args['xref'] = $xref;
         }
         if ($username !== '') {
-            $where        .= " AND user_name LIKE CONCAT('%', :user, '%')";
+            $where .= " AND user_name LIKE CONCAT('%', :user, '%')";
             $args['user'] = $username;
         }
         if ($ged !== '') {
@@ -1277,8 +1277,8 @@ 
      */
     private function dataTablesPagination(Request $request): array
     {
-        $start  = (int)$request->get('start', '0');
-        $length = (int)$request->get('length', '0');
+        $start  = (int) $request->get('start', '0');
+        $length = (int) $request->get('length', '0');
         $order  = $request->get('order', []);
         $args   = [];
 
@@ -1429,7 +1429,7 @@ 
         }
 
         // The maximum difference is 255 (black versus white).
-        return 100 - (int)($max_difference * 100 / 255);
+        return 100 - (int) ($max_difference * 100 / 255);
     }
 
     /**
@@ -1460,7 +1460,7 @@ 
             $pixels[$x] = [];
             for ($y = 0; $y < $size; ++$y) {
                 $pixel          = $image->pickColor($x, $y);
-                $pixels[$x][$y] = (int)(($pixel[0] + $pixel[1] + $pixel[2]) / 3);
+                $pixels[$x][$y] = (int) (($pixel[0] + $pixel[1] + $pixel[2]) / 3);
             }
         }