fisharebest / webtrees

app/Http/Controllers/CalendarController.php

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

@@ -72,14 +72,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) {
@@ -191,14 +191,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/Functions/FunctionsPrint.php

Indentation +4 added lines, -4 removed lines

@@ -345,10 +345,10 @@
         }
         // print gedcom ages
         foreach ([
-                     I18N::translate('Age')     => $fact_age,
-                     I18N::translate('Husband') => $husb_age,
-                     I18N::translate('Wife')    => $wife_age,
-                 ] as $label => $age) {
+                        I18N::translate('Age')     => $fact_age,
+                        I18N::translate('Husband') => $husb_age,
+                        I18N::translate('Wife')    => $wife_age,
+                    ] as $label => $age) {
             if ($age != '') {
                 $html .= ' <span class="label">' . $label . ':</span> <span class="age">' . FunctionsDate::getAgeAtEvent($age) . '</span>';
             }

app/Http/Controllers/HomePageController.php

Indentation +3 added lines, -3 removed lines

@@ -840,9 +840,9 @@
         }
 
         foreach ([
-                     'main' => $main_blocks,
-                     'side' => $side_blocks,
-                 ] as $location => $updated_blocks) {
+                        'main' => $main_blocks,
+                        'side' => $side_blocks,
+                    ] as $location => $updated_blocks) {
             foreach ($updated_blocks as $block_order => $block_id) {
                 if (is_numeric($block_id)) {
                     // Updated block

Spacing +1 added lines, -1 removed lines

@@ -668,7 +668,7 @@
     private function filterActiveBlocks(Collection $blocks, Collection $active_blocks): Collection
     {
         return $blocks->map(function (string $block_name) use ($active_blocks): ?ModuleBlockInterface {
-            return $active_blocks->filter(function (ModuleInterface $block) use ($block_name): bool {
+            return $active_blocks->filter(function (ModuleInterface $block) use ($block_name) : bool {
                 return $block->getName() === $block_name;
             })->first();
         })

app/MediaFile.php

Indentation +4 added lines, -4 removed lines

@@ -224,10 +224,10 @@
             $src    = $this->imageUrl($width, $height, $fit);
             $srcset = [];
             foreach ([
-                         2,
-                         3,
-                         4,
-                     ] as $x) {
+                            2,
+                            3,
+                            4,
+                        ] as $x) {
                 $srcset[] = $this->imageUrl($width * $x, $height * $x, $fit) . ' ' . $x . 'x';
             }
         }

app/Http/Controllers/AdminLocationController.php

Braces +4 added lines, -2 removed lines

@@ -342,9 +342,11 @@
             'fqpn',
         ];
 
-        if ($serverfile !== '') {  // first choice is file on server
+        if ($serverfile !== '') {
+// first choice is file on server
             $filename = WT_DATA_DIR . 'places/' . $serverfile;
-        } elseif ($_FILES['localfile']['error'] === UPLOAD_ERR_OK) { // 2nd choice is local file
+        } elseif ($_FILES['localfile']['error'] === UPLOAD_ERR_OK) {
+// 2nd choice is local file
             $filename = $_FILES['localfile']['tmp_name'];
         }
 

Spacing +1 added lines, -1 removed lines

@@ -519,7 +519,7 @@
         // ... and process the differences
         $inserted = 0;
         if ($diff->isNotEmpty()) {
-            $nextRecordId    = 1 + (int) DB::table('placelocation')->max('pl_id');
+            $nextRecordId = 1 + (int) DB::table('placelocation')->max('pl_id');
 
             foreach ($diff as $place) {
                 // For Westminster, London, England, we must also create England and London, England

app/Date/JulianDate.php

Spacing +1 added lines, -1 removed lines

@@ -74,7 +74,7 @@
         }
 
         if (preg_match('/^(\d+) B\.C\.$/', $year, $match)) {
-            return - (int) $match[1];
+            return -(int) $match[1];
         }
 
         return (int) $year;

app/Stats.php

Indentation +2 added lines, -2 removed lines

@@ -1016,7 +1016,7 @@ 
             I18N::translate('Females') . ' - ' . $per_f . '|' .
             I18N::translate('Males') . ' - ' . $per_m;
         $chart_title = I18N::translate('Males') . ' - ' . $per_m . I18N::$list_separator .
-                   I18N::translate('Females') . ' - ' . $per_f;
+                    I18N::translate('Females') . ' - ' . $per_f;
 
         return "<img src=\"https://chart.googleapis.com/chart?cht=p3&amp;chd=e:{$chd}&amp;chs={$size}&amp;chco={$color_female},{$color_male}&amp;chf=bg,s,ffffff00&amp;chl={$chl}\" width=\"{$sizes[0]}\" height=\"{$sizes[1]}\" alt=\"" . $chart_title . '" title="' . $chart_title . '" />';
     }
@@ -1132,7 +1132,7 @@ 
             I18N::translate('Living') . ' - ' . $per_l . '|' .
             I18N::translate('Dead') . ' - ' . $per_d . '|';
         $chart_title = I18N::translate('Living') . ' - ' . $per_l . I18N::$list_separator .
-                   I18N::translate('Dead') . ' - ' . $per_d;
+                    I18N::translate('Dead') . ' - ' . $per_d;
 
         return "<img src=\"https://chart.googleapis.com/chart?cht=p3&amp;chd=e:{$chd}&amp;chs={$size}&amp;chco={$color_living},{$color_dead}&amp;chf=bg,s,ffffff00&amp;chl={$chl}\" width=\"{$sizes[0]}\" height=\"{$sizes[1]}\" alt=\"" . $chart_title . '" title="' . $chart_title . '" />';
     }

app/Date.php

Spacing +2 added lines, -2 removed lines

@@ -162,7 +162,7 @@ 
         // Ambiguous dates - don't override calendar escape
         if ($cal == '') {
             if (preg_match('/^(JAN|FEB|MAR|APR|MAY|JUN|JUL|AUG|SEP|OCT|NOV|DEC)$/', $m)) {
-                $cal =  GregorianDate::ESCAPE;
+                $cal = GregorianDate::ESCAPE;
             } else {
                 if (preg_match('/^[345]\d\d\d$/', $y)) {
                     // Year 3000-5999
@@ -460,7 +460,7 @@ 
     public function addYears(int $years, string $qualifier = ''): Date
     {
         $tmp               = clone $this;
-        $tmp->date1->year  += $years;
+        $tmp->date1->year += $years;
         $tmp->date1->month = 0;
         $tmp->date1->day   = 0;
         $tmp->date1->setJdFromYmd();

app/Http/Controllers/IndividualController.php

Indentation +2 added lines, -2 removed lines

@@ -378,8 +378,8 @@
             $edit_links = FontAwesome::linkIcon('edit', I18N::translate('Edit the gender'), [
                 'class' => 'btn btn-link',
                 'href'  => route('edit-fact', ['xref'    => $individual->xref(),
-                                               'fact_id' => $fact->id(),
-                                               'ged'     => $individual->tree()->name(),
+                                                'fact_id' => $fact->id(),
+                                                'ged'     => $individual->tree()->name(),
                 ]),
             ]);
         } else {