fisharebest / webtrees

app/Services/SearchService.php

Spacing +2 added lines, -2 removed lines

@@ -126,7 +126,7 @@ 
                     ->where('wife_name.n_type', '<>', '_MARNM');
             });
 
-        $field  = new Expression('COALESCE(' . DB::prefix('husb_name') . ".n_full, '') || COALESCE(" . DB::prefix('wife_name') . ".n_full, '')");
+        $field = new Expression('COALESCE(' . DB::prefix('husb_name') . ".n_full, '') || COALESCE(" . DB::prefix('wife_name') . ".n_full, '')");
 
         $this->whereTrees($query, 'f_file', $trees);
         $this->whereSearch($query, $field, $search);
@@ -1068,7 +1068,7 @@ 
      * @param Expression<string>|string $column
      * @param array<string>             $search_terms
      */
-    private function whereSearch(Builder $query, Expression|string $column, array $search_terms): void
+    private function whereSearch(Builder $query, Expression | string $column, array $search_terms): void
     {
         foreach ($search_terms as $search_term) {
             $query->where($column, DB::iLike(), '%' . addcslashes($search_term, '\\%_') . '%');

app/Http/Middleware/BadBotBlocker.php

Spacing +1 added lines, -1 removed lines

@@ -323,7 +323,7 @@
     {
         return Registry::cache()->file()->remember('whois-asn-' . $asn, function () use ($asn): array {
             $ranges = $this->network_service->findIpRangesForAsn($asn);
-            $mapper = static fn (string $range): RangeInterface|null => Factory::parseRangeString($range);
+            $mapper = static fn (string $range): RangeInterface | null => Factory::parseRangeString($range);
             $ranges = array_map($mapper, $ranges);
 
             return array_filter($ranges);

app/Module/IndividualFactsTabModule.php

Spacing +1 added lines, -1 removed lines

@@ -115,7 +115,7 @@
             ->flatten();
 
         // Don't show family meta-data tags
-        $exclude_facts  = new Collection(['FAM:CHAN', 'FAM:_UID', 'FAM:UID', 'FAM:SUBM']);
+        $exclude_facts = new Collection(['FAM:CHAN', 'FAM:_UID', 'FAM:UID', 'FAM:SUBM']);
         // Don't show tags that are shown in tabs or sidebars
         $exclude_facts = $exclude_facts->merge($sidebar_facts)->merge($tab_facts);
 

app/Services/GedcomExportService.php

Spacing +4 added lines, -4 removed lines

@@ -107,7 +107,7 @@ 
         string $line_endings,
         string $filename,
         string $format,
-        Collection|null $records = null
+        Collection | null $records = null
     ): ResponseInterface {
         $access_level = self::ACCESS_LEVELS[$privacy];
 
@@ -177,9 +177,9 @@ 
         string $encoding = UTF8::NAME,
         int $access_level = Auth::PRIV_HIDE,
         string $line_endings = 'CRLF',
-        Collection|null $records = null,
-        ZipArchive|FilesystemOperator|null $zip_filesystem = null,
-        string|null $media_path = null
+        Collection | null $records = null,
+        ZipArchive | FilesystemOperator | null $zip_filesystem = null,
+        string | null $media_path = null
     ) {
         $stream = fopen('php://memory', 'wb+');
 

app/Services/MapDataService.php

Spacing +3 added lines, -3 removed lines

@@ -164,7 +164,7 @@ 
     /**
      * @param list<int> $parent_place_ids
      */
-    public function deleteUnusedLocations(int|null $parent_location_id, array $parent_place_ids): void
+    public function deleteUnusedLocations(int | null $parent_location_id, array $parent_place_ids): void
     {
         if ($parent_location_id === null) {
             $location_query = DB::table('place_location')
@@ -199,7 +199,7 @@ 
      *
      * @return Collection<int,object{id:int,key:string,place:string,latitude:float|null,longitude:float|null,child_count:int,no_coord:int}>
      */
-    public function getPlaceListLocation(int|null $parent_id): Collection
+    public function getPlaceListLocation(int | null $parent_id): Collection
     {
         $expression =
             DB::prefix('p1') . '.place IS NOT NULL AND ' . DB::prefix('p1') . '.latitude IS NULL OR ' .
@@ -248,7 +248,7 @@ 
                 'child_count' => (int) $row->child_count,
                 'no_coord'    => (int) $row->no_coord,
             ])
-            ->sort(static fn (object $x, object $y): int => I18N::comparator()($x->place, $y->place));
+            ->sort(static fn (object $x, object $y) : int => I18N::comparator()($x->place, $y->place));
     }
 
     public function writeLatitude(float $latitude): string

app/DB.php

Spacing +3 added lines, -3 removed lines

@@ -176,7 +176,7 @@ 
         return self::pdo()->getAttribute(PDO::ATTR_DRIVER_NAME);
     }
 
-    public static function exec(string $sql): int|false
+    public static function exec(string $sql): int | false
     {
         return self::pdo()->exec($sql);
     }
@@ -262,7 +262,7 @@ 
     /**
      * @return Expression<string>
      */
-    public static function binaryColumn(string $column, string|null $alias = null): Expression
+    public static function binaryColumn(string $column, string | null $alias = null): Expression
     {
         if (self::driverName() === self::MYSQL) {
             $sql = 'CAST(' . $column . ' AS binary)';
@@ -419,7 +419,7 @@ 
      * @param list<string> $local_columns
      * @param list<string> $foreign_columns
      */
-    public static function foreignKey(array $local_columns, string $foreign_table, array|null $foreign_columns = null): ForeignKey
+    public static function foreignKey(array $local_columns, string $foreign_table, array | null $foreign_columns = null): ForeignKey
     {
         return new ForeignKey(
             local_columns: $local_columns,