fisharebest / webtrees

app/Services/UserService.php

Spacing +6 added lines, -6 removed lines

@@ -45,10 +45,10 @@ 
     /**
      * Find the user with a specified user_id.
      */
-    public function find(int|null $user_id): User|null
+    public function find(int | null $user_id): User | null
     {
         return Registry::cache()->array()
-            ->remember('user-' . $user_id, static fn(): User|null => DB::table('user')
+            ->remember('user-' . $user_id, static fn(): User | null => DB::table('user')
                 ->where('user_id', '=', $user_id)
                 ->get()
                 ->map(User::rowMapper())
@@ -58,7 +58,7 @@ 
     /**
      * Find the user with a specified email address.
      */
-    public function findByEmail(string $email): User|null
+    public function findByEmail(string $email): User | null
     {
         return DB::table('user')
             ->where('email', '=', $email)
@@ -70,7 +70,7 @@ 
     /**
      * Find the user with a specified user_name or email address.
      */
-    public function findByIdentifier(string $identifier): User|null
+    public function findByIdentifier(string $identifier): User | null
     {
         return DB::table('user')
             ->where('user_name', '=', $identifier)
@@ -102,7 +102,7 @@ 
     /**
      * Find the user with a specified password reset token.
      */
-    public function findByToken(string $token): User|null
+    public function findByToken(string $token): User | null
     {
         return DB::table('user')
             ->join('user_setting AS us1', 'us1.user_id', '=', 'user.user_id')
@@ -120,7 +120,7 @@ 
     /**
      * Find the user with a specified user_name.
      */
-    public function findByUserName(string $user_name): User|null
+    public function findByUserName(string $user_name): User | null
     {
         return DB::table('user')
             ->where('user_name', '=', $user_name)

app/I18N.php

Spacing +2 added lines, -2 removed lines

@@ -209,7 +209,7 @@ 
 
     private static Translator $translator;
 
-    private static Collator|null $collator = null;
+    private static Collator | null $collator = null;
 
     /**
      * The preferred locales for this site, or a default list if no preference.
@@ -248,7 +248,7 @@ 
      *
      * @return string
      */
-    public static function digits(string|int $n): string
+    public static function digits(string | int $n): string
     {
         return self::$locale->digits((string) $n);
     }

app/Statistics.php

Spacing +20 added lines, -20 removed lines

@@ -316,7 +316,7 @@ 
      * @return string
      */
     public function chartIndisWithSources(
-        string|null $color_from = null,
+        string | null $color_from = null,
         string $color_to = null
     ): string {
         return $this->individual_repository->chartIndisWithSources($color_from, $color_to);
@@ -369,7 +369,7 @@ 
      * @return string
      */
     public function chartFamsWithSources(
-        string|null $color_from = null,
+        string | null $color_from = null,
         string $color_to = null
     ): string {
         return $this->individual_repository->chartFamsWithSources($color_from, $color_to);
@@ -581,8 +581,8 @@ 
      * @return string
      */
     public function chartSex(
-        string|null $color_female = null,
-        string|null $color_male = null,
+        string | null $color_female = null,
+        string | null $color_male = null,
         string $color_unknown = null
     ): string {
         return $this->individual_repository->chartSex($color_female, $color_male, $color_unknown);
@@ -626,7 +626,7 @@ 
      *
      * @return string
      */
-    public function chartMortality(string|null $color_living = null, string|null $color_dead = null): string
+    public function chartMortality(string | null $color_living = null, string | null $color_dead = null): string
     {
         return $this->individual_repository->chartMortality($color_living, $color_dead);
     }
@@ -797,7 +797,7 @@ 
      *
      * @return string
      */
-    public function chartMedia(string|null $color_from = null, string|null $color_to = null): string
+    public function chartMedia(string | null $color_from = null, string | null $color_to = null): string
     {
         return $this->media_repository->chartMedia($color_from, $color_to);
     }
@@ -949,7 +949,7 @@ 
      *
      * @return string
      */
-    public function statsBirth(string|null $color_from = null, string|null $color_to = null): string
+    public function statsBirth(string | null $color_from = null, string | null $color_to = null): string
     {
         return $this->individual_repository->statsBirth($color_from, $color_to);
     }
@@ -1046,7 +1046,7 @@ 
      *
      * @return string
      */
-    public function statsDeath(string|null $color_from = null, string|null $color_to = null): string
+    public function statsDeath(string | null $color_from = null, string | null $color_to = null): string
     {
         return $this->individual_repository->statsDeath($color_from, $color_to);
     }
@@ -1468,7 +1468,7 @@ 
      *
      * @return string
      */
-    public function statsMarr(string|null $color_from = null, string|null $color_to = null): string
+    public function statsMarr(string | null $color_from = null, string | null $color_to = null): string
     {
         return $this->family_repository->statsMarr($color_from, $color_to);
     }
@@ -1543,7 +1543,7 @@ 
      *
      * @return string
      */
-    public function statsDiv(string|null $color_from = null, string|null $color_to = null): string
+    public function statsDiv(string | null $color_from = null, string | null $color_to = null): string
     {
         return $this->family_repository->statsDiv($color_from, $color_to);
     }
@@ -1978,8 +1978,8 @@ 
      * @return string
      */
     public function chartLargestFamilies(
-        string|null $color_from = null,
-        string|null $color_to = null,
+        string | null $color_from = null,
+        string | null $color_to = null,
         string $total = '10'
     ): string {
         return $this->family_repository->chartLargestFamilies($color_from, $color_to, (int) $total);
@@ -2189,8 +2189,8 @@ 
      * @return string
      */
     public function chartCommonSurnames(
-        string|null $color_from = null,
-        string|null $color_to = null,
+        string | null $color_from = null,
+        string | null $color_to = null,
         string $number_of_surnames = '10'
     ): string {
         return $this->individual_repository
@@ -2425,8 +2425,8 @@ 
      * @return string
      */
     public function chartCommonGiven(
-        string|null $color_from = null,
-        string|null $color_to = null,
+        string | null $color_from = null,
+        string | null $color_to = null,
         string $maxtoshow = '7'
     ): string {
         return $this->individual_repository->chartCommonGiven($color_from, $color_to, (int) $maxtoshow);
@@ -2551,7 +2551,7 @@ 
      *
      * @return string
      */
-    public function latestUserRegDate(string|null $format = null): string
+    public function latestUserRegDate(string | null $format = null): string
     {
         return $this->latest_user_repository->latestUserRegDate($format);
     }
@@ -2561,7 +2561,7 @@ 
      *
      * @return string
      */
-    public function latestUserRegTime(string|null $format = null): string
+    public function latestUserRegTime(string | null $format = null): string
     {
         return $this->latest_user_repository->latestUserRegTime($format);
     }
@@ -2572,7 +2572,7 @@ 
      *
      * @return string
      */
-    public function latestUserLoggedin(string|null $yes = null, string|null $no = null): string
+    public function latestUserLoggedin(string | null $yes = null, string | null $no = null): string
     {
         return $this->latest_user_repository->latestUserLoggedin($yes, $no);
     }
@@ -2796,7 +2796,7 @@ 
      *
      * @return string|null
      */
-    public function callBlock(string $block = '', ...$params): string|null
+    public function callBlock(string $block = '', ...$params): string | null
     {
         /** @var ModuleBlockInterface|null $module */
         $module = $this->module_service

app/Relationship.php

Spacing +1 added lines, -1 removed lines

@@ -103,7 +103,7 @@
      *
      * @return array<string>|null [nominative, genitive] or null
      */
-    public function match(array $nodes, array $patterns): array|null
+    public function match(array $nodes, array $patterns): array | null
     {
         $captures = [];
 

app/Contracts/NoteFactoryInterface.php

Spacing +2 added lines, -2 removed lines

@@ -31,7 +31,7 @@ 
     /**
      * Create a note.
      */
-    public function make(string $xref, Tree $tree, string|null $gedcom = null): Note|null;
+    public function make(string $xref, Tree $tree, string | null $gedcom = null): Note | null;
 
     /**
      * Create a note from a row in the database.
@@ -53,5 +53,5 @@ 
      *
      * @return Note
      */
-    public function new(string $xref, string $gedcom, string|null $pending, Tree $tree): Note;
+    public function new(string $xref, string $gedcom, string | null $pending, Tree $tree): Note;
 }

app/Contracts/TimestampFactoryInterface.php

Spacing +3 added lines, -3 removed lines

@@ -30,7 +30,7 @@ 
      *
      * @return TimestampInterface
      */
-    public function make(int $timestamp, UserInterface|null $user = null): TimestampInterface;
+    public function make(int $timestamp, UserInterface | null $user = null): TimestampInterface;
 
     /**
      * @param string|null        $string YYYY-MM-DD HH:MM:SS (as provided by SQL).
@@ -39,12 +39,12 @@ 
      *
      * @return TimestampInterface
      */
-    public function fromString(string|null $string, string $format = 'Y-m-d H:i:s', UserInterface|null $user = null): TimestampInterface;
+    public function fromString(string | null $string, string $format = 'Y-m-d H:i:s', UserInterface | null $user = null): TimestampInterface;
 
     /**
      * @param UserInterface|null $user
      *
      * @return TimestampInterface
      */
-    public function now(UserInterface|null $user = null): TimestampInterface;
+    public function now(UserInterface | null $user = null): TimestampInterface;
 }

app/Contracts/GedcomRecordFactoryInterface.php

Spacing +2 added lines, -2 removed lines

@@ -31,7 +31,7 @@ 
     /**
      * Create a GedcomRecord object.
      */
-    public function make(string $xref, Tree $tree, string|null $gedcom = null): GedcomRecord|null;
+    public function make(string $xref, Tree $tree, string | null $gedcom = null): GedcomRecord | null;
 
     /**
      * Create a GedcomRecord object from raw GEDCOM data.
@@ -44,7 +44,7 @@ 
      *
      * @return GedcomRecord
      */
-    public function new(string $xref, string $gedcom, string|null $pending, Tree $tree): GedcomRecord;
+    public function new(string $xref, string $gedcom, string | null $pending, Tree $tree): GedcomRecord;
 
     /**
      * Create a GedcomRecord object from a row in the database.

app/Contracts/FamilyFactoryInterface.php

Spacing +2 added lines, -2 removed lines

@@ -31,7 +31,7 @@ 
     /**
      * Create a family.
      */
-    public function make(string $xref, Tree $tree, string|null $gedcom = null): Family|null;
+    public function make(string $xref, Tree $tree, string | null $gedcom = null): Family | null;
 
     /**
      * Create a Family object from a row in the database.
@@ -53,5 +53,5 @@ 
      *
      * @return Family
      */
-    public function new(string $xref, string $gedcom, string|null $pending, Tree $tree): Family;
+    public function new(string $xref, string $gedcom, string | null $pending, Tree $tree): Family;
 }

app/Contracts/SubmissionFactoryInterface.php

Spacing +2 added lines, -2 removed lines

@@ -31,7 +31,7 @@ 
     /**
      * Create a submission.
      */
-    public function make(string $xref, Tree $tree, string|null $gedcom = null): Submission|null;
+    public function make(string $xref, Tree $tree, string | null $gedcom = null): Submission | null;
 
     /**
      * Create a submission from a row in the database.
@@ -53,5 +53,5 @@ 
      *
      * @return Submission
      */
-    public function new(string $xref, string $gedcom, string|null $pending, Tree $tree): Submission;
+    public function new(string $xref, string $gedcom, string | null $pending, Tree $tree): Submission;
 }