fisharebest / webtrees

app/Http/Controllers/AdminTreesController.php

Spacing +33 added lines, -33 removed lines

@@ -407,9 +407,9 @@ 
     public function exportClient(Request $request, Tree $tree): Response
     {
         // Validate user parameters
-        $convert          = (bool)$request->get('convert');
-        $zip              = (bool)$request->get('zip');
-        $media            = (bool)$request->get('media');
+        $convert          = (bool) $request->get('convert');
+        $zip              = (bool) $request->get('zip');
+        $media            = (bool) $request->get('media');
         $media_path       = $request->get('media-path');
         $privatize_export = $request->get('privatize_export');
 
@@ -539,8 +539,8 @@ 
     public function importAction(Request $request, Tree $tree): RedirectResponse
     {
         $source             = $request->get('source');
-        $keep_media         = (bool)$request->get('keep_media');
-        $WORD_WRAPPED_NOTES = (bool)$request->get('WORD_WRAPPED_NOTES');
+        $keep_media         = (bool) $request->get('keep_media');
+        $WORD_WRAPPED_NOTES = (bool) $request->get('WORD_WRAPPED_NOTES');
         $GEDCOM_MEDIA_PATH  = $request->get('GEDCOM_MEDIA_PATH');
 
         // Save these choices as defaults
@@ -603,7 +603,7 @@ 
      */
     public function index(Tree $tree): Response
     {
-        $multiple_tree_threshold = (int)Site::getPreference('MULTIPLE_TREE_THRESHOLD', self::MULTIPLE_TREE_THRESHOLD);
+        $multiple_tree_threshold = (int) Site::getPreference('MULTIPLE_TREE_THRESHOLD', self::MULTIPLE_TREE_THRESHOLD);
         $gedcom_files            = $this->gedcomFiles(WT_DATA_DIR);
 
         $all_trees = Tree::getAll();
@@ -1034,16 +1034,16 @@ 
     public function preferencesUpdate(Request $request, Tree $tree): RedirectResponse
     {
         // Coming soon
-        if ((bool)$request->get('all_trees')) {
+        if ((bool) $request->get('all_trees')) {
             FlashMessages::addMessage(I18N::translate('The preferences for all family trees have been updated.'), 'success');
         }
-        if ((bool)$request->get('new_trees')) {
+        if ((bool) $request->get('new_trees')) {
             FlashMessages::addMessage(I18N::translate('The preferences for new family trees have been updated.'), 'success');
         }
 
         $tree->setPreference('ADVANCED_NAME_FACTS', implode(',', $request->get('ADVANCED_NAME_FACTS', [])));
         $tree->setPreference('ADVANCED_PLAC_FACTS', implode(',', $request->get('ADVANCED_PLAC_FACTS', [])));
-        $tree->setPreference('ALLOW_THEME_DROPDOWN', (string)(bool)$request->get('ALLOW_THEME_DROPDOWN'));
+        $tree->setPreference('ALLOW_THEME_DROPDOWN', (string) (bool) $request->get('ALLOW_THEME_DROPDOWN'));
         // For backwards compatibility with webtrees 1.x we store the two calendar formats in one variable
         // e.g. "gregorian_and_jewish"
         $tree->setPreference('CALENDAR_FORMAT', implode('_and_', array_unique([
@@ -1052,57 +1052,57 @@ 
         ])));
         $tree->setPreference('CHART_BOX_TAGS', implode(',', $request->get('CHART_BOX_TAGS', [])));
         $tree->setPreference('CONTACT_USER_ID', $request->get('CONTACT_USER_ID'));
-        $tree->setPreference('DEFAULT_PEDIGREE_GENERATIONS', (string)(int)$request->get('DEFAULT_PEDIGREE_GENERATIONS'));
-        $tree->setPreference('EXPAND_NOTES', (string)(bool)$request->get('EXPAND_NOTES'));
-        $tree->setPreference('EXPAND_SOURCES', (string)(bool)$request->get('EXPAND_SOURCES'));
+        $tree->setPreference('DEFAULT_PEDIGREE_GENERATIONS', (string) (int) $request->get('DEFAULT_PEDIGREE_GENERATIONS'));
+        $tree->setPreference('EXPAND_NOTES', (string) (bool) $request->get('EXPAND_NOTES'));
+        $tree->setPreference('EXPAND_SOURCES', (string) (bool) $request->get('EXPAND_SOURCES'));
         $tree->setPreference('FAM_FACTS_ADD', implode(',', $request->get('FAM_FACTS_ADD', [])));
         $tree->setPreference('FAM_FACTS_QUICK', implode(',', $request->get('FAM_FACTS_QUICK', [])));
         $tree->setPreference('FAM_FACTS_UNIQUE', implode(',', $request->get('FAM_FACTS_UNIQUE', [])));
-        $tree->setPreference('FULL_SOURCES', (string)(bool)$request->get('FULL_SOURCES'));
+        $tree->setPreference('FULL_SOURCES', (string) (bool) $request->get('FULL_SOURCES'));
         $tree->setPreference('FORMAT_TEXT', $request->get('FORMAT_TEXT'));
-        $tree->setPreference('GENERATE_UIDS', (string)(bool)$request->get('GENERATE_UIDS'));
+        $tree->setPreference('GENERATE_UIDS', (string) (bool) $request->get('GENERATE_UIDS'));
         $tree->setPreference('GEONAMES_ACCOUNT', $request->get('GEONAMES_ACCOUNT'));
-        $tree->setPreference('HIDE_GEDCOM_ERRORS', (string)(bool)$request->get('HIDE_GEDCOM_ERRORS'));
+        $tree->setPreference('HIDE_GEDCOM_ERRORS', (string) (bool) $request->get('HIDE_GEDCOM_ERRORS'));
         $tree->setPreference('INDI_FACTS_ADD', implode(',', $request->get('INDI_FACTS_ADD', [])));
         $tree->setPreference('INDI_FACTS_QUICK', implode(',', $request->get('INDI_FACTS_QUICK', [])));
         $tree->setPreference('INDI_FACTS_UNIQUE', implode(',', $request->get('INDI_FACTS_UNIQUE', [])));
         $tree->setPreference('LANGUAGE', $request->get('LANGUAGE'));
-        $tree->setPreference('MAX_DESCENDANCY_GENERATIONS', (string)(int)$request->get('MAX_DESCENDANCY_GENERATIONS'));
-        $tree->setPreference('MAX_PEDIGREE_GENERATIONS', (string)(int)$request->get('MAX_PEDIGREE_GENERATIONS'));
+        $tree->setPreference('MAX_DESCENDANCY_GENERATIONS', (string) (int) $request->get('MAX_DESCENDANCY_GENERATIONS'));
+        $tree->setPreference('MAX_PEDIGREE_GENERATIONS', (string) (int) $request->get('MAX_PEDIGREE_GENERATIONS'));
         $tree->setPreference('MEDIA_UPLOAD', $request->get('MEDIA_UPLOAD'));
         $tree->setPreference('META_DESCRIPTION', $request->get('META_DESCRIPTION'));
         $tree->setPreference('META_TITLE', $request->get('META_TITLE'));
-        $tree->setPreference('NO_UPDATE_CHAN', (string)(bool)$request->get('NO_UPDATE_CHAN'));
-        $tree->setPreference('PEDIGREE_LAYOUT', (string)(bool)$request->get('PEDIGREE_LAYOUT'));
+        $tree->setPreference('NO_UPDATE_CHAN', (string) (bool) $request->get('NO_UPDATE_CHAN'));
+        $tree->setPreference('PEDIGREE_LAYOUT', (string) (bool) $request->get('PEDIGREE_LAYOUT'));
         $tree->setPreference('PEDIGREE_ROOT_ID', $request->get('PEDIGREE_ROOT_ID', WT_REGEX_XREF));
-        $tree->setPreference('PEDIGREE_SHOW_GENDER', (string)(bool)$request->get('PEDIGREE_SHOW_GENDER'));
+        $tree->setPreference('PEDIGREE_SHOW_GENDER', (string) (bool) $request->get('PEDIGREE_SHOW_GENDER'));
         $tree->setPreference('PREFER_LEVEL2_SOURCES', $request->get('PREFER_LEVEL2_SOURCES'));
         $tree->setPreference('QUICK_REQUIRED_FACTS', implode(',', $request->get('QUICK_REQUIRED_FACTS', [])));
         $tree->setPreference('QUICK_REQUIRED_FAMFACTS', implode(',', $request->get('QUICK_REQUIRED_FAMFACTS', [])));
         $tree->setPreference('REPO_FACTS_ADD', implode(',', $request->get('REPO_FACTS_ADD', [])));
         $tree->setPreference('REPO_FACTS_QUICK', implode(',', $request->get('REPO_FACTS_QUICK', [])));
         $tree->setPreference('REPO_FACTS_UNIQUE', implode(',', $request->get('REPO_FACTS_UNIQUE', [])));
-        $tree->setPreference('SHOW_COUNTER', (string)(bool)$request->get('SHOW_COUNTER'));
-        $tree->setPreference('SHOW_EST_LIST_DATES', (string)(bool)$request->get('SHOW_EST_LIST_DATES'));
-        $tree->setPreference('SHOW_FACT_ICONS', (string)(bool)$request->get('SHOW_FACT_ICONS'));
-        $tree->setPreference('SHOW_GEDCOM_RECORD', (string)(bool)$request->get('SHOW_GEDCOM_RECORD'));
-        $tree->setPreference('SHOW_HIGHLIGHT_IMAGES', (string)(bool)$request->get('SHOW_HIGHLIGHT_IMAGES'));
-        $tree->setPreference('SHOW_LAST_CHANGE', (string)(bool)$request->get('SHOW_LAST_CHANGE'));
-        $tree->setPreference('SHOW_LDS_AT_GLANCE', (string)(bool)$request->get('SHOW_LDS_AT_GLANCE'));
+        $tree->setPreference('SHOW_COUNTER', (string) (bool) $request->get('SHOW_COUNTER'));
+        $tree->setPreference('SHOW_EST_LIST_DATES', (string) (bool) $request->get('SHOW_EST_LIST_DATES'));
+        $tree->setPreference('SHOW_FACT_ICONS', (string) (bool) $request->get('SHOW_FACT_ICONS'));
+        $tree->setPreference('SHOW_GEDCOM_RECORD', (string) (bool) $request->get('SHOW_GEDCOM_RECORD'));
+        $tree->setPreference('SHOW_HIGHLIGHT_IMAGES', (string) (bool) $request->get('SHOW_HIGHLIGHT_IMAGES'));
+        $tree->setPreference('SHOW_LAST_CHANGE', (string) (bool) $request->get('SHOW_LAST_CHANGE'));
+        $tree->setPreference('SHOW_LDS_AT_GLANCE', (string) (bool) $request->get('SHOW_LDS_AT_GLANCE'));
         $tree->setPreference('SHOW_MEDIA_DOWNLOAD', $request->get('SHOW_MEDIA_DOWNLOAD'));
         $tree->setPreference('SHOW_NO_WATERMARK', $request->get('SHOW_NO_WATERMARK'));
-        $tree->setPreference('SHOW_PARENTS_AGE', (string)(bool)$request->get('SHOW_PARENTS_AGE'));
+        $tree->setPreference('SHOW_PARENTS_AGE', (string) (bool) $request->get('SHOW_PARENTS_AGE'));
         $tree->setPreference('SHOW_PEDIGREE_PLACES', $request->get('SHOW_PEDIGREE_PLACES'));
-        $tree->setPreference('SHOW_PEDIGREE_PLACES_SUFFIX', (string)(bool)$request->get('SHOW_PEDIGREE_PLACES_SUFFIX'));
+        $tree->setPreference('SHOW_PEDIGREE_PLACES_SUFFIX', (string) (bool) $request->get('SHOW_PEDIGREE_PLACES_SUFFIX'));
         $tree->setPreference('SHOW_RELATIVES_EVENTS', implode(',', $request->get('SHOW_RELATIVES_EVENTS', [])));
         $tree->setPreference('SOUR_FACTS_ADD', implode(',', $request->get('SOUR_FACTS_ADD', [])));
         $tree->setPreference('SOUR_FACTS_QUICK', implode(',', $request->get('SOUR_FACTS_QUICK', [])));
         $tree->setPreference('SOUR_FACTS_UNIQUE', implode(',', $request->get('SOUR_FACTS_UNIQUE', [])));
-        $tree->setPreference('SUBLIST_TRIGGER_I', (string)(int)$request->get('SUBLIST_TRIGGER_I', 200));
+        $tree->setPreference('SUBLIST_TRIGGER_I', (string) (int) $request->get('SUBLIST_TRIGGER_I', 200));
         $tree->setPreference('SURNAME_LIST_STYLE', $request->get('SURNAME_LIST_STYLE'));
         $tree->setPreference('SURNAME_TRADITION', $request->get('SURNAME_TRADITION'));
         $tree->setPreference('THEME_DIR', $request->get('THEME_DIR'));
-        $tree->setPreference('USE_SILHOUETTE', (string)(bool)$request->get('USE_SILHOUETTE'));
+        $tree->setPreference('USE_SILHOUETTE', (string) (bool) $request->get('USE_SILHOUETTE'));
         $tree->setPreference('WEBMASTER_USER_ID', $request->get('WEBMASTER_USER_ID'));
         $tree->setPreference('WEBTREES_EMAIL', $request->get('WEBTREES_EMAIL'));
         $tree->setPreference('title', $request->get('title'));
@@ -1607,7 +1607,7 @@ 
 
         foreach ($gedcom_files as $gedcom_file) {
             // Only import files that have changed
-            $filemtime = (string)filemtime(WT_DATA_DIR . $gedcom_file);
+            $filemtime = (string) filemtime(WT_DATA_DIR . $gedcom_file);
 
             $tree = Tree::findByName($gedcom_file) ?? Tree::create($gedcom_file, $gedcom_file);
 
@@ -1640,7 +1640,7 @@ 
      */
     public function unconnected(Request $request, Tree $tree, User $user): Response
     {
-        $associates = (bool)$request->get('associates');
+        $associates = (bool) $request->get('associates');
 
         if ($associates) {
             $sql = "SELECT l_from, l_to FROM `##link` WHERE l_file = :tree_id AND l_type IN ('FAMS', 'FAMC', 'ASSO', '_ASSO')";

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 !== '') {
             $title = /* 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)
     {
-        $generation = (int)log($sosa, 2) + 1;
+        $generation = (int) log($sosa, 2) + 1;
 
         return '<sup title="' . I18N::translate('Generation') . '">' . $generation . '</sup>';
     }

app/Http/Controllers/AdminController.php

Spacing +37 added lines, -37 removed lines

@@ -698,7 +698,7 @@ 
      */
     public function changesLogData(Request $request): Response
     {
-        list($select, , $where, $args1) = $this->changesQuery($request);
+        list($select,, $where, $args1) = $this->changesQuery($request);
         list($order_by, $limit, $args2) = $this->dataTablesPagination($request);
 
         $rows = Database::prepare(
@@ -706,8 +706,8 @@ 
         )->execute(array_merge($args1, $args2))->fetchAll();
 
         // Total filtered/unfiltered rows
-        $recordsFiltered = (int)Database::prepare("SELECT FOUND_ROWS()")->fetchOne();
-        $recordsTotal    = (int)Database::prepare("SELECT COUNT(*) FROM `##change`")->fetchOne();
+        $recordsFiltered = (int) Database::prepare("SELECT FOUND_ROWS()")->fetchOne();
+        $recordsTotal    = (int) Database::prepare("SELECT COUNT(*) FROM `##change`")->fetchOne();
 
         $data      = [];
         $algorithm = new MyersDiff;
@@ -757,7 +757,7 @@ 
 
         // See http://www.datatables.net/usage/server-side
         return new JsonResponse([
-            'draw'            => (int)$request->get('draw'),
+            'draw'            => (int) $request->get('draw'),
             'recordsTotal'    => $recordsTotal,
             'recordsFiltered' => $recordsFiltered,
             'data'            => $data,
@@ -773,7 +773,7 @@ 
      */
     public function changesLogDownload(Request $request): Response
     {
-        list($select, , $where, $args) = $this->changesQuery($request);
+        list($select,, $where, $args) = $this->changesQuery($request);
 
         $rows = Database::prepare($select . $where)->execute($args)->fetchAll();
 
@@ -917,8 +917,8 @@ 
             'RESN',
         ];
 
-        $start  = (int)$request->get('start', 0);
-        $length = (int)$request->get('length', 20);
+        $start  = (int) $request->get('start', 0);
+        $length = (int) $request->get('length', 20);
         $search = $request->get('search', []);
         $search = $search['value'] ?? '';
 
@@ -938,7 +938,7 @@ 
         $args  = [];
 
         if ($search !== '') {
-            $where           .= " AND (multimedia_file_refn LIKE CONCAT('%', :search1, '%') OR multimedia_file_refn LIKE CONCAT('%', :search2, '%'))";
+            $where .= " AND (multimedia_file_refn LIKE CONCAT('%', :search1, '%') OR multimedia_file_refn LIKE CONCAT('%', :search2, '%'))";
             $args['search1'] = $search;
             $args['search2'] = $search;
         }
@@ -957,8 +957,8 @@ 
         )->fetchAll();
 
         // Total filtered/unfiltered rows
-        $recordsFiltered = (int)Database::prepare("SELECT FOUND_ROWS()")->fetchOne();
-        $recordsTotal    = (int)Database::prepare($select2)->fetchOne();
+        $recordsFiltered = (int) Database::prepare("SELECT FOUND_ROWS()")->fetchOne();
+        $recordsTotal    = (int) Database::prepare($select2)->fetchOne();
 
         // Turn each row from the query into a row for the table
         $data = array_map(function (stdClass $datum) use ($ignore_facts) {
@@ -1000,7 +1000,7 @@ 
         }, $data);
 
         return new JsonResponse([
-            'draw'            => (int)$request->get('draw'),
+            'draw'            => (int) $request->get('draw'),
             'recordsTotal'    => $recordsTotal,
             'recordsFiltered' => $recordsFiltered,
             'data'            => $data,
@@ -1089,8 +1089,8 @@ 
      */
     public function webtrees1ThumbnailsData(Request $request): JsonResponse
     {
-        $start  = (int)$request->get('start', 0);
-        $length = (int)$request->get('length', 20);
+        $start  = (int) $request->get('start', 0);
+        $length = (int) $request->get('length', 20);
         $search = $request->get('search', []);
         $search = $search['value'] ?? '';
 
@@ -1121,7 +1121,7 @@ 
         $data = array_map(function (string $thumbnail) {
             $original = $this->findOriginalFileFromThumbnail($thumbnail);
 
-            $original_url  = route('unused-media-thumbnail', [
+            $original_url = route('unused-media-thumbnail', [
                 'folder' => dirname($original),
                 'file'   => basename($original),
                 'w'      => 100,
@@ -1163,7 +1163,7 @@ 
         }, $thumbnails);
 
         return new JsonResponse([
-            'draw'            => (int)$request->get('draw'),
+            'draw'            => (int) $request->get('draw'),
             'recordsTotal'    => $recordsTotal,
             'recordsFiltered' => $recordsFiltered,
             'data'            => $data,
@@ -1481,7 +1481,7 @@ 
      */
     public function treePrivacyUpdate(Request $request, Tree $tree): RedirectResponse
     {
-        foreach ((array)$request->get('delete') as $default_resn_id) {
+        foreach ((array) $request->get('delete') as $default_resn_id) {
             Database::prepare(
                 "DELETE FROM `##default_resn` WHERE default_resn_id = :default_resn_id"
             )->execute([
@@ -1489,13 +1489,13 @@ 
             ]);
         }
 
-        $xrefs     = (array)$request->get('xref');
-        $tag_types = (array)$request->get('tag_type');
-        $resns     = (array)$request->get('resn');
+        $xrefs     = (array) $request->get('xref');
+        $tag_types = (array) $request->get('tag_type');
+        $resns     = (array) $request->get('resn');
 
         foreach ($xrefs as $n => $xref) {
-            $tag_type = (string)$tag_types[$n];
-            $resn     = (string)$resns[$n];
+            $tag_type = (string) $tag_types[$n];
+            $resn     = (string) $resns[$n];
 
             if ($tag_type !== '' || $xref !== '') {
                 // Delete any existing data
@@ -1541,10 +1541,10 @@ 
         FlashMessages::addMessage(I18N::translate('The preferences for the family tree “%s” have been updated.', e($tree->getTitle()), 'success'));
 
         // Coming soon...
-        if ((bool)$request->get('all_trees')) {
+        if ((bool) $request->get('all_trees')) {
             FlashMessages::addMessage(I18N::translate('The preferences for all family trees have been updated.', e($tree->getTitle())), 'success');
         }
-        if ((bool)$request->get('new_trees')) {
+        if ((bool) $request->get('new_trees')) {
             FlashMessages::addMessage(I18N::translate('The preferences for new family trees have been updated.', e($tree->getTitle())), 'success');
         }
 
@@ -1567,7 +1567,7 @@ 
         foreach ($modules as $module) {
             foreach (Tree::getAll() as $tree) {
                 $key          = 'access-' . $module->getName() . '-' . $tree->getTreeId();
-                $access_level = (int)$request->get($key, $module->defaultAccessLevel());
+                $access_level = (int) $request->get($key, $module->defaultAccessLevel());
 
                 Database::prepare("REPLACE INTO `##module_privacy` (module_name, gedcom_id, component, access_level)" . " VALUES (:module_name, :tree_id, :component, :access_level)")->execute([
                     'module_name'  => $module->getName(),
@@ -1594,7 +1594,7 @@ 
         $module_status = Database::prepare("SELECT module_name, status FROM `##module`")->fetchAssoc();
 
         foreach ($modules as $module) {
-            $new_status = (bool)$request->get('status-' . $module->getName()) ? 'enabled' : 'disabled';
+            $new_status = (bool) $request->get('status-' . $module->getName()) ? 'enabled' : 'disabled';
             $old_status = $module_status[$module->getName()];
 
             if ($new_status !== $old_status) {
@@ -1657,36 +1657,36 @@ 
         $where = ' WHERE 1';
         $args  = [];
         if ($search !== '') {
-            $where            .= " AND (old_gedcom LIKE CONCAT('%', :search_1, '%') OR new_gedcom LIKE CONCAT('%', :search_2, '%'))";
+            $where .= " AND (old_gedcom LIKE CONCAT('%', :search_1, '%') OR new_gedcom LIKE CONCAT('%', :search_2, '%'))";
             $args['search_1'] = $search;
             $args['search_2'] = $search;
         }
         if ($from !== '') {
-            $where        .= " AND change_time >= :from";
+            $where .= " AND change_time >= :from";
             $args['from'] = $from;
         }
         if ($to !== '') {
-            $where      .= ' AND change_time < TIMESTAMPADD(DAY, 1 , :to)'; // before end of the day
+            $where .= ' AND change_time < TIMESTAMPADD(DAY, 1 , :to)'; // before end of the day
             $args['to'] = $to;
         }
         if ($type !== '') {
-            $where          .= ' AND status = :status';
+            $where .= ' AND status = :status';
             $args['status'] = $type;
         }
         if ($oldged !== '') {
-            $where           .= " AND old_gedcom LIKE CONCAT('%', :old_ged, '%')";
+            $where .= " AND old_gedcom LIKE CONCAT('%', :old_ged, '%')";
             $args['old_ged'] = $oldged;
         }
         if ($newged !== '') {
-            $where           .= " AND new_gedcom LIKE CONCAT('%', :new_ged, '%')";
+            $where .= " AND new_gedcom LIKE CONCAT('%', :new_ged, '%')";
             $args['new_ged'] = $newged;
         }
         if ($xref !== '') {
-            $where        .= " AND xref = :xref";
+            $where .= " AND xref = :xref";
             $args['xref'] = $xref;
         }
         if ($username !== '') {
-            $where        .= " AND user_name LIKE CONCAT('%', :user, '%')";
+            $where .= " AND user_name LIKE CONCAT('%', :user, '%')";
             $args['user'] = $username;
         }
         if ($ged !== '') {
@@ -1737,8 +1737,8 @@ 
      */
     private function dataTablesPagination(Request $request): array
     {
-        $start  = (int)$request->get('start', '0');
-        $length = (int)$request->get('length', '0');
+        $start  = (int) $request->get('start', '0');
+        $length = (int) $request->get('length', '0');
         $order  = $request->get('order', []);
         $args   = [];
 
@@ -1907,7 +1907,7 @@ 
         }
 
         // The maximum difference is 255 (black versus white).
-        return 100 - (int)($max_difference * 100 / 255);
+        return 100 - (int) ($max_difference * 100 / 255);
     }
 
     /**
@@ -1938,7 +1938,7 @@ 
             $pixels[$x] = [];
             for ($y = 0; $y < $size; ++$y) {
                 $pixel          = $image->pickColor($x, $y);
-                $pixels[$x][$y] = (int)(($pixel[0] + $pixel[1] + $pixel[2]) / 3);
+                $pixels[$x][$y] = (int) (($pixel[0] + $pixel[1] + $pixel[2]) / 3);
             }
         }
 

app/Http/Controllers/LifespansChartController.php

Spacing +8 added lines, -8 removed lines

@@ -52,9 +52,9 @@ 
     {
         $this->checkModuleIsActive($tree, 'lifespans_chart');
 
-        $xrefs     = (array)$request->get('xrefs', []);
+        $xrefs     = (array) $request->get('xrefs', []);
         $addxref   = $request->get('addxref', '');
-        $addfam    = (bool)$request->get('addfam', false);
+        $addfam    = (bool) $request->get('addfam', false);
         $placename = $request->get('placename', '');
         $start     = $request->get('start', '');
         $end       = $request->get('end', '');
@@ -111,7 +111,7 @@ 
     {
         $this->checkModuleIsActive($tree, 'lifespans_chart');
 
-        $xrefs = (array)$request->get('xrefs', []);
+        $xrefs = (array) $request->get('xrefs', []);
         $xrefs = array_unique($xrefs);
 
         /** @var Individual[] $individuals */
@@ -131,8 +131,8 @@ 
         $subtitle = $request->get('subtitle');
 
         // Round to whole decades
-        $start_year = (int)floor($this->minYear($individuals) / 10) * 10;
-        $end_year   = (int)ceil($this->maxYear($individuals) / 10) * 10;
+        $start_year = (int) floor($this->minYear($individuals) / 10) * 10;
+        $end_year   = (int) ceil($this->maxYear($individuals) / 10) * 10;
 
         $lifespans = $this->layoutIndividuals($individuals);
 
@@ -167,7 +167,7 @@ 
             'U' => new ColorGenerator(120, self::SATURATION, self::LIGHTNESS, self::ALPHA, self::RANGE),
         ];
 
-        $current_year = (int)date('Y');
+        $current_year = (int) date('Y');
 
         // Latest year used in each row
         $rows = [];
@@ -196,7 +196,7 @@ 
             // Fill the row up to the year (leaving a small gap)
             $rows[$next_row] = $death_year;
 
-            $lifespans[] = (object)[
+            $lifespans[] = (object) [
                 'background' => $colors[$individual->getSex()]->getNextColor(),
                 'birth_year' => $birth_year,
                 'death_year' => $death_year,
@@ -225,7 +225,7 @@ 
         $year = $this->jdToYear($jd);
 
         // Don't show future dates
-        return min($year, (int)date('Y'));
+        return min($year, (int) date('Y'));
 
     }
 

app/Module/PedigreeMapModule.php

Spacing +10 added lines, -10 removed lines

@@ -35,7 +35,7 @@ 
  */
 class PedigreeMapModule extends AbstractModule implements ModuleChartInterface
 {
-    const LINE_COLORS  = [
+    const LINE_COLORS = [
         '#FF0000',
         // Red
         '#00FF00',
@@ -140,7 +140,7 @@ 
                     $color            = self::LINE_COLORS[log($id, 2) % $color_count];
                     $icon['color']    = $color; //make icon color the same as the line
                     $sosa_points[$id] = $event->getLatLonJSArray();
-                    $sosa_parent      = (int)floor($id / 2);
+                    $sosa_parent      = (int) floor($id / 2);
                     if (array_key_exists($sosa_parent, $sosa_points)) {
                         // Would like to use a GeometryCollection to hold LineStrings
                         // rather than generate polylines but the MarkerCluster library
@@ -168,7 +168,7 @@ 
                             'icon'     => $icon,
                             'tooltip'  => $event->toolTip(),
                             'summary'  => view('modules/pedigree-map/event-sidebar', $event->shortSummary('pedigree', $id)),
-                            'zoom'     => (int)$event->getZoom(),
+                            'zoom'     => (int) $event->getZoom(),
                         ],
                     ];
                 }
@@ -188,7 +188,7 @@ 
     {
         $xref        = $request->get('reference');
         $individual  = Individual::getInstance($xref, $tree);
-        $generations = (int)$request->get(
+        $generations = (int) $request->get(
             'generations',
             $tree->getPreference('DEFAULT_PEDIGREE_GENERATIONS')
         );
@@ -241,14 +241,14 @@ 
                         function ($item) {
                             return preg_replace('/[^a-z\d]/i', '', strtolower($item));
                         },
-                        (array)$provider->styles
+                        (array) $provider->styles
                     );
 
-                    $key = preg_replace('/[^a-z\d]/i', '', strtolower((string)$provider->name));
+                    $key = preg_replace('/[^a-z\d]/i', '', strtolower((string) $provider->name));
 
                     self::$map_providers[$key] = [
-                        'name'   => (string)$provider->name,
-                        'styles' => array_combine($style_keys, (array)$provider->styles),
+                        'name'   => (string) $provider->name,
+                        'styles' => array_combine($style_keys, (array) $provider->styles),
                     ];
                 }
             } catch (Exception $ex) {
@@ -257,7 +257,7 @@ 
                     'provider' => 'openstreetmap',
                     'style'    => 'mapnik',
                 ];
-                self::$map_providers  = [
+                self::$map_providers = [
                     'openstreetmap' => [
                         'name'   => 'OpenStreetMap',
                         'styles' => ['mapnik' => 'Mapnik'],
@@ -318,7 +318,7 @@ 
             throw new IndividualAccessDeniedException;
         }
         
-        return (object)[
+        return (object) [
             'name' => 'modules/pedigree-map/pedigree-map-page',
             'data' => [
                 'module'         => $this->getName(),

app/Module/UserMessagesModule.php

Spacing +4 added lines, -4 removed lines

@@ -55,7 +55,7 @@ 
      */
     public function postDeleteMessageAction(Request $request, Tree $tree): Response
     {
-        $message_ids = (array)$request->get('message_id', []);
+        $message_ids = (array) $request->get('message_id', []);
 
         $stmt = Database::prepare("DELETE FROM `##message` WHERE user_id = :user_id AND message_id = :message_id");
 
@@ -100,7 +100,7 @@ 
 
         $content = '';
         if (!empty($users)) {
-            $url     = route('user-page', ['ged' => $tree->getName()]);
+            $url = route('user-page', ['ged' => $tree->getName()]);
             $content .= '<form onsubmit="return $(&quot;#to&quot;).val() !== &quot;&quot;">';
             $content .= '<input type="hidden" name="route" value="message">';
             $content .= '<input type="hidden" name="ged" value="' . e($tree->getName()) . '">';
@@ -136,7 +136,7 @@ 
                 $content .= '<td class="list_value_wrap"><a href="#" onclick="return expand_layer(\'message' . $message->message_id . '\');"><i id="message' . $message->message_id . '_img" class="icon-plus"></i> <b dir="auto">' . e($message->subject) . '</b></a></td>';
                 $content .= '<td class="list_value_wrap">' . FunctionsDate::formatTimestamp($message->created + WT_TIMESTAMP_OFFSET) . '</td>';
                 $content .= '<td class="list_value_wrap">';
-                $user    = User::findByIdentifier($message->sender);
+                $user = User::findByIdentifier($message->sender);
                 if ($user) {
                     $content .= '<span dir="auto">' . e($user->getRealName()) . '</span> - <span dir="auto">' . $user->getEmail() . '</span>';
                 } else {
@@ -158,7 +158,7 @@ 
                         'subject' => $message->subject,
                         'ged'     => $tree->getName(),
                     ]);
-                    $content   .= '<a class="btn btn-primary" href="' . e($reply_url) . '" title="' . I18N::translate('Reply') . '">' . I18N::translate('Reply') . '</a> ';
+                    $content .= '<a class="btn btn-primary" href="' . e($reply_url) . '" title="' . I18N::translate('Reply') . '">' . I18N::translate('Reply') . '</a> ';
                 }
                 $content .= '<button type="button" class="btn btn-danger" data-confirm="' . I18N::translate('Are you sure you want to delete this message? It cannot be retrieved later.') . '" onclick="if (confirm(this.dataset.confirm)) {$(\'#messageform :checkbox\').prop(\'checked\', false); $(\'#cb_message' . $message->message_id . '\').prop(\'checked\', true); document.messageform.submit();}">' . I18N::translate('Delete') . '</button></div></td></tr>';
             }

app/Module/UserFavoritesModule.php

Spacing +1 added lines, -1 removed lines

@@ -191,7 +191,7 @@
      */
     public function postDeleteFavoriteAction(Request $request, Tree $tree, User $user): RedirectResponse
     {
-        $favorite_id = (int)$request->get('favorite_id');
+        $favorite_id = (int) $request->get('favorite_id');
 
         if (Auth::check()) {
             Database::prepare(

app/Module/FrequentlyAskedQuestionsModule.php

Spacing +6 added lines, -6 removed lines

@@ -156,7 +156,7 @@ 
      */
     public function postAdminDeleteAction(Request $request, Tree $tree): RedirectResponse
     {
-        $block_id = (int)$request->get('block_id');
+        $block_id = (int) $request->get('block_id');
 
         Database::prepare(
             "DELETE FROM `##block_setting` WHERE block_id = :block_id"
@@ -184,7 +184,7 @@ 
      */
     public function postAdminMoveDownAction(Request $request, Tree $tree): RedirectResponse
     {
-        $block_id = (int)$request->get('block_id');
+        $block_id = (int) $request->get('block_id');
 
         $block_order = Database::prepare(
             "SELECT block_order FROM `##block` WHERE block_id = :block_id"
@@ -237,7 +237,7 @@ 
      */
     public function postAdminMoveUpAction(Request $request, Tree $tree): RedirectResponse
     {
-        $block_id = (int)$request->get('block_id');
+        $block_id = (int) $request->get('block_id');
 
         $block_order = Database::prepare(
             "SELECT block_order FROM `##block` WHERE block_id = :block_id"
@@ -292,7 +292,7 @@ 
     {
         $this->layout = 'layouts/administration';
 
-        $block_id = (int)$request->get('block_id');
+        $block_id = (int) $request->get('block_id');
 
         if ($block_id === 0) {
             // Creating a new faq
@@ -303,7 +303,7 @@ 
             )->execute([
                 'module_name' => $this->getName(),
             ])->fetchOne();
-            $languages   = [];
+            $languages = [];
 
             $title = I18N::translate('Add an FAQ');
         } else {
@@ -340,7 +340,7 @@ 
      */
     public function postAdminEditAction(Request $request, Tree $tree): RedirectResponse
     {
-        $block_id  = (int)$request->get('block_id');
+        $block_id  = (int) $request->get('block_id');
         $faqbody   = $request->get('faqbody', '');
         $header    = $request->get('header', '');
         $languages = $request->get('languages', []);

app/Module/FamilyTreeFavoritesModule.php

Spacing +1 added lines, -1 removed lines

@@ -190,7 +190,7 @@
      */
     public function postDeleteFavoriteAction(Request $request, Tree $tree, User $user): RedirectResponse
     {
-        $favorite_id = (int)$request->get('favorite_id');
+        $favorite_id = (int) $request->get('favorite_id');
 
         if (Auth::isManager($tree, $user)) {
             Database::prepare(