fisharebest / webtrees

app/Functions/FunctionsPrintFacts.php

Spacing +5 added lines, -5 removed lines

@@ -432,10 +432,10 @@ 
         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">';
+                $data .= '<div class="fact_SOUR"><span class="label">' . I18N::translate('Source') . ':</span> <span class="field" dir="auto">';
 
                 if ($tree->getPreference('FORMAT_TEXT') === 'markdown') {
-                    $data .= '<div class="markdown" dir="auto">' ;
+                    $data .= '<div class="markdown" dir="auto">';
                     $data .= Registry::markdownFactory()->markdown($tree)->convertToHtml($source);
                     $data .= '</div>';
                 } else {
@@ -444,7 +444,7 @@ 
                     $data .= '</div>';
                 }
 
-                $data   .= '</span></div>';
+                $data .= '</span></div>';
             }
         }
         // Find source for each fact
@@ -462,7 +462,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) {
@@ -852,7 +852,7 @@ 
             }
 
             if ($tree->getPreference('FORMAT_TEXT') === 'markdown') {
-                $formatted_text = '<div class="markdown" dir="auto">' ;
+                $formatted_text = '<div class="markdown" dir="auto">';
                 $formatted_text .= Registry::markdownFactory()->markdown($tree)->convertToHtml($text);
                 $formatted_text .= '</div>';
             } else {

app/Services/SearchService.php

Spacing +6 added lines, -6 removed lines

@@ -740,7 +740,7 @@ 
                         $query->where('individuals.i_gedcom', 'LIKE', $like);
                         break;
                 }
-            } elseif (str_starts_with($field_name, 'INDI:')  && str_ends_with($field_name, ':DATE')) {
+            } elseif (str_starts_with($field_name, 'INDI:') && str_ends_with($field_name, ':DATE')) {
                 $date = new Date($field_value);
                 if ($date->isOK()) {
                     $delta = 365 * ($modifiers[$field_name] ?? 0);
@@ -750,7 +750,7 @@ 
                         ->where('date_' . $parts[1] . '.d_julianday2', '<=', $date->maximumJulianDay() + $delta);
                 }
                 unset($fields[$field_name]);
-            } elseif (str_starts_with($field_name, 'FAM:')  && str_ends_with($field_name, ':DATE')) {
+            } elseif (str_starts_with($field_name, 'FAM:') && str_ends_with($field_name, ':DATE')) {
                 $date = new Date($field_value);
                 if ($date->isOK()) {
                     $delta = 365 * $modifiers[$field_name];
@@ -760,10 +760,10 @@ 
                         ->where('date_' . $parts[1] . '.d_julianday2', '<=', $date->maximumJulianDay() + $delta);
                 }
                 unset($fields[$field_name]);
-            } elseif (str_starts_with($field_name, 'INDI:')  && str_ends_with($field_name, ':PLAC')) {
+            } elseif (str_starts_with($field_name, 'INDI:') && str_ends_with($field_name, ':PLAC')) {
                 // SQL can only link a place to a person/family, not to an event.
                 $query->where('individual_places.p_place', 'LIKE', '%' . $field_value . '%');
-            } elseif (str_starts_with($field_name, 'FAM:')  && str_ends_with($field_name, ':PLAC')) {
+            } elseif (str_starts_with($field_name, 'FAM:') && str_ends_with($field_name, ':PLAC')) {
                 // SQL can only link a place to a person/family, not to an event.
                 $query->where('family_places.p_place', 'LIKE', '%' . $field_value . '%');
             } elseif (str_starts_with($field_name, 'MOTHER:NAME:') || str_starts_with($field_name, 'FATHER:NAME:')) {
@@ -871,7 +871,7 @@ 
 
                     $regex = '/' . preg_quote($field_value, '/') . '/i';
 
-                    if (str_starts_with($field_name, 'INDI:')  && str_ends_with($field_name, ':PLAC')) {
+                    if (str_starts_with($field_name, 'INDI:') && str_ends_with($field_name, ':PLAC')) {
                         foreach ($individual->facts([$parts[1]]) as $fact) {
                             if (preg_match($regex, $fact->place()->gedcomName())) {
                                 continue 2;
@@ -880,7 +880,7 @@ 
                         return false;
                     }
 
-                    if (str_starts_with($field_name, 'FAM:')  && str_ends_with($field_name, ':PLAC')) {
+                    if (str_starts_with($field_name, 'FAM:') && str_ends_with($field_name, ':PLAC')) {
                         foreach ($individual->spouseFamilies() as $family) {
                             foreach ($family->facts([$parts[1]]) as $fact) {
                                 if (preg_match($regex, $fact->place()->gedcomName())) {

app/Http/RequestHandlers/SearchAdvancedPage.php

Spacing +2 added lines, -2 removed lines

@@ -198,9 +198,9 @@
         };
 
         return $default_facts
-            ->reject(fn (string $field): bool => array_key_exists($field, $fields))
+            ->reject(fn(string $field): bool => array_key_exists($field, $fields))
             ->sort($comparator)
-            ->mapWithKeys(fn (string $fact): array => [$fact => Registry::elementFactory()->make($fact)->label()])
+            ->mapWithKeys(fn(string $fact): array => [$fact => Registry::elementFactory()->make($fact)->label()])
             ->all();
     }
 

app/Http/RequestHandlers/SearchReplaceAction.php

Spacing +1 added lines, -1 removed lines

@@ -93,7 +93,7 @@
 
             case 'name':
                 $name_tags = Registry::elementFactory()->make('INDI:NAME')->subtags();
-                $name_tags = array_map(fn (string $tag): string => '2 ' . $tag, $name_tags);
+                $name_tags = array_map(fn(string $tag): string => '2 ' . $tag, $name_tags);
                 $name_tags[] = '1 NAME';
 
                 $records = $this->search_service->searchIndividuals([$tree], [$search]);

app/Http/RequestHandlers/AutoCompleteFolder.php

Spacing +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
 
         try {
             return $this->media_file_service->mediaFolders($tree)
-                ->filter(fn (string $path): bool => stripos($path, $query) !== false);
+                ->filter(fn(string $path): bool => stripos($path, $query) !== false);
         } catch (FilesystemException $ex) {
             return new Collection();
         }

app/Services/MediaFileService.php

Spacing +10 added lines, -10 removed lines

@@ -98,7 +98,7 @@ 
         $sizePostMax = $this->parseIniFileSize(ini_get('post_max_size'));
         $sizeUploadMax = $this->parseIniFileSize(ini_get('upload_max_filesize'));
 
-        $bytes =  min($sizePostMax, $sizeUploadMax);
+        $bytes = min($sizePostMax, $sizeUploadMax);
         $kb    = intdiv($bytes + 1023, 1024);
 
         return I18N::translate('%s KB', I18N::number($kb));
@@ -297,9 +297,9 @@ 
         try {
             $files = $filesystem
                 ->listContents($folder, $subfolders)
-                ->filter(fn (StorageAttributes $attributes): bool => $attributes->isFile())
-                ->filter(fn (StorageAttributes $attributes): bool => !$this->ignorePath($attributes->path()))
-                ->map(fn (StorageAttributes $attributes): string => $attributes->path())
+                ->filter(fn(StorageAttributes $attributes): bool => $attributes->isFile())
+                ->filter(fn(StorageAttributes $attributes): bool => !$this->ignorePath($attributes->path()))
+                ->map(fn(StorageAttributes $attributes): string => $attributes->path())
                 ->toArray();
         } catch (FilesystemException $ex) {
             $files = [];
@@ -347,9 +347,9 @@ 
     {
         $folders = Registry::filesystem()->media($tree)
             ->listContents('', Filesystem::LIST_DEEP)
-            ->filter(fn (StorageAttributes $attributes): bool => $attributes->isDir())
-            ->filter(fn (StorageAttributes $attributes): bool => !$this->ignorePath($attributes->path()))
-            ->map(fn (StorageAttributes $attributes): string => $attributes->path())
+            ->filter(fn(StorageAttributes $attributes): bool => $attributes->isDir())
+            ->filter(fn(StorageAttributes $attributes): bool => !$this->ignorePath($attributes->path()))
+            ->map(fn(StorageAttributes $attributes): string => $attributes->path())
             ->toArray();
 
         return new Collection($folders);
@@ -394,9 +394,9 @@ 
         foreach ($media_roots as $media_folder) {
             $tmp = $data_filesystem
                 ->listContents($media_folder, Filesystem::LIST_DEEP)
-                ->filter(fn (StorageAttributes $attributes): bool => $attributes->isDir())
-                ->filter(fn (StorageAttributes $attributes): bool => !$this->ignorePath($attributes->path()))
-                ->map(fn (StorageAttributes $attributes): string => $attributes->path() . '/')
+                ->filter(fn(StorageAttributes $attributes): bool => $attributes->isDir())
+                ->filter(fn(StorageAttributes $attributes): bool => !$this->ignorePath($attributes->path()))
+                ->map(fn(StorageAttributes $attributes): string => $attributes->path() . '/')
                 ->toArray();
 
             $disk_folders = $disk_folders->concat($tmp);

app/Services/GedcomEditService.php

Spacing +3 added lines, -3 removed lines

@@ -438,12 +438,12 @@ 
     {
         $subtags = Registry::elementFactory()->make($record->tag())->subtags();
 
-        $subtags = array_filter($subtags, fn (string $v, string $k) => !str_ends_with($v, ':1') || $record->facts([$k])->isEmpty(), ARRAY_FILTER_USE_BOTH);
+        $subtags = array_filter($subtags, fn(string $v, string $k) => !str_ends_with($v, ':1') || $record->facts([$k])->isEmpty(), ARRAY_FILTER_USE_BOTH);
 
         $subtags = array_keys($subtags);
 
         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);
         }
 
@@ -536,7 +536,7 @@ 
     private function isHiddenTag(string $tag): bool
     {
         // Function to filter hidden tags.
-        $fn_hide = fn (string $x): bool => (bool) Site::getPreference('HIDE_' . $x);
+        $fn_hide = 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/Functions/FunctionsPrint.php

Spacing +12 added lines, -12 removed lines

@@ -161,7 +161,7 @@ 
                     if ($note->canShow()) {
                         $noterec = $note->gedcom();
                         $nt      = preg_match("/0 @$nmatch[1]@ NOTE (.*)/", $noterec, $n1match);
-                        $data    .= self::printNoteRecord($tree, $nt > 0 ? $n1match[1] : '', 1, $noterec);
+                        $data .= self::printNoteRecord($tree, $nt > 0 ? $n1match[1] : '', 1, $noterec);
                     }
                 } else {
                     $data = '<div class="fact_NOTE"><span class="label">' . I18N::translate('Note') . '</span>: <span class="field error">' . $nmatch[1] . '</span></div>';
@@ -379,7 +379,7 @@ 
                 if (preg_match_all('/\n3 (?:_HEB|ROMN) (.+)/', $placerec, $matches)) {
                     foreach ($matches[1] as $match) {
                         $wt_place = new Place($match, $tree);
-                        $html     .= ' - ' . $wt_place->fullName();
+                        $html .= ' - ' . $wt_place->fullName();
                     }
                 }
 
@@ -393,7 +393,7 @@ 
                     // Links to external maps
                     $html .= app(ModuleService::class)
                         ->findByInterface(ModuleMapLinkInterface::class)
-                        ->map(fn (ModuleMapLinkInterface $module): string => ' ' . $module->mapLink($event))
+                        ->map(fn(ModuleMapLinkInterface $module): string => ' ' . $module->mapLink($event))
                         ->implode('');
                 }
 
@@ -440,7 +440,7 @@ 
                 $quick_facts  = explode(',', $tree->getPreference('INDI_FACTS_QUICK'));
                 $unique_facts = [
                     'ADOP',
-                    'AFN' ,
+                    'AFN',
                     'BAPL',
                     'BAPM',
                     'BARM',
@@ -449,7 +449,7 @@ 
                     'BURI',
                     'CAST',
                     'CHAN',
-                    'CHR' ,
+                    'CHR',
                     'CHRA',
                     'CONF',
                     'CONL',
@@ -459,18 +459,18 @@ 
                     'FCOM',
                     'GRAD',
                     'NCHI',
-                    'NMR' ,
+                    'NMR',
                     'ORDN',
                     'PROB',
                     'REFN',
                     'RELI',
                     'RESN',
                     'RETI',
-                    'RFN' ,
-                    'RIN' ,
-                    'SEX' ,
+                    'RFN',
+                    'RIN',
+                    'SEX',
                     'SLGC',
-                    'SSN' ,
+                    'SSN',
                     'WILL',
                 ];
                 break;
@@ -492,13 +492,13 @@ 
         }
 
         // Filter existing tags
-        $filter_fn = fn ($tag): bool => !in_array($tag, $unique_facts, true) || $record->facts([$tag])->isEmpty();
+        $filter_fn = fn($tag): bool => !in_array($tag, $unique_facts, true) || $record->facts([$tag])->isEmpty();
 
         $quick_facts = array_filter($quick_facts, $filter_fn);
 
 
         // Create a label for a subtag
-        $label_fn = fn ($subtag): string => Registry::elementFactory()->make($record->tag() . ':' . $subtag)->label();
+        $label_fn = fn($subtag): string => Registry::elementFactory()->make($record->tag() . ':' . $subtag)->label();
 
         $quick_facts = array_combine($quick_facts, array_map($label_fn, $quick_facts));
         $add_facts   = array_combine($add_facts, array_map($label_fn, $add_facts));