Completed
Pull Request — master (#1854)
by Rico
149:06 queued 135:36
created
app/Census/CensusColumnChildrenDied.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -53,6 +53,6 @@
 block discarded – undo
53 53
             }
54 54
         }
55 55
 
56
-        return (string)$count;
56
+        return (string) $count;
57 57
     }
58 58
 }
Please login to merge, or discard this patch.
app/Census/CensusColumnYearsMarried.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@
 block discarded – undo
47 47
         if ($marriage_date === null) {
48 48
             return '';
49 49
         } else {
50
-            return (string)Date::getAge($marriage_date, $this->date(), 0);
50
+            return (string) Date::getAge($marriage_date, $this->date(), 0);
51 51
         }
52 52
     }
53 53
 }
Please login to merge, or discard this patch.
app/Census/CensusColumnAgeMale5Years.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -42,7 +42,7 @@
 block discarded – undo
42 42
                 $years -= $years % 5;
43 43
             }
44 44
 
45
-            return (string)$years;
45
+            return (string) $years;
46 46
         }
47 47
     }
48 48
 }
Please login to merge, or discard this patch.
app/Census/CensusColumnAgeMale.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@
 block discarded – undo
37 37
         if ($individual->getSex() === 'F') {
38 38
             return '';
39 39
         } else {
40
-            return (string)Date::getAge($individual->getEstimatedBirthDate(), $this->date(), 0);
40
+            return (string) Date::getAge($individual->getEstimatedBirthDate(), $this->date(), 0);
41 41
         }
42 42
     }
43 43
 }
Please login to merge, or discard this patch.
app/Functions/FunctionsPrint.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
139 139
                     if ($note->canShow()) {
140 140
                         $noterec = $note->getGedcom();
141 141
                         $nt      = preg_match("/0 @$nmatch[1]@ NOTE (.*)/", $noterec, $n1match);
142
-                        $data    .= self::printNoteRecord($tree, ($nt > 0) ? $n1match[1] : '', 1, $noterec);
142
+                        $data .= self::printNoteRecord($tree, ($nt > 0) ? $n1match[1] : '', 1, $noterec);
143 143
                     }
144 144
                 } else {
145 145
                     $data = '<div class="fact_NOTE"><span class="label">' . I18N::translate('Note') . '</span>: <span class="field error">' . $nmatch[1] . '</span></div>';
@@ -385,35 +385,35 @@  discard block
 block discarded – undo
385 385
                 if (preg_match_all('/\n3 (?:_HEB|ROMN) (.+)/', $placerec, $matches)) {
386 386
                     foreach ($matches[1] as $match) {
387 387
                         $wt_place = new Place($match, $tree);
388
-                        $html     .= ' - ' . $wt_place->getFullName();
388
+                        $html .= ' - ' . $wt_place->getFullName();
389 389
                     }
390 390
                 }
391 391
                 $map_lati = '';
392 392
                 $cts      = preg_match('/\d LATI (.*)/', $placerec, $match);
393 393
                 if ($cts > 0) {
394 394
                     $map_lati = $match[1];
395
-                    $html     .= '<br><span class="label">' . I18N::translate('Latitude') . ': </span>' . $map_lati;
395
+                    $html .= '<br><span class="label">' . I18N::translate('Latitude') . ': </span>' . $map_lati;
396 396
                 }
397 397
                 $map_long = '';
398 398
                 $cts      = preg_match('/\d LONG (.*)/', $placerec, $match);
399 399
                 if ($cts > 0) {
400 400
                     $map_long = $match[1];
401
-                    $html     .= ' <span class="label">' . I18N::translate('Longitude') . ': </span>' . $map_long;
401
+                    $html .= ' <span class="label">' . I18N::translate('Longitude') . ': </span>' . $map_long;
402 402
                 }
403 403
                 if ($map_lati && $map_long) {
404 404
                     $map_lati = trim(strtr($map_lati, 'NSEW,�', ' - -. ')); // S5,6789 ==> -5.6789
405 405
                     $map_long = trim(strtr($map_long, 'NSEW,�', ' - -. ')); // E3.456� ==> 3.456
406
-                    $html     .= FontAwesome::linkIcon('google-maps', I18N::translate('Google Maps™'), [
406
+                    $html .= FontAwesome::linkIcon('google-maps', I18N::translate('Google Maps™'), [
407 407
                         'class' => 'btn btn-link',
408 408
                         'url'   => 'https://maps.google.com/maps?q=' . $map_lati . ',' . $map_long,
409 409
                         'rel'   => 'nofollow',
410 410
                     ]);
411
-                    $html     .= FontAwesome::linkIcon('bing-maps', I18N::translate('Bing Maps™'), [
411
+                    $html .= FontAwesome::linkIcon('bing-maps', I18N::translate('Bing Maps™'), [
412 412
                         'class' => 'btn btn-link',
413 413
                         'url'   => 'https://www.bing.com/maps/?lvl=15&cp=' . $map_lati . '~' . $map_long,
414 414
                         'rel'   => 'nofollow',
415 415
                     ]);
416
-                    $html     .= FontAwesome::linkIcon('openstreetmap', I18N::translate('OpenStreetMap™'), [
416
+                    $html .= FontAwesome::linkIcon('openstreetmap', I18N::translate('OpenStreetMap™'), [
417 417
                         'class' => 'btn btn-link',
418 418
                         'url'   => 'https://www.openstreetmap.org/#map=15/' . $map_lati . '/' . $map_long,
419 419
                         'rel'   => 'nofollow',
Please login to merge, or discard this patch.
app/Functions/Functions.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -307,17 +307,17 @@
 block discarded – undo
307 307
             return false;
308 308
         }
309 309
 
310
-        $spouse_codes  = [
310
+        $spouse_codes = [
311 311
             'M' => 'hus',
312 312
             'F' => 'wif',
313 313
             'U' => 'spo',
314 314
         ];
315
-        $parent_codes  = [
315
+        $parent_codes = [
316 316
             'M' => 'fat',
317 317
             'F' => 'mot',
318 318
             'U' => 'par',
319 319
         ];
320
-        $child_codes   = [
320
+        $child_codes = [
321 321
             'M' => 'son',
322 322
             'F' => 'dau',
323 323
             'U' => 'chi',
Please login to merge, or discard this patch.
app/Functions/FunctionsExport.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -64,7 +64,7 @@
 block discarded – undo
64 64
                         break;
65 65
                     }
66 66
                     $newrec .= mb_substr($line, 0, $pos) . Gedcom::EOL;
67
-                    $line   = $level . ' CONC ' . mb_substr($line, $pos);
67
+                    $line = $level . ' CONC ' . mb_substr($line, $pos);
68 68
                 } while (mb_strlen($line) > Gedcom::LINE_LENGTH);
69 69
             }
70 70
             $newrec .= $line . Gedcom::EOL;
Please login to merge, or discard this patch.
app/Menu.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -69,7 +69,7 @@
 block discarded – undo
69 69
                     $attrs .= ' ' . $key . '="' . e($value) . '"';
70 70
                 }
71 71
 
72
-                $class    = trim('dropdown-item ' . $submenu->class);
72
+                $class = trim('dropdown-item ' . $submenu->class);
73 73
                 $submenus .= '<a class="' . $class . '" href="' . e($submenu->link) . '"' . $attrs . '>' . $submenu->label . '</a>';
74 74
             }
75 75
 
Please login to merge, or discard this patch.
app/Schema/Migration22.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -60,7 +60,7 @@
 block discarded – undo
60 60
                     $_tmp_dir   = $WT_DATA_DIR;
61 61
                     while (strpos($_mf_dir, $_tmp_dir) !== 0) {
62 62
                         $_media_dir .= '../';
63
-                        $_tmp_dir   = preg_replace('~[^/\\\\]+[/\\\\]$~', '', $_tmp_dir);
63
+                        $_tmp_dir = preg_replace('~[^/\\\\]+[/\\\\]$~', '', $_tmp_dir);
64 64
                         if ($_tmp_dir == '') {
65 65
                             // Shouldn't get here - but this script is not allowed to fail...
66 66
                             continue 2;
Please login to merge, or discard this patch.