fisharebest / webtrees

app/Functions/FunctionsPrintFacts.php

Spacing +2 added lines, -2 removed lines

@@ -583,7 +583,7 @@ 
         for ($j = 0; $j < $ct; $j++) {
             if (!str_contains($match[$j][1], '@')) {
                 $source = e($match[$j][1] . preg_replace('/\n\d CONT ?/', "\n", $match[$j][2]));
-                $data   .= '<div class="fact_SOUR"><span class="label">' . I18N::translate('Source') . ':</span> <span class="field" dir="auto">' . Filter::formatText($source, $tree) . '</span></div>';
+                $data .= '<div class="fact_SOUR"><span class="label">' . I18N::translate('Source') . ':</span> <span class="field" dir="auto">' . Filter::formatText($source, $tree) . '</span></div>';
             }
         }
         // Find source for each fact
@@ -601,7 +601,7 @@ 
                     }
                     $srec     = substr($factrec, $spos1, $spos2 - $spos1);
                     $lt       = preg_match_all("/$nlevel \w+/", $srec, $matches);
-                    $data     .= '<div class="fact_SOUR">';
+                    $data .= '<div class="fact_SOUR">';
                     $id       = 'collapse-' . Uuid::uuid4()->toString();
                     $expanded = (bool) $tree->getPreference('EXPAND_SOURCES');
                     if ($lt > 0) {

app/Module/BranchesListModule.php

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
 {
     use ModuleListTrait;
 
-    protected const ROUTE_URL  = '/tree/{tree}/branches{/surname}';
+    protected const ROUTE_URL = '/tree/{tree}/branches{/surname}';
 
     /** @var ModuleService */
     protected $module_service;

app/Module/IndividualListModule.php

Braces +3 added lines, -1 removed lines

@@ -326,7 +326,8 @@ 
                     <li class="wt-initials-list-item d-flex">
                         <?php if ($count > 0) : ?>
                             <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>
-                        <?php else : ?>
+                        <?php else {
+    : ?>
                             <span class="wt-initial px-1 text-muted"><?= $this->surnameInitial((string) $letter) ?></span>
 
                         <?php endif ?>
@@ -380,6 +381,7 @@ 
 
             if ($show === 'indi' || $show === 'surn') {
                 $surns = $this->surnames($tree, $surname, $alpha, $show_marnm === 'yes', $families, I18N::locale());
+}
                 if ($show === 'surn') {
                     // Show the surname list
                     switch ($tree->getPreference('SURNAME_LIST_STYLE')) {

app/Http/RequestHandlers/PendingChangesLogData.php

Spacing +1 added lines, -1 removed lines

@@ -112,7 +112,7 @@
                 '<div class="gedcom-data" dir="ltr">' .
                 preg_replace_callback(
                     '/@(' . Gedcom::REGEX_XREF . ')@/',
-                    static function (array $match) use ($tree): string {
+                    static function (array $match) use ($tree) : string {
                         $record = Registry::gedcomRecordFactory()->make($match[1], $tree);
 
                         return $record ? '<a href="' . e($record->url()) . '">' . $match[0] . '</a>' : $match[0];

app/Http/RequestHandlers/DataFixUpdateAll.php

Spacing +1 added lines, -1 removed lines

@@ -94,7 +94,7 @@
         /** @var Collection<GedcomRecord> $records */
         $records = $rows->map(function (stdClass $row) use ($tree): ?GedcomRecord {
             return $this->data_fix_service->getRecordByType($row->xref, $tree, $row->type);
-        })->filter(static function (?GedcomRecord $record) use ($module, $params): bool {
+        })->filter(static function (?GedcomRecord $record) use ($module, $params) : bool {
             return $record instanceof GedcomRecord && !$record->isPendingDeletion() && $module->doesRecordNeedUpdate($record, $params);
         });
 

app/Http/RequestHandlers/MapDataList.php

Spacing +1 added lines, -1 removed lines

@@ -85,7 +85,7 @@
         }
 
         // Request for a non-existent location?
-        if ($parent_id !== null &&  $parent->id() === null) {
+        if ($parent_id !== null && $parent->id() === null) {
             return redirect(route(__CLASS__));
         }
 

app/Services/UserService.php

Spacing +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
      */
     public function find(?int $user_id): ?User
     {
-        return Registry::cache()->array()->remember('user-' . $user_id, static function () use ($user_id): ?User {
+        return Registry::cache()->array()->remember('user-' . $user_id, static function () use ($user_id) : ?User {
             return DB::table('user')
                 ->where('user_id', '=', $user_id)
                 ->get()

app/Module/ChartsBlockModule.php

Spacing +5 added lines, -5 removed lines

@@ -117,7 +117,7 @@ 
                             'generations' => 3,
                             'layout'      => PedigreeChartModule::STYLE_RIGHT,
                         ]);
-                        $content   = view('modules/charts/chart', [
+                        $content = view('modules/charts/chart', [
                             'block_id'  => $block_id,
                             'chart_url' => $chart_url,
                         ]);
@@ -137,7 +137,7 @@ 
                             'generations' => 2,
                             'chart_style' => DescendancyChartModule::CHART_STYLE_TREE,
                         ]);
-                        $content   = view('modules/charts/chart', [
+                        $content = view('modules/charts/chart', [
                             'block_id'  => $block_id,
                             'chart_url' => $chart_url,
                         ]);
@@ -149,7 +149,7 @@ 
                     break;
 
                 case 'hourglass':
-                    $module    = $this->module_service->findByInterface(HourglassChartModule::class)->first();
+                    $module = $this->module_service->findByInterface(HourglassChartModule::class)->first();
 
                     if ($module instanceof HourglassChartModule) {
                         $title     = $module->chartTitle($individual);
@@ -157,7 +157,7 @@ 
                             'ajax'        => true,
                             'generations' => 2,
                         ]);
-                        $content   = view('modules/charts/chart', [
+                        $content = view('modules/charts/chart', [
                             'block_id'  => $block_id,
                             'chart_url' => $chart_url,
                         ]);
@@ -262,7 +262,7 @@ 
         $default_xref     = $gedcomid ?: $PEDIGREE_ROOT_ID;
 
         $type = $this->getBlockSetting($block_id, 'type', 'pedigree');
-        $xref  = $this->getBlockSetting($block_id, 'pid', $default_xref);
+        $xref = $this->getBlockSetting($block_id, 'pid', $default_xref);
 
         $charts = [
             'pedigree'    => I18N::translate('Pedigree'),

app/Module/TimelineChartModule.php

Spacing +2 added lines, -2 removed lines

@@ -46,7 +46,7 @@ 
 {
     use ModuleChartTrait;
 
-    protected const ROUTE_URL  = '/tree/{tree}/timeline-{scale}';
+    protected const ROUTE_URL = '/tree/{tree}/timeline-{scale}';
 
     // Defaults
     protected const DEFAULT_SCALE      = 10;
@@ -153,7 +153,7 @@ 
 
         $params = (array) $request->getParsedBody();
 
-        $add  = $params['add'] ?? '';
+        $add = $params['add'] ?? '';
 
         Auth::checkComponentAccess($this, ModuleChartInterface::class, $tree, $user);