fisharebest / webtrees

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(),

app/Http/Controllers/ReportEngineController.php

Spacing +4 added lines, -4 removed lines

@@ -115,7 +115,7 @@ 
                     $input['control'] = FunctionsEdit::formControlSource($tree, $source, $attributes + ['required' => 'true']);
                     break;
                 case 'DATE':
-                    $attributes       += [
+                    $attributes += [
                         'type'  => 'text',
                         'value' => $input['default'],
                     ];
@@ -129,16 +129,16 @@ 
                 default:
                     switch ($input['type']) {
                         case 'text':
-                            $attributes       += [
+                            $attributes += [
                                 'type'  => 'text',
                                 'value' => $input['default'],
                             ];
                             $input['control'] = '<input ' . Html::attributes($attributes) . '>';
                             break;
                         case 'checkbox':
-                            $attributes       += [
+                            $attributes += [
                                 'type'    => 'checkbox',
-                                'checked' => (bool)$input['default'],
+                                'checked' => (bool) $input['default'],
                             ];
                             $input['control'] = '<input ' . Html::attributes($attributes) . '>';
                             break;

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/Date/CalendarDate.php

Spacing +4 added lines, -4 removed lines

@@ -107,7 +107,7 @@ 
 
         // Construct from an array (of three gedcom-style strings: "1900", "FEB", "4")
         if (is_array($date)) {
-            $this->d = (int)$date[2];
+            $this->d = (int) $date[2];
             if (array_key_exists($date[1], static::$MONTH_ABBREV)) {
                 $this->m = static::$MONTH_ABBREV[$date[1]];
             } else {
@@ -154,7 +154,7 @@ 
             $jd    = $date->calendar->ymdToJd($today[0], $date->m, $date->d == 0 ? $today[2] : $date->d);
         } else {
             // Complete date
-            $jd = (int)(($date->maxJD + $date->minJD) / 2);
+            $jd = (int) (($date->maxJD + $date->minJD) / 2);
         }
         list($this->y, $this->m, $this->d) = $this->calendar->jdToYmd($jd);
         // New date has same precision as original date
@@ -961,7 +961,7 @@ 
     {
         if ($number < 1) {
             // Cannot convert zero/negative numbers
-            return (string)$number;
+            return (string) $number;
         }
         $roman = '';
         foreach (self::$roman_numerals as $key => $value) {
@@ -986,7 +986,7 @@ 
         $num = 0;
         foreach (self::$roman_numerals as $key => $value) {
             if (strpos($roman, $value) === 0) {
-                $num   += $key;
+                $num += $key;
                 $roman = substr($roman, strlen($value));
             }
         }

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