fisharebest / webtrees

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/YahrzeitModule.php

Spacing +2 added lines, -2 removed lines

@@ -68,7 +68,7 @@ 
 
         $calendar_service = new CalendarService();
 
-        $days      = (int)$this->getBlockSetting($block_id, 'days', self::DEFAULT_DAYS);
+        $days      = (int) $this->getBlockSetting($block_id, 'days', self::DEFAULT_DAYS);
         $infoStyle = $this->getBlockSetting($block_id, 'infoStyle', self::DEFAULT_STYLE);
         $calendar  = $this->getBlockSetting($block_id, 'calendar', self::DEFAULT_CALENDAR);
 
@@ -122,7 +122,7 @@ 
                         }
                         $yahrzeit_date = new Date($yahrzeit_date->format('%@ %A %O %E'));
 
-                        $yahrzeits[] = (object)[
+                        $yahrzeits[] = (object) [
                             'individual'    => $fact->getParent(),
                             'fact_date'     => $fact->getDate(),
                             'fact'          => $fact,

app/Module/UpcomingAnniversariesModule.php

Spacing +2 added lines, -2 removed lines

@@ -118,7 +118,7 @@ 
         $default_events = implode(',', self::DEFAULT_EVENTS);
 
         $days      = $this->getBlockSetting($block_id, 'days', self::DEFAULT_DAYS);
-        $filter    = (bool)$this->getBlockSetting($block_id, 'filter', self::DEFAULT_FILTER);
+        $filter    = (bool) $this->getBlockSetting($block_id, 'filter', self::DEFAULT_FILTER);
         $infoStyle = $this->getBlockSetting($block_id, 'infoStyle', self::DEFAULT_STYLE);
         $sortStyle = $this->getBlockSetting($block_id, 'sortStyle', self::DEFAULT_SORT);
         $events    = $this->getBlockSetting($block_id, 'events', $default_events);
@@ -136,7 +136,7 @@ 
         $events_filter = implode('|', $event_array);
 
         $startjd = WT_CLIENT_JD + 1;
-        $endjd   = WT_CLIENT_JD + (int)$days;
+        $endjd   = WT_CLIENT_JD + (int) $days;
 
         $facts = $calendar_service->getEventsList($startjd, $endjd, $events_filter, $filter, $sortStyle, $tree);
 

app/Tree.php

Spacing +1 added lines, -1 removed lines

@@ -294,7 +294,7 @@
     public static function getAll(): array
     {
         if (empty(self::$trees)) {
-            $rows        = Database::prepare(
+            $rows = Database::prepare(
                 "SELECT g.gedcom_id AS tree_id, g.gedcom_name AS tree_name, gs1.setting_value AS tree_title" .
                 " FROM `##gedcom` g" .
                 " LEFT JOIN `##gedcom_setting`      gs1 ON (g.gedcom_id=gs1.gedcom_id AND gs1.setting_name='title')" .

app/Services/CalendarService.php

Indentation +3 added lines, -3 removed lines

@@ -327,9 +327,9 @@
 
             // Now fetch these anniversaries
             foreach ([
-                         'INDI' => $ind_sql . $where . $order_by,
-                         'FAM'  => $fam_sql . $where . $order_by,
-                     ] as $type => $sql) {
+                            'INDI' => $ind_sql . $where . $order_by,
+                            'FAM'  => $fam_sql . $where . $order_by,
+                        ] as $type => $sql) {
                 $rows = Database::prepare($sql)->execute($args)->fetchAll();
                 foreach ($rows as $row) {
                     if ($type === 'INDI') {

Spacing +5 added lines, -5 removed lines

@@ -183,7 +183,7 @@ 
                 "SELECT DISTINCT f_id AS xref, f_gedcom AS gedcom, d_type, d_day, d_month, d_year, d_fact" .
                 " FROM `##dates` JOIN `##families` ON d_gid = f_id AND d_file = f_file" .
                 " WHERE d_type = :type AND d_file = :tree_id";
-            $args    = [
+            $args = [
                 'type'    => $anniv->format('%@'),
                 'tree_id' => $tree->getTreeId(),
             ];
@@ -213,7 +213,7 @@ 
                     $where       .= " AND d_day = :day";
                     $args['day'] = $anniv->d;
                 }
-                $where         .= " AND d_mon = :month";
+                $where .= " AND d_mon = :month";
                 $args['month'] = $anniv->m;
             } else {
                 // SPECIAL CASES:
@@ -227,7 +227,7 @@ 
                         } elseif ($anniv->d === 29 && $anniv->daysInMonth() === 29) {
                             $where .= " AND (d_day = 29 OR d_day > 30) AND d_mon = 2";
                         } else {
-                            $where       .= " AND d_day = :day AND d_mon = 2";
+                            $where .= " AND d_day = :day AND d_mon = 2";
                             $args['day'] = $anniv->d;
                         }
                         break;
@@ -250,7 +250,7 @@ 
                         } elseif ($anniv->d == 29 && $anniv->daysInMonth() === 29) {
                             $where .= " AND (d_day = 29 OR d_day > 30) AND d_mon = 3";
                         } else {
-                            $where       .= " AND d_day = :day AND d_mon = 3";
+                            $where .= " AND d_day = :day AND d_mon = 3";
                             $args['day'] = $anniv->d;
                         }
                         break;
@@ -305,7 +305,7 @@ 
                 }
             }
             // Only events in the past (includes dates without a year)
-            $where        .= " AND d_year <= :year";
+            $where .= " AND d_year <= :year";
             $args['year'] = $anniv->y;
 
             if ($facts) {

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/Module/ReviewChangesModule.php

Spacing +3 added lines, -3 removed lines

@@ -73,7 +73,7 @@ 
 
         if ($changes === '1' && $sendmail === '1') {
             // There are pending changes - tell moderators/managers/administrators about them.
-            if (WT_TIMESTAMP - (int)Site::getPreference('LAST_CHANGE_EMAIL') > (60 * 60 * 24 * $days)) {
+            if (WT_TIMESTAMP - (int) Site::getPreference('LAST_CHANGE_EMAIL') > (60 * 60 * 24 * $days)) {
                 // Which users have pending changes?
                 foreach (User::all() as $user) {
                     if ($user->getPreference('contactmethod') !== 'none') {
@@ -82,7 +82,7 @@ 
                                 I18N::init($user->getPreference('language'));
 
                                 $sender = new User(
-                                    (object)[
+                                    (object) [
                                         'user_id'   => null,
                                         'user_name' => '',
                                         'real_name' => $tmp_tree->getTitle(),
@@ -119,7 +119,7 @@ 
             }
             if ($sendmail === '1') {
                 $content .= I18N::translate('Last email reminder was sent ') . FunctionsDate::formatTimestamp(Site::getPreference('LAST_CHANGE_EMAIL')) . '<br>';
-                $content .= I18N::translate('Next email reminder will be sent after ') . FunctionsDate::formatTimestamp((int)Site::getPreference('LAST_CHANGE_EMAIL') + (60 * 60 * 24 * $days)) . '<br><br>';
+                $content .= I18N::translate('Next email reminder will be sent after ') . FunctionsDate::formatTimestamp((int) Site::getPreference('LAST_CHANGE_EMAIL') + (60 * 60 * 24 * $days)) . '<br><br>';
             }
             $content .= '<ul>';
             $changes = Database::prepare(

app/Http/Controllers/AdminMediaController.php

Spacing +10 added lines, -10 removed lines

@@ -119,8 +119,8 @@ 
         $files  = $request->get('files'); // local|external|unused
         $search = $request->get('search');
         $search = $search['value'];
-        $start  = (int)$request->get('start');
-        $length = (int)$request->get('length');
+        $start  = (int) $request->get('start');
+        $length = (int) $request->get('length');
 
         // family tree setting MEDIA_DIRECTORY
         $media_folders = $this->allMediaFolders();
@@ -156,7 +156,7 @@ 
                     "  OR   descriptive_title LIKE CONCAT('%', :search_2, '%'))" .
                     " AND   multimedia_file_refn NOT LIKE 'http://%'" .
                     " AND   multimedia_file_refn NOT LIKE 'https://%'";
-                $ARGS1   = [
+                $ARGS1 = [
                     'media_path_1' => $media_path,
                     'media_folder' => $media_folder,
                     'media_path_2' => Database::escapeLike($media_path),
@@ -173,7 +173,7 @@ 
                     " AND   multimedia_file_refn LIKE CONCAT(:media_path_3, '%')" .
                     " AND   multimedia_file_refn NOT LIKE 'http://%'" .
                     " AND   multimedia_file_refn NOT LIKE 'https://%'";
-                $ARGS2   = [
+                $ARGS2 = [
                     'media_folder' => $media_folder,
                     'media_path_3' => $media_path,
                 ];
@@ -185,7 +185,7 @@ 
                     $ARGS2['media_path_4'] = Database::escapeLike($media_path);
                 }
 
-                $order   = $request->get('order', []);
+                $order = $request->get('order', []);
                 $SELECT1 .= " ORDER BY ";
                 if ($order) {
                     foreach ($order as $key => $value) {
@@ -209,7 +209,7 @@ 
                 }
 
                 if ($length > 0) {
-                    $SELECT1         .= " LIMIT :length OFFSET :start";
+                    $SELECT1 .= " LIMIT :length OFFSET :start";
                     $ARGS1['length'] = $length;
                     $ARGS1['start']  = $start;
                 }
@@ -242,7 +242,7 @@ 
                     " JOIN  `##media_file` USING (m_id, m_file)" .
                     " WHERE (multimedia_file_refn LIKE 'http://%' OR multimedia_file_refn LIKE 'https://%')" .
                     " AND   (multimedia_file_refn LIKE CONCAT('%', :search_1, '%') OR descriptive_title LIKE CONCAT('%', :search_2, '%'))";
-                $ARGS1   = [
+                $ARGS1 = [
                     'search_1' => Database::escapeLike($search),
                     'search_2' => Database::escapeLike($search),
                 ];
@@ -278,7 +278,7 @@ 
                 }
 
                 if ($length > 0) {
-                    $SELECT1         .= " LIMIT :length OFFSET :start";
+                    $SELECT1 .= " LIMIT :length OFFSET :start";
                     $ARGS1['length'] = $length;
                     $ARGS1['start']  = $start;
                 }
@@ -578,7 +578,7 @@ 
 
         // $dir comes from the database. The actual folder may not exist.
         if (is_dir($dir)) {
-            foreach (scandir($dir,SCANDIR_SORT_NONE) as $path) {
+            foreach (scandir($dir, SCANDIR_SORT_NONE) as $path) {
                 if (is_dir($dir . $path)) {
                     // What if there are user-defined subfolders “thumbs” or “watermarks”?
                     if ($path != '.' && $path != '..' && $path != 'thumbs' && $path != 'watermark' && $recursive) {
@@ -660,7 +660,7 @@ 
         $full_path = WT_DATA_DIR . $media_folder . $media_path . $file;
         try {
             $size = filesize($full_path);
-            $size = (int)(($size + 1023) / 1024); // Round up to next KB
+            $size = (int) (($size + 1023) / 1024); // Round up to next KB
             /* I18N: size of file in KB */
             $size = I18N::translate('%s KB', I18N::number($size));
             $html .= '<dt>' . I18N::translate('File size') . '</dt>';

app/Http/Controllers/PedigreeChartController.php

Spacing +15 added lines, -15 removed lines

@@ -92,8 +92,8 @@ 
 
         $this->checkIndividualAccess($individual);
 
-        $orientation = (int)$request->get('orientation', self::LANDSCAPE);
-        $generations = (int)$request->get('generations', self::DEFAULT_GENERATIONS);
+        $orientation = (int) $request->get('orientation', self::LANDSCAPE);
+        $generations = (int) $request->get('generations', self::DEFAULT_GENERATIONS);
 
         $generations = min(self::MAX_GENERATIONS, $generations);
         $generations = max(self::MIN_GENERATIONS, $generations);
@@ -129,8 +129,8 @@ 
 
         $this->checkIndividualAccess($individual);
 
-        $this->orientation = (int)$request->get('orientation');
-        $this->generations = (int)$request->get('generations');
+        $this->orientation = (int) $request->get('orientation');
+        $this->generations = (int) $request->get('generations');
         $bxspacing         = Theme::theme()->parameter('chart-spacing-x');
         $byspacing         = Theme::theme()->parameter('chart-spacing-y');
         $curgen            = 1; // -- track which generation the algorithm is currently working on
@@ -155,7 +155,7 @@ 
         }, array_values($this->sosaStradonitzAncestors($individual, $this->generations)));
 
         //check earliest generation for any ancestors
-        for ($i = (int)($this->treesize / 2); $i < $this->treesize; $i++) {
+        for ($i = (int) ($this->treesize / 2); $i < $this->treesize; $i++) {
             $this->chartHasAncestors = $this->chartHasAncestors || ($this->nodes[$i]['indi'] && $this->nodes[$i]['indi']->getChildFamilies());
         }
 
@@ -189,7 +189,7 @@ 
 
         for ($i = ($this->treesize - 1); $i >= 0; $i--) {
             // -- check to see if we have moved to the next generation
-            if ($i < (int)($this->treesize / (2 ** $curgen))) {
+            if ($i < (int) ($this->treesize / (2 ** $curgen))) {
                 $curgen++;
             }
 
@@ -220,7 +220,7 @@ 
                         } else {
                             $yoffset = $yoffset + (($boxspacing / 2) * ($curgen - 1));
                         }
-                        $parent = (int)(($i - 1) / 2);
+                        $parent = (int) (($i - 1) / 2);
                         $pgen   = $curgen;
                         while ($parent > 0) {
                             if ($parent % 2 == 0) {
@@ -240,7 +240,7 @@ 
                                     $yoffset = $yoffset + (($boxspacing / 2) * $temp);
                                 }
                             }
-                            $parent = (int)(($parent - 1) / 2);
+                            $parent = (int) (($parent - 1) / 2);
                         }
                         if ($curgen > 3) {
                             $temp = 0;
@@ -276,8 +276,8 @@ 
                     }
                     break;
             }
-            $this->nodes[$i]['x'] = (int)$xoffset;
-            $this->nodes[$i]['y'] = (int)$yoffset;
+            $this->nodes[$i]['x'] = (int) $xoffset;
+            $this->nodes[$i]['y'] = (int) $yoffset;
         }
 
         // find the minimum x & y offsets and deduct that number from
@@ -306,7 +306,7 @@ 
         $canvas_width   = $max_xoffset + $bxspacing + Theme::theme()->parameter('chart-box-x') + $addoffset['x'];
         $canvas_height  = $max_yoffset + $byspacing + Theme::theme()->parameter('chart-box-y') + $addoffset['y'];
         $posn           = I18N::direction() === 'rtl' ? 'right' : 'left';
-        $last_gen_start = (int)floor($this->treesize / 2);
+        $last_gen_start = (int) floor($this->treesize / 2);
         if ($this->orientation === self::OLDEST_AT_TOP || $this->orientation === self::OLDEST_AT_BOTTOM) {
             $flex_direction = ' flex-column';
         } else {
@@ -355,7 +355,7 @@ 
             $html = sprintf('<div id="childarrow"><a href="#" class="menuselect %s"></a><div id="childbox-pedigree">', $this->arrows->menu);
 
             foreach ($families as $family) {
-                $html   .= '<span class="name1">' . I18N::translate('Family') . '</span>';
+                $html .= '<span class="name1">' . I18N::translate('Family') . '</span>';
                 $spouse = $family->getSpouse($this->root);
                 if ($spouse) {
                     $html .= '<a class="name1" href="' . e(route('pedigree', [
@@ -416,9 +416,9 @@ 
         $html = '';
         if ($this->chartHasAncestors) {
             if ($this->nodes[$index]['indi'] && $this->nodes[$index]['indi']->getChildFamilies()) {
-                $html         .= '<div class="ancestorarrow">';
+                $html .= '<div class="ancestorarrow">';
                 $rootParentId = 1;
-                if ($index > (int)($this->treesize / 2) + (int)($this->treesize / 4)) {
+                if ($index > (int) ($this->treesize / 2) + (int) ($this->treesize / 4)) {
                     $rootParentId++;
                 }
                 $html .= '<a class="' . $this->arrows->prevGen . '" href="' . e(route('pedigree', [
@@ -445,7 +445,7 @@ 
     private function generationOptions(Tree $tree): array
     {
         // @TODO - do we need this config setting, given that we cannot show more than 8 generations?
-        $max_generations = min(self::MAX_GENERATIONS, (int)$tree->getPreference('MAX_PEDIGREE_GENERATIONS'));
+        $max_generations = min(self::MAX_GENERATIONS, (int) $tree->getPreference('MAX_PEDIGREE_GENERATIONS'));
 
         return FunctionsEdit::numericOptions(range(self::MIN_GENERATIONS, $max_generations));
     }