fisharebest / webtrees

app/Http/Controllers/EditFamilyController.php

Spacing +5 added lines, -5 removed lines

@@ -62,7 +62,7 @@ 
     public function reorderChildrenAction(Request $request, Tree $tree): Response
     {
         $xref   = $request->get('xref');
-        $order  = (array)$request->get('order', []);
+        $order  = (array) $request->get('order', []);
         $family = Family::getInstance($xref, $tree);
 
         $this->checkFamilyAccess($family, true);
@@ -138,7 +138,7 @@ 
         $this->checkFamilyAccess($family, true);
 
         $PEDI      = $request->get('PEDI', '');
-        $keep_chan = (bool)$request->get('keep_chan');
+        $keep_chan = (bool) $request->get('keep_chan');
 
         $this->glevels = $request->get('glevels', []);
         $this->tag     = $request->get('tag', []);
@@ -155,7 +155,7 @@ 
             }
         }
         $gedrec .= "\n" . GedcomCodePedi::createNewFamcPedi($PEDI, $xref);
-        if ((bool)$request->get('SOUR_INDI')) {
+        if ((bool) $request->get('SOUR_INDI')) {
             $gedrec = $this->handleUpdates($gedrec);
         } else {
             $gedrec = $this->updateRest($gedrec);
@@ -253,7 +253,7 @@ 
             }
         }
 
-        if ((bool)$request->get('SOUR_INDI')) {
+        if ((bool) $request->get('SOUR_INDI')) {
             $gedrec = $this->handleUpdates($gedrec);
         } else {
             $gedrec = $this->updateRest($gedrec);
@@ -273,7 +273,7 @@ 
                 $famrec .= $this->addNewFact($request, $tree, $match);
             }
         }
-        if ((bool)$request->get('SOUR_FAM')) {
+        if ((bool) $request->get('SOUR_FAM')) {
             $famrec = $this->handleUpdates($famrec);
         } else {
             $famrec = $this->updateRest($famrec);

app/Http/Controllers/EditIndividualController.php

Spacing +9 added lines, -9 removed lines

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

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(