fisharebest / webtrees

app/Http/Controllers/EditFamilyController.php

Spacing +5 added lines, -5 removed lines

@@ -62,7 +62,7 @@ 
     public function reorderChildrenAction(Request $request, Tree $tree): Response
     {
         $xref   = $request->get('xref');
-        $order  = (array)$request->get('order', []);
+        $order  = (array) $request->get('order', []);
         $family = Family::getInstance($xref, $tree);
 
         $this->checkFamilyAccess($family, true);
@@ -138,7 +138,7 @@ 
         $this->checkFamilyAccess($family, true);
 
         $PEDI      = $request->get('PEDI', '');
-        $keep_chan = (bool)$request->get('keep_chan');
+        $keep_chan = (bool) $request->get('keep_chan');
 
         $this->glevels = $request->get('glevels', []);
         $this->tag     = $request->get('tag', []);
@@ -155,7 +155,7 @@ 
             }
         }
         $gedrec .= "\n" . GedcomCodePedi::createNewFamcPedi($PEDI, $xref);
-        if ((bool)$request->get('SOUR_INDI')) {
+        if ((bool) $request->get('SOUR_INDI')) {
             $gedrec = $this->handleUpdates($gedrec);
         } else {
             $gedrec = $this->updateRest($gedrec);
@@ -253,7 +253,7 @@ 
             }
         }
 
-        if ((bool)$request->get('SOUR_INDI')) {
+        if ((bool) $request->get('SOUR_INDI')) {
             $gedrec = $this->handleUpdates($gedrec);
         } else {
             $gedrec = $this->updateRest($gedrec);
@@ -273,7 +273,7 @@ 
                 $famrec .= $this->addNewFact($request, $tree, $match);
             }
         }
-        if ((bool)$request->get('SOUR_FAM')) {
+        if ((bool) $request->get('SOUR_FAM')) {
             $famrec = $this->handleUpdates($famrec);
         } else {
             $famrec = $this->updateRest($famrec);

app/Http/Controllers/EditIndividualController.php

Spacing +9 added lines, -9 removed lines

@@ -62,7 +62,7 @@ 
     public function reorderMediaAction(Request $request, Tree $tree): Response
     {
         $xref       = $request->get('xref');
-        $order      = (array)$request->get('order', []);
+        $order      = (array) $request->get('order', []);
         $individual = Individual::getInstance($xref, $tree);
 
         $this->checkIndividualAccess($individual, true);
@@ -123,7 +123,7 @@ 
     public function reorderNamesAction(Request $request, Tree $tree): Response
     {
         $xref       = $request->get('xref');
-        $order      = (array)$request->get('order', []);
+        $order      = (array) $request->get('order', []);
         $individual = Individual::getInstance($xref, $tree);
 
         $this->checkIndividualAccess($individual, true);
@@ -184,7 +184,7 @@ 
     public function reorderSpousesAction(Request $request, Tree $tree): Response
     {
         $xref       = $request->get('xref');
-        $order      = (array)$request->get('order', []);
+        $order      = (array) $request->get('order', []);
         $individual = Individual::getInstance($xref, $tree);
 
         $this->checkIndividualAccess($individual, true);
@@ -291,7 +291,7 @@ 
                 $gedcom .= $this->addNewFact($request, $tree, $match);
             }
         }
-        if ((bool)$request->get('SOUR_INDI')) {
+        if ((bool) $request->get('SOUR_INDI')) {
             $gedcom = $this->handleUpdates($gedcom);
         } else {
             $gedcom = $this->updateRest($gedcom);
@@ -383,7 +383,7 @@ 
                 $gedcom .= $this->addNewFact($request, $tree, $match);
             }
         }
-        if ((bool)$request->get('SOUR_INDI')) {
+        if ((bool) $request->get('SOUR_INDI')) {
             $gedcom = $this->handleUpdates($gedcom);
         } else {
             $gedcom = $this->updateRest($gedcom);
@@ -416,7 +416,7 @@ 
      */
     public function addSpouse(Request $request, Tree $tree): Response
     {
-        $xref   = $request->get('xref', '');
+        $xref = $request->get('xref', '');
 
         $individual = Individual::getInstance($xref, $tree);
 
@@ -474,7 +474,7 @@ 
                 $indi_gedcom .= $this->addNewFact($request, $tree, $match);
             }
         }
-        if ((bool)$request->get('SOUR_INDI')) {
+        if ((bool) $request->get('SOUR_INDI')) {
             $indi_gedcom = $this->handleUpdates($indi_gedcom);
         } else {
             $indi_gedcom = $this->updateRest($indi_gedcom);
@@ -486,7 +486,7 @@ 
                 $fam_gedcom .= $this->addNewFact($request, $tree, $match);
             }
         }
-        if ((bool)$request->get('SOUR_FAM')) {
+        if ((bool) $request->get('SOUR_FAM')) {
             $fam_gedcom = $this->handleUpdates($fam_gedcom);
         } else {
             $fam_gedcom = $this->updateRest($fam_gedcom);
@@ -560,7 +560,7 @@ 
                 $gedrec .= $this->addNewFact($request, $tree, $match);
             }
         }
-        if ((bool)$request->get('SOUR_INDI')) {
+        if ((bool) $request->get('SOUR_INDI')) {
             $gedrec = $this->handleUpdates($gedrec);
         } else {
             $gedrec = $this->updateRest($gedrec);

app/Module/YahrzeitModule.php

Spacing +2 added lines, -2 removed lines

@@ -68,7 +68,7 @@ 
 
         $calendar_service = new CalendarService();
 
-        $days      = (int)$this->getBlockSetting($block_id, 'days', self::DEFAULT_DAYS);
+        $days      = (int) $this->getBlockSetting($block_id, 'days', self::DEFAULT_DAYS);
         $infoStyle = $this->getBlockSetting($block_id, 'infoStyle', self::DEFAULT_STYLE);
         $calendar  = $this->getBlockSetting($block_id, 'calendar', self::DEFAULT_CALENDAR);
 
@@ -122,7 +122,7 @@ 
                         }
                         $yahrzeit_date = new Date($yahrzeit_date->format('%@ %A %O %E'));
 
-                        $yahrzeits[] = (object)[
+                        $yahrzeits[] = (object) [
                             'individual'    => $fact->getParent(),
                             'fact_date'     => $fact->getDate(),
                             'fact'          => $fact,

app/Module/UpcomingAnniversariesModule.php

Spacing +2 added lines, -2 removed lines

@@ -118,7 +118,7 @@ 
         $default_events = implode(',', self::DEFAULT_EVENTS);
 
         $days      = $this->getBlockSetting($block_id, 'days', self::DEFAULT_DAYS);
-        $filter    = (bool)$this->getBlockSetting($block_id, 'filter', self::DEFAULT_FILTER);
+        $filter    = (bool) $this->getBlockSetting($block_id, 'filter', self::DEFAULT_FILTER);
         $infoStyle = $this->getBlockSetting($block_id, 'infoStyle', self::DEFAULT_STYLE);
         $sortStyle = $this->getBlockSetting($block_id, 'sortStyle', self::DEFAULT_SORT);
         $events    = $this->getBlockSetting($block_id, 'events', $default_events);
@@ -136,7 +136,7 @@ 
         $events_filter = implode('|', $event_array);
 
         $startjd = WT_CLIENT_JD + 1;
-        $endjd   = WT_CLIENT_JD + (int)$days;
+        $endjd   = WT_CLIENT_JD + (int) $days;
 
         $facts = $calendar_service->getEventsList($startjd, $endjd, $events_filter, $filter, $sortStyle, $tree);
 

app/Tree.php

Spacing +1 added lines, -1 removed lines

@@ -294,7 +294,7 @@
     public static function getAll(): array
     {
         if (empty(self::$trees)) {
-            $rows        = Database::prepare(
+            $rows = Database::prepare(
                 "SELECT g.gedcom_id AS tree_id, g.gedcom_name AS tree_name, gs1.setting_value AS tree_title" .
                 " FROM `##gedcom` g" .
                 " LEFT JOIN `##gedcom_setting`      gs1 ON (g.gedcom_id=gs1.gedcom_id AND gs1.setting_name='title')" .

app/Services/CalendarService.php

Indentation +3 added lines, -3 removed lines

@@ -327,9 +327,9 @@
 
             // Now fetch these anniversaries
             foreach ([
-                         'INDI' => $ind_sql . $where . $order_by,
-                         'FAM'  => $fam_sql . $where . $order_by,
-                     ] as $type => $sql) {
+                            'INDI' => $ind_sql . $where . $order_by,
+                            'FAM'  => $fam_sql . $where . $order_by,
+                        ] as $type => $sql) {
                 $rows = Database::prepare($sql)->execute($args)->fetchAll();
                 foreach ($rows as $row) {
                     if ($type === 'INDI') {

Spacing +5 added lines, -5 removed lines

@@ -183,7 +183,7 @@ 
                 "SELECT DISTINCT f_id AS xref, f_gedcom AS gedcom, d_type, d_day, d_month, d_year, d_fact" .
                 " FROM `##dates` JOIN `##families` ON d_gid = f_id AND d_file = f_file" .
                 " WHERE d_type = :type AND d_file = :tree_id";
-            $args    = [
+            $args = [
                 'type'    => $anniv->format('%@'),
                 'tree_id' => $tree->getTreeId(),
             ];
@@ -213,7 +213,7 @@ 
                     $where       .= " AND d_day = :day";
                     $args['day'] = $anniv->d;
                 }
-                $where         .= " AND d_mon = :month";
+                $where .= " AND d_mon = :month";
                 $args['month'] = $anniv->m;
             } else {
                 // SPECIAL CASES:
@@ -227,7 +227,7 @@ 
                         } elseif ($anniv->d === 29 && $anniv->daysInMonth() === 29) {
                             $where .= " AND (d_day = 29 OR d_day > 30) AND d_mon = 2";
                         } else {
-                            $where       .= " AND d_day = :day AND d_mon = 2";
+                            $where .= " AND d_day = :day AND d_mon = 2";
                             $args['day'] = $anniv->d;
                         }
                         break;
@@ -250,7 +250,7 @@ 
                         } elseif ($anniv->d == 29 && $anniv->daysInMonth() === 29) {
                             $where .= " AND (d_day = 29 OR d_day > 30) AND d_mon = 3";
                         } else {
-                            $where       .= " AND d_day = :day AND d_mon = 3";
+                            $where .= " AND d_day = :day AND d_mon = 3";
                             $args['day'] = $anniv->d;
                         }
                         break;
@@ -305,7 +305,7 @@ 
                 }
             }
             // Only events in the past (includes dates without a year)
-            $where        .= " AND d_year <= :year";
+            $where .= " AND d_year <= :year";
             $args['year'] = $anniv->y;
 
             if ($facts) {

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)) {