Passed
Pull Request — master (#2335)
by Rico
06:20
created
app/Http/Controllers/Admin/ImportThumbnailsController.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/Admin/MediaController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -120,7 +120,7 @@
 block discarded – undo
120 120
         $length = (int) $request->get('length');
121 121
 
122 122
         // Files within this folder
123
-        $media_folder  = $request->get('media_folder', '');
123
+        $media_folder = $request->get('media_folder', '');
124 124
 
125 125
         // subfolders within $media_path
126 126
         $subfolders = $request->get('subfolders', ''); // include|exclude
Please login to merge, or discard this patch.
app/Http/Controllers/ReportEngineController.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -135,7 +135,7 @@  discard block
 block discarded – undo
135 135
                     break;
136 136
 
137 137
                 case 'DATE':
138
-                    $attributes       += [
138
+                    $attributes += [
139 139
                         'type'  => 'text',
140 140
                         'value' => $input['default'],
141 141
                         'dir'   => 'ltr',
@@ -148,7 +148,7 @@  discard block
 block discarded – undo
148 148
                 default:
149 149
                     switch ($input['type']) {
150 150
                         case 'text':
151
-                            $attributes       += [
151
+                            $attributes += [
152 152
                                 'type'  => 'text',
153 153
                                 'value' => $input['default'],
154 154
                             ];
@@ -156,7 +156,7 @@  discard block
 block discarded – undo
156 156
                             break;
157 157
 
158 158
                         case 'checkbox':
159
-                            $attributes       += [
159
+                            $attributes += [
160 160
                                 'type'    => 'checkbox',
161 161
                                 'checked' => (bool) $input['default'],
162 162
                             ];
Please login to merge, or discard this patch.
app/Module/RelationshipsChartModule.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -320,14 +320,14 @@  discard block
 block discarded – undo
320 320
                         case 'sis':
321 321
                         case 'sib':
322 322
                             $table[$x + 1][$y] = '<div style="background:url(' . e(asset('css/images/hline.png')) . ') 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-right') . '</div></div>';
323
-                            $x                 += 2;
323
+                            $x += 2;
324 324
                             break;
325 325
                         case 'son':
326 326
                         case 'dau':
327 327
                         case 'chi':
328 328
                             if ($n > 2 && preg_match('/fat|mot|par/', $relationships[$n - 2])) {
329 329
                                 $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>';
330
-                                $x                     += 2;
330
+                                $x += 2;
331 331
                             } else {
332 332
                                 $table[$x][$y - 1] = '<div style="background:url(' . e('"' . asset('css/images/vline.png') . '"') . ') 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>';
333 333
                             }
@@ -338,9 +338,9 @@  discard block
 block discarded – undo
338 338
                         case 'par':
339 339
                             if ($n > 2 && preg_match('/son|dau|chi/', $relationships[$n - 2])) {
340 340
                                 $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>';
341
-                                $x                     += 2;
341
+                                $x += 2;
342 342
                             } else {
343
-                                $table[$x][$y + 1] = '<div style="background:url(' . e('"' . asset('css/images/vline.png') . '"')  . ') 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>';
343
+                                $table[$x][$y + 1] = '<div style="background:url(' . e('"' . asset('css/images/vline.png') . '"') . ') 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>';
344 344
                             }
345 345
                             $y += 2;
346 346
                             break;
@@ -478,17 +478,17 @@  discard block
 block discarded – undo
478 478
      */
479 479
     private function oldStyleRelationshipPath(Tree $tree, array $path): array
480 480
     {
481
-        $spouse_codes  = [
481
+        $spouse_codes = [
482 482
             'M' => 'hus',
483 483
             'F' => 'wif',
484 484
             'U' => 'spo',
485 485
         ];
486
-        $parent_codes  = [
486
+        $parent_codes = [
487 487
             'M' => 'fat',
488 488
             'F' => 'mot',
489 489
             'U' => 'par',
490 490
         ];
491
-        $child_codes   = [
491
+        $child_codes = [
492 492
             'M' => 'son',
493 493
             'F' => 'dau',
494 494
             'U' => 'chi',
Please login to merge, or discard this patch.
app/Statistics/Google/ChartCommonGiven.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -59,7 +59,7 @@
 block discarded – undo
59 59
         ];
60 60
 
61 61
         foreach ($given as $name => $count) {
62
-            $data[] = [ $name, $count ];
62
+            $data[] = [$name, $count];
63 63
         }
64 64
 
65 65
         $data[] = [
Please login to merge, or discard this patch.
app/Statistics/Google/ChartMortality.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -57,7 +57,7 @@
 block discarded – undo
57 57
                 $tot_l
58 58
             ];
59 59
 
60
-            $data[] =  [
60
+            $data[] = [
61 61
                 I18N::translate('Dead'),
62 62
                 $tot_d
63 63
             ];
Please login to merge, or discard this patch.
app/Statistics/Google/ChartMarriageAge.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -102,9 +102,9 @@
 block discarded – undo
102 102
             ->groupBy(['century', 'sex']);
103 103
 
104 104
         return $male->unionAll($female)
105
-           ->orderBy('century')
106
-           ->get()
107
-           ->all();
105
+            ->orderBy('century')
106
+            ->get()
107
+            ->all();
108 108
     }
109 109
 
110 110
     /**
Please login to merge, or discard this patch.
app/Module/StatisticsChartModule.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -962,7 +962,7 @@  discard block
 block discarded – undo
962 962
 
963 963
         $data = [
964 964
             array_merge(
965
-                [ I18N::translate('Century') ],
965
+                [I18N::translate('Century')],
966 966
                 array_values($z_axis)
967 967
             )
968 968
         ];
@@ -979,7 +979,7 @@  discard block
 block discarded – undo
979 979
 
980 980
         foreach ($intermediate as $key => $values) {
981 981
             $data[] = array_merge(
982
-                [ $x_axis[$key] ],
982
+                [$x_axis[$key]],
983 983
                 $values
984 984
             );
985 985
         }
Please login to merge, or discard this patch.
app/Functions/FunctionsPrint.php 2 patches
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
145 145
                     if ($note->canShow()) {
146 146
                         $noterec = $note->gedcom();
147 147
                         $nt      = preg_match("/0 @$nmatch[1]@ NOTE (.*)/", $noterec, $n1match);
148
-                        $data    .= self::printNoteRecord($tree, ($nt > 0) ? $n1match[1] : '', 1, $noterec);
148
+                        $data .= self::printNoteRecord($tree, ($nt > 0) ? $n1match[1] : '', 1, $noterec);
149 149
                     }
150 150
                 } else {
151 151
                     $data = '<div class="fact_NOTE"><span class="label">' . I18N::translate('Note') . '</span>: <span class="field error">' . $nmatch[1] . '</span></div>';
@@ -362,20 +362,20 @@  discard block
 block discarded – undo
362 362
                 if (preg_match_all('/\n3 (?:_HEB|ROMN) (.+)/', $placerec, $matches)) {
363 363
                     foreach ($matches[1] as $match) {
364 364
                         $wt_place = new Place($match, $tree);
365
-                        $html     .= ' - ' . $wt_place->fullName();
365
+                        $html .= ' - ' . $wt_place->fullName();
366 366
                     }
367 367
                 }
368 368
                 $map_lati = '';
369 369
                 $cts      = preg_match('/\d LATI (.*)/', $placerec, $match);
370 370
                 if ($cts > 0) {
371 371
                     $map_lati = $match[1];
372
-                    $html     .= '<br><span class="label">' . I18N::translate('Latitude') . ': </span>' . $map_lati;
372
+                    $html .= '<br><span class="label">' . I18N::translate('Latitude') . ': </span>' . $map_lati;
373 373
                 }
374 374
                 $map_long = '';
375 375
                 $cts      = preg_match('/\d LONG (.*)/', $placerec, $match);
376 376
                 if ($cts > 0) {
377 377
                     $map_long = $match[1];
378
-                    $html     .= ' <span class="label">' . I18N::translate('Longitude') . ': </span>' . $map_long;
378
+                    $html .= ' <span class="label">' . I18N::translate('Longitude') . ': </span>' . $map_long;
379 379
                 }
380 380
                 if ($map_lati && $map_long) {
381 381
                     $map_lati = trim(strtr($map_lati, 'NSEW,�', ' - -. ')); // S5,6789 ==> -5.6789
Please login to merge, or discard this patch.
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -322,10 +322,10 @@
 block discarded – undo
322 322
         }
323 323
         // print gedcom ages
324 324
         foreach ([
325
-                     I18N::translate('Age')     => $fact_age,
326
-                     I18N::translate('Husband') => $husb_age,
327
-                     I18N::translate('Wife')    => $wife_age,
328
-                 ] as $label => $age) {
325
+                        I18N::translate('Age')     => $fact_age,
326
+                        I18N::translate('Husband') => $husb_age,
327
+                        I18N::translate('Wife')    => $wife_age,
328
+                    ] as $label => $age) {
329 329
             if ($age !== '') {
330 330
                 $html .= ' <span class="label">' . $label . ':</span> <span class="age">' . FunctionsDate::getAgeAtEvent($age) . '</span>';
331 331
             }
Please login to merge, or discard this patch.