fisharebest / webtrees

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/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) {

app/Module/PlacesModule.php

Spacing +2 added lines, -2 removed lines

@@ -141,7 +141,7 @@ 
      */
     private function getPersonalFacts(Individual $individual): array
     {
-        $facts      = $individual->getFacts();
+        $facts = $individual->getFacts();
         foreach ($individual->getSpouseFamilies() as $family) {
             $facts = array_merge($facts, $family->getFacts());
             // Add birth of children from this family to the facts array
@@ -215,7 +215,7 @@ 
                     'provider' => 'openstreetmap',
                     'style'    => 'mapnik',
                 ];
-                self::$map_providers  = [
+                self::$map_providers = [
                     'openstreetmap' => [
                         'name'   => 'OpenStreetMap',
                         'styles' => ['mapnik' => 'Mapnik'],

app/Theme/AbstractTheme.php

Spacing +3 added lines, -3 removed lines

@@ -214,7 +214,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) : '-',
             ];
@@ -276,7 +276,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>';
@@ -1798,7 +1798,7 @@ 
     public function menuSearchPhonetic(): Menu
     {
         /* I18N: search using “sounds like”, rather than exact spelling */
-        return new Menu(I18N::translate('Phonetic search'), route('search-phonetic', ['ged'    => $this->tree->getName(), 'action' => 'soundex',]), 'menu-search-soundex', ['rel' => 'nofollow']);
+        return new Menu(I18N::translate('Phonetic search'), route('search-phonetic', ['ged'    => $this->tree->getName(), 'action' => 'soundex', ]), 'menu-search-soundex', ['rel' => 'nofollow']);
     }
 
     /**

app/MediaFile.php

Spacing +1 added lines, -1 removed lines

@@ -342,7 +342,7 @@
     public function fileSizeKB(): string
     {
         $size = $this->fileSizeBytes();
-        $size = (int)(($size + 1023) / 1024);
+        $size = (int) (($size + 1023) / 1024);
 
         /* I18N: size of file in KB */
         return I18N::translate('%s KB', I18N::number($size));

app/Module/RecentChangesModule.php

Spacing +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
         $days      = (int) $this->getBlockSetting($block_id, 'days', self::DEFAULT_DAYS);
         $infoStyle = $this->getBlockSetting($block_id, 'infoStyle', self::DEFAULT_INFO_STYLE);
         $sortStyle = $this->getBlockSetting($block_id, 'sortStyle', self::DEFAULT_SORT_STYLE);
-        $show_user = (bool)$this->getBlockSetting($block_id, 'show_user', self::DEFAULT_SHOW_USER);
+        $show_user = (bool) $this->getBlockSetting($block_id, 'show_user', self::DEFAULT_SHOW_USER);
 
         extract($cfg, EXTR_OVERWRITE);
 

app/Http/Controllers/AdminUsersController.php

Spacing +26 added lines, -26 removed lines

@@ -49,7 +49,7 @@ 
      */
     public function cleanup(Request $request): Response
     {
-        $months = (int)$request->get('months', 6);
+        $months = (int) $request->get('months', 6);
 
         $inactive_threshold   = time() - $months * 30 * self::SECONDS_PER_DAY;
         $unverified_threshold = time() - 7 * self::SECONDS_PER_DAY;
@@ -58,9 +58,9 @@ 
 
         $inactive_users = array_filter($users, function (User $user) use ($inactive_threshold): bool {
             if ($user->getPreference('sessiontime') === '0') {
-                $datelogin = (int)$user->getPreference('reg_timestamp');
+                $datelogin = (int) $user->getPreference('reg_timestamp');
             } else {
-                $datelogin = (int)$user->getPreference('sessiontime');
+                $datelogin = (int) $user->getPreference('sessiontime');
             }
 
             return $datelogin < $inactive_threshold && $user->getPreference('verified');
@@ -68,9 +68,9 @@ 
 
         $unverified_users = array_filter($users, function (User $user) use ($unverified_threshold): bool {
             if ($user->getPreference('sessiontime') === '0') {
-                $datelogin = (int)$user->getPreference('reg_timestamp');
+                $datelogin = (int) $user->getPreference('reg_timestamp');
             } else {
-                $datelogin = (int)$user->getPreference('sessiontime');
+                $datelogin = (int) $user->getPreference('sessiontime');
             }
 
             return $datelogin < $unverified_threshold && !$user->getPreference('verified');
@@ -97,7 +97,7 @@ 
     public function cleanupAction(Request $request): RedirectResponse
     {
         foreach (User::all() as $user) {
-            if ((bool)$request->get('del_' . $user->getUserId())) {
+            if ((bool) $request->get('del_' . $user->getUserId())) {
                 Log::addAuthenticationLog('Deleted user: ' . $user->getUserName());
                 $user->delete();
 
@@ -144,10 +144,10 @@ 
     public function data(Request $request, User $user): JsonResponse
     {
         $search = $request->get('search')['value'];
-        $start  = (int)$request->get('start');
-        $length = (int)$request->get('length');
+        $start  = (int) $request->get('start');
+        $length = (int) $request->get('length');
         $order  = $request->get('order', []);
-        $draw   = (int)$request->get('draw');
+        $draw   = (int) $request->get('draw');
 
         $sql_select =
             "SELECT SQL_CALC_FOUND_ROWS u.user_id, user_name, real_name, email, us1.setting_value AS language, us2.setting_value AS registered_at, us3.setting_value AS active_at, us4.setting_value AS verified, us5.setting_value AS verified_by_admin" .
@@ -162,7 +162,7 @@ 
         $args = [];
 
         if ($search) {
-            $sql_select       .= " AND (user_name LIKE CONCAT('%', :search_1, '%') OR real_name LIKE CONCAT('%', :search_2, '%') OR email LIKE CONCAT('%', :search_3, '%'))";
+            $sql_select .= " AND (user_name LIKE CONCAT('%', :search_1, '%') OR real_name LIKE CONCAT('%', :search_2, '%') OR email LIKE CONCAT('%', :search_3, '%'))";
             $args['search_1'] = $search;
             $args['search_2'] = $search;
             $args['search_3'] = $search;
@@ -191,7 +191,7 @@ 
 
         if ($length) {
             $user->setPreference('admin_users_page_size', $length);
-            $sql_select     .= " LIMIT :limit OFFSET :offset";
+            $sql_select .= " LIMIT :limit OFFSET :offset";
             $args['limit']  = $length;
             $args['offset'] = $start;
         }
@@ -199,8 +199,8 @@ 
         $rows = Database::prepare($sql_select)->execute($args)->fetchAll();
 
         // Total filtered/unfiltered rows
-        $recordsFiltered = (int)Database::prepare("SELECT FOUND_ROWS()")->fetchOne();
-        $recordsTotal    = (int)Database::prepare("SELECT COUNT(*) FROM `##user` WHERE user_id > 0")->fetchOne();
+        $recordsFiltered = (int) Database::prepare("SELECT FOUND_ROWS()")->fetchOne();
+        $recordsTotal    = (int) Database::prepare("SELECT COUNT(*) FROM `##user` WHERE user_id > 0")->fetchOne();
 
         $installed_languages = [];
         foreach (I18N::installedLocales() as $installed_locale) {
@@ -286,7 +286,7 @@ 
      */
     public function edit(Request $request): Response
     {
-        $user_id = (int)$request->get('user_id');
+        $user_id = (int) $request->get('user_id');
         $user    = User::find($user_id);
 
         if ($user === null) {
@@ -369,7 +369,7 @@ 
      */
     public function update(Request $request, User $user): RedirectResponse
     {
-        $user_id        = (int)$request->get('user_id');
+        $user_id        = (int) $request->get('user_id');
         $username       = $request->get('username');
         $real_name      = $request->get('real_name');
         $email          = $request->get('email');
@@ -379,11 +379,11 @@ 
         $timezone       = $request->get('timezone');
         $contact_method = $request->get('contact_method');
         $comment        = $request->get('comment');
-        $auto_accept    = (bool)$request->get('auto_accept');
-        $canadmin       = (bool)$request->get('canadmin');
-        $visible_online = (bool)$request->get('visible_online');
-        $verified       = (bool)$request->get('verified');
-        $approved       = (bool)$request->get('approved');
+        $auto_accept    = (bool) $request->get('auto_accept');
+        $canadmin       = (bool) $request->get('canadmin');
+        $visible_online = (bool) $request->get('visible_online');
+        $verified       = (bool) $request->get('verified');
+        $approved       = (bool) $request->get('approved');
 
         $edit_user = User::find($user_id);
 
@@ -400,10 +400,10 @@ 
             ->setPreference('TIMEZONE', $timezone)
             ->setPreference('contactmethod', $contact_method)
             ->setPreference('comment', $comment)
-            ->setPreference('auto_accept', (string)$auto_accept)
-            ->setPreference('visibleonline', (string)$visible_online)
-            ->setPreference('verified', (string)$verified)
-            ->setPreference('verified_by_admin', (string)$approved);
+            ->setPreference('auto_accept', (string) $auto_accept)
+            ->setPreference('visibleonline', (string) $visible_online)
+            ->setPreference('verified', (string) $verified)
+            ->setPreference('verified_by_admin', (string) $approved);
 
         if ($pass1 !== '') {
             $edit_user->setPassword($pass1);
@@ -415,7 +415,7 @@ 
         }
 
         foreach (Tree::getAll() as $tree) {
-            $path_length = (int)$request->get('RELATIONSHIP_PATH_LENGTH' . $tree->getTreeId());
+            $path_length = (int) $request->get('RELATIONSHIP_PATH_LENGTH' . $tree->getTreeId());
             $gedcom_id   = $request->get('gedcomid' . $tree->getTreeId(), '');
             $can_edit    = $request->get('canedit' . $tree->getTreeId(), '');
 
@@ -426,7 +426,7 @@ 
 
             $tree->setUserPreference($edit_user, 'gedcomid', $gedcom_id);
             $tree->setUserPreference($edit_user, 'canedit', $can_edit);
-            $tree->setUserPreference($edit_user, 'RELATIONSHIP_PATH_LENGTH', (string)$path_length);
+            $tree->setUserPreference($edit_user, 'RELATIONSHIP_PATH_LENGTH', (string) $path_length);
         }
 
         $url = route('admin-users');