fisharebest / webtrees

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/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);
         });
 

app/Factories/TimestampFactory.php

Spacing +2 added lines, -2 removed lines

@@ -45,7 +45,7 @@ 
      */
     public function make(int $timestamp, UserInterface $user = null): TimestampInterface
     {
-        $user     ??= Auth::user();
+        $user ??= Auth::user();
         $timezone = $user->getPreference(UserInterface::PREF_TIME_ZONE, Site::getPreference('TIMEZONE'));
         $locale   = I18N::locale()->code();
 
@@ -61,7 +61,7 @@ 
      */
     public function fromString(?string $string, string $format = 'Y-m-d H:i:s', UserInterface $user = null): TimestampInterface
     {
-        $string    ??= date($format);
+        $string ??= date($format);
         $timestamp = date_create_from_format($format, $string);
 
         if ($timestamp === false) {

app/Report/ReportParserSetup.php

Spacing +1 added lines, -1 removed lines

@@ -126,7 +126,7 @@
             } else {
                 $match = [];
                 if (preg_match('/NOW([+\-]\d+)/', $attrs['default'], $match) > 0) {
-                    $date = Registry::timestampFactory()->now()->addDays((int)$match[1]);
+                    $date = Registry::timestampFactory()->now()->addDays((int) $match[1]);
                     $this->input['default'] = strtoupper($date->format('d M Y'));
                 } else {
                     $this->input['default'] = $attrs['default'];

app/Console/ComposerScripts.php

Spacing +3 added lines, -3 removed lines

@@ -85,9 +85,9 @@
         $filesystem = new Filesystem(new LocalFilesystemAdapter(self::ROOT_DIR));
 
         $scripts = $filesystem->listContents('app', FilesystemReader::LIST_DEEP)
-            ->filter(static fn (StorageAttributes $file): bool => $file->isFile())
-            ->map(static fn (StorageAttributes $file): string => $file->path())
-            ->filter(static fn (string $script): bool => !str_contains($script, 'Interface.php') && !str_contains($script, 'Abstract'));
+            ->filter(static fn(StorageAttributes $file): bool => $file->isFile())
+            ->map(static fn(StorageAttributes $file): string => $file->path())
+            ->filter(static fn(string $script): bool => !str_contains($script, 'Interface.php') && !str_contains($script, 'Abstract'));
 
         foreach ($scripts as $script) {
             $class = strtr($script, ['app/' => '', '.php' => '', '/' => '\\']);