fisharebest / webtrees

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

Spacing +7 added lines, -7 removed lines

@@ -43,8 +43,8 @@ 
     public function page(Request $request): Response
     {
         $surname     = $request->get('surname', '');
-        $soundex_std = (bool)$request->get('soundex_std');
-        $soundex_dm  = (bool)$request->get('soundex_dm');
+        $soundex_std = (bool) $request->get('soundex_std');
+        $soundex_dm  = (bool) $request->get('soundex_dm');
 
         if ($surname !== '') {
             /* I18N: %s is a surname */
@@ -71,8 +71,8 @@ 
      */
     public function list(Request $request, Tree $tree, User $user): Response
     {
-        $soundex_dm  = (bool)$request->get('soundex_dm');
-        $soundex_std = (bool)$request->get('soundex_std');
+        $soundex_dm  = (bool) $request->get('soundex_dm');
+        $soundex_std = (bool) $request->get('soundex_std');
         $surname     = $request->get('surname', '');
 
         // Highlight direct-line ancestors of this individual.
@@ -160,7 +160,7 @@ 
             $sdx = Soundex::russell($surname);
             if ($sdx !== '') {
                 foreach (explode(':', $sdx) as $value) {
-                    $sql    .= " OR n_soundex_surn_std LIKE CONCAT('%', ?, '%')";
+                    $sql .= " OR n_soundex_surn_std LIKE CONCAT('%', ?, '%')";
                     $args[] = $value;
                 }
             }
@@ -170,7 +170,7 @@ 
             $sdx = Soundex::daitchMokotoff($surname);
             if ($sdx !== '') {
                 foreach (explode(':', $sdx) as $value) {
-                    $sql    .= " OR n_soundex_surn_dm LIKE CONCAT('%', ?, '%')";
+                    $sql .= " OR n_soundex_surn_dm LIKE CONCAT('%', ?, '%')";
                     $args[] = $value;
                 }
             }
@@ -340,7 +340,7 @@ 
      */
     private static function sosaGeneration($sosa): string
     {
-        $generation = (int)log($sosa, 2) + 1;
+        $generation = (int) log($sosa, 2) + 1;
 
         return '<sup title="' . I18N::translate('Generation') . '">' . $generation . '</sup>';
     }

app/Http/Controllers/FamilyController.php

Spacing +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
      */
     private function significant(Family $family): stdClass
     {
-        $significant = (object)[
+        $significant = (object) [
             'family'     => $family,
             'individual' => null,
             'surname'    => '',

app/Http/Controllers/MessageController.php

Spacing +4 added lines, -4 removed lines

@@ -328,8 +328,8 @@ 
     private function validContacts(Tree $tree): array
     {
         $contacts = [
-            User::find((int)$tree->getPreference('CONTACT_USER_ID')),
-            User::find((int)$tree->getPreference('WEBMASTER_USER_ID')),
+            User::find((int) $tree->getPreference('CONTACT_USER_ID')),
+            User::find((int) $tree->getPreference('WEBMASTER_USER_ID')),
         ];
 
         return array_filter($contacts);
@@ -353,7 +353,7 @@ 
     {
         // Create a dummy user, so we can send messages from the tree.
         $from = new User(
-            (object)[
+            (object) [
                 'user_id'   => null,
                 'user_name' => '',
                 'real_name' => $tree->getTitle(),
@@ -363,7 +363,7 @@ 
 
         // Create a dummy user, so we can reply to visitors.
         $sender = new User(
-            (object)[
+            (object) [
                 'user_id'   => null,
                 'user_name' => '',
                 'real_name' => $sender_name,

app/Date.php

Spacing +1 added lines, -1 removed lines

@@ -448,7 +448,7 @@
      */
     public function julianDay(): int
     {
-        return (int)(($this->minimumJulianDay() + $this->maximumJulianDay()) / 2);
+        return (int) (($this->minimumJulianDay() + $this->maximumJulianDay()) / 2);
     }
 
     /**

app/Database.php

Spacing +3 added lines, -4 removed lines

@@ -88,8 +88,7 @@ 
         self::$table_prefix = $config['tblpfx'];
 
         $dsn = (substr($config['dbhost'], 0, 1) === '/' ?
-            "mysql:unix_socket='{$config['dbhost']};dbname={$config['dbname']}" :
-            "mysql:host={$config['dbhost']};dbname={$config['dbname']};port={$config['dbport']}"
+            "mysql:unix_socket='{$config['dbhost']};dbname={$config['dbname']}" : "mysql:host={$config['dbhost']};dbname={$config['dbname']};port={$config['dbport']}"
         );
 
         // Create the underlying PDO object.
@@ -222,7 +221,7 @@ 
     public static function updateSchema($namespace, $schema_name, $target_version): bool
     {
         try {
-            $current_version = (int)Site::getPreference($schema_name);
+            $current_version = (int) Site::getPreference($schema_name);
         } catch (PDOException $ex) {
             DebugBar::addThrowable($ex);
 
@@ -239,7 +238,7 @@ 
             $migration = new $class();
             $migration->upgrade();
             $current_version++;
-            Site::setPreference($schema_name, (string)$current_version);
+            Site::setPreference($schema_name, (string) $current_version);
             $updates_applied = true;
         }
 

app/Census/AbstractCensusColumnCondition.php

Spacing +1 added lines, -1 removed lines

@@ -97,7 +97,7 @@
      */
     private function isChild(Individual $individual): bool
     {
-        $age = (int)Date::getAge($individual->getEstimatedBirthDate(), $this->date(), 0);
+        $age = (int) Date::getAge($individual->getEstimatedBirthDate(), $this->date(), 0);
 
         return $age < $this->age_adult;
     }