fisharebest / webtrees

app/Statistics/Google/ChartSex.php

Spacing +2 added lines, -2 removed lines

@@ -46,8 +46,8 @@
         string $color_male = null,
         string $color_unknown = null
     ): string {
-        $color_female  = $color_female  ?? '#ffd1dc';
-        $color_male    = $color_male    ?? '#84beff';
+        $color_female  = $color_female ?? '#ffd1dc';
+        $color_male    = $color_male ?? '#84beff';
         $color_unknown = $color_unknown ?? '#777777';
 
         $data = [

app/Statistics/Repository/FamilyDatesRepository.php

Spacing +1 added lines, -1 removed lines

@@ -79,7 +79,7 @@
             ->select(['d_gid as id', 'd_year as year', 'd_fact AS fact', 'd_type AS type'])
             ->where('d_file', '=', $this->tree->id())
             ->where('d_fact', '=', $fact)
-            ->where('d_julianday1', '=', function (Builder $query) use ($operation, $fact): void {
+            ->where('d_julianday1', '=', function (Builder $query) use ($operation, $fact) : void {
                 $query->selectRaw($operation . '(d_julianday1)')
                     ->from('dates')
                     ->where('d_file', '=', $this->tree->id())

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/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/RelationshipsChartModule.php

Spacing +1 added lines, -1 removed lines

@@ -330,7 +330,7 @@
 
             $language = app(ModuleService::class)
                 ->findByInterface(ModuleLanguageInterface::class, true)
-                ->first(fn (ModuleLanguageInterface $language): bool => $language->locale()->languageTag() === I18N::languageTag());
+                ->first(fn(ModuleLanguageInterface $language): bool => $language->locale()->languageTag() === I18N::languageTag());
 
 
 

app/Services/RelationshipService.php

Spacing +1 added lines, -1 removed lines

@@ -76,7 +76,7 @@
     {
         $language = app(ModuleService::class)
             ->findByInterface(ModuleLanguageInterface::class, true)
-            ->first(fn (ModuleLanguageInterface $language): bool => $language->locale()->languageTag() === I18N::languageTag());
+            ->first(fn(ModuleLanguageInterface $language): bool => $language->locale()->languageTag() === I18N::languageTag());
 
         $path = $this->getCloseRelationship($individual1, $individual2);
 

app/Module/ShareAnniversaryModule.php

Spacing +7 added lines, -7 removed lines

@@ -100,7 +100,7 @@ 
     {
         if ($record instanceof Individual) {
             $facts = $record->facts(static::INDIVIDUAL_EVENTS, true)
-                ->merge($record->spouseFamilies()->map(fn (Family $family): Collection => $family->facts(static::FAMILY_EVENTS, true)));
+                ->merge($record->spouseFamilies()->map(fn(Family $family): Collection => $family->facts(static::FAMILY_EVENTS, true)));
         } elseif ($record instanceof Family) {
             $facts = $record->facts(static::FAMILY_EVENTS, true);
         } else {
@@ -110,11 +110,11 @@ 
         // iCalendar only supports exact Gregorian dates.
         $facts = $facts
             ->flatten()
-            ->filter(fn (Fact $fact): bool => $fact->date()->isOK())
-            ->filter(fn (Fact $fact): bool => $fact->date()->qual1 === '')
-            ->filter(fn (Fact $fact): bool => $fact->date()->minimumDate() instanceof GregorianDate)
-            ->filter(fn (Fact $fact): bool => $fact->date()->minimumJulianDay() === $fact->date()->maximumJulianDay())
-            ->mapWithKeys(fn (Fact $fact): array => [
+            ->filter(fn(Fact $fact): bool => $fact->date()->isOK())
+            ->filter(fn(Fact $fact): bool => $fact->date()->qual1 === '')
+            ->filter(fn(Fact $fact): bool => $fact->date()->minimumDate() instanceof GregorianDate)
+            ->filter(fn(Fact $fact): bool => $fact->date()->minimumJulianDay() === $fact->date()->maximumJulianDay())
+            ->mapWithKeys(fn(Fact $fact): array => [
                 route(static::class, ['tree' => $record->tree()->name(), 'xref' => $fact->record()->xref(), 'fact_id' => $fact->id()]) =>
                     $fact->label() . ' — ' . $fact->date()->display(false, null, false),
             ]);
@@ -149,7 +149,7 @@ 
         $record = Auth::checkRecordAccess($record);
 
         $fact = $record->facts()
-            ->filter(fn (Fact $fact): bool => $fact->id() === $fact_id)
+            ->filter(fn(Fact $fact): bool => $fact->id() === $fact_id)
             ->first();
 
         if ($fact instanceof Fact) {

app/Module/IndividualFactsTabModule.php

Spacing +3 added lines, -3 removed lines

@@ -120,17 +120,17 @@
         // Which facts and events are handled by other modules?
         $sidebar_facts = $this->module_service
             ->findByComponent(ModuleSidebarInterface::class, $individual->tree(), Auth::user())
-            ->map(fn (ModuleSidebarInterface $sidebar): Collection => $sidebar->supportedFacts());
+            ->map(fn(ModuleSidebarInterface $sidebar): Collection => $sidebar->supportedFacts());
 
         $tab_facts = $this->module_service
             ->findByComponent(ModuleTabInterface::class, $individual->tree(), Auth::user())
-            ->map(fn (ModuleTabInterface $tab): Collection => $tab->supportedFacts());
+            ->map(fn(ModuleTabInterface $tab): Collection => $tab->supportedFacts());
 
         $exclude_facts = $sidebar_facts->merge($tab_facts)->flatten();
 
         // The individual’s own facts
         $individual_facts = $individual->facts()
-            ->filter(fn (Fact $fact): bool => !$exclude_facts->contains($fact->tag()));
+            ->filter(fn(Fact $fact): bool => !$exclude_facts->contains($fact->tag()));
 
         $relative_facts = new Collection();