fisharebest / webtrees

app/Http/Controllers/AdminController.php

Spacing +38 added lines, -38 removed lines

@@ -165,7 +165,7 @@ 
             $user_list[$tmp_user->getUserName()] = $tmp_user->getUserName();
         }
 
-        $action   = $request->get('action');
+        $action = $request->get('action');
 
         // @TODO This ought to be a POST action
         if ($action === 'delete') {
@@ -231,7 +231,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(
@@ -239,8 +239,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();
@@ -291,7 +291,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,
@@ -307,7 +307,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();
 
@@ -449,8 +449,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'] ?? '';
 
@@ -470,7 +470,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;
         }
@@ -489,8 +489,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) {
@@ -532,7 +532,7 @@ 
         }, $data);
 
         return new JsonResponse([
-            'draw'            => (int)$request->get('draw'),
+            'draw'            => (int) $request->get('draw'),
             'recordsTotal'    => $recordsTotal,
             'recordsFiltered' => $recordsFiltered,
             'data'            => $data,
@@ -621,8 +621,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'] ?? '';
 
@@ -653,7 +653,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,
@@ -695,7 +695,7 @@ 
         }, $thumbnails);
 
         return new JsonResponse([
-            'draw'            => (int)$request->get('draw'),
+            'draw'            => (int) $request->get('draw'),
             'recordsTotal'    => $recordsTotal,
             'recordsFiltered' => $recordsFiltered,
             'data'            => $data,
@@ -1021,7 +1021,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([
@@ -1029,13 +1029,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
@@ -1081,10 +1081,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');
         }
 
@@ -1107,7 +1107,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(),
@@ -1134,7 +1134,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) {
@@ -1197,36 +1197,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 !== '') {
@@ -1277,8 +1277,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   = [];
 
@@ -1429,7 +1429,7 @@ 
         }
 
         // The maximum difference is 255 (black versus white).
-        return 100 - (int)($max_difference * 100 / 255);
+        return 100 - (int) ($max_difference * 100 / 255);
     }
 
     /**
@@ -1460,7 +1460,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/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/Http/Controllers/SearchController.php

Spacing +46 added lines, -46 removed lines

@@ -163,11 +163,11 @@ 
         $query = $request->get('query', '');
 
         // What type of records to search?
-        $search_individuals  = (bool)$request->get('search_individuals');
-        $search_families     = (bool)$request->get('search_families');
-        $search_repositories = (bool)$request->get('search_repositories');
-        $search_sources      = (bool)$request->get('search_sources');
-        $search_notes        = (bool)$request->get('search_notes');
+        $search_individuals  = (bool) $request->get('search_individuals');
+        $search_families     = (bool) $request->get('search_families');
+        $search_repositories = (bool) $request->get('search_repositories');
+        $search_sources      = (bool) $request->get('search_sources');
+        $search_notes        = (bool) $request->get('search_notes');
 
         // Default to individuals only
         if (!$search_individuals && !$search_families && !$search_repositories && !$search_sources && !$search_notes) {
@@ -184,7 +184,7 @@ 
             $all_trees = [$tree];
         }
 
-        $search_tree_names = (array)$request->get('search_trees', []);
+        $search_tree_names = (array) $request->get('search_trees', []);
 
         $search_trees = array_filter($all_trees, function (Tree $tree) use ($search_tree_names): bool {
             return in_array($tree->getName(), $search_tree_names);
@@ -290,7 +290,7 @@ 
             $all_trees = [$tree];
         }
 
-        $search_tree_names = (array)$request->get('search_trees', []);
+        $search_tree_names = (array) $request->get('search_trees', []);
 
         $search_trees = array_filter($all_trees, function (Tree $tree) use ($search_tree_names): bool {
             return in_array($tree->getName(), $search_tree_names);
@@ -640,7 +640,7 @@ 
 
         foreach ($search_terms as $n => $q) {
             $queryregex[]          = preg_quote(I18N::strtoupper($q), '/');
-            $sql                   .= " AND f_gedcom COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
+            $sql .= " AND f_gedcom COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
             $args['collate_' . $n] = I18N::collation();
             $args['query_' . $n]   = Database::escapeLike($q);
         }
@@ -688,7 +688,7 @@ 
      */
     private function searchFamilyNames(array $search_terms, array $search_trees): array
     {
-        $sql  =
+        $sql =
             "SELECT DISTINCT f_id AS xref, f_file AS gedcom_id, f_gedcom AS gedcom" .
             " FROM `##families`" .
             " LEFT JOIN `##name` husb ON f_husb = husb.n_id AND f_file = husb.n_file" .
@@ -697,7 +697,7 @@ 
         $args = [];
 
         foreach ($search_terms as $n => $q) {
-            $sql                        .= " AND (husb.n_full COLLATE :husb_collate_" . $n . " LIKE CONCAT('%', :husb_query_" . $n . ", '%') OR wife.n_full COLLATE :wife_collate_" . $n . " LIKE CONCAT('%', :wife_query_" . $n . ", '%'))";
+            $sql .= " AND (husb.n_full COLLATE :husb_collate_" . $n . " LIKE CONCAT('%', :husb_query_" . $n . ", '%') OR wife.n_full COLLATE :wife_collate_" . $n . " LIKE CONCAT('%', :wife_query_" . $n . ", '%'))";
             $args['husb_collate_' . $n] = I18N::collation();
             $args['husb_query_' . $n]   = Database::escapeLike($q);
             $args['wife_collate_' . $n] = I18N::collation();
@@ -749,7 +749,7 @@ 
 
         foreach ($search_terms as $n => $q) {
             $queryregex[]          = preg_quote(I18N::strtoupper($q), '/');
-            $sql                   .= " AND i_gedcom COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
+            $sql .= " AND i_gedcom COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
             $args['collate_' . $n] = I18N::collation();
             $args['query_' . $n]   = Database::escapeLike($q);
         }
@@ -896,7 +896,7 @@ 
         }
 
         // Add the where clause
-        $sql    .= " WHERE ind.i_file=?";
+        $sql .= " WHERE ind.i_file=?";
         $bind[] = $tree->getTreeId();
 
         foreach ($fields as $field_name => $field_value) {
@@ -907,15 +907,15 @@ 
                     case 'GIVN':
                         switch ($modifiers[$field_name]) {
                             case 'EXACT':
-                                $sql    .= " AND i_n.n_givn=?";
+                                $sql .= " AND i_n.n_givn=?";
                                 $bind[] = $field_value;
                                 break;
                             case 'BEGINS':
-                                $sql    .= " AND i_n.n_givn LIKE CONCAT(?, '%')";
+                                $sql .= " AND i_n.n_givn LIKE CONCAT(?, '%')";
                                 $bind[] = $field_value;
                                 break;
                             case 'CONTAINS':
-                                $sql    .= " AND i_n.n_givn LIKE CONCAT('%', ?, '%')";
+                                $sql .= " AND i_n.n_givn LIKE CONCAT('%', ?, '%')";
                                 $bind[] = $field_value;
                                 break;
                             case 'SDX_STD':
@@ -929,7 +929,7 @@ 
                                     $sql .= ' AND (' . implode(' OR ', $sdx) . ')';
                                 } else {
                                     // No phonetic content? Use a substring match
-                                    $sql    .= " AND i_n.n_givn LIKE CONCAT('%', ?, '%')";
+                                    $sql .= " AND i_n.n_givn LIKE CONCAT('%', ?, '%')";
                                     $bind[] = $field_value;
                                 }
                                 break;
@@ -945,7 +945,7 @@ 
                                     $sql .= ' AND (' . implode(' OR ', $sdx) . ')';
                                 } else {
                                     // No phonetic content? Use a substring match
-                                    $sql    .= " AND i_n.n_givn LIKE CONCAT('%', ?, '%')";
+                                    $sql .= " AND i_n.n_givn LIKE CONCAT('%', ?, '%')";
                                     $bind[] = $field_value;
                                 }
                                 break;
@@ -954,15 +954,15 @@ 
                     case 'SURN':
                         switch ($modifiers[$field_name]) {
                             case 'EXACT':
-                                $sql    .= " AND i_n.n_surname=?";
+                                $sql .= " AND i_n.n_surname=?";
                                 $bind[] = $field_value;
                                 break;
                             case 'BEGINS':
-                                $sql    .= " AND i_n.n_surname LIKE CONCAT(?, '%')";
+                                $sql .= " AND i_n.n_surname LIKE CONCAT(?, '%')";
                                 $bind[] = $field_value;
                                 break;
                             case 'CONTAINS':
-                                $sql    .= " AND i_n.n_surname LIKE CONCAT('%', ?, '%')";
+                                $sql .= " AND i_n.n_surname LIKE CONCAT('%', ?, '%')";
                                 $bind[] = $field_value;
                                 break;
                             case 'SDX_STD':
@@ -976,7 +976,7 @@ 
                                     $sql .= " AND (" . implode(' OR ', $sdx) . ")";
                                 } else {
                                     // No phonetic content? Use a substring match
-                                    $sql    .= " AND i_n.n_surn LIKE CONCAT('%', ?, '%')";
+                                    $sql .= " AND i_n.n_surn LIKE CONCAT('%', ?, '%')";
                                     $bind[] = $field_value;
                                 }
                                 break;
@@ -993,7 +993,7 @@ 
                                     break;
                                 } else {
                                     // No phonetic content? Use a substring match
-                                    $sql    .= " AND i_n.n_surn LIKE CONCAT('%', ?, '%')";
+                                    $sql .= " AND i_n.n_surn LIKE CONCAT('%', ?, '%')";
                                     $bind[] = $field_value;
                                 }
                         }
@@ -1002,7 +1002,7 @@ 
                     case '_MARNM':
                     case '_HEB':
                     case '_AKA':
-                        $sql    .= " AND i_n.n_type=? AND i_n.n_full LIKE CONCAT('%', ?, '%')";
+                        $sql .= " AND i_n.n_type=? AND i_n.n_full LIKE CONCAT('%', ?, '%')";
                         $bind[] = $parts[1];
                         $bind[] = $field_value;
                         break;
@@ -1012,7 +1012,7 @@ 
                 $date = new Date($field_value);
                 if ($date->isOK()) {
                     $delta  = 365 * ($modifiers[$field_name] ?? 0);
-                    $sql    .= " AND i_d.d_fact=? AND i_d.d_julianday1>=? AND i_d.d_julianday2<=?";
+                    $sql .= " AND i_d.d_fact=? AND i_d.d_julianday1>=? AND i_d.d_julianday2<=?";
                     $bind[] = $parts[0];
                     $bind[] = $date->minimumJulianDay() - $delta;
                     $bind[] = $date->maximumJulianDay() + $delta;
@@ -1022,7 +1022,7 @@ 
                 $date = new Date($field_value);
                 if ($date->isOK()) {
                     $delta  = 365 * $modifiers[$field_name];
-                    $sql    .= " AND f_d.d_fact=? AND f_d.d_julianday1>=? AND f_d.d_julianday2<=?";
+                    $sql .= " AND f_d.d_fact=? AND f_d.d_julianday1>=? AND f_d.d_julianday2<=?";
                     $bind[] = $parts[1];
                     $bind[] = $date->minimumJulianDay() - $delta;
                     $bind[] = $date->maximumJulianDay() + $delta;
@@ -1030,12 +1030,12 @@ 
             } elseif ($parts[1] === 'PLAC') {
                 // *:PLAC
                 // SQL can only link a place to a person/family, not to an event.
-                $sql    .= " AND i_p.place LIKE CONCAT('%', ?, '%')";
+                $sql .= " AND i_p.place LIKE CONCAT('%', ?, '%')";
                 $bind[] = $field_value;
             } elseif ($parts[0] === 'FAMS' && $parts[2] === 'PLAC') {
                 // FAMS:*:PLAC
                 // SQL can only link a place to a person/family, not to an event.
-                $sql    .= " AND f_p.place LIKE CONCAT('%', ?, '%')";
+                $sql .= " AND f_p.place LIKE CONCAT('%', ?, '%')";
                 $bind[] = $field_value;
             } elseif ($parts[0] === 'FAMC' && $parts[2] === 'NAME') {
                 $table = $parts[1] === 'HUSB' ? 'f_n' : 'm_n';
@@ -1044,15 +1044,15 @@ 
                     case 'GIVN':
                         switch ($modifiers[$field_name]) {
                             case 'EXACT':
-                                $sql    .= " AND {$table}.n_givn=?";
+                                $sql .= " AND {$table}.n_givn=?";
                                 $bind[] = $field_value;
                                 break;
                             case 'BEGINS':
-                                $sql    .= " AND {$table}.n_givn LIKE CONCAT(?, '%')";
+                                $sql .= " AND {$table}.n_givn LIKE CONCAT(?, '%')";
                                 $bind[] = $field_value;
                                 break;
                             case 'CONTAINS':
-                                $sql    .= " AND {$table}.n_givn LIKE CONCAT('%', ?, '%')";
+                                $sql .= " AND {$table}.n_givn LIKE CONCAT('%', ?, '%')";
                                 $bind[] = $field_value;
                                 break;
                             case 'SDX_STD':
@@ -1066,7 +1066,7 @@ 
                                     $sql .= ' AND (' . implode(' OR ', $sdx) . ')';
                                 } else {
                                     // No phonetic content? Use a substring match
-                                    $sql    .= " AND {$table}.n_givn LIKE CONCAT('%', ?, '%')";
+                                    $sql .= " AND {$table}.n_givn LIKE CONCAT('%', ?, '%')";
                                     $bind[] = $field_value;
                                 }
                                 break;
@@ -1083,7 +1083,7 @@ 
                                     break;
                                 } else {
                                     // No phonetic content? Use a substring match
-                                    $sql    .= " AND {$table}.n_givn LIKE CONCAT('%', ?, '%')";
+                                    $sql .= " AND {$table}.n_givn LIKE CONCAT('%', ?, '%')";
                                     $bind[] = $field_value;
                                 }
                         }
@@ -1091,15 +1091,15 @@ 
                     case 'SURN':
                         switch ($modifiers[$field_name]) {
                             case 'EXACT':
-                                $sql    .= " AND {$table}.n_surname=?";
+                                $sql .= " AND {$table}.n_surname=?";
                                 $bind[] = $field_value;
                                 break;
                             case 'BEGINS':
-                                $sql    .= " AND {$table}.n_surname LIKE CONCAT(?, '%')";
+                                $sql .= " AND {$table}.n_surname LIKE CONCAT(?, '%')";
                                 $bind[] = $field_value;
                                 break;
                             case 'CONTAINS':
-                                $sql    .= " AND {$table}.n_surname LIKE CONCAT('%', ?, '%')";
+                                $sql .= " AND {$table}.n_surname LIKE CONCAT('%', ?, '%')";
                                 $bind[] = $field_value;
                                 break;
                             case 'SDX_STD':
@@ -1113,7 +1113,7 @@ 
                                     $sql .= ' AND (' . implode(' OR ', $sdx) . ')';
                                 } else {
                                     // No phonetic content? Use a substring match
-                                    $sql    .= " AND {$table}.n_surn LIKE CONCAT('%', ?, '%')";
+                                    $sql .= " AND {$table}.n_surn LIKE CONCAT('%', ?, '%')";
                                     $bind[] = $field_value;
                                 }
                                 break;
@@ -1129,7 +1129,7 @@ 
                                     $sql .= ' AND (' . implode(' OR ', $sdx) . ')';
                                 } else {
                                     // No phonetic content? Use a substring match
-                                    $sql    .= " AND {$table}.n_surn LIKE CONCAT('%', ?, '%')";
+                                    $sql .= " AND {$table}.n_surn LIKE CONCAT('%', ?, '%')";
                                     $bind[] = $field_value;
                                 }
                                 break;
@@ -1138,17 +1138,17 @@ 
                 }
             } elseif ($parts[0] === 'FAMS') {
                 // e.g. searches for occupation, religion, note, etc.
-                $sql    .= " AND fam.f_gedcom REGEXP CONCAT('\n[0-9] ', ?, '(.*\n[0-9] CONT)* [^\n]*', ?)";
+                $sql .= " AND fam.f_gedcom REGEXP CONCAT('\n[0-9] ', ?, '(.*\n[0-9] CONT)* [^\n]*', ?)";
                 $bind[] = $parts[1];
                 $bind[] = $field_value;
             } elseif ($parts[1] === 'TYPE') {
                 // e.g. FACT:TYPE or EVEN:TYPE
-                $sql    .= " AND ind.i_gedcom REGEXP CONCAT('\n1 ', ?, '.*(\n[2-9] .*)*\n2 TYPE .*', ?)";
+                $sql .= " AND ind.i_gedcom REGEXP CONCAT('\n1 ', ?, '.*(\n[2-9] .*)*\n2 TYPE .*', ?)";
                 $bind[] = $parts[0];
                 $bind[] = $field_value;
             } else {
                 // e.g. searches for occupation, religion, note, etc.
-                $sql    .= " AND ind.i_gedcom REGEXP CONCAT('\n[0-9] ', ?, '(.*\n[0-9] CONT)* [^\n]*', ?)";
+                $sql .= " AND ind.i_gedcom REGEXP CONCAT('\n[0-9] ', ?, '(.*\n[0-9] CONT)* [^\n]*', ?)";
                 $bind[] = $parts[0];
                 $bind[] = $field_value;
             }
@@ -1227,7 +1227,7 @@ 
         $sql .= ")";
 
         if ($givn_sdx !== '') {
-            $sql      .= " AND (";
+            $sql .= " AND (";
             $givn_sdx = explode(':', $givn_sdx);
             foreach ($givn_sdx as $n => $sdx) {
                 $sql .= $n > 0 ? " OR " : "";
@@ -1245,7 +1245,7 @@ 
         }
 
         if ($surn_sdx !== '') {
-            $sql      .= " AND (";
+            $sql .= " AND (";
             $surn_sdx = explode(':', $surn_sdx);
             foreach ($surn_sdx as $n => $sdx) {
                 $sql .= $n ? " OR " : "";
@@ -1263,7 +1263,7 @@ 
         }
 
         if ($plac_sdx !== '') {
-            $sql      .= " AND (";
+            $sql .= " AND (";
             $plac_sdx = explode(':', $plac_sdx);
             foreach ($plac_sdx as $n => $sdx) {
                 $sql .= $n ? " OR " : "";
@@ -1310,7 +1310,7 @@ 
 
         foreach ($search_terms as $n => $q) {
             $queryregex[]          = preg_quote(I18N::strtoupper($q), '/');
-            $sql                   .= " AND o_gedcom COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
+            $sql .= " AND o_gedcom COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
             $args['collate_' . $n] = I18N::collation();
             $args['query_' . $n]   = Database::escapeLike($q);
         }
@@ -1366,7 +1366,7 @@ 
 
         foreach ($search_terms as $n => $q) {
             $queryregex[]          = preg_quote(I18N::strtoupper($q), '/');
-            $sql                   .= " AND o_gedcom COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
+            $sql .= " AND o_gedcom COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
             $args['collate_' . $n] = I18N::collation();
             $args['query_' . $n]   = Database::escapeLike($q);
         }
@@ -1422,7 +1422,7 @@ 
 
         foreach ($search_terms as $n => $q) {
             $queryregex[]          = preg_quote(I18N::strtoupper($q), '/');
-            $sql                   .= " AND s_gedcom COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
+            $sql .= " AND s_gedcom COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
             $args['collate_' . $n] = I18N::collation();
             $args['query_' . $n]   = Database::escapeLike($q);
         }

app/Http/Controllers/ReportEngineController.php

Spacing +4 added lines, -4 removed lines

@@ -115,7 +115,7 @@ 
                     $input['control'] = FunctionsEdit::formControlSource($tree, $source, $attributes + ['required' => 'true']);
                     break;
                 case 'DATE':
-                    $attributes       += [
+                    $attributes += [
                         'type'  => 'text',
                         'value' => $input['default'],
                     ];
@@ -129,16 +129,16 @@ 
                 default:
                     switch ($input['type']) {
                         case 'text':
-                            $attributes       += [
+                            $attributes += [
                                 'type'  => 'text',
                                 'value' => $input['default'],
                             ];
                             $input['control'] = '<input ' . Html::attributes($attributes) . '>';
                             break;
                         case 'checkbox':
-                            $attributes       += [
+                            $attributes += [
                                 'type'    => 'checkbox',
-                                'checked' => (bool)$input['default'],
+                                'checked' => (bool) $input['default'],
                             ];
                             $input['control'] = '<input ' . Html::attributes($attributes) . '>';
                             break;

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

Spacing +21 added lines, -21 removed lines

@@ -47,7 +47,7 @@ 
      */
     public function treePageBlockEdit(Request $request, Tree $tree, User $user): Response
     {
-        $block_id = (int)$request->get('block_id');
+        $block_id = (int) $request->get('block_id');
         $block    = $this->treeBlock($request, $user);
         $title    = $block->getTitle() . ' — ' . I18N::translate('Preferences');
 
@@ -89,7 +89,7 @@ 
      */
     private function treeBlock(Request $request, User $user): ModuleBlockInterface
     {
-        $block_id = (int)$request->get('block_id');
+        $block_id = (int) $request->get('block_id');
 
         $block_info = Database::prepare(
             "SELECT module_Name, user_id FROM `##block` WHERE block_id = :block_id"
@@ -125,7 +125,7 @@ 
      */
     public function userPageBlockEdit(Request $request, Tree $tree, User $user): Response
     {
-        $block_id = (int)$request->get('block_id');
+        $block_id = (int) $request->get('block_id');
         $block    = $this->userBlock($request, $user);
         $title    = $block->getTitle() . ' — ' . I18N::translate('Preferences');
 
@@ -167,7 +167,7 @@ 
      */
     private function userBlock(Request $request, User $user): ModuleBlockInterface
     {
-        $block_id = (int)$request->get('block_id');
+        $block_id = (int) $request->get('block_id');
 
         $block_info = Database::prepare(
             "SELECT module_Name, user_id FROM `##block` WHERE block_id = :block_id"
@@ -185,7 +185,7 @@ 
             throw new NotFoundHttpException($block_info->module_name . ' is not a block');
         }
 
-        $block_owner_id = (int)$block_info->user_id;
+        $block_owner_id = (int) $block_info->user_id;
 
         if ($block_owner_id !== $user->getUserId() && !Auth::isAdmin()) {
             throw new AccessDeniedHttpException('You are not allowed to edit this block');
@@ -231,7 +231,7 @@ 
      */
     public function treePageBlock(Request $request, Tree $tree): Response
     {
-        $block_id = (int)$request->get('block_id');
+        $block_id = (int) $request->get('block_id');
 
         $block = Database::prepare(
             "SELECT * FROM `##block` WHERE block_id = :block_id AND gedcom_id = :tree_id AND user_id IS NULL"
@@ -297,8 +297,8 @@ 
      */
     public function treePageDefaultUpdate(Request $request): RedirectResponse
     {
-        $main_blocks = (array)$request->get('main');
-        $side_blocks = (array)$request->get('side');
+        $main_blocks = (array) $request->get('main');
+        $side_blocks = (array) $request->get('side');
 
         $this->updateTreeBlocks(-1, $main_blocks, $side_blocks);
 
@@ -342,14 +342,14 @@ 
      */
     public function treePageUpdate(Request $request, Tree $tree): RedirectResponse
     {
-        $defaults = (bool)$request->get('defaults');
+        $defaults = (bool) $request->get('defaults');
 
         if ($defaults) {
             $main_blocks = $this->getBlocksForTreePage(-1, AUth::PRIV_NONE, 'main');
             $side_blocks = $this->getBlocksForTreePage(-1, Auth::PRIV_NONE, 'side');
         } else {
-            $main_blocks = (array)$request->get('main');
-            $side_blocks = (array)$request->get('side');
+            $main_blocks = (array) $request->get('main');
+            $side_blocks = (array) $request->get('side');
         }
 
         $this->updateTreeBlocks($tree->getTreeId(), $main_blocks, $side_blocks);
@@ -396,7 +396,7 @@ 
      */
     public function userPageBlock(Request $request, Tree $tree, User $user): Response
     {
-        $block_id = (int)$request->get('block_id');
+        $block_id = (int) $request->get('block_id');
 
         $block = Database::prepare(
             "SELECT * FROM `##block` WHERE block_id = :block_id AND gedcom_id IS NULL AND user_id = :user_id"
@@ -461,8 +461,8 @@ 
      */
     public function userPageDefaultUpdate(Request $request): RedirectResponse
     {
-        $main_blocks = (array)$request->get('main');
-        $side_blocks = (array)$request->get('side');
+        $main_blocks = (array) $request->get('main');
+        $side_blocks = (array) $request->get('side');
 
         $this->updateUserBlocks(-1, $main_blocks, $side_blocks);
 
@@ -508,14 +508,14 @@ 
      */
     public function userPageUpdate(Request $request, Tree $tree, User $user): RedirectResponse
     {
-        $defaults = (bool)$request->get('defaults');
+        $defaults = (bool) $request->get('defaults');
 
         if ($defaults) {
             $main_blocks = $this->getBlocksForUserPage(-1, -1, AUth::PRIV_NONE, 'main');
             $side_blocks = $this->getBlocksForUserPage(-1, -1, Auth::PRIV_NONE, 'side');
         } else {
-            $main_blocks = (array)$request->get('main');
-            $side_blocks = (array)$request->get('side');
+            $main_blocks = (array) $request->get('main');
+            $side_blocks = (array) $request->get('side');
         }
 
         $this->updateUserBlocks($user->getUserId(), $main_blocks, $side_blocks);
@@ -532,7 +532,7 @@ 
      */
     public function userPageUserEdit(Request $request): Response
     {
-        $user_id     = (int)$request->get('user_id');
+        $user_id     = (int) $request->get('user_id');
         $user        = User::find($user_id);
         $main_blocks = $this->getBlocksForUserPage(-1, $user_id, Auth::PRIV_NONE, 'main');
         $side_blocks = $this->getBlocksForUserPage(-1, $user_id, Auth::PRIV_NONE, 'side');
@@ -561,9 +561,9 @@ 
      */
     public function userPageUserUpdate(Request $request): RedirectResponse
     {
-        $user_id     = (int)$request->get('user_id');
-        $main_blocks = (array)$request->get('main');
-        $side_blocks = (array)$request->get('side');
+        $user_id     = (int) $request->get('user_id');
+        $main_blocks = (array) $request->get('main');
+        $side_blocks = (array) $request->get('side');
 
         $this->updateUserBlocks($user_id, $main_blocks, $side_blocks);
 

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/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'    => '',