fisharebest / webtrees

app/Services/UpgradeService.php

Spacing +1 added lines, -1 removed lines

@@ -73,7 +73,7 @@
     {
         $latest_version = $this->fetchLatestVersion();
 
-        list(, , $url) = explode('|', $latest_version . '||');
+        list(,, $url) = explode('|', $latest_version . '||');
 
         return $url;
     }

app/Functions/FunctionsPrintLists.php

Spacing +3 added lines, -3 removed lines

@@ -53,7 +53,7 @@ 
                 } else {
                     $size = 75.0 + 125.0 * ($count - $minimum) / ($maximum - $minimum);
                 }
-                $url  = route($route, [
+                $url = route($route, [
                     'surname' => $surn,
                     'ged'     => $tree->getName(),
                 ]);
@@ -130,13 +130,13 @@ 
                 }
                 $newcol = ceil($count / $col);
                 $html2  = '<table class="list_table"><tr>';
-                $html2  .= '<td class="list_value" style="padding: 14px;">';
+                $html2 .= '<td class="list_value" style="padding: 14px;">';
 
                 foreach ($html as $surns) {
                     $html2 .= $surns . '<br>';
                     $i++;
                     if ($i == $newcol && $i < $count) {
-                        $html2  .= '</td><td class="list_value" style="padding: 14px;">';
+                        $html2 .= '</td><td class="list_value" style="padding: 14px;">';
                         $newcol = $i + ceil($count / $col);
                     }
                 }

app/Module/TopSurnamesModule.php

Indentation +1 added lines, -1 removed lines

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

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

Spacing +5 added lines, -5 removed lines

@@ -841,23 +841,23 @@
         $year   = 365 * $day;
 
         if ($seconds > $year) {
-            $years = (int)($seconds / $year);
+            $years = (int) ($seconds / $year);
 
             return self::plural('%s year ago', '%s years ago', $years, self::number($years));
         } elseif ($seconds > $month) {
-            $months = (int)($seconds / $month);
+            $months = (int) ($seconds / $month);
 
             return self::plural('%s month ago', '%s months ago', $months, self::number($months));
         } elseif ($seconds > $day) {
-            $days = (int)($seconds / $day);
+            $days = (int) ($seconds / $day);
 
             return self::plural('%s day ago', '%s days ago', $days, self::number($days));
         } elseif ($seconds > $hour) {
-            $hours = (int)($seconds / $hour);
+            $hours = (int) ($seconds / $hour);
 
             return self::plural('%s hour ago', '%s hours ago', $hours, self::number($hours));
         } elseif ($seconds > $minute) {
-            $minutes = (int)($seconds / $minute);
+            $minutes = (int) ($seconds / $minute);
 
             return self::plural('%s minute ago', '%s minutes ago', $minutes, self::number($minutes));
         } else {

app/Report/ReportParserGenerate.php

Spacing +9 added lines, -9 removed lines

@@ -1843,7 +1843,7 @@ 
         // Some filters/sorts can be applied using SQL, while others require PHP
         switch ($listname) {
             case 'pending':
-                $rows       = Database::prepare(
+                $rows = Database::prepare(
                     "SELECT xref, CASE new_gedcom WHEN '' THEN old_gedcom ELSE new_gedcom END AS gedcom" .
                     " FROM `##change`" . " WHERE (xref, change_id) IN (" .
                     "  SELECT xref, MAX(change_id)" .
@@ -1882,7 +1882,7 @@ 
                                 $sql_params[$attr . 'date'] = $date->minimumJulianDay();
                             }
                             if ($sortby == $match[1]) {
-                                $sortby       = "";
+                                $sortby = "";
                                 $sql_order_by .= ($sql_order_by ? ", " : " ORDER BY ") . "{$attr}.d_julianday1";
                             }
                             unset($attrs[$attr]); // This filter has been fully processed
@@ -1894,13 +1894,13 @@ 
                                 if ($match[1] != '') {
                                     $names = explode(' ', $match[1]);
                                     foreach ($names as $n => $name) {
-                                        $sql_where                       .= " AND {$attr}.n_full LIKE CONCAT('%', :{$attr}name{$n}, '%')";
+                                        $sql_where .= " AND {$attr}.n_full LIKE CONCAT('%', :{$attr}name{$n}, '%')";
                                         $sql_params[$attr . 'name' . $n] = $name;
                                     }
                                 }
                                 // Let the DB do the name sorting even when no name was entered
                                 if ($sortby == 'NAME') {
-                                    $sortby       = '';
+                                    $sortby = '';
                                     $sql_order_by .= ($sql_order_by ? ', ' : ' ORDER BY ') . "{$attr}.n_sort";
                                 }
                             }
@@ -1917,7 +1917,7 @@ 
                             $sql_params[$attr . 'place'] = $match[1];
                             // Don't unset this filter. This is just initial filtering
                         } elseif (preg_match('/^(\w*):*(\w*) CONTAINS (.+)$/', $value, $match)) {
-                            $sql_where                       .= " AND i_gedcom LIKE CONCAT('%', :{$attr}contains1, '%', :{$attr}contains2, '%', :{$attr}contains3, '%')";
+                            $sql_where .= " AND i_gedcom LIKE CONCAT('%', :{$attr}contains1, '%', :{$attr}contains2, '%', :{$attr}contains3, '%')";
                             $sql_params[$attr . 'contains1'] = $match[1];
                             $sql_params[$attr . 'contains2'] = $match[2];
                             $sql_params[$attr . 'contains3'] = $match[3];
@@ -1959,7 +1959,7 @@ 
                                 $sql_params[$attr . 'date'] = $date->minimumJulianDay();
                             }
                             if ($sortby == $match[1]) {
-                                $sortby       = '';
+                                $sortby = '';
                                 $sql_order_by .= ($sql_order_by ? ', ' : ' ORDER BY ') . "{$attr}.d_julianday1";
                             }
                             unset($attrs[$attr]); // This filter has been fully processed
@@ -1976,13 +1976,13 @@ 
                                 if ($match[1] != '') {
                                     $names = explode(' ', $match[1]);
                                     foreach ($names as $n => $name) {
-                                        $sql_where                       .= " AND {$attr}.n_full LIKE CONCAT('%', :{$attr}name{$n}, '%')";
+                                        $sql_where .= " AND {$attr}.n_full LIKE CONCAT('%', :{$attr}name{$n}, '%')";
                                         $sql_params[$attr . 'name' . $n] = $name;
                                     }
                                 }
                                 // Let the DB do the name sorting even when no name was entered
                                 if ($sortby == 'NAME') {
-                                    $sortby       = '';
+                                    $sortby = '';
                                     $sql_order_by .= ($sql_order_by ? ', ' : ' ORDER BY ') . "{$attr}.n_sort";
                                 }
                             }
@@ -1994,7 +1994,7 @@ 
                             $sql_params[$attr . 'place'] = $match[1];
                             // Don't unset this filter. This is just initial filtering
                         } elseif (preg_match('/^(\w*):*(\w*) CONTAINS (.+)$/', $value, $match)) {
-                            $sql_where                       .= " AND f_gedcom LIKE CONCAT('%', :{$attr}contains1, '%', :{$attr}contains2, '%', :{$attr}contains3, '%')";
+                            $sql_where .= " AND f_gedcom LIKE CONCAT('%', :{$attr}contains1, '%', :{$attr}contains2, '%', :{$attr}contains3, '%')";
                             $sql_params[$attr . 'contains1'] = $match[1];
                             $sql_params[$attr . 'contains2'] = $match[2];
                             $sql_params[$attr . 'contains3'] = $match[3];

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

Spacing +18 added lines, -18 removed lines

@@ -55,15 +55,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');
 
         /* I18N: %s is an individual’s name */
         $title = I18N::translate('Hourglass chart of %s', $individual->getFullName());
@@ -95,14 +95,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);
@@ -115,7 +115,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),
         ]));
     }
 
@@ -134,7 +134,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);
@@ -156,7 +156,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);
@@ -309,7 +309,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>';
                 }
@@ -317,7 +317,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>';
                 }
@@ -332,7 +332,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>';
                     }
@@ -341,7 +341,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>';
                     }
@@ -360,7 +360,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>';
                     }
@@ -423,7 +423,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(),
                     ]);
                 }
@@ -460,7 +460,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/Functions/FunctionsPrintFacts.php

Spacing +4 added lines, -4 removed lines

@@ -176,14 +176,14 @@ 
             case '_BIRT_CHIL':
                 $children[$fact->getParent()->getXref()] = true;
                 /* I18N: Abbreviation for "number %s" */
-                $label                                   .= '<br>' . I18N::translate('#%s', count($children));
+                $label .= '<br>' . I18N::translate('#%s', count($children));
                 break;
             case '_BIRT_GCHI':
             case '_BIRT_GCH1':
             case '_BIRT_GCH2':
                 $grandchildren[$fact->getParent()->getXref()] = true;
                 /* I18N: Abbreviation for "number %s" */
-                $label                                        .= '<br>' . I18N::translate('#%s', count($grandchildren));
+                $label .= '<br>' . I18N::translate('#%s', count($grandchildren));
                 break;
         }
 
@@ -577,7 +577,7 @@ 
         for ($j = 0; $j < $ct; $j++) {
             if (strpos($match[$j][1], '@') === false) {
                 $source = e($match[$j][1] . preg_replace('/\n\d CONT ?/', "\n", $match[$j][2]));
-                $data   .= '<div class="fact_SOUR"><span class="label">' . I18N::translate('Source') . ':</span> <span class="field" dir="auto">' . Filter::formatText($source, $tree) . '</span></div>';
+                $data .= '<div class="fact_SOUR"><span class="label">' . I18N::translate('Source') . ':</span> <span class="field" dir="auto">' . Filter::formatText($source, $tree) . '</span></div>';
             }
         }
         // Find source for each fact
@@ -595,7 +595,7 @@ 
                     }
                     $srec      = substr($factrec, $spos1, $spos2 - $spos1);
                     $lt        = preg_match_all("/$nlevel \w+/", $srec, $matches);
-                    $data      .= '<div class="fact_SOUR">';
+                    $data .= '<div class="fact_SOUR">';
                     $elementID = Uuid::uuid4()->toString();
                     if ($tree->getPreference('EXPAND_SOURCES')) {
                         $plusminus = 'icon-minus';