Completed
Pull Request — master (#2487)
by
unknown
40:43
created
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/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/Functions/Functions.php 2 patches
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -320,7 +320,7 @@  discard block
 block discarded – undo
320 320
                                 return $new_path;
321 321
                             }
322 322
 
323
-                            $paths[]                     = $new_path;
323
+                            $paths[] = $new_path;
324 324
                             $visited[$spouse->xref()] = true;
325 325
                         }
326 326
                     }
@@ -334,7 +334,7 @@  discard block
 block discarded – undo
334 334
                                 return $new_path;
335 335
                             }
336 336
 
337
-                            $paths[]                    = $new_path;
337
+                            $paths[] = $new_path;
338 338
                             $visited[$child->xref()] = true;
339 339
                         }
340 340
                     }
@@ -353,7 +353,7 @@  discard block
 block discarded – undo
353 353
                                 return $new_path;
354 354
                             }
355 355
 
356
-                            $paths[]                     = $new_path;
356
+                            $paths[] = $new_path;
357 357
                             $visited[$spouse->xref()] = true;
358 358
                         }
359 359
                     }
@@ -367,7 +367,7 @@  discard block
 block discarded – undo
367 367
                                 return $new_path;
368 368
                             }
369 369
 
370
-                            $paths[]                    = $new_path;
370
+                            $paths[] = $new_path;
371 371
                             $visited[$child->xref()] = true;
372 372
                         }
373 373
                     }
Please login to merge, or discard this patch.
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -1714,9 +1714,9 @@  discard block
 block discarded – undo
1714 1714
                             }
1715 1715
 
1716 1716
                             return I18N::translate('great ×%s aunt/uncle', I18N::number($up - 2));
1717
-			case 'zh-Hans':
1718
-			case 'zh-Hant':
1719
-			    if ($sex2 === 'M') {
1717
+            case 'zh-Hans':
1718
+            case 'zh-Hant':
1719
+                if ($sex2 === 'M') {
1720 1720
                                 return I18N::translate('great ×%s uncle', I18N::number($up));
1721 1721
                             }
1722 1722
 
@@ -1928,8 +1928,8 @@  discard block
 block discarded – undo
1928 1928
                             }
1929 1929
 
1930 1930
                             return I18N::translateContext('(a woman’s) great ×%s nephew/niece', 'great ×%s nephew/niece', I18N::number($down - 3));
1931
-			case 'zh-Hans':
1932
-			case 'zh-Hant':
1931
+            case 'zh-Hans':
1932
+            case 'zh-Hant':
1933 1933
                             if ($sex2 === 'M') {
1934 1934
                                 if ($first === 'bro' && $sex1 === 'M') {
1935 1935
                                     return I18N::translateContext('(a man’s) brother’s great ×(%s-1) grandson', 'great ×%s nephew', I18N::number($down - 1));
@@ -2080,8 +2080,8 @@  discard block
 block discarded – undo
2080 2080
                             return I18N::translate('great ×%s grandparent', I18N::number($up - 3));
2081 2081
 
2082 2082
                         case 'it': // Source: Michele Locati
2083
-			case 'zh-Hans':
2084
-			case 'zh-Hant':
2083
+            case 'zh-Hans':
2084
+            case 'zh-Hant':
2085 2085
                         case 'es': // Source: Wes Groleau
2086 2086
                             if ($sex2 === 'M') {
2087 2087
                                 return I18N::translate('great ×%s grandfather', I18N::number($up));
@@ -2093,7 +2093,7 @@  discard block
 block discarded – undo
2093 2093
 
2094 2094
                             return I18N::translate('great ×%s grandparent', I18N::number($up));
2095 2095
 
2096
-						case 'fr': // Source: Jacqueline Tetreault
2096
+                        case 'fr': // Source: Jacqueline Tetreault
2097 2097
                         case 'fr_CA':
2098 2098
                             if ($sex2 === 'M') {
2099 2099
                                 return I18N::translate('great ×%s grandfather', I18N::number($up - 1));
@@ -2226,8 +2226,8 @@  discard block
 block discarded – undo
2226 2226
                             }
2227 2227
 
2228 2228
                             return I18N::translate('great ×%s grandchild', I18N::number($up - 3));
2229
-			case 'zh-Hans':
2230
-			case 'zh-Hant':
2229
+            case 'zh-Hans':
2230
+            case 'zh-Hant':
2231 2231
                             if ($sex2 === 'M') {
2232 2232
                                 return I18N::translate('great ×%s grandson', I18N::number($up));
2233 2233
                             }
@@ -2238,7 +2238,7 @@  discard block
 block discarded – undo
2238 2238
 
2239 2239
                             return I18N::translate('great ×%s grandchild', I18N::number($up));
2240 2240
 
2241
-						case 'it':
2241
+                        case 'it':
2242 2242
                             // Source: Michele Locati
2243 2243
                         case 'es':
2244 2244
                             // Source: Wes Groleau (adding doesn’t change behavior, but needs to be better researched)
Please login to merge, or discard this patch.
app/Module/OnThisDayModule.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -121,7 +121,7 @@
 block discarded – undo
121 121
 
122 122
         // If we are only showing living individuals, then we don't need to search for DEAT events.
123 123
         if ($filter) {
124
-            $event_array  = array_diff($event_array, Gedcom::DEATH_EVENTS);
124
+            $event_array = array_diff($event_array, Gedcom::DEATH_EVENTS);
125 125
         }
126 126
 
127 127
         $events_filter = implode('|', $event_array);
Please login to merge, or discard this patch.
app/Module/UpcomingAnniversariesModule.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -121,7 +121,7 @@
 block discarded – undo
121 121
 
122 122
         // If we are only showing living individuals, then we don't need to search for DEAT events.
123 123
         if ($filter) {
124
-            $event_array  = array_diff($event_array, Gedcom::DEATH_EVENTS);
124
+            $event_array = array_diff($event_array, Gedcom::DEATH_EVENTS);
125 125
         }
126 126
 
127 127
         $events_filter = implode('|', $event_array);
Please login to merge, or discard this patch.
app/Services/UpgradeService.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -76,7 +76,7 @@
 block discarded – undo
76 76
     {
77 77
         $latest_version = $this->fetchLatestVersion();
78 78
 
79
-        [, , $url] = explode('|', $latest_version . '||');
79
+        [,, $url] = explode('|', $latest_version . '||');
80 80
 
81 81
         return $url;
82 82
     }
Please login to merge, or discard this patch.
app/Module/TopPageViewsModule.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -70,7 +70,7 @@
 block discarded – undo
70 70
 
71 71
         $top10 = DB::table('hit_counter')
72 72
             ->where('gedcom_id', '=', $tree->id())
73
-            ->whereIn('page_name', ['individual.php','family.php','source.php','repo.php','note.php','mediaviewer.php'])
73
+            ->whereIn('page_name', ['individual.php', 'family.php', 'source.php', 'repo.php', 'note.php', 'mediaviewer.php'])
74 74
             ->orderByDesc('page_count')
75 75
             ->limit((int) $num)
76 76
             ->pluck('page_count', 'page_parameter');
Please login to merge, or discard this patch.
app/Source.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@
 block discarded – undo
28 28
 {
29 29
     public const RECORD_TYPE = 'SOUR';
30 30
 
31
-    protected const ROUTE_NAME  = 'source';
31
+    protected const ROUTE_NAME = 'source';
32 32
 
33 33
     /**
34 34
      * A closure which will create a record from a database row.
Please login to merge, or discard this patch.
app/Census/CensusColumnNationality.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -52,7 +52,7 @@
 block discarded – undo
52 52
         }
53 53
 
54 54
         // Did we emigrate or naturalise?
55
-        foreach ($individual->facts(['IMMI' ,'EMIG', 'NATU'], true) as $fact) {
55
+        foreach ($individual->facts(['IMMI', 'EMIG', 'NATU'], true) as $fact) {
56 56
             if (Date::compare($fact->date(), $this->date()) <= 0) {
57 57
                 $place = $fact->place()->gedcomName();
58 58
             }
Please login to merge, or discard this patch.