Passed
Pull Request — master (#2252)
by Rico
06:36
created
app/Functions/FunctionsPrint.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -345,10 +345,10 @@
 block discarded – undo
345 345
         }
346 346
         // print gedcom ages
347 347
         foreach ([
348
-                     I18N::translate('Age')     => $fact_age,
349
-                     I18N::translate('Husband') => $husb_age,
350
-                     I18N::translate('Wife')    => $wife_age,
351
-                 ] as $label => $age) {
348
+                        I18N::translate('Age')     => $fact_age,
349
+                        I18N::translate('Husband') => $husb_age,
350
+                        I18N::translate('Wife')    => $wife_age,
351
+                    ] as $label => $age) {
352 352
             if ($age != '') {
353 353
                 $html .= ' <span class="label">' . $label . ':</span> <span class="age">' . FunctionsDate::getAgeAtEvent($age) . '</span>';
354 354
             }
Please login to merge, or discard this patch.
app/Http/Controllers/HomePageController.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -840,9 +840,9 @@
 block discarded – undo
840 840
         }
841 841
 
842 842
         foreach ([
843
-                     'main' => $main_blocks,
844
-                     'side' => $side_blocks,
845
-                 ] as $location => $updated_blocks) {
843
+                        'main' => $main_blocks,
844
+                        'side' => $side_blocks,
845
+                    ] as $location => $updated_blocks) {
846 846
             foreach ($updated_blocks as $block_order => $block_id) {
847 847
                 if (is_numeric($block_id)) {
848 848
                     // Updated block
Please login to merge, or discard this patch.
app/MediaFile.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -224,10 +224,10 @@
 block discarded – undo
224 224
             $src    = $this->imageUrl($width, $height, $fit);
225 225
             $srcset = [];
226 226
             foreach ([
227
-                         2,
228
-                         3,
229
-                         4,
230
-                     ] as $x) {
227
+                            2,
228
+                            3,
229
+                            4,
230
+                        ] as $x) {
231 231
                 $srcset[] = $this->imageUrl($width * $x, $height * $x, $fit) . ' ' . $x . 'x';
232 232
             }
233 233
         }
Please login to merge, or discard this patch.
app/Module/FrequentlyAskedQuestionsModule.php 1 patch
Indentation   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -399,19 +399,19 @@
 block discarded – undo
399 399
     private function faqsExist(Tree $tree, string $language): bool
400 400
     {
401 401
         return DB::table('block')
402
-             ->join('block_setting', 'block_setting.block_id', '=', 'block.block_id')
403
-             ->where('module_name', '=', $this->name())
404
-             ->where('setting_name', '=', 'languages')
405
-             ->where(function (Builder $query) use ($tree): void {
406
-                 $query
407
-                     ->whereNull('gedcom_id')
408
-                     ->orWhere('gedcom_id', '=', $tree->id());
409
-             })
410
-             ->select(['setting_value AS languages'])
411
-             ->get()
412
-             ->filter(function (stdClass $faq) use ($language): bool {
413
-                 return $faq->languages === '' || in_array($language, explode(',', $faq->languages));
414
-             })
402
+                ->join('block_setting', 'block_setting.block_id', '=', 'block.block_id')
403
+                ->where('module_name', '=', $this->name())
404
+                ->where('setting_name', '=', 'languages')
405
+                ->where(function (Builder $query) use ($tree): void {
406
+                    $query
407
+                        ->whereNull('gedcom_id')
408
+                        ->orWhere('gedcom_id', '=', $tree->id());
409
+                })
410
+                ->select(['setting_value AS languages'])
411
+                ->get()
412
+                ->filter(function (stdClass $faq) use ($language): bool {
413
+                    return $faq->languages === '' || in_array($language, explode(',', $faq->languages));
414
+                })
415 415
             ->isNotEmpty();
416 416
     }
417 417
 }
Please login to merge, or discard this patch.
app/Http/Controllers/Admin/LocationController.php 1 patch
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -334,9 +334,11 @@
 block discarded – undo
334 334
             'fqpn',
335 335
         ];
336 336
 
337
-        if ($serverfile !== '' && is_dir(WT_DATA_DIR . 'places')) {  // first choice is file on server
337
+        if ($serverfile !== '' && is_dir(WT_DATA_DIR . 'places')) {
338
+// first choice is file on server
338 339
             $filename = WT_DATA_DIR . 'places/' . $serverfile;
339
-        } elseif ($request->files->has('localfile')) { // 2nd choice is local file
340
+        } elseif ($request->files->has('localfile')) {
341
+// 2nd choice is local file
340 342
             $filename = $request->files->get('localfile')->getPathName();
341 343
         }
342 344
 
Please login to merge, or discard this patch.
app/Http/Controllers/ListController.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -223,7 +223,8 @@  discard block
 block discarded – undo
223 223
                     <li class="wt-initials-list-item d-flex">
224 224
                         <?php if ($count > 0) : ?>
225 225
                             <a href="<?= e(route($route, ['alpha' => $letter, 'ged' => $tree->name()])) ?>" class="wt-initial px-1<?= $letter === $alpha ? ' active' : '' ?> '" title="<?= I18N::number($count) ?>"><?= $this->surnameInitial((string) $letter) ?></a>
226
-                        <?php else : ?>
226
+                        <?php else {
227
+    : ?>
227 228
                             <span class="wt-initial px-1 text-muted"><?= $this->surnameInitial((string) $letter) ?></span>
228 229
 
229 230
                         <?php endif ?>
@@ -277,6 +278,7 @@  discard block
 block discarded – undo
277 278
 
278 279
             if ($show === 'indi' || $show === 'surn') {
279 280
                 $surns = $this->individual_list_service->surnames($surname, $alpha, $show_marnm === 'yes', $families, WT_LOCALE, I18N::collation());
281
+}
280 282
                 if ($show === 'surn') {
281 283
                     // Show the surname list
282 284
                     switch ($tree->getPreference('SURNAME_LIST_STYLE')) {
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.