fisharebest / webtrees

app/Http/Controllers/Auth/VerifyEmailController.php

Spacing +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
 
             // Create a dummy user, so we can send messages from the tree.
             $sender = new User(
-                (object)[
+                (object) [
                     'user_id'   => null,
                     'user_name' => '',
                     'real_name' => $tree->getTitle(),

app/Http/Controllers/AdminUpgradeController.php

Spacing +2 added lines, -2 removed lines

@@ -61,7 +61,7 @@ 
      */
     public function wizard(Request $request): Response
     {
-        $continue = (bool)$request->get('continue');
+        $continue = (bool) $request->get('continue');
 
         $title = I18N::translate('Upgrade wizard');
 
@@ -120,7 +120,7 @@ 
         $export_steps = [];
 
         foreach (Tree::getAll() as $tree) {
-            $route                = route('upgrade', [
+            $route = route('upgrade', [
                 'step' => 'Export',
                 'ged'  => $tree->getName(),
             ]);

app/Http/Controllers/MessageController.php

Spacing +4 added lines, -4 removed lines

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

app/Http/Controllers/AncestorsChartController.php

Spacing +10 added lines, -10 removed lines

@@ -64,12 +64,12 @@ 
         $this->checkIndividualAccess($individual);
 
         $minimum_generations = 2;
-        $maximum_generations = (int)$tree->getPreference('MAX_PEDIGREE_GENERATIONS', self::DEFAULT_MAXIMUM_GENERATIONS);
-        $default_generations = (int)$tree->getPreference('DEFAULT_PEDIGREE_GENERATIONS', self::DEFAULT_GENERATIONS);
+        $maximum_generations = (int) $tree->getPreference('MAX_PEDIGREE_GENERATIONS', self::DEFAULT_MAXIMUM_GENERATIONS);
+        $default_generations = (int) $tree->getPreference('DEFAULT_PEDIGREE_GENERATIONS', self::DEFAULT_GENERATIONS);
 
-        $show_cousins = (bool)$request->get('show_cousins', self::DEFAULT_COUSINS);
-        $chart_style  = (int)$request->get('chart_style', self::DEFAULT_STYLE);
-        $generations  = (int)$request->get('generations', $default_generations);
+        $show_cousins = (bool) $request->get('show_cousins', self::DEFAULT_COUSINS);
+        $chart_style  = (int) $request->get('chart_style', self::DEFAULT_STYLE);
+        $generations  = (int) $request->get('generations', $default_generations);
 
         $generations = min($generations, $maximum_generations);
         $generations = max($generations, $minimum_generations);
@@ -112,12 +112,12 @@ 
         $this->checkIndividualAccess($individual);
 
         $minimum_generations = 2;
-        $maximum_generations = (int)$tree->getPreference('MAX_PEDIGREE_GENERATIONS', self::DEFAULT_MAXIMUM_GENERATIONS);
-        $default_generations = (int)$tree->getPreference('DEFAULT_PEDIGREE_GENERATIONS', self::DEFAULT_GENERATIONS);
+        $maximum_generations = (int) $tree->getPreference('MAX_PEDIGREE_GENERATIONS', self::DEFAULT_MAXIMUM_GENERATIONS);
+        $default_generations = (int) $tree->getPreference('DEFAULT_PEDIGREE_GENERATIONS', self::DEFAULT_GENERATIONS);
 
-        $show_cousins = (bool)$request->get('show_cousins', self::DEFAULT_COUSINS);
-        $chart_style  = (int)$request->get('chart_style', self::DEFAULT_STYLE);
-        $generations  = (int)$request->get('generations', $default_generations);
+        $show_cousins = (bool) $request->get('show_cousins', self::DEFAULT_COUSINS);
+        $chart_style  = (int) $request->get('chart_style', self::DEFAULT_STYLE);
+        $generations  = (int) $request->get('generations', $default_generations);
 
         $generations = min($generations, $maximum_generations);
         $generations = max($generations, $minimum_generations);

app/Http/Controllers/HourglassChartController.php

Spacing +18 added lines, -18 removed lines

@@ -57,15 +57,15 @@ 
 
         $this->checkIndividualAccess($individual);
 
-        $maximum_generations = (int)$tree->getPreference('MAX_DESCENDANCY_GENERATIONS', self::DEFAULT_MAXIMUM_GENERATIONS);
-        $default_generations = (int)$tree->getPreference('DEFAULT_PEDIGREE_GENERATIONS', self::DEFAULT_GENERATIONS);
+        $maximum_generations = (int) $tree->getPreference('MAX_DESCENDANCY_GENERATIONS', self::DEFAULT_MAXIMUM_GENERATIONS);
+        $default_generations = (int) $tree->getPreference('DEFAULT_PEDIGREE_GENERATIONS', self::DEFAULT_GENERATIONS);
 
-        $generations = (int)$request->get('generations', $default_generations);
+        $generations = (int) $request->get('generations', $default_generations);
 
         $generations = min($generations, $maximum_generations);
         $generations = max($generations, self::MINIMUM_GENERATIONS);
 
-        $show_spouse = (bool)$request->get('show_spouse');
+        $show_spouse = (bool) $request->get('show_spouse');
 
         $title = /* I18N: %s is an individual’s name */
             I18N::translate('Hourglass chart of %s', $individual->getFullName());
@@ -99,14 +99,14 @@ 
 
         $this->checkIndividualAccess($individual);
 
-        $maximum_generations = (int)$tree->getPreference('MAX_DESCENDANCY_GENERATIONS', self::DEFAULT_MAXIMUM_GENERATIONS);
-        $default_generations = (int)$tree->getPreference('DEFAULT_PEDIGREE_GENERATIONS', self::DEFAULT_GENERATIONS);
+        $maximum_generations = (int) $tree->getPreference('MAX_DESCENDANCY_GENERATIONS', self::DEFAULT_MAXIMUM_GENERATIONS);
+        $default_generations = (int) $tree->getPreference('DEFAULT_PEDIGREE_GENERATIONS', self::DEFAULT_GENERATIONS);
 
-        $generations = (int)$request->get('generations', $default_generations);
+        $generations = (int) $request->get('generations', $default_generations);
         $generations = min($generations, $maximum_generations);
         $generations = max($generations, self::MINIMUM_GENERATIONS);
 
-        $show_spouse = (bool)$request->get('show_spouse');
+        $show_spouse = (bool) $request->get('show_spouse');
 
         ob_start();
         $this->printDescendency($individual, 1, $generations, $show_spouse, true);
@@ -119,7 +119,7 @@ 
         return new Response(view('hourglass-chart', [
             'descendants' => $descendants,
             'ancestors'   => $ancestors,
-            'bhalfheight' => (int)(Theme::theme()->parameter('chart-box-y') / 2),
+            'bhalfheight' => (int) (Theme::theme()->parameter('chart-box-y') / 2),
         ]));
     }
 
@@ -140,7 +140,7 @@ 
 
         $this->checkIndividualAccess($individual);
 
-        $show_spouse = (bool)$request->get('show_spouse');
+        $show_spouse = (bool) $request->get('show_spouse');
 
         ob_start();
         $this->printPersonPedigree($individual, 0, 1, $show_spouse);
@@ -164,7 +164,7 @@ 
         $xref       = $request->get('xref');
         $individual = Individual::getInstance($xref, $tree);
 
-        $show_spouse = (bool)$request->get('show_spouse');
+        $show_spouse = (bool) $request->get('show_spouse');
 
         ob_start();
         $this->printDescendency($individual, 1, 2, $show_spouse, false);
@@ -317,7 +317,7 @@ 
                     echo '<a href="' . e(route('hourglass', [
                             'xref'        => $spouse->getXref(),
                             'generations' => $generations,
-                            'show_spouse' => (int)$show_spouse,
+                            'show_spouse' => (int) $show_spouse,
                             'ged'         => $spouse->getTree()->getName(),
                         ])) . '" class="name1">' . $spouse->getFullName() . '</a>';
                 }
@@ -325,7 +325,7 @@ 
                     echo '<a href="' . e(route('hourglass', [
                             'xref'        => $child->getXref(),
                             'generations' => $generations,
-                            'show_spouse' => (int)$show_spouse,
+                            'show_spouse' => (int) $show_spouse,
                             'ged'         => $child->getTree()->getName(),
                         ])) . '" class="name1">' . $child->getFullName() . '</a>';
                 }
@@ -340,7 +340,7 @@ 
                         echo '<a href="' . e(route('hourglass', [
                                 'xref'        => $husb->getXref(),
                                 'generations' => $generations,
-                                'show_spouse' => (int)$show_spouse,
+                                'show_spouse' => (int) $show_spouse,
                                 'ged'         => $husb->getTree()->getName(),
                             ])) . '" class="name1">' . $husb->getFullName() . '</a>';
                     }
@@ -349,7 +349,7 @@ 
                         echo '<a href="' . e(route('hourglass', [
                                 'xref'        => $wife->getXref(),
                                 'generations' => $generations,
-                                'show_spouse' => (int)$show_spouse,
+                                'show_spouse' => (int) $show_spouse,
                                 'ged'         => $wife->getTree()->getName(),
                             ])) . '" class="name1">' . $wife->getFullName() . '</a>';
                     }
@@ -368,7 +368,7 @@ 
                         echo '<a href="' . e(route('hourglass', [
                                 'xref'        => $child->getXref(),
                                 'generations' => $generations,
-                                'show_spouse' => (int)$show_spouse,
+                                'show_spouse' => (int) $show_spouse,
                                 'ged'         => $child->getTree()->getName(),
                             ])) . '" class="name1">' . $child->getFullName() . '</a>';
                     }
@@ -431,7 +431,7 @@ 
                         'href'         => '#',
                         'data-route'   => 'hourglass-add-asc',
                         'data-xref'    => $ARID,
-                        'data-spouses' => (int)$show_spouse,
+                        'data-spouses' => (int) $show_spouse,
                         'data-tree'    => $family->getHusband()->getTree()->getName(),
                     ]);
                 }
@@ -468,7 +468,7 @@ 
                         'href'         => '#',
                         'data-route'   => 'hourglass-add-asc',
                         'data-xref'    => $ARID,
-                        'data-spouses' => (int)$show_spouse,
+                        'data-spouses' => (int) $show_spouse,
                         'data-tree'    => $family->getWife()->getTree()->getName(),
                     ]);
                 }

app/Http/Controllers/IndividualController.php

Spacing +1 added lines, -1 removed lines

@@ -443,7 +443,7 @@
      */
     private function significant(Individual $individual)
     {
-        $significant = (object)[
+        $significant = (object) [
             'family'     => null,
             'individual' => $individual,
             'surname'    => '',

Indentation +4 added lines, -4 removed lines

@@ -327,8 +327,8 @@ 
                 FontAwesome::linkIcon('edit', I18N::translate('Edit the name'), [
                     'class' => 'btn btn-link',
                     'href'  => route('edit-name', ['xref'    => $individual->getXref(),
-                                                   'fact_id' => $fact->getFactId(),
-                                                   'ged'     => $individual->getTree()->getName(),
+                                                    'fact_id' => $fact->getFactId(),
+                                                    'ged'     => $individual->getTree()->getName(),
                     ]),
                 ]);
         } else {
@@ -381,8 +381,8 @@ 
             $edit_links = FontAwesome::linkIcon('edit', I18N::translate('Edit the gender'), [
                 'class' => 'btn btn-link',
                 'href'  => route('edit-fact', ['xref'    => $individual->getXref(),
-                                               'fact_id' => $fact->getFactId(),
-                                               'ged'     => $individual->getTree()->getName(),
+                                                'fact_id' => $fact->getFactId(),
+                                                'ged'     => $individual->getTree()->getName(),
                 ]),
             ]);
         } else {

app/Http/Controllers/AdminMediaController.php

Spacing +9 added lines, -9 removed lines

@@ -119,8 +119,8 @@ 
         $files  = $request->get('files'); // local|external|unused
         $search = $request->get('search');
         $search = $search['value'];
-        $start  = (int)$request->get('start');
-        $length = (int)$request->get('length');
+        $start  = (int) $request->get('start');
+        $length = (int) $request->get('length');
 
         // family tree setting MEDIA_DIRECTORY
         $media_folders = $this->allMediaFolders();
@@ -156,7 +156,7 @@ 
                     "  OR   descriptive_title LIKE CONCAT('%', :search_2, '%'))" .
                     " AND   multimedia_file_refn NOT LIKE 'http://%'" .
                     " AND   multimedia_file_refn NOT LIKE 'https://%'";
-                $ARGS1   = [
+                $ARGS1 = [
                     'media_path_1' => $media_path,
                     'media_folder' => $media_folder,
                     'media_path_2' => Database::escapeLike($media_path),
@@ -173,7 +173,7 @@ 
                     " AND   multimedia_file_refn LIKE CONCAT(:media_path_3, '%')" .
                     " AND   multimedia_file_refn NOT LIKE 'http://%'" .
                     " AND   multimedia_file_refn NOT LIKE 'https://%'";
-                $ARGS2   = [
+                $ARGS2 = [
                     'media_folder' => $media_folder,
                     'media_path_3' => $media_path,
                 ];
@@ -185,7 +185,7 @@ 
                     $ARGS2['media_path_4'] = Database::escapeLike($media_path);
                 }
 
-                $order   = $request->get('order', []);
+                $order = $request->get('order', []);
                 $SELECT1 .= " ORDER BY ";
                 if ($order) {
                     foreach ($order as $key => $value) {
@@ -209,7 +209,7 @@ 
                 }
 
                 if ($length > 0) {
-                    $SELECT1         .= " LIMIT :length OFFSET :start";
+                    $SELECT1 .= " LIMIT :length OFFSET :start";
                     $ARGS1['length'] = $length;
                     $ARGS1['start']  = $start;
                 }
@@ -242,7 +242,7 @@ 
                     " JOIN  `##media_file` USING (m_id, m_file)" .
                     " WHERE (multimedia_file_refn LIKE 'http://%' OR multimedia_file_refn LIKE 'https://%')" .
                     " AND   (multimedia_file_refn LIKE CONCAT('%', :search_1, '%') OR descriptive_title LIKE CONCAT('%', :search_2, '%'))";
-                $ARGS1   = [
+                $ARGS1 = [
                     'search_1' => Database::escapeLike($search),
                     'search_2' => Database::escapeLike($search),
                 ];
@@ -278,7 +278,7 @@ 
                 }
 
                 if ($length > 0) {
-                    $SELECT1         .= " LIMIT :length OFFSET :start";
+                    $SELECT1 .= " LIMIT :length OFFSET :start";
                     $ARGS1['length'] = $length;
                     $ARGS1['start']  = $start;
                 }
@@ -660,7 +660,7 @@ 
         $full_path = WT_DATA_DIR . $media_folder . $media_path . $file;
         try {
             $size = filesize($full_path);
-            $size = (int)(($size + 1023) / 1024); // Round up to next KB
+            $size = (int) (($size + 1023) / 1024); // Round up to next KB
             $size = /* I18N: size of file in KB */
                 I18N::translate('%s KB', I18N::number($size));
             $html .= '<dt>' . I18N::translate('File size') . '</dt>';

app/Http/Controllers/SearchController.php

Spacing +46 added lines, -46 removed lines

@@ -167,11 +167,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) {
@@ -188,7 +188,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) {
             return in_array($tree->getName(), $search_tree_names);
@@ -296,7 +296,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) {
             return in_array($tree->getName(), $search_tree_names);
@@ -650,7 +650,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);
         }
@@ -698,7 +698,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" .
@@ -707,7 +707,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();
@@ -759,7 +759,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);
         }
@@ -906,7 +906,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) {
@@ -917,15 +917,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':
@@ -939,7 +939,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;
@@ -955,7 +955,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;
@@ -964,15 +964,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':
@@ -986,7 +986,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;
@@ -1003,7 +1003,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;
                                 }
                         }
@@ -1012,7 +1012,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;
@@ -1022,7 +1022,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;
@@ -1032,7 +1032,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;
@@ -1040,12 +1040,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';
@@ -1054,15 +1054,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':
@@ -1076,7 +1076,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;
@@ -1093,7 +1093,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;
                                 }
                         }
@@ -1101,15 +1101,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':
@@ -1123,7 +1123,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;
@@ -1139,7 +1139,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;
@@ -1148,17 +1148,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;
             }
@@ -1237,7 +1237,7 @@ 
         $sql .= ")";
 
         if ($givn_sdx !== '') {
-            $sql      .= " AND (";
+            $sql .= " AND (";
             $givn_sdx = explode(':', $givn_sdx);
             foreach ($givn_sdx as $n => $sdx) {
                 $sql .= $n > 0 ? " OR " : "";
@@ -1255,7 +1255,7 @@ 
         }
 
         if ($surn_sdx !== '') {
-            $sql      .= " AND (";
+            $sql .= " AND (";
             $surn_sdx = explode(':', $surn_sdx);
             foreach ($surn_sdx as $n => $sdx) {
                 $sql .= $n ? " OR " : "";
@@ -1273,7 +1273,7 @@ 
         }
 
         if ($plac_sdx !== '') {
-            $sql      .= " AND (";
+            $sql .= " AND (";
             $plac_sdx = explode(':', $plac_sdx);
             foreach ($plac_sdx as $n => $sdx) {
                 $sql .= $n ? " OR " : "";
@@ -1320,7 +1320,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);
         }
@@ -1376,7 +1376,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);
         }
@@ -1432,7 +1432,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/PedigreeChartController.php

Spacing +15 added lines, -15 removed lines

@@ -94,8 +94,8 @@ 
 
         $this->checkIndividualAccess($individual);
 
-        $orientation = (int)$request->get('orientation', self::LANDSCAPE);
-        $generations = (int)$request->get('generations', self::DEFAULT_GENERATIONS);
+        $orientation = (int) $request->get('orientation', self::LANDSCAPE);
+        $generations = (int) $request->get('generations', self::DEFAULT_GENERATIONS);
 
         $generations = min(self::MAX_GENERATIONS, $generations);
         $generations = max(self::MIN_GENERATIONS, $generations);
@@ -133,8 +133,8 @@ 
 
         $this->checkIndividualAccess($individual);
 
-        $this->orientation = (int)$request->get('orientation');
-        $this->generations = (int)$request->get('generations');
+        $this->orientation = (int) $request->get('orientation');
+        $this->generations = (int) $request->get('generations');
         $bxspacing         = Theme::theme()->parameter('chart-spacing-x');
         $byspacing         = Theme::theme()->parameter('chart-spacing-y');
         $curgen            = 1; // -- track which generation the algorithm is currently working on
@@ -159,7 +159,7 @@ 
         }, array_values($this->sosaStradonitzAncestors($individual, $this->generations)));
 
         //check earliest generation for any ancestors
-        for ($i = (int)($this->treesize / 2); $i < $this->treesize; $i++) {
+        for ($i = (int) ($this->treesize / 2); $i < $this->treesize; $i++) {
             $this->chartHasAncestors = $this->chartHasAncestors || ($this->nodes[$i]['indi'] && $this->nodes[$i]['indi']->getChildFamilies());
         }
 
@@ -194,7 +194,7 @@ 
         for ($i = ($this->treesize - 1); $i >= 0; $i--) {
 
             // -- check to see if we have moved to the next generation
-            if ($i < (int)($this->treesize / pow(2, $curgen))) {
+            if ($i < (int) ($this->treesize / pow(2, $curgen))) {
                 $curgen++;
             }
 
@@ -225,7 +225,7 @@ 
                         } else {
                             $yoffset = $yoffset + (($boxspacing / 2) * ($curgen - 1));
                         }
-                        $parent = (int)(($i - 1) / 2);
+                        $parent = (int) (($i - 1) / 2);
                         $pgen   = $curgen;
                         while ($parent > 0) {
                             if ($parent % 2 == 0) {
@@ -245,7 +245,7 @@ 
                                     $yoffset = $yoffset + (($boxspacing / 2) * $temp);
                                 }
                             }
-                            $parent = (int)(($parent - 1) / 2);
+                            $parent = (int) (($parent - 1) / 2);
                         }
                         if ($curgen > 3) {
                             $temp = 0;
@@ -281,8 +281,8 @@ 
                     }
                     break;
             }
-            $this->nodes[$i]['x'] = (int)$xoffset;
-            $this->nodes[$i]['y'] = (int)$yoffset;
+            $this->nodes[$i]['x'] = (int) $xoffset;
+            $this->nodes[$i]['y'] = (int) $yoffset;
         }
 
         // find the minimum x & y offsets and deduct that number from
@@ -311,7 +311,7 @@ 
         $canvas_width   = $max_xoffset + $bxspacing + Theme::theme()->parameter('chart-box-x') + $addoffset['x'];
         $canvas_height  = $max_yoffset + $byspacing + Theme::theme()->parameter('chart-box-y') + $addoffset['y'];
         $posn           = I18N::direction() === 'rtl' ? 'right' : 'left';
-        $last_gen_start = (int)floor($this->treesize / 2);
+        $last_gen_start = (int) floor($this->treesize / 2);
         if ($this->orientation === self::OLDEST_AT_TOP || $this->orientation === self::OLDEST_AT_BOTTOM) {
             $flex_direction = ' flex-column';
         } else {
@@ -360,7 +360,7 @@ 
             $html = sprintf('<div id="childarrow"><a href="#" class="menuselect %s"></a><div id="childbox-pedigree">', $this->arrows->menu);
 
             foreach ($families as $family) {
-                $html   .= '<span class="name1">' . I18N::translate('Family') . '</span>';
+                $html .= '<span class="name1">' . I18N::translate('Family') . '</span>';
                 $spouse = $family->getSpouse($this->root);
                 if ($spouse) {
                     $html .= '<a class="name1" href="' . e(route('pedigree', [
@@ -421,9 +421,9 @@ 
         $html = '';
         if ($this->chartHasAncestors) {
             if ($this->nodes[$index]['indi'] && $this->nodes[$index]['indi']->getChildFamilies()) {
-                $html         .= '<div class="ancestorarrow">';
+                $html .= '<div class="ancestorarrow">';
                 $rootParentId = 1;
-                if ($index > (int)($this->treesize / 2) + (int)($this->treesize / 4)) {
+                if ($index > (int) ($this->treesize / 2) + (int) ($this->treesize / 4)) {
                     $rootParentId++;
                 }
                 $html .= '<a class="' . $this->arrows->prevGen . '" href="' . e(route('pedigree', [
@@ -450,7 +450,7 @@ 
     private function generationOptions(Tree $tree): array
     {
         // @TODO - do we need this config setting, given that we cannot show more than 8 generations?
-        $max_generations = min(self::MAX_GENERATIONS, (int)$tree->getPreference('MAX_PEDIGREE_GENERATIONS'));
+        $max_generations = min(self::MAX_GENERATIONS, (int) $tree->getPreference('MAX_PEDIGREE_GENERATIONS'));
 
         return FunctionsEdit::numericOptions(range(self::MIN_GENERATIONS, $max_generations));
     }