Completed
Push — develop ( e9444a...456dc1 )
by Greg
10:30 queued 04:51
created
app/Module/ClippingsCartModule.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -321,7 +321,7 @@
 block discarded – undo
321 321
 
322 322
         // Create a source, to indicate the source of the data.
323 323
         $record = "0 @WEBTREES@ SOUR\n1 TITL " . $base_url;
324
-        $author   = $this->user_service->find((int) $tree->getPreference('CONTACT_USER_ID'));
324
+        $author = $this->user_service->find((int) $tree->getPreference('CONTACT_USER_ID'));
325 325
         if ($author !== null) {
326 326
             $record .= "\n1 AUTH " . $author->realName();
327 327
         }
Please login to merge, or discard this patch.
app/Statistics/Repository/FamilyDatesRepository.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -79,7 +79,7 @@
 block discarded – undo
79 79
             ->select(['d_gid as id', 'd_year as year', 'd_fact AS fact', 'd_type AS type'])
80 80
             ->where('d_file', '=', $this->tree->id())
81 81
             ->where('d_fact', '=', $fact)
82
-            ->where('d_julianday1', '=', function (Builder $query) use ($operation, $fact): void {
82
+            ->where('d_julianday1', '=', function (Builder $query) use ($operation, $fact) : void {
83 83
                 $query->selectRaw($operation . '(d_julianday1)')
84 84
                     ->from('dates')
85 85
                     ->where('d_file', '=', $this->tree->id())
Please login to merge, or discard this patch.
app/Services/ModuleService.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -694,7 +694,7 @@  discard block
 block discarded – undo
694 694
         } catch (Throwable $exception) {
695 695
             $module_name = basename(dirname($filename));
696 696
             $message     = 'Fatal error in module: ' . $module_name;
697
-            $message     .= '<br>' . $exception;
697
+            $message .= '<br>' . $exception;
698 698
             FlashMessages::addMessage($message, 'danger');
699 699
         }
700 700
         return null;
@@ -805,7 +805,7 @@  discard block
 block discarded – undo
805 805
     public function findByName(string $module_name, bool $include_disabled = false): ?ModuleInterface
806 806
     {
807 807
         return $this->all($include_disabled)
808
-            ->first(static function (ModuleInterface $module) use ($module_name): bool {
808
+            ->first(static function (ModuleInterface $module) use ($module_name) : bool {
809 809
                 return $module->name() === $module_name;
810 810
             });
811 811
     }
Please login to merge, or discard this patch.
app/Http/RequestHandlers/LinkSpouseToIndividualPage.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
 
58 58
         // Create a dummy family record, so we can create new/empty facts.
59 59
         $dummy = Factory::family()->new('', '0 @@ FAM', null, $tree);
60
-        $facts  = [
60
+        $facts = [
61 61
             'f' => [
62 62
                 new Fact('1 MARR', $dummy, ''),
63 63
             ],
Please login to merge, or discard this patch.
app/Functions/FunctionsPrintFacts.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -583,7 +583,7 @@  discard block
 block discarded – undo
583 583
         for ($j = 0; $j < $ct; $j++) {
584 584
             if (!str_contains($match[$j][1], '@')) {
585 585
                 $source = e($match[$j][1] . preg_replace('/\n\d CONT ?/', "\n", $match[$j][2]));
586
-                $data   .= '<div class="fact_SOUR"><span class="label">' . I18N::translate('Source') . ':</span> <span class="field" dir="auto">' . Filter::formatText($source, $tree) . '</span></div>';
586
+                $data .= '<div class="fact_SOUR"><span class="label">' . I18N::translate('Source') . ':</span> <span class="field" dir="auto">' . Filter::formatText($source, $tree) . '</span></div>';
587 587
             }
588 588
         }
589 589
         // Find source for each fact
@@ -601,7 +601,7 @@  discard block
 block discarded – undo
601 601
                     }
602 602
                     $srec     = substr($factrec, $spos1, $spos2 - $spos1);
603 603
                     $lt       = preg_match_all("/$nlevel \w+/", $srec, $matches);
604
-                    $data     .= '<div class="fact_SOUR">';
604
+                    $data .= '<div class="fact_SOUR">';
605 605
                     $id       = 'collapse-' . Uuid::uuid4()->toString();
606 606
                     $expanded = (bool) $tree->getPreference('EXPAND_SOURCES');
607 607
                     if ($lt > 0) {
Please login to merge, or discard this patch.
app/Module/BranchesListModule.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
 {
65 65
     use ModuleListTrait;
66 66
 
67
-    protected const ROUTE_URL  = '/tree/{tree}/branches{/surname}';
67
+    protected const ROUTE_URL = '/tree/{tree}/branches{/surname}';
68 68
 
69 69
     /** @var ModuleService */
70 70
     protected $module_service;
Please login to merge, or discard this patch.
app/Module/IndividualListModule.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -326,7 +326,8 @@  discard block
 block discarded – undo
326 326
                     <li class="wt-initials-list-item d-flex">
327 327
                         <?php if ($count > 0) : ?>
328 328
                             <a href="<?= e($this->listUrl($tree, ['alpha' => $letter, 'tree' => $tree->name()])) ?>" class="wt-initial px-1<?= $letter === $alpha ? ' active' : '' ?> '" title="<?= I18N::number($count) ?>"><?= $this->surnameInitial((string) $letter) ?></a>
329
-                        <?php else : ?>
329
+                        <?php else {
330
+    : ?>
330 331
                             <span class="wt-initial px-1 text-muted"><?= $this->surnameInitial((string) $letter) ?></span>
331 332
 
332 333
                         <?php endif ?>
@@ -380,6 +381,7 @@  discard block
 block discarded – undo
380 381
 
381 382
             if ($show === 'indi' || $show === 'surn') {
382 383
                 $surns = $this->surnames($tree, $surname, $alpha, $show_marnm === 'yes', $families, I18N::locale());
384
+}
383 385
                 if ($show === 'surn') {
384 386
                     // Show the surname list
385 387
                     switch ($tree->getPreference('SURNAME_LIST_STYLE')) {
Please login to merge, or discard this patch.
app/Http/RequestHandlers/CalendarEvents.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -106,7 +106,7 @@  discard block
 block discarded – undo
106 106
                 $anniversary_facts = $this->calendar_service->getCalendarEvents($ged_year->minimumJulianDay(), $ged_year->maximumJulianDay(), $filterev, $tree, $filterof, $filtersx);
107 107
             }
108 108
 
109
-            $anniversaries     = Collection::make($anniversary_facts)
109
+            $anniversaries = Collection::make($anniversary_facts)
110 110
                 ->unique()
111 111
                 ->sort(static function (Fact $x, Fact $y): int {
112 112
                     return $x->date()->minimumJulianDay() <=> $y->date()->minimumJulianDay();
@@ -285,7 +285,7 @@  discard block
 block discarded – undo
285 285
         $html = '';
286 286
 
287 287
         foreach ($list as $xref => $facts) {
288
-            $tmp  = Factory::gedcomRecord()->make((string) $xref, $tree);
288
+            $tmp = Factory::gedcomRecord()->make((string) $xref, $tree);
289 289
             $html .= $tag1 . '<a href="' . e($tmp->url()) . '">' . $tmp->fullName() . '</a> ';
290 290
             $html .= '<div class="indent">' . $facts . '</div>' . $tag2;
291 291
         }
Please login to merge, or discard this patch.
app/Http/Controllers/Admin/ImportThumbnailsController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -215,7 +215,7 @@
 block discarded – undo
215 215
                 // Turn each filename into a row for the table
216 216
                 $original = $this->findOriginalFileFromThumbnail($thumbnail);
217 217
 
218
-                $original_url  = route(MediaFileUnused::class, [
218
+                $original_url = route(MediaFileUnused::class, [
219 219
                     'path' => $original,
220 220
                     'w'    => 100,
221 221
                     'h'    => 100,
Please login to merge, or discard this patch.