Completed
Push — develop ( 7b1d72...7e6652 )
by Greg
05:30
created
app/Date/JulianDate.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -74,7 +74,7 @@
 block discarded – undo
74 74
         }
75 75
 
76 76
         if (preg_match('/^(\d+) B\.C\.$/', $year, $match)) {
77
-            return - (int) $match[1];
77
+            return -(int) $match[1];
78 78
         }
79 79
 
80 80
         return (int) $year;
Please login to merge, or discard this patch.
app/Database.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -224,7 +224,7 @@
 block discarded – undo
224 224
     public static function updateSchema($namespace, $schema_name, $target_version): bool
225 225
     {
226 226
         try {
227
-            $current_version = (int)Site::getPreference($schema_name);
227
+            $current_version = (int) Site::getPreference($schema_name);
228 228
         } catch (PDOException $ex) {
229 229
             DebugBar::addThrowable($ex);
230 230
 
Please login to merge, or discard this patch.
app/Http/Controllers/AdminController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -230,7 +230,7 @@  discard block
 block discarded – undo
230 230
      */
231 231
     public function changesLogData(Request $request): Response
232 232
     {
233
-        list($select, , $where, $args1) = $this->changesQuery($request);
233
+        list($select,, $where, $args1) = $this->changesQuery($request);
234 234
         list($order_by, $limit, $args2) = $this->dataTablesPagination($request);
235 235
 
236 236
         $rows = Database::prepare(
@@ -306,7 +306,7 @@  discard block
 block discarded – undo
306 306
      */
307 307
     public function changesLogDownload(Request $request): Response
308 308
     {
309
-        list($select, , $where, $args) = $this->changesQuery($request);
309
+        list($select,, $where, $args) = $this->changesQuery($request);
310 310
 
311 311
         $rows = Database::prepare($select . $where)->execute($args)->fetchAll();
312 312
 
Please login to merge, or discard this patch.
app/Stats.php 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1016,7 +1016,7 @@  discard block
 block discarded – undo
1016 1016
             I18N::translate('Females') . ' - ' . $per_f . '|' .
1017 1017
             I18N::translate('Males') . ' - ' . $per_m;
1018 1018
         $chart_title = I18N::translate('Males') . ' - ' . $per_m . I18N::$list_separator .
1019
-                   I18N::translate('Females') . ' - ' . $per_f;
1019
+                    I18N::translate('Females') . ' - ' . $per_f;
1020 1020
 
1021 1021
         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 . '" />';
1022 1022
     }
@@ -1132,7 +1132,7 @@  discard block
 block discarded – undo
1132 1132
             I18N::translate('Living') . ' - ' . $per_l . '|' .
1133 1133
             I18N::translate('Dead') . ' - ' . $per_d . '|';
1134 1134
         $chart_title = I18N::translate('Living') . ' - ' . $per_l . I18N::$list_separator .
1135
-                   I18N::translate('Dead') . ' - ' . $per_d;
1135
+                    I18N::translate('Dead') . ' - ' . $per_d;
1136 1136
 
1137 1137
         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 . '" />';
1138 1138
     }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -5374,7 +5374,7 @@
 block discarded – undo
5374 5374
         foreach ($rows as $row) {
5375 5375
             $family = Family::getInstance($row->id, $this->tree);
5376 5376
             if ($family->canShow()) {
5377
-                $total  = (int) $row->tot;
5377
+                $total = (int) $row->tot;
5378 5378
 
5379 5379
                 if ($type === 'list') {
5380 5380
                     $top10[] = '<li><a href="' . e($family->url()) . '">' . $family->getFullName() . '</a> - ' . I18N::plural('%s grandchild', '%s grandchildren', $total, I18N::number($total));
Please login to merge, or discard this patch.
app/Http/Controllers/ListController.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -215,7 +215,7 @@
 block discarded – undo
215 215
                     <li class="wt-initials-list-item">
216 216
                         <?php if ($count > 0): ?>
217 217
                             <a href="<?= e(route($route, ['alpha' => $letter, 'ged' => $tree->getName()])) ?>" class="wt-initial<?= $letter === $alpha ? ' active' : ''?> '" title="<?= I18N::number($count) ?>"><?= $this->surnameInitial((string) $letter) ?></a>
218
-                        <?php else: ?>
218
+                        <?php else : ?>
219 219
                             <span class="wt-initial text-muted"><?= $this->surnameInitial((string) $letter) ?></span>
220 220
 
221 221
                         <?php endif ?>
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -215,7 +215,8 @@  discard block
 block discarded – undo
215 215
                     <li class="wt-initials-list-item">
216 216
                         <?php if ($count > 0): ?>
217 217
                             <a href="<?= e(route($route, ['alpha' => $letter, 'ged' => $tree->getName()])) ?>" class="wt-initial<?= $letter === $alpha ? ' active' : ''?> '" title="<?= I18N::number($count) ?>"><?= $this->surnameInitial((string) $letter) ?></a>
218
-                        <?php else: ?>
218
+                        <?php else {
219
+    : ?>
219 220
                             <span class="wt-initial text-muted"><?= $this->surnameInitial((string) $letter) ?></span>
220 221
 
221 222
                         <?php endif ?>
@@ -269,6 +270,7 @@  discard block
 block discarded – undo
269 270
 
270 271
             if ($show === 'indi' || $show === 'surn') {
271 272
                 $surns = $this->surnames($tree, $surname, $alpha, $show_marnm === 'yes', $families);
273
+}
272 274
                 if ($show === 'surn') {
273 275
                     // Show the surname list
274 276
                     switch ($tree->getPreference('SURNAME_LIST_STYLE')) {
Please login to merge, or discard this patch.
app/Http/Controllers/AdminTreesController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -414,7 +414,7 @@
 block discarded – undo
414 414
         ];
415 415
 
416 416
         $access_level = $access_levels[$privatize_export];
417
-        $encoding     =  $convert ? 'ANSI' : 'UTF-8';
417
+        $encoding     = $convert ? 'ANSI' : 'UTF-8';
418 418
 
419 419
         // What to call the downloaded file
420 420
         $download_filename = $tree->getName();
Please login to merge, or discard this patch.
app/Theme/AbstractTheme.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1577,7 +1577,7 @@
 block discarded – undo
1577 1577
     public function menuSearchPhonetic(): Menu
1578 1578
     {
1579 1579
         /* I18N: search using “sounds like”, rather than exact spelling */
1580
-        return new Menu(I18N::translate('Phonetic search'), route('search-phonetic', ['ged' => $this->tree->getName(), 'action' => 'soundex',]), 'menu-search-soundex', ['rel' => 'nofollow']);
1580
+        return new Menu(I18N::translate('Phonetic search'), route('search-phonetic', ['ged' => $this->tree->getName(), 'action' => 'soundex', ]), 'menu-search-soundex', ['rel' => 'nofollow']);
1581 1581
     }
1582 1582
 
1583 1583
     /**
Please login to merge, or discard this patch.
app/Date.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -162,7 +162,7 @@  discard block
 block discarded – undo
162 162
         // Ambiguous dates - don't override calendar escape
163 163
         if ($cal == '') {
164 164
             if (preg_match('/^(JAN|FEB|MAR|APR|MAY|JUN|JUL|AUG|SEP|OCT|NOV|DEC)$/', $m)) {
165
-                $cal =  GregorianDate::ESCAPE;
165
+                $cal = GregorianDate::ESCAPE;
166 166
             } else {
167 167
                 if (preg_match('/^[345]\d\d\d$/', $y)) {
168 168
                     // Year 3000-5999
@@ -460,7 +460,7 @@  discard block
 block discarded – undo
460 460
     public function addYears(int $years, string $qualifier = ''): Date
461 461
     {
462 462
         $tmp               = clone $this;
463
-        $tmp->date1->year  += $years;
463
+        $tmp->date1->year += $years;
464 464
         $tmp->date1->month = 0;
465 465
         $tmp->date1->day   = 0;
466 466
         $tmp->date1->setJdFromYmd();
Please login to merge, or discard this patch.