fisharebest / webtrees

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(),
             ]);
@@ -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/Http/RequestHandlers/AddSpouseToFamilyPage.php

Spacing +1 added lines, -1 removed lines

@@ -79,7 +79,7 @@
         $surname_tradition = SurnameTradition::create($tree->getPreference('SURNAME_TRADITION'));
         $spouse            = $family->spouses()->first();
         assert($spouse instanceof Individual);
-        $names      = $surname_tradition->newSpouseNames($spouse, $sex);
+        $names = $surname_tradition->newSpouseNames($spouse, $sex);
 
         $facts = [
             'i' => $this->gedcom_edit_service->newIndividualFacts($tree, $sex, $names),

app/Services/GedcomEditService.php

Spacing +8 added lines, -8 removed lines

@@ -68,7 +68,7 @@ 
     {
         $dummy = Registry::familyFactory()->new('', '0 @@ FAM', null, $tree);
         $tags  = new Collection(explode(',', $tree->getPreference('QUICK_REQUIRED_FAMFACTS')));
-        $facts = $tags->map(fn (string $tag): Fact => $this->createNewFact($dummy, $tag));
+        $facts = $tags->map(fn(string $tag): Fact => $this->createNewFact($dummy, $tag));
 
         return Fact::sortFacts($facts);
     }
@@ -84,9 +84,9 @@ 
     {
         $dummy      = Registry::individualFactory()->new('', '0 @@ INDI', null, $tree);
         $tags       = new Collection(explode(',', $tree->getPreference('QUICK_REQUIRED_FACTS')));
-        $facts      = $tags->map(fn (string $tag): Fact => $this->createNewFact($dummy, $tag));
+        $facts      = $tags->map(fn(string $tag): Fact => $this->createNewFact($dummy, $tag));
         $sex_fact   = new Collection([new Fact('1 SEX ' . $sex, $dummy, '')]);
-        $name_facts = Collection::make($names)->map(static fn (string $gedcom): Fact => new Fact($gedcom, $dummy, ''));
+        $name_facts = Collection::make($names)->map(static fn(string $gedcom): Fact => new Fact($gedcom, $dummy, ''));
 
         return $sex_fact->concat($name_facts)->concat(Fact::sortFacts($facts));
     }
@@ -152,7 +152,7 @@ 
                 }
             }
 
-            if ($values[$i] !== '' || $children_with_values  && !$element instanceof AbstractXrefElement) {
+            if ($values[$i] !== '' || $children_with_values && !$element instanceof AbstractXrefElement) {
                 if ($values[$i] === '') {
                     $gedcom_lines[] = $levels[$i] . ' ' . $tags[$i];
                 } else {
@@ -218,15 +218,15 @@ 
     {
         $subtags = Registry::elementFactory()->make($record->tag())->subtags();
 
-        $subtags = array_filter($subtags, static fn (string $v, string $k) => !str_ends_with($v, ':1') || $record->facts([$k])->isEmpty(), ARRAY_FILTER_USE_BOTH);
+        $subtags = array_filter($subtags, static fn(string $v, string $k) => !str_ends_with($v, ':1') || $record->facts([$k])->isEmpty(), ARRAY_FILTER_USE_BOTH);
 
         $subtags = array_keys($subtags);
 
         // Don't include facts/events that we have hidden in the control panel.
-        $subtags = array_filter($subtags, fn (string $subtag): bool => !$this->isHiddenTag($record->tag() . ':' . $subtag));
+        $subtags = array_filter($subtags, fn(string $subtag): bool => !$this->isHiddenTag($record->tag() . ':' . $subtag));
 
         if (!$include_hidden) {
-            $fn_hidden = fn (string $t): bool => !$this->isHiddenTag($record->tag() . ':' . $t);
+            $fn_hidden = fn(string $t): bool => !$this->isHiddenTag($record->tag() . ':' . $t);
             $subtags   = array_filter($subtags, $fn_hidden);
         }
 
@@ -317,7 +317,7 @@ 
     private function isHiddenTag(string $tag): bool
     {
         // Function to filter hidden tags.
-        $fn_hide = static fn (string $x): bool => (bool) Site::getPreference('HIDE_' . $x);
+        $fn_hide = static fn(string $x): bool => (bool) Site::getPreference('HIDE_' . $x);
 
         $preferences = array_filter(Gedcom::HIDDEN_TAGS, $fn_hide, ARRAY_FILTER_USE_KEY);
         $preferences = array_values($preferences);

app/Module/IndividualMetadataModule.php

Spacing +2 added lines, -2 removed lines

@@ -101,7 +101,7 @@ 
     public function getSidebarContent(Individual $individual): string
     {
         $html = $individual->facts(static::HANDLED_FACTS)
-            ->map(static fn (Fact $fact): string =>view('fact', ['fact' => $fact, 'record' => $individual]))
+            ->map(static fn(Fact $fact): string =>view('fact', ['fact' => $fact, 'record' => $individual]))
             ->implode('');
 
         return strip_tags($html, '<a><div><span><i>');
@@ -114,6 +114,6 @@ 
      */
     public function supportedFacts(): Collection
     {
-        return new Collection(array_map(static fn (string $tag): string => 'INDI:' . $tag, static::HANDLED_FACTS));
+        return new Collection(array_map(static fn(string $tag): string => 'INDI:' . $tag, static::HANDLED_FACTS));
     }
 }

app/Module/NotesTabModule.php

Spacing +1 added lines, -1 removed lines

@@ -142,7 +142,7 @@
                 }
             }
 
-            $callback = static fn (Fact $fact): bool => preg_match('/(?:^1|\n\d) NOTE/', $fact->gedcom()) === 1;
+            $callback = static fn(Fact $fact): bool => preg_match('/(?:^1|\n\d) NOTE/', $fact->gedcom()) === 1;
 
             $this->facts = $facts->filter($callback);
 

app/Elements/NoteStructure.php

Indentation +3 added lines, -3 removed lines

@@ -130,9 +130,9 @@
 
         if ($one_line_only) {
             return
-                 '<div class="fact_NOTE">' .
-                 I18N::translate('<span class="label">%1$s:</span> <span class="field" dir="auto">%2$s</span>', $label, $html) .
-                 '</div>';
+                    '<div class="fact_NOTE">' .
+                    I18N::translate('<span class="label">%1$s:</span> <span class="field" dir="auto">%2$s</span>', $label, $html) .
+                    '</div>';
         }
 
         return

app/Validator.php

Spacing +6 added lines, -6 removed lines

@@ -80,7 +80,7 @@ 
      */
     public function isBetween(int $minimum, int $maximum): self
     {
-        $this->rules[] = static function (?int $value) use ($minimum, $maximum): ?int {
+        $this->rules[] = static function (?int $value) use ($minimum, $maximum) : ?int {
             if (is_int($value) && $value >= $minimum && $value <= $maximum) {
                 return $value;
             }
@@ -98,7 +98,7 @@ 
      */
     public function isInArray(array $values): self
     {
-        $this->rules[] = static fn (?string $value): ?string => is_string($value) && in_array($value, $values, true) ? $value : null;
+        $this->rules[] = static fn(?string $value) : ?string => is_string($value) && in_array($value, $values, true) ? $value : null;
 
         return $this;
     }
@@ -109,7 +109,7 @@ 
      */
     public function isLocalUrl(string $base_url): self
     {
-        $this->rules[] = static function (?string $value) use ($base_url): ?string {
+        $this->rules[] = static function (?string $value) use ($base_url) : ?string {
             if (is_string($value)) {
                 $value_info    = parse_url($value);
                 $base_url_info = parse_url($base_url);
@@ -166,7 +166,7 @@ 
             $value = null;
         }
 
-        $callback = static fn (?array $value, Closure $rule): ?array => $rule($value);
+        $callback = static fn(?array $value, Closure $rule) : ?array => $rule($value);
 
         return array_reduce($this->rules, $callback, $value);
     }
@@ -186,7 +186,7 @@ 
             $value = null;
         }
 
-        $callback = static fn (?int $value, Closure $rule): ?int => $rule($value);
+        $callback = static fn(?int $value, Closure $rule) : ?int => $rule($value);
 
         return array_reduce($this->rules, $callback, $value);
     }
@@ -204,7 +204,7 @@ 
             $value = null;
         }
 
-        $callback = static fn (?string $value, Closure $rule): ?string => $rule($value);
+        $callback = static fn(?string $value, Closure $rule) : ?string => $rule($value);
 
         return array_reduce($this->rules, $callback, $value);
     }

app/Encodings/UTF8.php

Spacing +1 added lines, -1 removed lines

@@ -828,7 +828,7 @@
     public static function chr(int $code): string
     {
         if ($code < 0 || $code > 0x1FFFFF) {
-            throw new InvalidArgumentException((string)$code);
+            throw new InvalidArgumentException((string) $code);
         }
 
         if ($code <= 0x7F) {

app/Http/RequestHandlers/DataFixUpdateAll.php

Spacing +1 added lines, -1 removed lines

@@ -93,7 +93,7 @@
         /** @var Collection<int,GedcomRecord> $records */
         $records = $rows->map(function (object $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);
         });