fisharebest / webtrees

app/Module/AbstractModule.php

Spacing +1 added lines, -1 removed lines

@@ -227,7 +227,7 @@
             return $this->defaultAccessLevel();
         }
 
-        return (int)$access_level;
+        return (int) $access_level;
     }
 
     /**

app/Census/CensusColumnAgeMale.php

Spacing +1 added lines, -1 removed lines

@@ -38,6 +38,6 @@
             return '';
         }
 
-        return (string)Date::getAge($individual->getEstimatedBirthDate(), $this->date(), 0);
+        return (string) Date::getAge($individual->getEstimatedBirthDate(), $this->date(), 0);
     }
 }

app/Census/CensusColumnAgeMale5Years.php

Spacing +1 added lines, -1 removed lines

@@ -43,6 +43,6 @@
             $years -= $years % 5;
         }
 
-        return (string)$years;
+        return (string) $years;
     }
 }

app/Census/CensusColumnYearsMarried.php

Spacing +1 added lines, -1 removed lines

@@ -48,6 +48,6 @@
             return '';
         }
 
-        return (string)Date::getAge($marriage_date, $this->date(), 0);
+        return (string) Date::getAge($marriage_date, $this->date(), 0);
     }
 }

app/Http/Controllers/SearchController.php

Spacing +46 added lines, -46 removed lines

@@ -163,11 +163,11 @@ 
         $query = $request->get('query', '');
 
         // What type of records to search?
-        $search_individuals  = (bool)$request->get('search_individuals');
-        $search_families     = (bool)$request->get('search_families');
-        $search_repositories = (bool)$request->get('search_repositories');
-        $search_sources      = (bool)$request->get('search_sources');
-        $search_notes        = (bool)$request->get('search_notes');
+        $search_individuals  = (bool) $request->get('search_individuals');
+        $search_families     = (bool) $request->get('search_families');
+        $search_repositories = (bool) $request->get('search_repositories');
+        $search_sources      = (bool) $request->get('search_sources');
+        $search_notes        = (bool) $request->get('search_notes');
 
         // Default to individuals only
         if (!$search_individuals && !$search_families && !$search_repositories && !$search_sources && !$search_notes) {
@@ -184,7 +184,7 @@ 
             $all_trees = [$tree];
         }
 
-        $search_tree_names = (array)$request->get('search_trees', []);
+        $search_tree_names = (array) $request->get('search_trees', []);
 
         $search_trees = array_filter($all_trees, function (Tree $tree) use ($search_tree_names): bool {
             return in_array($tree->getName(), $search_tree_names);
@@ -290,7 +290,7 @@ 
             $all_trees = [$tree];
         }
 
-        $search_tree_names = (array)$request->get('search_trees', []);
+        $search_tree_names = (array) $request->get('search_trees', []);
 
         $search_trees = array_filter($all_trees, function (Tree $tree) use ($search_tree_names): bool {
             return in_array($tree->getName(), $search_tree_names);
@@ -640,7 +640,7 @@ 
 
         foreach ($search_terms as $n => $q) {
             $queryregex[]          = preg_quote(I18N::strtoupper($q), '/');
-            $sql                   .= " AND f_gedcom COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
+            $sql .= " AND f_gedcom COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
             $args['collate_' . $n] = I18N::collation();
             $args['query_' . $n]   = Database::escapeLike($q);
         }
@@ -688,7 +688,7 @@ 
      */
     private function searchFamilyNames(array $search_terms, array $search_trees): array
     {
-        $sql  =
+        $sql =
             "SELECT DISTINCT f_id AS xref, f_file AS gedcom_id, f_gedcom AS gedcom" .
             " FROM `##families`" .
             " LEFT JOIN `##name` husb ON f_husb = husb.n_id AND f_file = husb.n_file" .
@@ -697,7 +697,7 @@ 
         $args = [];
 
         foreach ($search_terms as $n => $q) {
-            $sql                        .= " AND (husb.n_full COLLATE :husb_collate_" . $n . " LIKE CONCAT('%', :husb_query_" . $n . ", '%') OR wife.n_full COLLATE :wife_collate_" . $n . " LIKE CONCAT('%', :wife_query_" . $n . ", '%'))";
+            $sql .= " AND (husb.n_full COLLATE :husb_collate_" . $n . " LIKE CONCAT('%', :husb_query_" . $n . ", '%') OR wife.n_full COLLATE :wife_collate_" . $n . " LIKE CONCAT('%', :wife_query_" . $n . ", '%'))";
             $args['husb_collate_' . $n] = I18N::collation();
             $args['husb_query_' . $n]   = Database::escapeLike($q);
             $args['wife_collate_' . $n] = I18N::collation();
@@ -749,7 +749,7 @@ 
 
         foreach ($search_terms as $n => $q) {
             $queryregex[]          = preg_quote(I18N::strtoupper($q), '/');
-            $sql                   .= " AND i_gedcom COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
+            $sql .= " AND i_gedcom COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
             $args['collate_' . $n] = I18N::collation();
             $args['query_' . $n]   = Database::escapeLike($q);
         }
@@ -896,7 +896,7 @@ 
         }
 
         // Add the where clause
-        $sql    .= " WHERE ind.i_file=?";
+        $sql .= " WHERE ind.i_file=?";
         $bind[] = $tree->getTreeId();
 
         foreach ($fields as $field_name => $field_value) {
@@ -907,15 +907,15 @@ 
                     case 'GIVN':
                         switch ($modifiers[$field_name]) {
                             case 'EXACT':
-                                $sql    .= " AND i_n.n_givn=?";
+                                $sql .= " AND i_n.n_givn=?";
                                 $bind[] = $field_value;
                                 break;
                             case 'BEGINS':
-                                $sql    .= " AND i_n.n_givn LIKE CONCAT(?, '%')";
+                                $sql .= " AND i_n.n_givn LIKE CONCAT(?, '%')";
                                 $bind[] = $field_value;
                                 break;
                             case 'CONTAINS':
-                                $sql    .= " AND i_n.n_givn LIKE CONCAT('%', ?, '%')";
+                                $sql .= " AND i_n.n_givn LIKE CONCAT('%', ?, '%')";
                                 $bind[] = $field_value;
                                 break;
                             case 'SDX_STD':
@@ -929,7 +929,7 @@ 
                                     $sql .= ' AND (' . implode(' OR ', $sdx) . ')';
                                 } else {
                                     // No phonetic content? Use a substring match
-                                    $sql    .= " AND i_n.n_givn LIKE CONCAT('%', ?, '%')";
+                                    $sql .= " AND i_n.n_givn LIKE CONCAT('%', ?, '%')";
                                     $bind[] = $field_value;
                                 }
                                 break;
@@ -945,7 +945,7 @@ 
                                     $sql .= ' AND (' . implode(' OR ', $sdx) . ')';
                                 } else {
                                     // No phonetic content? Use a substring match
-                                    $sql    .= " AND i_n.n_givn LIKE CONCAT('%', ?, '%')";
+                                    $sql .= " AND i_n.n_givn LIKE CONCAT('%', ?, '%')";
                                     $bind[] = $field_value;
                                 }
                                 break;
@@ -954,15 +954,15 @@ 
                     case 'SURN':
                         switch ($modifiers[$field_name]) {
                             case 'EXACT':
-                                $sql    .= " AND i_n.n_surname=?";
+                                $sql .= " AND i_n.n_surname=?";
                                 $bind[] = $field_value;
                                 break;
                             case 'BEGINS':
-                                $sql    .= " AND i_n.n_surname LIKE CONCAT(?, '%')";
+                                $sql .= " AND i_n.n_surname LIKE CONCAT(?, '%')";
                                 $bind[] = $field_value;
                                 break;
                             case 'CONTAINS':
-                                $sql    .= " AND i_n.n_surname LIKE CONCAT('%', ?, '%')";
+                                $sql .= " AND i_n.n_surname LIKE CONCAT('%', ?, '%')";
                                 $bind[] = $field_value;
                                 break;
                             case 'SDX_STD':
@@ -976,7 +976,7 @@ 
                                     $sql .= " AND (" . implode(' OR ', $sdx) . ")";
                                 } else {
                                     // No phonetic content? Use a substring match
-                                    $sql    .= " AND i_n.n_surn LIKE CONCAT('%', ?, '%')";
+                                    $sql .= " AND i_n.n_surn LIKE CONCAT('%', ?, '%')";
                                     $bind[] = $field_value;
                                 }
                                 break;
@@ -994,7 +994,7 @@ 
                                 }
 
 // No phonetic content? Use a substring match
-                            $sql    .= " AND i_n.n_surn LIKE CONCAT('%', ?, '%')";
+                            $sql .= " AND i_n.n_surn LIKE CONCAT('%', ?, '%')";
                             $bind[] = $field_value;
                         }
                         break;
@@ -1002,7 +1002,7 @@ 
                     case '_MARNM':
                     case '_HEB':
                     case '_AKA':
-                        $sql    .= " AND i_n.n_type=? AND i_n.n_full LIKE CONCAT('%', ?, '%')";
+                        $sql .= " AND i_n.n_type=? AND i_n.n_full LIKE CONCAT('%', ?, '%')";
                         $bind[] = $parts[1];
                         $bind[] = $field_value;
                         break;
@@ -1012,7 +1012,7 @@ 
                 $date = new Date($field_value);
                 if ($date->isOK()) {
                     $delta  = 365 * ($modifiers[$field_name] ?? 0);
-                    $sql    .= " AND i_d.d_fact=? AND i_d.d_julianday1>=? AND i_d.d_julianday2<=?";
+                    $sql .= " AND i_d.d_fact=? AND i_d.d_julianday1>=? AND i_d.d_julianday2<=?";
                     $bind[] = $parts[0];
                     $bind[] = $date->minimumJulianDay() - $delta;
                     $bind[] = $date->maximumJulianDay() + $delta;
@@ -1022,7 +1022,7 @@ 
                 $date = new Date($field_value);
                 if ($date->isOK()) {
                     $delta  = 365 * $modifiers[$field_name];
-                    $sql    .= " AND f_d.d_fact=? AND f_d.d_julianday1>=? AND f_d.d_julianday2<=?";
+                    $sql .= " AND f_d.d_fact=? AND f_d.d_julianday1>=? AND f_d.d_julianday2<=?";
                     $bind[] = $parts[1];
                     $bind[] = $date->minimumJulianDay() - $delta;
                     $bind[] = $date->maximumJulianDay() + $delta;
@@ -1030,12 +1030,12 @@ 
             } elseif ($parts[1] === 'PLAC') {
                 // *:PLAC
                 // SQL can only link a place to a person/family, not to an event.
-                $sql    .= " AND i_p.place LIKE CONCAT('%', ?, '%')";
+                $sql .= " AND i_p.place LIKE CONCAT('%', ?, '%')";
                 $bind[] = $field_value;
             } elseif ($parts[0] === 'FAMS' && $parts[2] === 'PLAC') {
                 // FAMS:*:PLAC
                 // SQL can only link a place to a person/family, not to an event.
-                $sql    .= " AND f_p.place LIKE CONCAT('%', ?, '%')";
+                $sql .= " AND f_p.place LIKE CONCAT('%', ?, '%')";
                 $bind[] = $field_value;
             } elseif ($parts[0] === 'FAMC' && $parts[2] === 'NAME') {
                 $table = $parts[1] === 'HUSB' ? 'f_n' : 'm_n';
@@ -1044,15 +1044,15 @@ 
                     case 'GIVN':
                         switch ($modifiers[$field_name]) {
                             case 'EXACT':
-                                $sql    .= " AND {$table}.n_givn=?";
+                                $sql .= " AND {$table}.n_givn=?";
                                 $bind[] = $field_value;
                                 break;
                             case 'BEGINS':
-                                $sql    .= " AND {$table}.n_givn LIKE CONCAT(?, '%')";
+                                $sql .= " AND {$table}.n_givn LIKE CONCAT(?, '%')";
                                 $bind[] = $field_value;
                                 break;
                             case 'CONTAINS':
-                                $sql    .= " AND {$table}.n_givn LIKE CONCAT('%', ?, '%')";
+                                $sql .= " AND {$table}.n_givn LIKE CONCAT('%', ?, '%')";
                                 $bind[] = $field_value;
                                 break;
                             case 'SDX_STD':
@@ -1066,7 +1066,7 @@ 
                                     $sql .= ' AND (' . implode(' OR ', $sdx) . ')';
                                 } else {
                                     // No phonetic content? Use a substring match
-                                    $sql    .= " AND {$table}.n_givn LIKE CONCAT('%', ?, '%')";
+                                    $sql .= " AND {$table}.n_givn LIKE CONCAT('%', ?, '%')";
                                     $bind[] = $field_value;
                                 }
                                 break;
@@ -1084,22 +1084,22 @@ 
                                 }
 
 // No phonetic content? Use a substring match
-                            $sql    .= " AND {$table}.n_givn LIKE CONCAT('%', ?, '%')";
+                            $sql .= " AND {$table}.n_givn LIKE CONCAT('%', ?, '%')";
                             $bind[] = $field_value;
                         }
                         break;
                     case 'SURN':
                         switch ($modifiers[$field_name]) {
                             case 'EXACT':
-                                $sql    .= " AND {$table}.n_surname=?";
+                                $sql .= " AND {$table}.n_surname=?";
                                 $bind[] = $field_value;
                                 break;
                             case 'BEGINS':
-                                $sql    .= " AND {$table}.n_surname LIKE CONCAT(?, '%')";
+                                $sql .= " AND {$table}.n_surname LIKE CONCAT(?, '%')";
                                 $bind[] = $field_value;
                                 break;
                             case 'CONTAINS':
-                                $sql    .= " AND {$table}.n_surname LIKE CONCAT('%', ?, '%')";
+                                $sql .= " AND {$table}.n_surname LIKE CONCAT('%', ?, '%')";
                                 $bind[] = $field_value;
                                 break;
                             case 'SDX_STD':
@@ -1113,7 +1113,7 @@ 
                                     $sql .= ' AND (' . implode(' OR ', $sdx) . ')';
                                 } else {
                                     // No phonetic content? Use a substring match
-                                    $sql    .= " AND {$table}.n_surn LIKE CONCAT('%', ?, '%')";
+                                    $sql .= " AND {$table}.n_surn LIKE CONCAT('%', ?, '%')";
                                     $bind[] = $field_value;
                                 }
                                 break;
@@ -1129,7 +1129,7 @@ 
                                     $sql .= ' AND (' . implode(' OR ', $sdx) . ')';
                                 } else {
                                     // No phonetic content? Use a substring match
-                                    $sql    .= " AND {$table}.n_surn LIKE CONCAT('%', ?, '%')";
+                                    $sql .= " AND {$table}.n_surn LIKE CONCAT('%', ?, '%')";
                                     $bind[] = $field_value;
                                 }
                                 break;
@@ -1138,17 +1138,17 @@ 
                 }
             } elseif ($parts[0] === 'FAMS') {
                 // e.g. searches for occupation, religion, note, etc.
-                $sql    .= " AND fam.f_gedcom REGEXP CONCAT('\n[0-9] ', ?, '(.*\n[0-9] CONT)* [^\n]*', ?)";
+                $sql .= " AND fam.f_gedcom REGEXP CONCAT('\n[0-9] ', ?, '(.*\n[0-9] CONT)* [^\n]*', ?)";
                 $bind[] = $parts[1];
                 $bind[] = $field_value;
             } elseif ($parts[1] === 'TYPE') {
                 // e.g. FACT:TYPE or EVEN:TYPE
-                $sql    .= " AND ind.i_gedcom REGEXP CONCAT('\n1 ', ?, '.*(\n[2-9] .*)*\n2 TYPE .*', ?)";
+                $sql .= " AND ind.i_gedcom REGEXP CONCAT('\n1 ', ?, '.*(\n[2-9] .*)*\n2 TYPE .*', ?)";
                 $bind[] = $parts[0];
                 $bind[] = $field_value;
             } else {
                 // e.g. searches for occupation, religion, note, etc.
-                $sql    .= " AND ind.i_gedcom REGEXP CONCAT('\n[0-9] ', ?, '(.*\n[0-9] CONT)* [^\n]*', ?)";
+                $sql .= " AND ind.i_gedcom REGEXP CONCAT('\n[0-9] ', ?, '(.*\n[0-9] CONT)* [^\n]*', ?)";
                 $bind[] = $parts[0];
                 $bind[] = $field_value;
             }
@@ -1227,7 +1227,7 @@ 
         $sql .= ")";
 
         if ($givn_sdx !== '') {
-            $sql      .= " AND (";
+            $sql .= " AND (";
             $givn_sdx = explode(':', $givn_sdx);
             foreach ($givn_sdx as $n => $sdx) {
                 $sql .= $n > 0 ? " OR " : "";
@@ -1245,7 +1245,7 @@ 
         }
 
         if ($surn_sdx !== '') {
-            $sql      .= " AND (";
+            $sql .= " AND (";
             $surn_sdx = explode(':', $surn_sdx);
             foreach ($surn_sdx as $n => $sdx) {
                 $sql .= $n ? " OR " : "";
@@ -1263,7 +1263,7 @@ 
         }
 
         if ($plac_sdx !== '') {
-            $sql      .= " AND (";
+            $sql .= " AND (";
             $plac_sdx = explode(':', $plac_sdx);
             foreach ($plac_sdx as $n => $sdx) {
                 $sql .= $n ? " OR " : "";
@@ -1310,7 +1310,7 @@ 
 
         foreach ($search_terms as $n => $q) {
             $queryregex[]          = preg_quote(I18N::strtoupper($q), '/');
-            $sql                   .= " AND o_gedcom COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
+            $sql .= " AND o_gedcom COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
             $args['collate_' . $n] = I18N::collation();
             $args['query_' . $n]   = Database::escapeLike($q);
         }
@@ -1366,7 +1366,7 @@ 
 
         foreach ($search_terms as $n => $q) {
             $queryregex[]          = preg_quote(I18N::strtoupper($q), '/');
-            $sql                   .= " AND o_gedcom COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
+            $sql .= " AND o_gedcom COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
             $args['collate_' . $n] = I18N::collation();
             $args['query_' . $n]   = Database::escapeLike($q);
         }
@@ -1422,7 +1422,7 @@ 
 
         foreach ($search_terms as $n => $q) {
             $queryregex[]          = preg_quote(I18N::strtoupper($q), '/');
-            $sql                   .= " AND s_gedcom COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
+            $sql .= " AND s_gedcom COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
             $args['collate_' . $n] = I18N::collation();
             $args['query_' . $n]   = Database::escapeLike($q);
         }

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,11 +401,11 @@ 
             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']);
                     }
 
-                    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/Stats.php

Indentation +3 added lines, -3 removed lines

@@ -476,7 +476,7 @@ 
             100 * $tot_sindi_per,
         ]);
         $chl           = I18N::translate('Without sources') . ' - ' . I18N::percentage(1 - $tot_sindi_per, 1) . '|' .
-                     I18N::translate('With sources') . ' - ' . I18N::percentage($tot_sindi_per, 1);
+                        I18N::translate('With sources') . ' - ' . I18N::percentage($tot_sindi_per, 1);
         $chart_title   = I18N::translate('Individuals with sources');
 
         return '<img src="https://chart.googleapis.com/chart?cht=p3&amp;chd=e:' . $chd . '&amp;chs=' . $size . '&amp;chco=' . $color_from . ',' . $color_to . '&amp;chf=bg,s,ffffff00&amp;chl=' . rawurlencode($chl) . '" width="' . $sizes[0] . '" height="' . $sizes[1] . '" alt="' . $chart_title . '" title="' . $chart_title . '">';
@@ -1068,7 +1068,7 @@ 
             I18N::translate('Females') . ' - ' . $per_f . '|' .
             I18N::translate('Males') . ' - ' . $per_m;
         $chart_title = I18N::translate('Males') . ' - ' . $per_m . I18N::$list_separator .
-                   I18N::translate('Females') . ' - ' . $per_f;
+                    I18N::translate('Females') . ' - ' . $per_f;
 
         return "<img src=\"https://chart.googleapis.com/chart?cht=p3&amp;chd=e:{$chd}&amp;chs={$size}&amp;chco={$color_female},{$color_male}&amp;chf=bg,s,ffffff00&amp;chl={$chl}\" width=\"{$sizes[0]}\" height=\"{$sizes[1]}\" alt=\"" . $chart_title . '" title="' . $chart_title . '" />';
     }
@@ -1193,7 +1193,7 @@ 
             I18N::translate('Living') . ' - ' . $per_l . '|' .
             I18N::translate('Dead') . ' - ' . $per_d . '|';
         $chart_title = I18N::translate('Living') . ' - ' . $per_l . I18N::$list_separator .
-                   I18N::translate('Dead') . ' - ' . $per_d;
+                    I18N::translate('Dead') . ' - ' . $per_d;
 
         return "<img src=\"https://chart.googleapis.com/chart?cht=p3&amp;chd=e:{$chd}&amp;chs={$size}&amp;chco={$color_living},{$color_dead}&amp;chf=bg,s,ffffff00&amp;chl={$chl}\" width=\"{$sizes[0]}\" height=\"{$sizes[1]}\" alt=\"" . $chart_title . '" title="' . $chart_title . '" />';
     }

Spacing +104 added lines, -104 removed lines

@@ -156,7 +156,7 @@ 
     private function getTags($text): array
     {
         // 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
@@ -392,7 +392,7 @@ 
      */
     private function totalIndividualsQuery(): int
     {
-        return (int)Database::prepare(
+        return (int) Database::prepare(
             "SELECT COUNT(*) FROM `##individuals` WHERE i_file = :tree_id"
         )->execute([
             'tree_id' => $this->tree->getTreeId(),
@@ -416,7 +416,7 @@ 
      */
     private function totalIndisWithSourcesQuery(): int
     {
-        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'"
@@ -499,7 +499,7 @@ 
      */
     private function totalFamiliesQuery(): int
     {
-        return (int)Database::prepare(
+        return (int) Database::prepare(
             "SELECT COUNT(*) FROM `##families` WHERE f_file = :tree_id"
         )->execute([
             'tree_id' => $this->tree->getTreeId(),
@@ -523,7 +523,7 @@ 
      */
     private function totalFamsWithSourcesQuery(): int
     {
-        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'"
@@ -606,7 +606,7 @@ 
      */
     private function totalSourcesQuery(): int
     {
-        return (int)Database::prepare(
+        return (int) Database::prepare(
             "SELECT COUNT(*) FROM `##sources` WHERE s_file = :tree_id"
         )->execute([
             'tree_id' => $this->tree->getTreeId(),
@@ -640,7 +640,7 @@ 
      */
     private function totalNotesQuery(): int
     {
-        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(),
@@ -674,7 +674,7 @@ 
      */
     private function totalRepositoriesQuery(): int
     {
-        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(),
@@ -785,11 +785,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);
 
         $n = (int) Database::prepare($sql)->execute($vars)->fetchOne();
@@ -901,7 +901,7 @@ 
      */
     private function totalSexMalesQuery(): int
     {
-        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(): int
     {
-        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(): int
     {
-        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(),
@@ -1043,12 +1043,12 @@ 
         }
 
         if ($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;
@@ -1060,7 +1060,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 . '" />';
         }
 
-        $chd         = $this->arrayToExtendedEncoding([
+        $chd = $this->arrayToExtendedEncoding([
             4095 * $tot_f / $tot,
             4095 * $tot_m / $tot,
         ]);
@@ -1085,7 +1085,7 @@ 
      */
     private function totalLivingQuery(): int
     {
-        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(),
@@ -1119,7 +1119,7 @@ 
      */
     private function totalDeceasedQuery(): int
     {
-        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(),
@@ -1185,7 +1185,7 @@ 
             return '';
         }
 
-        $chd         = $this->arrayToExtendedEncoding([
+        $chd = $this->arrayToExtendedEncoding([
             4095 * $tot_l / $tot,
             4095 * $tot_d / $tot,
         ]);
@@ -1208,7 +1208,7 @@ 
     public function totalUsers($params = []): string
     {
         if (isset($params[0])) {
-            $total = count(User::all()) + (int)$params[0];
+            $total = count(User::all()) + (int) $params[0];
         } else {
             $total = count(User::all());
         }
@@ -1255,18 +1255,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();
     }
 
     /**
@@ -1729,7 +1729,7 @@ 
     private function totalPlacesQuery(): int
     {
         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();
     }
@@ -1899,7 +1899,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>';
@@ -1941,9 +1941,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;
                 }
             }
         }
@@ -2120,7 +2120,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);
@@ -2214,7 +2214,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);
@@ -2464,7 +2464,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>';
@@ -2493,7 +2493,7 @@ 
             $sex_search = '';
         }
         if (isset($params[0])) {
-            $total = (int)$params[0];
+            $total = (int) $params[0];
         } else {
             $total = 10;
         }
@@ -2527,10 +2527,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';
             }
@@ -2592,11 +2592,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" .
@@ -2619,10 +2619,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';
             }
@@ -2699,10 +2699,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';
             }
@@ -2772,7 +2772,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'] . ',';
@@ -2814,7 +2814,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);
             }
 
@@ -3390,16 +3390,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;
         }
@@ -3419,7 +3419,7 @@ 
     private function ageOfMarriageQuery($type = 'list', $age_dir = 'ASC', $params = []): string
     {
         if (isset($params[0])) {
-            $total = (int)$params[0];
+            $total = (int) $params[0];
         } else {
             $total = 10;
         }
@@ -3502,10 +3502,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';
             }
@@ -3567,7 +3567,7 @@ 
     private function ageBetweenSpousesQuery($type = 'list', $age_dir = 'DESC', $params = []): string
     {
         if (isset($params[0])) {
-            $total = (int)$params[0];
+            $total = (int) $params[0];
         } else {
             $total = 10;
         }
@@ -3612,10 +3612,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';
             }
@@ -3703,16 +3703,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;
         }
@@ -3796,7 +3796,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) {
@@ -3805,7 +3805,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);
@@ -3901,7 +3901,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);
@@ -4170,7 +4170,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) {
@@ -4227,7 +4227,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);
             }
 
@@ -4763,7 +4763,7 @@ 
     private function topTenFamilyQuery($type = 'list', $params = []): string
     {
         if (isset($params[0])) {
-            $total = (int)$params[0];
+            $total = (int) $params[0];
         } else {
             $total = 10;
         }
@@ -4830,7 +4830,7 @@ 
     private function ageBetweenSiblingsQuery($type = 'list', $params = []): string
     {
         if (isset($params[0])) {
-            $total = (int)$params[0];
+            $total = (int) $params[0];
         } else {
             $total = 10;
         }
@@ -4886,10 +4886,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';
             }
@@ -4900,7 +4900,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>';
@@ -4911,7 +4911,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 = []): string
     {
         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 = []): string
     {
-        $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);
@@ -5882,7 +5882,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) {
@@ -5906,11 +5906,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);
@@ -5932,12 +5932,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;
         }
@@ -6330,11 +6330,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);
@@ -6565,7 +6565,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];
@@ -6573,7 +6573,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];
@@ -6913,9 +6913,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;
@@ -7059,7 +7059,7 @@ 
      */
     public function totalUserMessages(): string
     {
-        $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();
 
@@ -7074,7 +7074,7 @@ 
     public function totalUserJournal(): string
     {
         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) {
@@ -7095,7 +7095,7 @@ 
     public function totalGedcomNews(): string
     {
         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/Census/CensusColumnAgeFemale5Years.php

Spacing +1 added lines, -1 removed lines

@@ -43,6 +43,6 @@
             $years -= $years % 5;
         }
 
-        return (string)$years;
+        return (string) $years;
     }
 }

app/Census/CensusColumnAgeFemale.php

Spacing +1 added lines, -1 removed lines

@@ -38,6 +38,6 @@
             return '';
         }
 
-        return (string)Date::getAge($individual->getEstimatedBirthDate(), $this->date(), 0);
+        return (string) Date::getAge($individual->getEstimatedBirthDate(), $this->date(), 0);
     }
 }