fisharebest / webtrees

app/Http/Controllers/TimelineChartController.php

Spacing +9 added lines, -9 removed lines

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

app/Http/Controllers/Auth/ForgotPasswordController.php

Spacing +2 added lines, -2 removed lines

@@ -69,7 +69,7 @@ 
 
             Log::addAuthenticationLog('Password request was sent to user: ' . $user->getUserName());
 
-            $sender = new User((object)[
+            $sender = new User((object) [
                 'user_id'   => null,
                 'user_name' => '',
                 'real_name' => $tree->getTitle(),
@@ -104,7 +104,7 @@ 
         $max       = \strlen($passchars) - 1;
 
         for ($i = 0; $i < 8; $i++) {
-            $index    = random_int(0, $max);
+            $index = random_int(0, $max);
             $password .= $passchars{$index};
         }
 

app/Http/Controllers/CalendarController.php

Upper-Lower-Casing +4 added lines, -4 removed lines

@@ -86,14 +86,14 @@ 
             if (\strlen($match[1]) > \strlen($match[2])) {
                 $match[2] = substr($match[1], 0, \strlen($match[1]) - \strlen($match[2])) . $match[2];
             }
-            $ged_date = new Date("FROM {$cal} {$match[1]} TO {$cal} {$match[2]}");
+            $ged_date = new Date("from {$cal} {$match[1]} TO {$cal} {$match[2]}");
             $view     = 'year';
         } else {
             // advanced-year "decade/century wildcard"
             if (preg_match('/^(\d+)(\?+)$/', $year, $match)) {
                 $y1       = $match[1] . str_replace('?', '0', $match[2]);
                 $y2       = $match[1] . str_replace('?', '9', $match[2]);
-                $ged_date = new Date("FROM {$cal} {$y1} TO {$cal} {$y2}");
+                $ged_date = new Date("from {$cal} {$y1} TO {$cal} {$y2}");
                 $view     = 'year';
             } else {
                 if ($year < 0) {
@@ -204,14 +204,14 @@ 
             if (\strlen($match[1]) > \strlen($match[2])) {
                 $match[2] = substr($match[1], 0, \strlen($match[1]) - \strlen($match[2])) . $match[2];
             }
-            $ged_date = new Date("FROM {$cal} {$match[1]} TO {$cal} {$match[2]}");
+            $ged_date = new Date("from {$cal} {$match[1]} TO {$cal} {$match[2]}");
             $view     = 'year';
         } else {
             // advanced-year "decade/century wildcard"
             if (preg_match('/^(\d+)(\?+)$/', $year, $match)) {
                 $y1       = $match[1] . str_replace('?', '0', $match[2]);
                 $y2       = $match[1] . str_replace('?', '9', $match[2]);
-                $ged_date = new Date("FROM {$cal} {$y1} TO {$cal} {$y2}");
+                $ged_date = new Date("from {$cal} {$y1} TO {$cal} {$y2}");
                 $view     = 'year';
             } else {
                 if ($year < 0) {

app/Http/Controllers/AdminLocationController.php

Indentation +1 added lines, -1 removed lines

@@ -377,7 +377,7 @@
 
                     // convert separate place fields into a comma separated placename
                     $fqdn = implode(Place::GEDCOM_SEPARATOR, array_filter(array_reverse(
-                                                                              \array_slice($row, 1, $fields - 5))));
+                                                                                \array_slice($row, 1, $fields - 5))));
 
                     $places[] = [
                         'pl_level' => $row[0],

app/Http/Controllers/SetupController.php

Spacing +5 added lines, -5 removed lines

@@ -47,7 +47,7 @@ 
     {
         \define('WT_LOCALE', I18N::init('en-US'));
 
-        $step     = (int)$request->get('step', '1');
+        $step     = (int) $request->get('step', '1');
         $errors   = $this->serverErrors();
         $warnings = $this->serverWarnings();
         $data     = $this->extractParameters($request);
@@ -364,7 +364,7 @@ 
      */
     private function maxExecutionTime(): int
     {
-        return (int)ini_get('max_execution_time');
+        return (int) ini_get('max_execution_time');
     }
 
     /**
@@ -397,7 +397,7 @@ 
                 $memory_limit = $memory_limit / 1024 / 1024;
         }
 
-        return (int)$memory_limit;
+        return (int) $memory_limit;
     }
 
     /**
@@ -454,11 +454,11 @@ 
             /* I18N: a program feature */
             'simplexml' => I18N::translate('reporting'),
         ];
-        $settings   = [
+        $settings = [
             /* I18N: a program feature */
             'file_uploads' => I18N::translate('file upload capability'),
         ];
-        $warnings   = [];
+        $warnings = [];
 
         foreach ($extensions as $extension => $features) {
             if (!\extension_loaded($extension)) {

app/Http/Controllers/FanChartController.php

Spacing +17 added lines, -17 removed lines

@@ -62,9 +62,9 @@ 
 
         $this->checkIndividualAccess($individual);
 
-        $chart_style = (int)$request->get('chart_style', self::DEFAULT_STYLE);
-        $fan_width   = (int)$request->get('fan_width', self::DEFAULT_WIDTH);
-        $generations = (int)$request->get('generations', self::DEFAULT_GENERATIONS);
+        $chart_style = (int) $request->get('chart_style', self::DEFAULT_STYLE);
+        $fan_width   = (int) $request->get('fan_width', self::DEFAULT_WIDTH);
+        $generations = (int) $request->get('generations', self::DEFAULT_GENERATIONS);
 
         $fan_width = min($fan_width, self::MAXIMUM_WIDTH);
         $fan_width = max($fan_width, self::MINIMUM_WIDTH);
@@ -106,9 +106,9 @@ 
 
         $this->checkIndividualAccess($individual);
 
-        $chart_style = (int)$request->get('chart_style', self::DEFAULT_STYLE);
-        $fan_width   = (int)$request->get('fan_width', self::DEFAULT_WIDTH);
-        $generations = (int)$request->get('generations', self::DEFAULT_GENERATIONS);
+        $chart_style = (int) $request->get('chart_style', self::DEFAULT_STYLE);
+        $fan_width   = (int) $request->get('fan_width', self::DEFAULT_WIDTH);
+        $generations = (int) $request->get('generations', self::DEFAULT_GENERATIONS);
 
         $fan_width = min($fan_width, self::MAXIMUM_WIDTH);
         $fan_width = max($fan_width, self::MINIMUM_WIDTH);
@@ -137,7 +137,7 @@ 
         $scale = $fanw / 640;
 
         // Create the image
-        $image = imagecreate((int)$fanw, (int)$fanh);
+        $image = imagecreate((int) $fanw, (int) $fanh);
 
         // Create colors
         $transparent = imagecolorallocate($image, 0, 0, 0);
@@ -154,7 +154,7 @@ 
         ];
 
 
-        imagefilledrectangle($image, 0, 0, (int)$fanw, (int)$fanh, $transparent);
+        imagefilledrectangle($image, 0, 0, (int) $fanw, (int) $fanh, $transparent);
 
         $fandeg = 90 * $chart_style;
 
@@ -169,7 +169,7 @@ 
             // clean current generation area
             $deg2 = 360 + ($fandeg - 180) / 2;
             $deg1 = $deg2 - $fandeg;
-            imagefilledarc($image, (int)$cx, (int)$cy, (int)$rx, (int)$rx, (int)$deg1, (int)$deg2, $backgrounds['U'], IMG_ARC_PIE);
+            imagefilledarc($image, (int) $cx, (int) $cy, (int) $rx, (int) $rx, (int) $deg1, (int) $deg2, $backgrounds['U'], IMG_ARC_PIE);
             $rx -= 3;
 
             // calculate new angle
@@ -199,15 +199,15 @@ 
 
                     $background = $backgrounds[$person->getSex()];
 
-                    imagefilledarc($image, (int)$cx, (int)$cy, (int)$rx, (int)$rx, (int)$deg1, (int)$deg2, $background, IMG_ARC_PIE);
+                    imagefilledarc($image, (int) $cx, (int) $cy, (int) $rx, (int) $rx, (int) $deg1, (int) $deg2, $background, IMG_ARC_PIE);
 
                     // split and center text by lines
-                    $wmax = (int)($angle * 7 / 7 * $scale);
+                    $wmax = (int) ($angle * 7 / 7 * $scale);
                     $wmax = min($wmax, 35 * $scale);
                     if ($gen == 0) {
                         $wmax = min($wmax, 17 * $scale);
                     }
-                    $text = $this->splitAlignText($text, (int)$wmax);
+                    $text = $this->splitAlignText($text, (int) $wmax);
 
                     // text angle
                     $tangle = 270 - ($deg1 + $angle / 2);
@@ -376,7 +376,7 @@ 
                     }
                     $line .= "$word";
                 } else {
-                    $p = max(0, (int)(($maxlen - $len) / 2));
+                    $p = max(0, (int) (($maxlen - $len) / 2));
                     if (!empty($line)) {
                         $line = str_repeat(' ', $p) . $line; // center alignment using spaces
                         $text .= $line . "\n";
@@ -391,7 +391,7 @@ 
             if (\in_array(\ord($line{0}), $RTLOrd)) {
                 $len /= 2;
             }
-            $p    = max(0, (int)(($maxlen - $len) / 2));
+            $p    = max(0, (int) (($maxlen - $len) / 2));
             $line = str_repeat(' ', $p) . $line; // center alignment using spaces
             $text .= $line;
         }
@@ -411,9 +411,9 @@ 
     {
         return imagecolorallocate(
             $image,
-            (int)hexdec(substr($css_color, 0, 2)),
-            (int)hexdec(substr($css_color, 2, 2)),
-            (int)hexdec(substr($css_color, 4, 2))
+            (int) hexdec(substr($css_color, 0, 2)),
+            (int) hexdec(substr($css_color, 2, 2)),
+            (int) hexdec(substr($css_color, 4, 2))
         );
     }
 

app/Http/Controllers/AdminController.php

Spacing +38 added lines, -38 removed lines

@@ -163,7 +163,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') {
@@ -229,7 +229,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(
@@ -237,8 +237,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();
@@ -289,7 +289,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,
@@ -305,7 +305,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();
 
@@ -447,8 +447,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'] ?? '';
 
@@ -468,7 +468,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;
         }
@@ -487,8 +487,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) {
@@ -530,7 +530,7 @@ 
         }, $data);
 
         return new JsonResponse([
-            'draw'            => (int)$request->get('draw'),
+            'draw'            => (int) $request->get('draw'),
             'recordsTotal'    => $recordsTotal,
             'recordsFiltered' => $recordsFiltered,
             'data'            => $data,
@@ -619,8 +619,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'] ?? '';
 
@@ -651,7 +651,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,
@@ -693,7 +693,7 @@ 
         }, $thumbnails);
 
         return new JsonResponse([
-            'draw'            => (int)$request->get('draw'),
+            'draw'            => (int) $request->get('draw'),
             'recordsTotal'    => $recordsTotal,
             'recordsFiltered' => $recordsFiltered,
             'data'            => $data,
@@ -1019,7 +1019,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([
@@ -1027,13 +1027,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
@@ -1079,10 +1079,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');
         }
 
@@ -1105,7 +1105,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(),
@@ -1132,7 +1132,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) {
@@ -1195,36 +1195,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 !== '') {
@@ -1275,8 +1275,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   = [];
 
@@ -1427,7 +1427,7 @@ 
         }
 
         // The maximum difference is 255 (black versus white).
-        return 100 - (int)($max_difference * 100 / 255);
+        return 100 - (int) ($max_difference * 100 / 255);
     }
 
     /**
@@ -1458,7 +1458,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/StatisticsChartController.php

Spacing +3 added lines, -3 removed lines

@@ -576,7 +576,7 @@ 
                         $z_axis = $this->axisAll();
                         // The stats query doesn't have an "all" function, so query M/F/U separately
                         foreach (['M', 'F', 'U'] as $sex) {
-                            $rows  = $stats->statsMarrAgeQuery(false, $sex);
+                            $rows = $stats->statsMarrAgeQuery(false, $sex);
                             $indi = [];
                             foreach ($rows as $row) {
                                 if (!\in_array($row->d_gid, $indi)) {
@@ -589,7 +589,7 @@ 
                     case self::Z_AXIS_SEX:
                         $z_axis = $this->axisSexes();
                         foreach (array_keys($z_axis) as $sex) {
-                            $rows  = $stats->statsMarrAgeQuery(false, $sex);
+                            $rows = $stats->statsMarrAgeQuery(false, $sex);
                             $indi = [];
                             foreach ($rows as $row) {
                                 if (!\in_array($row->d_gid, $indi)) {
@@ -605,7 +605,7 @@ 
                         // The stats query doesn't have an "all" function, so query M/F/U separately
                         foreach (['M', 'F', 'U'] as $sex) {
                             $prev_boundary = 0;
-                            $indi   = [];
+                            $indi = [];
                             foreach (array_keys($z_axis) as $boundary) {
                                 $rows = $stats->statsMarrAgeQuery(false, $sex, $prev_boundary, $boundary);
                                 foreach ($rows as $row) {

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