fisharebest / webtrees

app/Http/Controllers/AccountController.php

Spacing +11 added lines, -11 removed lines

@@ -47,7 +47,7 @@ 
      */
     public function edit(Tree $tree, User $user): Response
     {
-        $allow_user_themes    = (bool)Site::getPreference('ALLOW_USER_THEMES');
+        $allow_user_themes    = (bool) Site::getPreference('ALLOW_USER_THEMES');
         $my_individual_record = Individual::getInstance($tree->getUserPreference(Auth::user(), 'gedcomid'), $tree);
         $contact_methods      = FunctionsEdit::optionsContactMethods();
         $default_individual   = Individual::getInstance($tree->getUserPreference(Auth::user(), 'rootid'), $tree);
@@ -82,16 +82,16 @@ 
      */
     public function update(Request $request, Tree $tree, User $user): RedirectResponse
     {
-        $contact_method = (string)$request->get('contact_method');
-        $email          = (string)$request->get('email');
-        $language       = (string)$request->get('language');
-        $real_name      = (string)$request->get('real_name');
-        $password       = (string)$request->get('password');
-        $rootid         = (string)$request->get('root_id');
-        $theme          = (string)$request->get('theme');
-        $time_zone      = (string)$request->get('timezone');
-        $user_name      = (string)$request->get('user_name');
-        $visible_online = (string)$request->get('visible_online');
+        $contact_method = (string) $request->get('contact_method');
+        $email          = (string) $request->get('email');
+        $language       = (string) $request->get('language');
+        $real_name      = (string) $request->get('real_name');
+        $password       = (string) $request->get('password');
+        $rootid         = (string) $request->get('root_id');
+        $theme          = (string) $request->get('theme');
+        $time_zone      = (string) $request->get('timezone');
+        $user_name      = (string) $request->get('user_name');
+        $visible_online = (string) $request->get('visible_online');
 
         // Change the password
         if ($password !== '') {

app/Http/Controllers/EditGedcomRecordController.php

Spacing +4 added lines, -4 removed lines

@@ -290,8 +290,8 @@ 
     public function editRawRecordAction(Request $request, Tree $tree): Response
     {
         $xref     = $request->get('xref');
-        $facts    = (array)$request->get('fact');
-        $fact_ids = (array)$request->get('fact_id');
+        $facts    = (array) $request->get('fact');
+        $fact_ids = (array) $request->get('fact_id');
         $record   = GedcomRecord::getInstance($xref, $tree);
 
         $this->checkRecordAccess($record, true);
@@ -395,7 +395,7 @@ 
         $record = GedcomRecord::getInstance($xref, $tree);
         $this->checkRecordAccess($record, true);
 
-        $keep_chan = (bool)$request->get('keep_chan');
+        $keep_chan = (bool) $request->get('keep_chan');
 
         $this->glevels = $request->get('glevels', []);
         $this->tag     = $request->get('tag', []);
@@ -414,7 +414,7 @@ 
 
         $newged = '';
         if (!empty($_POST['NAME'])) {
-            $newged     .= "\n1 NAME " . $_POST['NAME'];
+            $newged .= "\n1 NAME " . $_POST['NAME'];
             $name_facts = [
                 'TYPE',
                 'NPFX',

app/Http/Controllers/AutocompleteController.php

Spacing +10 added lines, -10 removed lines

@@ -84,7 +84,7 @@ 
         $pages = [];
 
         // Escape the query for MySQL and PHP, converting spaces to wildcards.
-        $like_query  = strtr($query, [
+        $like_query = strtr($query, [
             '_' => '\\_',
             '%' => '\\%',
             ' ' => '%',
@@ -206,7 +206,7 @@ 
      */
     public function select2Family(Request $request, Tree $tree): JsonResponse
     {
-        $page  = (int)$request->get('page');
+        $page  = (int) $request->get('page');
         $query = $request->get('q');
 
         return new JsonResponse(Select2::familySearch($tree, $page, $query));
@@ -220,7 +220,7 @@ 
     public function select2Flag(Request $request): JsonResponse
     {
         $page  = $request->get('page');
-        $query = (int)$request->get('q');
+        $query = (int) $request->get('q');
 
         return new JsonResponse(Select2::flagSearch($page, $query));
     }
@@ -233,7 +233,7 @@ 
      */
     public function select2Individual(Request $request, Tree $tree): JsonResponse
     {
-        $page  = (int)$request->get('page');
+        $page  = (int) $request->get('page');
         $query = $request->get('q');
 
         return new JsonResponse(Select2::individualSearch($tree, $page, $query));
@@ -247,7 +247,7 @@ 
      */
     public function select2MediaObject(Request $request, Tree $tree): JsonResponse
     {
-        $page  = (int)$request->get('page');
+        $page  = (int) $request->get('page');
         $query = $request->get('q');
 
         return new JsonResponse(Select2::mediaObjectSearch($tree, $page, $query));
@@ -261,7 +261,7 @@ 
      */
     public function select2Note(Request $request, Tree $tree): JsonResponse
     {
-        $page  = (int)$request->get('page');
+        $page  = (int) $request->get('page');
         $query = $request->get('q');
 
         return new JsonResponse(Select2::noteSearch($tree, $page, $query));
@@ -275,7 +275,7 @@ 
      */
     public function select2Place(Request $request, Tree $tree): JsonResponse
     {
-        $page  = (int)$request->get('page');
+        $page  = (int) $request->get('page');
         $query = $request->get('q');
 
         return new JsonResponse(Select2::placeSearch($tree, $page, $query, true));
@@ -289,7 +289,7 @@ 
      */
     public function select2Repository(Request $request, Tree $tree): JsonResponse
     {
-        $page  = (int)$request->get('page');
+        $page  = (int) $request->get('page');
         $query = $request->get('q');
 
         return new JsonResponse(Select2::repositorySearch($tree, $page, $query));
@@ -303,7 +303,7 @@ 
      */
     public function select2Source(Request $request, Tree $tree): JsonResponse
     {
-        $page  = (int)$request->get('page');
+        $page  = (int) $request->get('page');
         $query = $request->get('q');
 
         return new JsonResponse(Select2::sourceSearch($tree, $page, $query));
@@ -317,7 +317,7 @@ 
      */
     public function select2Submitter(Request $request, Tree $tree): JsonResponse
     {
-        $page  = (int)$request->get('page');
+        $page  = (int) $request->get('page');
         $query = $request->get('q');
 
         return new JsonResponse(Select2::submitterSearch($tree, $page, $query));

app/Http/Controllers/PendingChangesController.php

Spacing +2 added lines, -2 removed lines

@@ -98,7 +98,7 @@ 
     {
         $url       = $request->get('url', '');
         $xref      = $request->get('xref', '');
-        $change_id = (int)$request->get('change_id');
+        $change_id = (int) $request->get('change_id');
 
         $changes = Database::prepare(
             "SELECT change_id, xref, old_gedcom, new_gedcom" .
@@ -204,7 +204,7 @@ 
     {
         $url       = $request->get('url', '');
         $xref      = $request->get('xref', '');
-        $change_id = (int)$request->get('change_id');
+        $change_id = (int) $request->get('change_id');
 
         // Reject a change, and subsequent changes to the same record
         Database::prepare(

app/Http/Controllers/AdminSiteController.php

Spacing +24 added lines, -24 removed lines

@@ -263,35 +263,35 @@ 
 
         $args = [];
         if ($search) {
-            $sql            .= " AND log_message LIKE CONCAT('%', :search, '%')";
+            $sql .= " AND log_message LIKE CONCAT('%', :search, '%')";
             $args['search'] = $search;
         }
         if ($from) {
-            $sql          .= " AND log_time >= :from";
+            $sql .= " AND log_time >= :from";
             $args['from'] = $from;
         }
         if ($to) {
-            $sql        .= " AND log_time < TIMESTAMPADD(DAY, 1 , :to)"; // before end of the day
+            $sql .= " AND log_time < TIMESTAMPADD(DAY, 1 , :to)"; // before end of the day
             $args['to'] = $to;
         }
         if ($type) {
-            $sql          .= " AND log_type = :type";
+            $sql .= " AND log_type = :type";
             $args['type'] = $type;
         }
         if ($text) {
-            $sql          .= " AND log_message LIKE CONCAT('%', :text, '%')";
+            $sql .= " AND log_message LIKE CONCAT('%', :text, '%')";
             $args['text'] = $text;
         }
         if ($ip) {
-            $sql        .= " AND ip_address LIKE CONCAT('%', :ip, '%')";
+            $sql .= " AND ip_address LIKE CONCAT('%', :ip, '%')";
             $args['ip'] = $ip;
         }
         if ($username) {
-            $sql          .= " AND user_name LIKE CONCAT('%', :user, '%')";
+            $sql .= " AND user_name LIKE CONCAT('%', :user, '%')";
             $args['user'] = $username;
         }
         if ($gedc) {
-            $sql          .= " AND gedcom_name = :gedc";
+            $sql .= " AND gedcom_name = :gedc";
             $args['gedc'] = $gedc;
         }
 
@@ -317,7 +317,7 @@ 
         }
 
         if ($length) {
-            $sql            .= " LIMIT :limit OFFSET :offset";
+            $sql .= " LIMIT :limit OFFSET :offset";
             $args['limit']  = $length;
             $args['offset'] = $start;
         }
@@ -375,35 +375,35 @@ 
 
         $args = [];
         if ($search) {
-            $sql            .= " AND log_message LIKE CONCAT('%', :search, '%')";
+            $sql .= " AND log_message LIKE CONCAT('%', :search, '%')";
             $args['search'] = $search;
         }
         if ($from) {
-            $sql          .= " AND log_time >= :from";
+            $sql .= " AND log_time >= :from";
             $args['from'] = $from;
         }
         if ($to) {
-            $sql        .= " AND log_time < TIMESTAMPADD(DAY, 1 , :to)"; // before end of the day
+            $sql .= " AND log_time < TIMESTAMPADD(DAY, 1 , :to)"; // before end of the day
             $args['to'] = $to;
         }
         if ($type) {
-            $sql          .= " AND log_type = :type";
+            $sql .= " AND log_type = :type";
             $args['type'] = $type;
         }
         if ($text) {
-            $sql          .= " AND log_message LIKE CONCAT('%', :text, '%')";
+            $sql .= " AND log_message LIKE CONCAT('%', :text, '%')";
             $args['text'] = $text;
         }
         if ($ip) {
-            $sql        .= " AND ip_address LIKE CONCAT('%', :ip, '%')";
+            $sql .= " AND ip_address LIKE CONCAT('%', :ip, '%')";
             $args['ip'] = $ip;
         }
         if ($username) {
-            $sql          .= " AND user_name LIKE CONCAT('%', :user, '%')";
+            $sql .= " AND user_name LIKE CONCAT('%', :user, '%')";
             $args['user'] = $username;
         }
         if ($gedc) {
-            $sql          .= " AND gedcom_name = :gedc";
+            $sql .= " AND gedcom_name = :gedc";
             $args['gedc'] = $gedc;
         }
 
@@ -436,31 +436,31 @@ 
 
         $args = [];
         if ($from) {
-            $sql          .= " AND log_time >= :from";
+            $sql .= " AND log_time >= :from";
             $args['from'] = $from;
         }
         if ($to) {
-            $sql        .= " AND log_time < TIMESTAMPADD(DAY, 1 , :to)"; // before end of the day
+            $sql .= " AND log_time < TIMESTAMPADD(DAY, 1 , :to)"; // before end of the day
             $args['to'] = $to;
         }
         if ($type) {
-            $sql          .= " AND log_type = :type";
+            $sql .= " AND log_type = :type";
             $args['type'] = $type;
         }
         if ($text) {
-            $sql          .= " AND log_message LIKE CONCAT('%', :text, '%')";
+            $sql .= " AND log_message LIKE CONCAT('%', :text, '%')";
             $args['text'] = $text;
         }
         if ($ip) {
-            $sql        .= " AND ip_address LIKE CONCAT('%', :ip, '%')";
+            $sql .= " AND ip_address LIKE CONCAT('%', :ip, '%')";
             $args['ip'] = $ip;
         }
         if ($username) {
-            $sql          .= " AND user_name LIKE CONCAT('%', :user, '%')";
+            $sql .= " AND user_name LIKE CONCAT('%', :user, '%')";
             $args['user'] = $username;
         }
         if ($gedc) {
-            $sql          .= " AND gedcom_name = :gedc";
+            $sql .= " AND gedcom_name = :gedc";
             $args['gedc'] = $gedc;
         }
 

app/Http/Controllers/AdminUsersController.php

Indentation +1 added lines, -1 removed lines

@@ -240,7 +240,7 @@
             // Link to send email to other users.
             if ($user_id != $user->getUserId()) {
                 $datum[4] = '<a href="' . e(route('message', ['to'  => $datum[2],
-                                                              'url' => route('admin-users'),
+                                                                'url' => route('admin-users'),
                     ])) . '">' . $datum[4] . '</a>';
             }
 

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');

app/Http/Controllers/TimelineChartController.php

Spacing +9 added lines, -9 removed lines

@@ -60,11 +60,11 @@ 
     {
         $this->checkModuleIsActive($tree, 'timeline_chart');
 
-        $scale = (int)$request->get('scale', self::SCALE_DEFAULT);
+        $scale = (int) $request->get('scale', self::SCALE_DEFAULT);
         $scale = min($scale, self::SCALE_MAX);
         $scale = max($scale, self::SCALE_MIN);
 
-        $xrefs = (array)$request->get('xrefs', []);
+        $xrefs = (array) $request->get('xrefs', []);
         $xrefs = array_unique($xrefs);
         $xrefs = array_filter($xrefs, function (string $xref) use ($tree): bool {
             $individual = Individual::getInstance($xref, $tree);
@@ -100,14 +100,14 @@ 
 
         $zoom_in_url = route('timeline', [
             'ged'   => $tree->getName(),
-            'scale' => min(self::SCALE_MAX, $scale + (int)($scale * 0.2 + 1)),
+            'scale' => min(self::SCALE_MAX, $scale + (int) ($scale * 0.2 + 1)),
             'xrefs' => $xrefs,
         ]);
 
         $zoom_out_url = route('timeline', [
             'route' => 'timeline',
             'ged'   => $tree->getName(),
-            'scale' => max(self::SCALE_MIN, $scale - (int)($scale * 0.2 + 1)),
+            'scale' => max(self::SCALE_MIN, $scale - (int) ($scale * 0.2 + 1)),
             'xrefs' => $xrefs,
         ]);
 
@@ -132,11 +132,11 @@ 
     {
         $this->checkModuleIsActive($tree, 'timeline_chart');
 
-        $scale = (int)$request->get('scale', self::SCALE_DEFAULT);
+        $scale = (int) $request->get('scale', self::SCALE_DEFAULT);
         $scale = min($scale, self::SCALE_MAX);
         $scale = max($scale, self::SCALE_MIN);
 
-        $xrefs = (array)$request->get('xrefs', []);
+        $xrefs = (array) $request->get('xrefs', []);
         $xrefs = array_unique($xrefs);
 
         /** @var Individual[] $individuals */
@@ -148,7 +148,7 @@ 
             return $individual !== null && $individual->canShow();
         });
 
-        $baseyear    = (int)date('Y');
+        $baseyear    = (int) date('Y');
         $topyear     = 0;
         $indifacts   = [];
         $birthyears  = [];
@@ -183,7 +183,7 @@ 
                         $topyear  = max($topyear, $date->y);
 
                         if (!$individual->isDead()) {
-                            $topyear = max($topyear, (int)date('Y'));
+                            $topyear = max($topyear, (int) date('Y'));
                         }
 
                         // do not add the same fact twice (prevents marriages from being added multiple times)
@@ -196,7 +196,7 @@ 
         }
 
         if ($scale === 0) {
-            $scale = (int)(($topyear - $baseyear) / 20 * count($indifacts) / 4);
+            $scale = (int) (($topyear - $baseyear) / 20 * count($indifacts) / 4);
             if ($scale < 6) {
                 $scale = 6;
             }

app/Module/TopSurnamesModule.php

Indentation +1 added lines, -1 removed lines

@@ -72,7 +72,7 @@
 
         extract($cfg, EXTR_OVERWRITE);
 
-         // Use the count of base surnames.
+            // Use the count of base surnames.
         $top_surnames = Database::prepare(
             "SELECT n_surn FROM `##name`" .
             " WHERE n_file = :tree_id AND n_type != '_MARNM' AND n_surn NOT IN ('@N.N.', '')" .

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 /**
  * webtrees: online genealogy
  * Copyright (C) 2018 webtrees development team

app/Http/Controllers/Auth/ForgotPasswordController.php

Spacing +2 added lines, -2 removed lines

@@ -69,7 +69,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(),
@@ -104,7 +104,7 @@ 
         $max       = strlen($passchars) - 1;
 
         for ($i = 0; $i < 8; $i++) {
-            $index    = random_int(0, $max);
+            $index = random_int(0, $max);
             $password .= $passchars{$index};
         }