fisharebest / webtrees

app/Report/ReportHtmlFootnote.php

Spacing +1 added lines, -1 removed lines

@@ -138,7 +138,7 @@
                                     $newtext .= ' ';
                                 }
                             } else {
-                                $lw      = $html->getStringWidth($word . ' ');
+                                $lw = $html->getStringWidth($word . ' ');
                                 $newtext .= "\n$word";
                                 if ($addspace != 0) {
                                     $newtext .= ' ';

app/Report/ReportHtmlText.php

Spacing +2 added lines, -2 removed lines

@@ -59,7 +59,7 @@ 
                     $lines = explode("\n", $temptext);
                     foreach ($lines as $line) {
                         echo '<div style="position:absolute;top:', $startY, 'pt;', $renderer->alignRTL, ':', $startX, 'pt;width:', $width, 'pt;">';
-                        $line   = $renderer->textWrap($line, $width);
+                        $line = $renderer->textWrap($line, $width);
                         $startY += $renderer->getTextCellHeight($line);
                         $renderer->setY($startY);
                         $renderer->write($line, $this->color);
@@ -146,7 +146,7 @@ 
                                     $newtext .= ' ';
                                 }
                             } else {
-                                $lw      = $html->getStringWidth($word . ' ');
+                                $lw = $html->getStringWidth($word . ' ');
                                 $newtext .= "\n$word";
                                 if ($addspace != 0) {
                                     $newtext .= ' ';

app/Report/ReportPdfFootnote.php

Spacing +2 added lines, -2 removed lines

@@ -107,7 +107,7 @@ 
         if ($this->wrapWidthRemaining > 0) {
             // Check with line counter too!
             // but floor the $wrapWidthRemaining first to keep it bugfree!
-            $wrapWidthRemaining = (int)($this->wrapWidthRemaining);
+            $wrapWidthRemaining = (int) ($this->wrapWidthRemaining);
             if ($lw >= $wrapWidthRemaining || $lfct > 1) {
                 $newtext = '';
                 $lines   = explode("\n", $this->numText);
@@ -129,7 +129,7 @@ 
                                     $newtext .= ' ';
                                 }
                             } else {
-                                $lw      = $pdf->GetStringWidth($word . ' ');
+                                $lw = $pdf->GetStringWidth($word . ' ');
                                 $newtext .= "\n$word";
                                 if ($addspace != 0) {
                                     $newtext .= ' ';

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';
@@ -725,14 +725,14 @@ 
     public function textWrap($str, $width)
     {
         // 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) {

app/Report/ReportPdfCell.php

Spacing +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
             '<u>',
             '</u>',
         ], $temptext);
-        $match    = [];
+        $match = [];
         // Indicates if the cell background must be painted (1) or transparent (0)
         if ($this->fill == 1) {
             if (!empty($this->bgcolor)) {

app/Individual.php

Spacing +8 added lines, -8 removed lines

@@ -123,7 +123,7 @@ 
         // Dead people...
         if ($this->tree->getPreference('SHOW_DEAD_PEOPLE') >= $access_level && $this->isDead()) {
             $keep_alive             = false;
-            $KEEP_ALIVE_YEARS_BIRTH = (int)$this->tree->getPreference('KEEP_ALIVE_YEARS_BIRTH');
+            $KEEP_ALIVE_YEARS_BIRTH = (int) $this->tree->getPreference('KEEP_ALIVE_YEARS_BIRTH');
             if ($KEEP_ALIVE_YEARS_BIRTH) {
                 preg_match_all('/\n1 (?:' . WT_EVENTS_BIRT . ').*(?:\n[2-9].*)*(?:\n2 DATE (.+))/', $this->gedcom, $matches, PREG_SET_ORDER);
                 foreach ($matches as $match) {
@@ -134,7 +134,7 @@ 
                     }
                 }
             }
-            $KEEP_ALIVE_YEARS_DEATH = (int)$this->tree->getPreference('KEEP_ALIVE_YEARS_DEATH');
+            $KEEP_ALIVE_YEARS_DEATH = (int) $this->tree->getPreference('KEEP_ALIVE_YEARS_DEATH');
             if ($KEEP_ALIVE_YEARS_DEATH) {
                 preg_match_all('/\n1 (?:' . WT_EVENTS_DEAT . ').*(?:\n[2-9].*)*(?:\n2 DATE (.+))/', $this->gedcom, $matches, PREG_SET_ORDER);
                 foreach ($matches as $match) {
@@ -150,7 +150,7 @@ 
             }
         }
         // Consider relationship privacy (unless an admin is applying download restrictions)
-        $user_path_length = (int)$this->tree->getUserPreference(Auth::user(), 'RELATIONSHIP_PATH_LENGTH');
+        $user_path_length = (int) $this->tree->getUserPreference(Auth::user(), 'RELATIONSHIP_PATH_LENGTH');
         $gedcomid         = $this->tree->getUserPreference(Auth::user(), 'gedcomid');
         if ($gedcomid !== '' && $user_path_length > 0) {
             return self::isRelated($this, $user_path_length);
@@ -322,7 +322,7 @@ 
      */
     public function isDead()
     {
-        $MAX_ALIVE_AGE = (int)$this->tree->getPreference('MAX_ALIVE_AGE');
+        $MAX_ALIVE_AGE = (int) $this->tree->getPreference('MAX_ALIVE_AGE');
 
         // "1 DEAT Y" or "1 DEAT/2 DATE" or "1 DEAT/2 PLAC"
         if (preg_match('/\n1 (?:' . WT_EVENTS_DEAT . ')(?: Y|(?:\n[2-9].+)*\n2 (DATE|PLAC) )/', $this->gedcom)) {
@@ -711,7 +711,7 @@ 
                 if ($min && $max) {
                     $gregorian_calendar = new GregorianCalendar;
 
-                    list($year) = $gregorian_calendar->jdToYmd((int)((max($min) + min($max)) / 2));
+                    list($year) = $gregorian_calendar->jdToYmd((int) ((max($min) + min($max)) / 2));
                     $this->_getEstimatedBirthDate = new Date('EST ' . $year);
                 } else {
                     $this->_getEstimatedBirthDate = new Date(''); // always return a date object
@@ -738,7 +738,7 @@ 
             }
             if ($this->_getEstimatedDeathDate === null) {
                 if ($this->getEstimatedBirthDate()->minimumJulianDay()) {
-                    $max_alive_age                = (int)$this->tree->getPreference('MAX_ALIVE_AGE');
+                    $max_alive_age                = (int) $this->tree->getPreference('MAX_ALIVE_AGE');
                     $this->_getEstimatedDeathDate = $this->getEstimatedBirthDate()->addYears($max_alive_age, 'BEF');
                 } else {
                     $this->_getEstimatedDeathDate = new Date(''); // always return a date object
@@ -1111,7 +1111,7 @@ 
         if ($display) {
             $txt .= ' style="display:' . $display . '"';
         }
-        $txt  .= '>';
+        $txt .= '>';
         $husb = $fam->getHusband();
         if ($husb) {
             // Temporarily reset the 'prefered' display name, as we always
@@ -1180,7 +1180,7 @@ 
         // Extract the structured name parts - use for "sortable" names and indexes
         ////////////////////////////////////////////////////////////////////////////
 
-        $sublevel = 1 + (int)$gedcom[0];
+        $sublevel = 1 + (int) $gedcom[0];
         $NPFX     = preg_match("/\n{$sublevel} NPFX (.+)/", $gedcom, $match) ? $match[1] : '';
         $GIVN     = preg_match("/\n{$sublevel} GIVN (.+)/", $gedcom, $match) ? $match[1] : '';
         $SURN     = preg_match("/\n{$sublevel} SURN (.+)/", $gedcom, $match) ? $match[1] : '';

app/Theme/AbstractTheme.php

Spacing +2 added lines, -2 removed lines

@@ -208,7 +208,7 @@ 
     {
         if ($analytics_id) {
             // Add extra dimensions (i.e. filtering categories)
-            $dimensions = (object)[
+            $dimensions = (object) [
                 'dimension1' => $this->tree ? $this->tree->getName() : '-',
                 'dimension2' => $this->tree ? Auth::accessLevel($this->tree) : '-',
             ];
@@ -270,7 +270,7 @@ 
         if ($project_id && $security_id) {
             return
                 '<script>' .
-                'var sc_project=' . (int)$project_id . ',sc_invisible=1,sc_security="' . $security_id .
+                'var sc_project=' . (int) $project_id . ',sc_invisible=1,sc_security="' . $security_id .
                 '",scJsHost = (("https:"===document.location.protocol)?"https://secure.":"http://www.");' .
                 'document.write("<sc"+"ript src=\'"+scJsHost+"statcounter.com/counter/counter.js\'></"+"script>");' .
                 '</script>';

app/Stats.php

Spacing +106 added lines, -106 removed lines

@@ -158,7 +158,7 @@ 
     private function getTags($text)
     {
         // Extract all tags from the provided text
-        preg_match_all('/#([^#]+)(?=#)/', (string)$text, $match);
+        preg_match_all('/#([^#]+)(?=#)/', (string) $text, $match);
         $tags       = $match[1];
         $c          = count($tags);
         $new_tags   = []; // tag to replace
@@ -399,7 +399,7 @@ 
      */
     private function totalIndividualsQuery()
     {
-        return (int)Database::prepare(
+        return (int) Database::prepare(
             "SELECT COUNT(*) FROM `##individuals` WHERE i_file = :tree_id"
         )->execute([
             'tree_id' => $this->tree->getTreeId(),
@@ -423,7 +423,7 @@ 
      */
     private function totalIndisWithSourcesQuery()
     {
-        return (int)Database::prepare(
+        return (int) Database::prepare(
             "SELECT COUNT(DISTINCT i_id)" .
             " FROM `##individuals` JOIN `##link` ON i_id = l_from AND i_file = l_file" .
             " WHERE l_file = :tree_id AND l_type = 'SOUR'"
@@ -506,7 +506,7 @@ 
      */
     private function totalFamiliesQuery()
     {
-        return (int)Database::prepare(
+        return (int) Database::prepare(
             "SELECT COUNT(*) FROM `##families` WHERE f_file = :tree_id"
         )->execute([
             'tree_id' => $this->tree->getTreeId(),
@@ -530,7 +530,7 @@ 
      */
     private function totalFamsWithSourcesQuery()
     {
-        return (int)Database::prepare(
+        return (int) Database::prepare(
             "SELECT COUNT(DISTINCT f_id)" .
             " FROM `##families` JOIN `##link` ON f_id = l_from AND f_file = l_file" .
             " WHERE l_file = :tree_id AND l_type = 'SOUR'"
@@ -613,7 +613,7 @@ 
      */
     private function totalSourcesQuery()
     {
-        return (int)Database::prepare(
+        return (int) Database::prepare(
             "SELECT COUNT(*) FROM `##sources` WHERE s_file = :tree_id"
         )->execute([
             'tree_id' => $this->tree->getTreeId(),
@@ -647,7 +647,7 @@ 
      */
     private function totalNotesQuery()
     {
-        return (int)Database::prepare(
+        return (int) Database::prepare(
             "SELECT COUNT(*) FROM `##other` WHERE o_type='NOTE' AND o_file = :tree_id"
         )->execute([
             'tree_id' => $this->tree->getTreeId(),
@@ -681,7 +681,7 @@ 
      */
     private function totalRepositoriesQuery()
     {
-        return (int)Database::prepare(
+        return (int) Database::prepare(
             "SELECT COUNT(*) FROM `##other` WHERE o_type='REPO' AND o_file = :tree_id"
         )->execute([
             'tree_id' => $this->tree->getTreeId(),
@@ -790,11 +790,11 @@ 
                 }
             }
             if ($types) {
-                $sql  .= ' AND d_fact IN (' . implode(', ', array_fill(0, count($types), '?')) . ')';
+                $sql .= ' AND d_fact IN (' . implode(', ', array_fill(0, count($types), '?')) . ')';
                 $vars = array_merge($vars, $types);
             }
         }
-        $sql  .= ' AND d_fact NOT IN (' . implode(', ', array_fill(0, count($no_types), '?')) . ')';
+        $sql .= ' AND d_fact NOT IN (' . implode(', ', array_fill(0, count($no_types), '?')) . ')';
         $vars = array_merge($vars, $no_types);
 
         return I18N::number(Database::prepare($sql)->execute($vars)->fetchOne());
@@ -904,7 +904,7 @@ 
      */
     private function totalSexMalesQuery()
     {
-        return (int)Database::prepare(
+        return (int) Database::prepare(
             "SELECT COUNT(*) FROM `##individuals` WHERE i_file = :tree_id AND i_sex = 'M'"
         )->execute([
             'tree_id' => $this->tree->getTreeId(),
@@ -938,7 +938,7 @@ 
      */
     private function totalSexFemalesQuery()
     {
-        return (int)Database::prepare(
+        return (int) Database::prepare(
             "SELECT COUNT(*) FROM `##individuals` WHERE i_file = :tree_id AND i_sex = 'F'"
         )->execute([
             'tree_id' => $this->tree->getTreeId(),
@@ -972,7 +972,7 @@ 
      */
     private function totalSexUnknownQuery()
     {
-        return (int)Database::prepare(
+        return (int) Database::prepare(
             "SELECT COUNT(*) FROM `##individuals` WHERE i_file = :tree_id AND i_sex = 'U'"
         )->execute([
             'tree_id' => $this->tree->getTreeId(),
@@ -1044,12 +1044,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;
@@ -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 . '" />';
         } else {
-            $chd         = $this->arrayToExtendedEncoding([
+            $chd = $this->arrayToExtendedEncoding([
                 4095 * $tot_f / $tot,
                 4095 * $tot_m / $tot,
             ]);
@@ -1086,7 +1086,7 @@ 
      */
     private function totalLivingQuery()
     {
-        return (int)Database::prepare(
+        return (int) Database::prepare(
             "SELECT COUNT(*) FROM `##individuals` WHERE i_file = :tree_id AND i_gedcom NOT REGEXP '\\n1 (" . WT_EVENTS_DEAT . ")'"
         )->execute([
             'tree_id' => $this->tree->getTreeId(),
@@ -1120,7 +1120,7 @@ 
      */
     private function totalDeceasedQuery()
     {
-        return (int)Database::prepare(
+        return (int) Database::prepare(
             "SELECT COUNT(*) FROM `##individuals` WHERE i_file = :tree_id AND i_gedcom REGEXP '\\n1 (" . WT_EVENTS_DEAT . ")'"
         )->execute([
             'tree_id' => $this->tree->getTreeId(),
@@ -1185,7 +1185,7 @@ 
         if ($tot == 0) {
             return '';
         } else {
-            $chd         = $this->arrayToExtendedEncoding([
+            $chd = $this->arrayToExtendedEncoding([
                 4095 * $tot_l / $tot,
                 4095 * $tot_d / $tot,
             ]);
@@ -1209,7 +1209,7 @@ 
     public function totalUsers($params = [])
     {
         if (isset($params[0])) {
-            $total = count(User::all()) + (int)$params[0];
+            $total = count(User::all()) + (int) $params[0];
         } else {
             $total = count(User::all());
         }
@@ -1256,18 +1256,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();
     }
 
     /**
@@ -1728,7 +1728,7 @@ 
     private function totalPlacesQuery()
     {
         return
-            (int)Database::prepare("SELECT COUNT(*) FROM `##places` WHERE p_file=?")
+            (int) Database::prepare("SELECT COUNT(*) FROM `##places` WHERE p_file=?")
                 ->execute([$this->tree->getTreeId()])
                 ->fetchOne();
     }
@@ -1886,7 +1886,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>';
@@ -1928,9 +1928,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'];
                 }
             }
         }
@@ -2107,7 +2107,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);
@@ -2201,7 +2201,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);
@@ -2451,7 +2451,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>';
@@ -2480,7 +2480,7 @@ 
             $sex_search = '';
         }
         if (isset($params[0])) {
-            $total = (int)$params[0];
+            $total = (int) $params[0];
         } else {
             $total = 10;
         }
@@ -2514,10 +2514,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';
             }
@@ -2579,11 +2579,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" .
@@ -2606,10 +2606,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';
             }
@@ -2689,10 +2689,10 @@ 
         $row = $rows[0];
         $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';
             } elseif (!empty($age)) {
                 $age = $age . 'd';
             }
@@ -2761,7 +2761,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'] . ',';
@@ -2803,7 +2803,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);
             }
 
@@ -3378,16 +3378,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;
         }
@@ -3407,7 +3407,7 @@ 
     private function ageOfMarriageQuery($type = 'list', $age_dir = 'ASC', $params = [])
     {
         if (isset($params[0])) {
-            $total = (int)$params[0];
+            $total = (int) $params[0];
         } else {
             $total = 10;
         }
@@ -3490,10 +3490,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';
             }
@@ -3555,7 +3555,7 @@ 
     private function ageBetweenSpousesQuery($type = 'list', $age_dir = 'DESC', $params = [])
     {
         if (isset($params[0])) {
-            $total = (int)$params[0];
+            $total = (int) $params[0];
         } else {
             $total = 10;
         }
@@ -3600,10 +3600,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';
             }
@@ -3691,16 +3691,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;
         }
@@ -3786,7 +3786,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) {
@@ -3795,7 +3795,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);
@@ -3884,7 +3884,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) {
@@ -3893,7 +3893,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);
@@ -4162,7 +4162,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) {
@@ -4219,7 +4219,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);
             }
 
@@ -4751,7 +4751,7 @@ 
     private function topTenFamilyQuery($type = 'list', $params = [])
     {
         if (isset($params[0])) {
-            $total = (int)$params[0];
+            $total = (int) $params[0];
         } else {
             $total = 10;
         }
@@ -4818,7 +4818,7 @@ 
     private function ageBetweenSiblingsQuery($type = 'list', $params = [])
     {
         if (isset($params[0])) {
-            $total = (int)$params[0];
+            $total = (int) $params[0];
         } else {
             $total = 10;
         }
@@ -4874,10 +4874,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';
             }
@@ -4888,7 +4888,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>';
@@ -4899,7 +4899,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>';
@@ -5174,7 +5174,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`" .
@@ -5187,7 +5187,7 @@ 
         }
         $tot = 0;
         foreach ($rows as $row) {
-            $tot += (int)$row['tot'];
+            $tot += (int) $row['tot'];
         }
         $chd = '';
         $chl = [];
@@ -5199,7 +5199,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']);
             }
         }
@@ -5542,7 +5542,7 @@ 
             if ($max < $values['count']) {
                 $max = $values['count'];
             }
-            $tot += (int)$values['count'];
+            $tot += (int) $values['count'];
         }
         $unknown = $this->noChildrenFamiliesQuery() - $tot;
         if ($unknown > $max) {
@@ -5566,13 +5566,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;
                 }
@@ -5597,7 +5597,7 @@ 
     private function topTenGrandFamilyQuery($type = 'list', $params = [])
     {
         if (isset($params[0])) {
-            $total = (int)$params[0];
+            $total = (int) $params[0];
         } else {
             $total = 10;
         }
@@ -5695,8 +5695,8 @@ 
      */
     private function commonSurnamesQuery($type = 'list', $show_tot = false, $params = [])
     {
-        $threshold          = empty($params[0]) ? 10 : (int)$params[0];
-        $number_of_surnames = empty($params[1]) ? 10 : (int)$params[1];
+        $threshold          = empty($params[0]) ? 10 : (int) $params[0];
+        $number_of_surnames = empty($params[1]) ? 10 : (int) $params[1];
         $sorting            = empty($params[2]) ? 'alpha' : $params[2];
 
         $surname_list = FunctionsDb::getTopSurnames($this->tree->getTreeId(), $threshold, $number_of_surnames);
@@ -5819,7 +5819,7 @@ 
         $size               = empty($params[0]) ? $WT_STATS_S_CHART_X . 'x' . $WT_STATS_S_CHART_Y : strtolower($params[0]);
         $color_from         = empty($params[1]) ? $WT_STATS_CHART_COLOR1 : strtolower($params[1]);
         $color_to           = empty($params[2]) ? $WT_STATS_CHART_COLOR2 : strtolower($params[2]);
-        $number_of_surnames = empty($params[3]) ? 10 : (int)$params[3];
+        $number_of_surnames = empty($params[3]) ? 10 : (int) $params[3];
 
         $sizes    = explode('x', $size);
         $tot_indi = $this->totalIndividualsQuery();
@@ -5841,7 +5841,7 @@ 
             $max_name  = 0;
             $top_name  = '';
             foreach ($surns as $spfxsurn => $indis) {
-                $per       = count($indis);
+                $per = count($indis);
                 $count_per += $per;
                 // select most common surname from all variants
                 if ($per > $max_name) {
@@ -5865,11 +5865,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);
@@ -5891,12 +5891,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;
         }
@@ -6369,11 +6369,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);
@@ -6604,7 +6604,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];
@@ -6612,7 +6612,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];
@@ -6952,9 +6952,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;
@@ -7097,7 +7097,7 @@ 
      */
     public function totalUserMessages()
     {
-        $total = (int)Database::prepare("SELECT COUNT(*) FROM `##message` WHERE user_id = ?")
+        $total = (int) Database::prepare("SELECT COUNT(*) FROM `##message` WHERE user_id = ?")
             ->execute([Auth::id()])
             ->fetchOne();
 
@@ -7112,7 +7112,7 @@ 
     public function totalUserJournal()
     {
         try {
-            $number = (int)Database::prepare("SELECT COUNT(*) FROM `##news` WHERE user_id = ?")
+            $number = (int) Database::prepare("SELECT COUNT(*) FROM `##news` WHERE user_id = ?")
                 ->execute([Auth::id()])
                 ->fetchOne();
         } catch (PDOException $ex) {
@@ -7133,7 +7133,7 @@ 
     public function totalGedcomNews()
     {
         try {
-            $number = (int)Database::prepare("SELECT COUNT(*) FROM `##news` WHERE gedcom_id = ?")
+            $number = (int) Database::prepare("SELECT COUNT(*) FROM `##news` WHERE gedcom_id = ?")
                 ->execute([$this->tree->getTreeId()])
                 ->fetchOne();
         } catch (PDOException $ex) {

app/Http/Controllers/Auth/ForgotPasswordController.php

Spacing +2 added lines, -2 removed lines

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