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/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/Http/Controllers/LifespansChartController.php

Spacing +8 added lines, -8 removed lines

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

app/Http/Controllers/Auth/RegisterController.php

Spacing +2 added lines, -2 removed lines

@@ -118,7 +118,7 @@ 
             ->setPreference('sessiontime', '0');
 
         // Create a dummy user, so we can send messages from the tree.
-        $sender = new User((object)[
+        $sender = new User((object) [
             'user_id'   => null,
             'user_name' => '',
             'real_name' => $tree->getTitle(),
@@ -137,7 +137,7 @@ 
         );
 
         // Tell the genealogy contact about the registration.
-        $webmaster = User::find((int)$tree->getPreference('WEBMASTER_USER_ID'));
+        $webmaster = User::find((int) $tree->getPreference('WEBMASTER_USER_ID'));
 
         if ($webmaster !== null) {
             I18N::init($webmaster->getPreference('language'));

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/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/Module/PedigreeMapModule.php

Spacing +10 added lines, -10 removed lines

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