Completed
Pull Request — master (#2168)
by Rico
11:42 queued 04:11
created
app/Http/Controllers/AdminController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -560,7 +560,7 @@
 block discarded – undo
560 560
         $data = array_map(function (string $thumbnail): array {
561 561
             $original = $this->findOriginalFileFromThumbnail($thumbnail);
562 562
 
563
-            $original_url  = route('unused-media-thumbnail', [
563
+            $original_url = route('unused-media-thumbnail', [
564 564
                 'folder' => dirname($original),
565 565
                 'file'   => basename($original),
566 566
                 'w'      => 100,
Please login to merge, or discard this patch.
app/Http/Controllers/BranchesController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -261,7 +261,7 @@  discard block
 block discarded – undo
261 261
         $sosa = array_search($individual, $ancestors, true);
262 262
         if (is_int($sosa) && $module instanceof RelationshipsChartModule) {
263 263
             $sosa_class = 'search_hit';
264
-            $sosa_html = '<a class="details1 ' . $individual->getBoxStyle() . '" href="' . e($module->chartUrl($individual, ['xref2' => $individuals[1]->xref()])) . '" rel="nofollow" title="' . I18N::translate('Relationships') . '">' .  I18N::number($sosa) . '</a>' . self::sosaGeneration($sosa);
264
+            $sosa_html = '<a class="details1 ' . $individual->getBoxStyle() . '" href="' . e($module->chartUrl($individual, ['xref2' => $individuals[1]->xref()])) . '" rel="nofollow" title="' . I18N::translate('Relationships') . '">' . I18N::number($sosa) . '</a>' . self::sosaGeneration($sosa);
265 265
         } else {
266 266
             $sosa_class = '';
267 267
             $sosa_html  = '';
@@ -297,7 +297,7 @@  discard block
 block discarded – undo
297 297
                     $sosa = array_search($spouse, $ancestors, true);
298 298
                     if (is_int($sosa) && $module instanceof RelationshipsChartModule) {
299 299
                         $sosa_class = 'search_hit';
300
-                        $sosa_html  = '<a class="details1 ' . $spouse->getBoxStyle() . '" href="' . e($module->chartUrl($individual, ['xref2' => $individuals[1]->xref()])) . '" rel="nofollow" title="' . I18N::translate('Relationships') . '">' .  I18N::number($sosa) . '</a>' . self::sosaGeneration($sosa);
300
+                        $sosa_html  = '<a class="details1 ' . $spouse->getBoxStyle() . '" href="' . e($module->chartUrl($individual, ['xref2' => $individuals[1]->xref()])) . '" rel="nofollow" title="' . I18N::translate('Relationships') . '">' . I18N::number($sosa) . '</a>' . self::sosaGeneration($sosa);
301 301
                     } else {
302 302
                         $sosa_class = '';
303 303
                         $sosa_html  = '';
Please login to merge, or discard this patch.
app/Functions/FunctionsExport.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -103,11 +103,11 @@
 block discarded – undo
103 103
         $record = GedcomRecord::getInstance('HEAD', $tree);
104 104
         $fact = $record->getFirstFact('COPR');
105 105
         if ($fact instanceof Fact) {
106
-            $COPR = "\n1 COPR " .$fact->value();
106
+            $COPR = "\n1 COPR " . $fact->value();
107 107
         }
108
-        $fact   = $record->getFirstFact('LANG');
108
+        $fact = $record->getFirstFact('LANG');
109 109
         if ($fact instanceof Fact) {
110
-            $LANG = "\n1 LANG " .$fact->value();
110
+            $LANG = "\n1 LANG " . $fact->value();
111 111
         }
112 112
         // Link to actual SUBM/SUBN records, if they exist
113 113
         $subn = DB::table('other')
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.
app/Http/Controllers/Admin/LocationController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -519,7 +519,7 @@
 block discarded – undo
519 519
         // ... and process the differences
520 520
         $inserted = 0;
521 521
         if ($diff->isNotEmpty()) {
522
-            $nextRecordId    = 1 + (int) DB::table('placelocation')->max('pl_id');
522
+            $nextRecordId = 1 + (int) DB::table('placelocation')->max('pl_id');
523 523
 
524 524
             foreach ($diff as $place) {
525 525
                 // For Westminster, London, England, we must also create England and London, England
Please login to merge, or discard this patch.
app/Statistics/Google/ChartIndividual.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@
 block discarded – undo
49 49
         $color_from = $color_from ?? $chart_color1;
50 50
         $color_to   = $color_to ?? $chart_color2;
51 51
 
52
-        $sizes    = explode('x', $size);
52
+        $sizes = explode('x', $size);
53 53
 
54 54
         if ($tot_indi === 0) {
55 55
             return '';
Please login to merge, or discard this patch.
app/Statistics/Google/ChartAge.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -135,7 +135,7 @@
 block discarded – undo
135 135
             $decades .= '|' . I18N::number($i);
136 136
         }
137 137
 
138
-        $chxl  .= '1:||' . I18N::translate('century') . '|2:' . $decades . '|3:||' . I18N::translate('Age') . '|';
138
+        $chxl .= '1:||' . I18N::translate('century') . '|2:' . $decades . '|3:||' . I18N::translate('Age') . '|';
139 139
         $title = I18N::translate('Average age related to death century');
140 140
 
141 141
         if (\count($rows) > 6 || mb_strlen($title) < 30) {
Please login to merge, or discard this patch.
app/Module/FabTheme.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@
 block discarded – undo
29 29
     /**
30 30
      * Where are our CSS, JS and other assets?
31 31
      */
32
-    public const    ASSET_DIR  = 'themes/fab/css-2.0.0/';
32
+    public const    ASSET_DIR = 'themes/fab/css-2.0.0/';
33 33
 
34 34
     protected const PERSON_BOX_CLASSES = [
35 35
         'M' => 'person_box',
Please login to merge, or discard this patch.
app/Module/RelationshipsChartModule.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -322,14 +322,14 @@  discard block
 block discarded – undo
322 322
                         case 'sis':
323 323
                         case 'sib':
324 324
                             $table[$x + 1][$y] = '<div style="background:url(' . app()->make(ModuleThemeInterface::class)->parameter('image-hline') . ') repeat-x center;  width: 94px; text-align: center"><div class="hline-text" style="height: 32px;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $tree), Individual::getInstance($path[$n + 1], $tree)) . '</div><div style="height: 32px;">' . view('icons/arrow-end') . '</div></div>';
325
-                            $x                 += 2;
325
+                            $x += 2;
326 326
                             break;
327 327
                         case 'son':
328 328
                         case 'dau':
329 329
                         case 'chi':
330 330
                             if ($n > 2 && preg_match('/fat|mot|par/', $relationships[$n - 2])) {
331 331
                                 $table[$x + 1][$y - 1] = '<div style="background:url(' . $diagonal2 . '); width: 64px; height: 64px; text-align: center;"><div style="height: 32px; text-align: end;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $tree), Individual::getInstance($path[$n + 1], $tree)) . '</div><div style="height: 32px; text-align: start;">' . view('icons/arrow-down') . '</div></div>';
332
-                                $x                     += 2;
332
+                                $x += 2;
333 333
                             } else {
334 334
                                 $table[$x][$y - 1] = '<div style="background:url(' . app()->make(ModuleThemeInterface::class)
335 335
                                         ->parameter('image-vline') . ') repeat-y center; height: 64px; text-align: center;"><div class="vline-text" style="display: inline-block; width:50%; line-height: 64px;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $tree), Individual::getInstance($path[$n + 1], $tree)) . '</div><div style="display: inline-block; width:50%; line-height: 64px;">' . view('icons/arrow-down') . '</div></div>';
@@ -341,7 +341,7 @@  discard block
 block discarded – undo
341 341
                         case 'par':
342 342
                             if ($n > 2 && preg_match('/son|dau|chi/', $relationships[$n - 2])) {
343 343
                                 $table[$x + 1][$y + 1] = '<div style="background:url(' . $diagonal1 . '); background-position: top right; width: 64px; height: 64px; text-align: center;"><div style="height: 32px; text-align: start;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $tree), Individual::getInstance($path[$n + 1], $tree)) . '</div><div style="height: 32px; text-align: end;">' . view('icons/arrow-down') . '</div></div>';
344
-                                $x                     += 2;
344
+                                $x += 2;
345 345
                             } else {
346 346
                                 $table[$x][$y + 1] = '<div style="background:url(' . app()->make(ModuleThemeInterface::class)
347 347
                                         ->parameter('image-vline') . ') repeat-y center; height: 64px; text-align:center; "><div class="vline-text" style="display: inline-block; width: 50%; line-height: 64px;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $tree), Individual::getInstance($path[$n + 1], $tree)) . '</div><div style="display: inline-block; width: 50%; line-height: 32px">' . view('icons/arrow-up') . '</div></div>';
@@ -482,17 +482,17 @@  discard block
 block discarded – undo
482 482
      */
483 483
     private function oldStyleRelationshipPath(Tree $tree, array $path): array
484 484
     {
485
-        $spouse_codes  = [
485
+        $spouse_codes = [
486 486
             'M' => 'hus',
487 487
             'F' => 'wif',
488 488
             'U' => 'spo',
489 489
         ];
490
-        $parent_codes  = [
490
+        $parent_codes = [
491 491
             'M' => 'fat',
492 492
             'F' => 'mot',
493 493
             'U' => 'par',
494 494
         ];
495
-        $child_codes   = [
495
+        $child_codes = [
496 496
             'M' => 'son',
497 497
             'F' => 'dau',
498 498
             'U' => 'chi',
Please login to merge, or discard this patch.