fisharebest / webtrees

app/Functions/FunctionsPrintFacts.php

Spacing +4 added lines, -4 removed lines

@@ -176,14 +176,14 @@ 
             case '_BIRT_CHIL':
                 $children[$fact->getParent()->getXref()] = true;
                 /* I18N: Abbreviation for "number %s" */
-                $label                                   .= '<br>' . I18N::translate('#%s', \count($children));
+                $label .= '<br>' . I18N::translate('#%s', \count($children));
                 break;
             case '_BIRT_GCHI':
             case '_BIRT_GCH1':
             case '_BIRT_GCH2':
                 $grandchildren[$fact->getParent()->getXref()] = true;
                 /* I18N: Abbreviation for "number %s" */
-                $label                                        .= '<br>' . I18N::translate('#%s', \count($grandchildren));
+                $label .= '<br>' . I18N::translate('#%s', \count($grandchildren));
                 break;
         }
 
@@ -577,7 +577,7 @@ 
         for ($j = 0; $j < $ct; $j++) {
             if (strpos($match[$j][1], '@') === false) {
                 $source = e($match[$j][1] . preg_replace('/\n\d CONT ?/', "\n", $match[$j][2]));
-                $data   .= '<div class="fact_SOUR"><span class="label">' . I18N::translate('Source') . ':</span> <span class="field" dir="auto">' . Filter::formatText($source, $tree) . '</span></div>';
+                $data .= '<div class="fact_SOUR"><span class="label">' . I18N::translate('Source') . ':</span> <span class="field" dir="auto">' . Filter::formatText($source, $tree) . '</span></div>';
             }
         }
         // Find source for each fact
@@ -595,7 +595,7 @@ 
                     }
                     $srec      = substr($factrec, $spos1, $spos2 - $spos1);
                     $lt        = preg_match_all("/$nlevel \w+/", $srec, $matches);
-                    $data      .= '<div class="fact_SOUR">';
+                    $data .= '<div class="fact_SOUR">';
                     $elementID = Uuid::uuid4()->toString();
                     if ($tree->getPreference('EXPAND_SOURCES')) {
                         $plusminus = 'icon-minus';

app/Date/CalendarDate.php

Spacing +4 added lines, -4 removed lines

@@ -107,7 +107,7 @@ 
 
         // Construct from an array (of three gedcom-style strings: "1900", "FEB", "4")
         if (\is_array($date)) {
-            $this->d = (int)$date[2];
+            $this->d = (int) $date[2];
             if (array_key_exists($date[1], static::$MONTH_ABBREV)) {
                 $this->m = static::$MONTH_ABBREV[$date[1]];
             } else {
@@ -154,7 +154,7 @@ 
             $jd    = $date->calendar->ymdToJd($today[0], $date->m, $date->d == 0 ? $today[2] : $date->d);
         } else {
             // Complete date
-            $jd = (int)(($date->maxJD + $date->minJD) / 2);
+            $jd = (int) (($date->maxJD + $date->minJD) / 2);
         }
         list($this->y, $this->m, $this->d) = $this->calendar->jdToYmd($jd);
         // New date has same precision as original date
@@ -961,7 +961,7 @@ 
     {
         if ($number < 1) {
             // Cannot convert zero/negative numbers
-            return (string)$number;
+            return (string) $number;
         }
         $roman = '';
         foreach (self::$roman_numerals as $key => $value) {
@@ -986,7 +986,7 @@ 
         $num = 0;
         foreach (self::$roman_numerals as $key => $value) {
             if (strpos($roman, $value) === 0) {
-                $num   += $key;
+                $num += $key;
                 $roman = substr($roman, \strlen($value));
             }
         }

app/Module/LoggedInUsersModule.php

Spacing +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
             }
         }
         $count_logged_in = \count($logged_in);
-        $content         .= '<div class="logged_in_count">';
+        $content .= '<div class="logged_in_count">';
         if ($anonymous) {
             $content .= I18N::plural('%s anonymous signed-in user', '%s anonymous signed-in users', $anonymous, I18N::number($anonymous));
             if ($count_logged_in) {

app/Module/StoriesModule.php

Spacing +4 added lines, -4 removed lines

@@ -117,7 +117,7 @@ 
             // Only show this block for certain languages
             $languages = $this->getBlockSetting($block_id, 'languages', '');
             if ($languages === '' || \in_array(WT_LOCALE, explode(',', $languages))) {
-                $stories[] = (object)[
+                $stories[] = (object) [
                     'block_id'   => $block_id,
                     'title'      => $this->getBlockSetting($block_id, 'title'),
                     'story_body' => $this->getBlockSetting($block_id, 'story_body'),
@@ -212,7 +212,7 @@ 
     {
         $this->layout = 'layouts/administration';
 
-        $block_id = (int)$request->get('block_id');
+        $block_id = (int) $request->get('block_id');
 
         if ($block_id === 0) {
             // Creating a new story
@@ -257,7 +257,7 @@ 
      */
     public function postAdminEditAction(Request $request, Tree $tree): RedirectResponse
     {
-        $block_id    = (int)$request->get('block_id');
+        $block_id    = (int) $request->get('block_id');
         $xref        = $request->get('xref', '');
         $story_body  = $request->get('story_body', '');
         $story_title = $request->get('story_title', '');
@@ -303,7 +303,7 @@ 
      */
     public function postAdminDeleteAction(Request $request, Tree $tree): Response
     {
-        $block_id = (int)$request->get('block_id');
+        $block_id = (int) $request->get('block_id');
 
         Database::prepare(
             "DELETE FROM `##block_setting` WHERE block_id = :block_id"

app/Family.php

Spacing +1 added lines, -1 removed lines

@@ -280,7 +280,7 @@
     {
         $nchi = \count($this->getChildren());
         foreach ($this->getFacts('NCHI') as $fact) {
-            $nchi = max($nchi, (int)$fact->getValue());
+            $nchi = max($nchi, (int) $fact->getValue());
         }
 
         return $nchi;

app/Bootstrap4.php

Spacing +3 added lines, -3 removed lines

@@ -100,7 +100,7 @@ 
                     'type'    => 'radio',
                     'name'    => $name,
                     'value'   => $value,
-                    'checked' => (string)$value === (string)$selected,
+                    'checked' => (string) $value === (string) $selected,
                 ] + $attributes);
 
             $html .=
@@ -129,7 +129,7 @@ 
         foreach ($options as $value => $option) {
             $option_attributes = self::attributes([
                 'value'    => $value,
-                'selected' => (string)$value === (string)$selected,
+                'selected' => (string) $value === (string) $selected,
             ]);
 
             $html .= '<option ' . $option_attributes . '>' . e($option) . '</option>';
@@ -161,7 +161,7 @@ 
         foreach ($options as $value => $option) {
             $option_attributes = self::attributes([
                                                       'value'    => $value,
-                                                      'selected' => \in_array((string)$value, $selected),
+                                                      'selected' => \in_array((string) $value, $selected),
             ]);
 
             $html .= '<option ' . $option_attributes . '>' . e($option) . '</option>';

app/Module/InteractiveTree/TreeView.php

Spacing +5 added lines, -5 removed lines

@@ -254,7 +254,7 @@ 
         // Fixing the width for td to the box initial width when the person is the root person fix a rare bug that happen when a person without child and without known parents is the root person : an unwanted white rectangle appear at the right of the person’s boxes, otherwise.
         $html .= '<td' . ($isRoot ? ' style="width:1px"' : '') . '><div class="tv_box' . ($isRoot ? ' rootPerson' : '') . '" dir="' . I18N::direction() . '" style="text-align: ' . (I18N::direction() === 'rtl' ? 'right' : 'left') . '; direction: ' . I18N::direction() . '" abbr="' . $person->getXref() . '" onclick="' . $this->name . 'Handler.expandBox(this, event);">';
         $html .= $this->drawPersonName($person);
-        $fop  = []; // $fop is fathers of partners
+        $fop = []; // $fop is fathers of partners
         if ($partner !== null) {
             $dashed = '';
             foreach ($person->getSpouseFamilies() as $family) {
@@ -272,7 +272,7 @@ 
                             $spouse_parents,
                         ];
                     }
-                    $html   .= $this->drawPersonName($spouse, $dashed);
+                    $html .= $this->drawPersonName($spouse, $dashed);
                     $dashed = 'dashed';
                 }
             }
@@ -292,9 +292,9 @@ 
         /* draw the parents */
         if ($state >= 0 && (!empty($parent) || \count($fop))) {
             $unique = (empty($parent) || \count($fop) == 0);
-            $html   .= '<td align="left"><table class="tv_tree"><tbody>';
+            $html .= '<td align="left"><table class="tv_tree"><tbody>';
             if (!empty($parent)) {
-                $u    = $unique ? 'c' : 't';
+                $u = $unique ? 'c' : 't';
                 $html .= '<tr><td ' . ($gen == 0 ? ' abbr="p' . $primaryChildFamily->getXref() . '@' . $u . '"' : '') . '>';
                 $html .= $this->drawPerson($parent, $gen - 1, 1, $primaryChildFamily, $u);
                 $html .= '</td></tr>';
@@ -304,7 +304,7 @@ 
                 $nb = \count($fop);
                 foreach ($fop as $p) {
                     $n++;
-                    $u    = $unique ? 'c' : ($n == $nb || empty($p[1]) ? 'b' : 'h');
+                    $u = $unique ? 'c' : ($n == $nb || empty($p[1]) ? 'b' : 'h');
                     $html .= '<tr><td ' . ($gen == 0 ? ' abbr="p' . $p[1]->getXref() . '@' . $u . '"' : '') . '>' . $this->drawPerson($p[0], $gen - 1, 1, $p[1], $u) . '</td></tr>';
                 }
             }

app/Stats.php

Spacing +103 added lines, -103 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(),
@@ -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(): 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(),
@@ -1117,7 +1117,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(),
@@ -1182,7 +1182,7 @@ 
         if ($tot == 0) {
             return '';
         } else {
-            $chd         = $this->arrayToExtendedEncoding([
+            $chd = $this->arrayToExtendedEncoding([
                 4095 * $tot_l / $tot,
                 4095 * $tot_d / $tot,
             ]);
@@ -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(): 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();
     }
@@ -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 = []): string
     {
         if (isset($params[0])) {
-            $total = (int)$params[0];
+            $total = (int) $params[0];
         } else {
             $total = 10;
         }
@@ -3498,10 +3498,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';
             }
@@ -3563,7 +3563,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;
         }
@@ -3608,10 +3608,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';
             }
@@ -3699,16 +3699,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;
         }
@@ -3792,7 +3792,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) {
@@ -3801,7 +3801,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);
@@ -3897,7 +3897,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);
@@ -4166,7 +4166,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) {
@@ -4223,7 +4223,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);
             }
 
@@ -4759,7 +4759,7 @@ 
     private function topTenFamilyQuery($type = 'list', $params = []): string
     {
         if (isset($params[0])) {
-            $total = (int)$params[0];
+            $total = (int) $params[0];
         } else {
             $total = 10;
         }
@@ -4826,7 +4826,7 @@ 
     private function ageBetweenSiblingsQuery($type = 'list', $params = []): string
     {
         if (isset($params[0])) {
-            $total = (int)$params[0];
+            $total = (int) $params[0];
         } else {
             $total = 10;
         }
@@ -4882,10 +4882,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';
             }
@@ -4896,7 +4896,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>';
@@ -4907,7 +4907,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>';
@@ -5182,7 +5182,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`" .
@@ -5195,7 +5195,7 @@ 
         }
         $tot = 0;
         foreach ($rows as $row) {
-            $tot += (int)$row->tot;
+            $tot += (int) $row->tot;
         }
         $chd = '';
         $chl = [];
@@ -5207,7 +5207,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);
             }
         }
@@ -5553,7 +5553,7 @@ 
             if ($max < $values->count) {
                 $max = $values->count;
             }
-            $tot += (int)$values->count;
+            $tot += (int) $values->count;
         }
         $unknown = $this->noChildrenFamiliesQuery() - $tot;
         if ($unknown > $max) {
@@ -5577,13 +5577,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;
                 }
@@ -5608,7 +5608,7 @@ 
     private function topTenGrandFamilyQuery($type = 'list', $params = []): string
     {
         if (isset($params[0])) {
-            $total = (int)$params[0];
+            $total = (int) $params[0];
         } else {
             $total = 10;
         }
@@ -5706,8 +5706,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);
@@ -5879,7 +5879,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) {
@@ -5903,11 +5903,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);
@@ -5929,12 +5929,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;
         }
@@ -6327,11 +6327,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);
@@ -6558,7 +6558,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];
@@ -6566,7 +6566,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];
@@ -6906,9 +6906,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;
@@ -7052,7 +7052,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();
 
@@ -7067,7 +7067,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) {
@@ -7088,7 +7088,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/Report/ReportHtml.php

Spacing +3 added lines, -3 removed lines

@@ -145,7 +145,7 @@ 
             $this->pageh = $tmpw;
         }
         // Store the pagewidth without margins
-        $this->noMarginWidth = (int)($this->pagew - $this->leftmargin - $this->rightmargin);
+        $this->noMarginWidth = (int) ($this->pagew - $this->leftmargin - $this->rightmargin);
         // If RTL
         if ($this->rtl) {
             $this->alignRTL  = 'right';
@@ -727,14 +727,14 @@ 
     public function textWrap($str, $width): string
     {
         // Calculate the line width
-        $lw = (int)($width / ($this->getCurrentStyleHeight() / 2));
+        $lw = (int) ($width / ($this->getCurrentStyleHeight() / 2));
         // Wordwrap each line
         $lines = explode("\n", $str);
         // Line Feed counter
         $lfct     = \count($lines);
         $wraptext = '';
         foreach ($lines as $line) {
-            $wtext    = FunctionsRtl::utf8WordWrap($line, $lw, "\n", true);
+            $wtext = FunctionsRtl::utf8WordWrap($line, $lw, "\n", true);
             $wraptext .= $wtext;
             // Add a new line as long as it’s not the last line
             if ($lfct > 1) {