fisharebest / webtrees

app/GedcomRecord.php

Spacing +9 added lines, -9 removed lines

@@ -77,7 +77,7 @@ 
     protected string $gedcom;
 
     // GEDCOM data (after any pending edits)
-    protected string|null $pending;
+    protected string | null $pending;
 
     /** @var array<Fact> Facts extracted from $gedcom/$pending */
     protected array $facts;
@@ -86,10 +86,10 @@ 
     protected array $getAllNames = [];
 
     /** @var int|null Cached result */
-    private int|null $getPrimaryName = null;
+    private int | null $getPrimaryName = null;
 
     /** @var int|null Cached result */
-    private int|null $getSecondaryName = null;
+    private int | null $getSecondaryName = null;
 
     /**
      * Create a GedcomRecord object from raw GEDCOM data.
@@ -100,7 +100,7 @@ 
      *                             empty string for records with pending deletions
      * @param Tree        $tree
      */
-    public function __construct(string $xref, string $gedcom, string|null $pending, Tree $tree)
+    public function __construct(string $xref, string $gedcom, string | null $pending, Tree $tree)
     {
         $this->xref    = $xref;
         $this->gedcom  = $gedcom;
@@ -239,7 +239,7 @@ 
      *
      * @return bool
      */
-    public function canShow(int|null $access_level = null): bool
+    public function canShow(int | null $access_level = null): bool
     {
         $access_level ??= Auth::accessLevel($this->tree);
 
@@ -261,7 +261,7 @@ 
      *
      * @return bool
      */
-    public function canShowName(int|null $access_level = null): bool
+    public function canShowName(int | null $access_level = null): bool
     {
         return $this->canShow($access_level);
     }
@@ -423,7 +423,7 @@ 
      *
      * @return void
      */
-    public function setPrimaryName(int|null $n = null): void
+    public function setPrimaryName(int | null $n = null): void
     {
         $this->getPrimaryName   = $n;
         $this->getSecondaryName = null;
@@ -474,7 +474,7 @@ 
      *
      * @return string|null
      */
-    public function alternateName(): string|null
+    public function alternateName(): string | null
     {
         if ($this->canShowName() && $this->getPrimaryName() !== $this->getSecondaryName()) {
             $all_names = $this->getAllNames();
@@ -602,7 +602,7 @@ 
     public function facts(
         array $filter = [],
         bool $sort = false,
-        int|null $access_level = null,
+        int | null $access_level = null,
         bool $ignore_deleted = false
     ): Collection {
         $access_level ??= Auth::accessLevel($this->tree);

app/Http/Middleware/BadBotBlocker.php

Spacing +1 added lines, -1 removed lines

@@ -344,7 +344,7 @@
     private function fetchIpRangesForAsn(string $asn): array
     {
         return Registry::cache()->file()->remember('whois-asn-' . $asn, static function () use ($asn): array {
-            $mapper = static fn (AsnRouteInfo $route_info): RangeInterface|null => IPFactory::parseRangeString($route_info->route ?: $route_info->route6);
+            $mapper = static fn (AsnRouteInfo $route_info): RangeInterface | null => IPFactory::parseRangeString($route_info->route ?: $route_info->route6);
 
             try {
                 $loader = new CurlLoader(self::WHOIS_TIMEOUT);

app/Http/Middleware/CompressResponse.php

Spacing +1 added lines, -1 removed lines

@@ -100,7 +100,7 @@
         return $response;
     }
 
-    protected function compressionMethod(RequestInterface $request): string|null
+    protected function compressionMethod(RequestInterface $request): string | null
     {
         $accept_encoding = strtolower($request->getHeaderLine('accept-encoding'));
         $zlib_available  = extension_loaded('zlib');

app/Statistics/Repository/FamilyDatesRepository.php

Spacing +1 added lines, -1 removed lines

@@ -69,7 +69,7 @@
      *
      * @return object{id:string,year:int,fact:string,type:string}|null
      */
-    private function eventQuery(string $fact, string $operation): object|null
+    private function eventQuery(string $fact, string $operation): object | null
     {
         return DB::table('dates')
             ->select(['d_gid as id', 'd_year as year', 'd_fact AS fact', 'd_type AS type'])

app/Statistics/Repository/EventRepository.php

Spacing +1 added lines, -1 removed lines

@@ -218,7 +218,7 @@
      *
      * @return object{id:string,year:int,fact:string,type:string}|null
      */
-    private function eventQuery(string $direction): object|null
+    private function eventQuery(string $direction): object | null
     {
         return DB::table('dates')
             ->select(['d_gid as id', 'd_year as year', 'd_fact AS fact', 'd_type AS type'])

app/Auth.php

Spacing +19 added lines, -19 removed lines

@@ -55,7 +55,7 @@ 
      *
      * @return bool
      */
-    public static function isAdmin(UserInterface|null $user = null): bool
+    public static function isAdmin(UserInterface | null $user = null): bool
     {
         $user ??= self::user();
 
@@ -70,7 +70,7 @@ 
      *
      * @return bool
      */
-    public static function isManager(Tree $tree, UserInterface|null $user = null): bool
+    public static function isManager(Tree $tree, UserInterface | null $user = null): bool
     {
         $user ??= self::user();
 
@@ -85,7 +85,7 @@ 
      *
      * @return bool
      */
-    public static function isModerator(Tree $tree, UserInterface|null $user = null): bool
+    public static function isModerator(Tree $tree, UserInterface | null $user = null): bool
     {
         $user ??= self::user();
 
@@ -102,7 +102,7 @@ 
      *
      * @return bool
      */
-    public static function isEditor(Tree $tree, UserInterface|null $user = null): bool
+    public static function isEditor(Tree $tree, UserInterface | null $user = null): bool
     {
         $user ??= self::user();
 
@@ -119,7 +119,7 @@ 
      *
      * @return bool
      */
-    public static function isMember(Tree $tree, UserInterface|null $user = null): bool
+    public static function isMember(Tree $tree, UserInterface | null $user = null): bool
     {
         $user ??= self::user();
 
@@ -136,7 +136,7 @@ 
      *
      * @return int
      */
-    public static function accessLevel(Tree $tree, UserInterface|null $user = null): int
+    public static function accessLevel(Tree $tree, UserInterface | null $user = null): int
     {
         $user ??= self::user();
 
@@ -154,7 +154,7 @@ 
     /**
      * The ID of the authenticated user, from the current session.
      */
-    public static function id(): int|null
+    public static function id(): int | null
     {
         $wt_user = Session::get('wt_user');
 
@@ -221,7 +221,7 @@ 
      * @throws HttpNotFoundException
      * @throws HttpAccessDeniedException
      */
-    public static function checkFamilyAccess(Family|null $family, bool $edit = false): Family
+    public static function checkFamilyAccess(Family | null $family, bool $edit = false): Family
     {
         $message = I18N::translate('This family does not exist or you do not have permission to view it.');
 
@@ -250,7 +250,7 @@ 
      * @throws HttpNotFoundException
      * @throws HttpAccessDeniedException
      */
-    public static function checkHeaderAccess(Header|null $header, bool $edit = false): Header
+    public static function checkHeaderAccess(Header | null $header, bool $edit = false): Header
     {
         $message = I18N::translate('This record does not exist or you do not have permission to view it.');
 
@@ -280,7 +280,7 @@ 
      * @throws HttpNotFoundException
      * @throws HttpAccessDeniedException
      */
-    public static function checkIndividualAccess(Individual|null $individual, bool $edit = false, bool $chart = false): Individual
+    public static function checkIndividualAccess(Individual | null $individual, bool $edit = false, bool $chart = false): Individual
     {
         $message = I18N::translate('This individual does not exist or you do not have permission to view it.');
 
@@ -313,7 +313,7 @@ 
      * @throws HttpNotFoundException
      * @throws HttpAccessDeniedException
      */
-    public static function checkLocationAccess(Location|null $location, bool $edit = false): Location
+    public static function checkLocationAccess(Location | null $location, bool $edit = false): Location
     {
         $message = I18N::translate('This record does not exist or you do not have permission to view it.');
 
@@ -342,7 +342,7 @@ 
      * @throws HttpNotFoundException
      * @throws HttpAccessDeniedException
      */
-    public static function checkMediaAccess(Media|null $media, bool $edit = false): Media
+    public static function checkMediaAccess(Media | null $media, bool $edit = false): Media
     {
         $message = I18N::translate('This media object does not exist or you do not have permission to view it.');
 
@@ -371,7 +371,7 @@ 
      * @throws HttpNotFoundException
      * @throws HttpAccessDeniedException
      */
-    public static function checkNoteAccess(Note|null $note, bool $edit = false): Note
+    public static function checkNoteAccess(Note | null $note, bool $edit = false): Note
     {
         $message = I18N::translate('This note does not exist or you do not have permission to view it.');
 
@@ -400,7 +400,7 @@ 
      * @throws HttpNotFoundException
      * @throws HttpAccessDeniedException
      */
-    public static function checkSharedNoteAccess(SharedNote|null $shared_note, bool $edit = false): SharedNote
+    public static function checkSharedNoteAccess(SharedNote | null $shared_note, bool $edit = false): SharedNote
     {
         $message = I18N::translate('This note does not exist or you do not have permission to view it.');
 
@@ -429,7 +429,7 @@ 
      * @throws HttpNotFoundException
      * @throws HttpAccessDeniedException
      */
-    public static function checkRecordAccess(GedcomRecord|null $record, bool $edit = false): GedcomRecord
+    public static function checkRecordAccess(GedcomRecord | null $record, bool $edit = false): GedcomRecord
     {
         $message = I18N::translate('This record does not exist or you do not have permission to view it.');
 
@@ -458,7 +458,7 @@ 
      * @throws HttpNotFoundException
      * @throws HttpAccessDeniedException
      */
-    public static function checkRepositoryAccess(Repository|null $repository, bool $edit = false): Repository
+    public static function checkRepositoryAccess(Repository | null $repository, bool $edit = false): Repository
     {
         $message = I18N::translate('This repository does not exist or you do not have permission to view it.');
 
@@ -487,7 +487,7 @@ 
      * @throws HttpNotFoundException
      * @throws HttpAccessDeniedException
      */
-    public static function checkSourceAccess(Source|null $source, bool $edit = false): Source
+    public static function checkSourceAccess(Source | null $source, bool $edit = false): Source
     {
         $message = I18N::translate('This source does not exist or you do not have permission to view it.');
 
@@ -516,7 +516,7 @@ 
      * @throws HttpNotFoundException
      * @throws HttpAccessDeniedException
      */
-    public static function checkSubmitterAccess(Submitter|null $submitter, bool $edit = false): Submitter
+    public static function checkSubmitterAccess(Submitter | null $submitter, bool $edit = false): Submitter
     {
         $message = I18N::translate('This record does not exist or you do not have permission to view it.');
 
@@ -545,7 +545,7 @@ 
      * @throws HttpNotFoundException
      * @throws HttpAccessDeniedException
      */
-    public static function checkSubmissionAccess(Submission|null $submission, bool $edit = false): Submission
+    public static function checkSubmissionAccess(Submission | null $submission, bool $edit = false): Submission
     {
         $message = I18N::translate('This record does not exist or you do not have permission to view it.');
 

app/PlaceLocation.php

Spacing +3 added lines, -3 removed lines

@@ -71,7 +71,7 @@ 
      *
      * @return int|null
      */
-    public function id(): int|null
+    public function id(): int | null
     {
         // The "top-level" location won't exist in the database.
         if ($this->parts->isEmpty()) {
@@ -170,7 +170,7 @@ 
     /**
      * Latitude of the location.
      */
-    public function latitude(): float|null
+    public function latitude(): float | null
     {
         return $this->details()->latitude;
     }
@@ -178,7 +178,7 @@ 
     /**
      * Longitude of the location.
      */
-    public function longitude(): float|null
+    public function longitude(): float | null
     {
         return $this->details()->longitude;
     }

app/Fact.php

Spacing +3 added lines, -3 removed lines

@@ -277,7 +277,7 @@ 
     /**
      * Get the PLAC:MAP:LATI for the fact.
      */
-    public function latitude(): float|null
+    public function latitude(): float | null
     {
         if (preg_match('/\n4 LATI (.+)/', $this->gedcom, $match)) {
             $gedcom_service = new GedcomService();
@@ -291,7 +291,7 @@ 
     /**
      * Get the PLAC:MAP:LONG for the fact.
      */
-    public function longitude(): float|null
+    public function longitude(): float | null
     {
         if (preg_match('/\n4 LONG (.+)/', $this->gedcom, $match)) {
             $gedcom_service = new GedcomService();
@@ -309,7 +309,7 @@ 
      *
      * @return bool
      */
-    public function canShow(int|null $access_level = null): bool
+    public function canShow(int | null $access_level = null): bool
     {
         $access_level ??= Auth::accessLevel($this->record->tree());
 

app/Validator.php

Spacing +15 added lines, -15 removed lines

@@ -125,7 +125,7 @@ 
      */
     public function isBetween(int $minimum, int $maximum): self
     {
-        $this->rules[] = static function (int|null $value) use ($minimum, $maximum): int|null {
+        $this->rules[] = static function (int | null $value) use ($minimum, $maximum): int | null {
             if (is_int($value) && $value >= $minimum && $value <= $maximum) {
                 return $value;
             }
@@ -143,7 +143,7 @@ 
      */
     public function isInArray(array $values): self
     {
-        $this->rules[] = static fn (int|string|null $value): int|string|null => in_array($value, $values, true) ? $value : null;
+        $this->rules[] = static fn (int | string | null $value): int | string | null => in_array($value, $values, true) ? $value : null;
 
         return $this;
     }
@@ -163,7 +163,7 @@ 
      */
     public function isNotEmpty(): self
     {
-        $this->rules[] = static fn (string|null $value): string|null => $value !== null && $value !== '' ? $value : null;
+        $this->rules[] = static fn (string | null $value): string | null => $value !== null && $value !== '' ? $value : null;
 
         return $this;
     }
@@ -175,7 +175,7 @@ 
     {
         $base_url = $this->request->getAttribute('base_url', '');
 
-        $this->rules[] = static function (string|null $value) use ($base_url): string|null {
+        $this->rules[] = static function (string | null $value) use ($base_url): string | null {
             if ($value !== null) {
                 $value_info    = parse_url($value);
                 $base_url_info = parse_url($base_url);
@@ -204,7 +204,7 @@ 
      */
     public function isTag(): self
     {
-        $this->rules[] = static function (string|null $value): string|null {
+        $this->rules[] = static function (string | null $value): string | null {
             if ($value !== null && preg_match('/^' . Gedcom::REGEX_TAG . '$/', $value) === 1) {
                 return $value;
             }
@@ -247,7 +247,7 @@ 
      *
      * @return bool
      */
-    public function boolean(string $parameter, bool|null $default = null): bool
+    public function boolean(string $parameter, bool | null $default = null): bool
     {
         $value = $this->parameters[$parameter] ?? null;
 
@@ -279,7 +279,7 @@ 
             throw new HttpBadRequestException(I18N::translate('The parameter “%s” is missing.', $parameter));
         }
 
-        $callback = static fn (array|null $value, Closure $rule): array|null => $rule($value);
+        $callback = static fn (array | null $value, Closure $rule): array | null => $rule($value);
 
         return array_reduce($this->rules, $callback, $value) ?? [];
     }
@@ -290,7 +290,7 @@ 
      *
      * @return float
      */
-    public function float(string $parameter, float|null $default = null): float
+    public function float(string $parameter, float | null $default = null): float
     {
         $value = $this->parameters[$parameter] ?? null;
 
@@ -300,7 +300,7 @@ 
             $value = null;
         }
 
-        $callback = static fn (?float $value, Closure $rule): float|null => $rule($value);
+        $callback = static fn (?float $value, Closure $rule) : float | null => $rule($value);
 
         $value = array_reduce($this->rules, $callback, $value) ?? $default;
 
@@ -317,7 +317,7 @@ 
      *
      * @return int
      */
-    public function integer(string $parameter, int|null $default = null): int
+    public function integer(string $parameter, int | null $default = null): int
     {
         $value = $this->parameters[$parameter] ?? null;
 
@@ -333,7 +333,7 @@ 
             $value = null;
         }
 
-        $callback = static fn (int|null $value, Closure $rule): int|null => $rule($value);
+        $callback = static fn (int | null $value, Closure $rule): int | null => $rule($value);
 
         $value = array_reduce($this->rules, $callback, $value) ?? $default;
 
@@ -366,7 +366,7 @@ 
      *
      * @return string
      */
-    public function string(string $parameter, string|null $default = null): string
+    public function string(string $parameter, string | null $default = null): string
     {
         $value = $this->parameters[$parameter] ?? null;
 
@@ -374,9 +374,9 @@ 
             $value = null;
         }
 
-        $callback = static fn (string|null $value, Closure $rule): string|null => $rule($value);
+        $callback = static fn (string | null $value, Closure $rule): string | null => $rule($value);
 
-        $value =  array_reduce($this->rules, $callback, $value) ?? $default;
+        $value = array_reduce($this->rules, $callback, $value) ?? $default;
 
         if ($value === null) {
             throw new HttpBadRequestException(I18N::translate('The parameter “%s” is missing.', $parameter));
@@ -401,7 +401,7 @@ 
         throw new HttpBadRequestException(I18N::translate('The parameter “%s” is missing.', $parameter));
     }
 
-    public function treeOptional(string $parameter = 'tree'): Tree|null
+    public function treeOptional(string $parameter = 'tree'): Tree | null
     {
         $value = $this->parameters[$parameter] ?? null;