fisharebest / webtrees

app/Contracts/LocationFactoryInterface.php

Spacing +2 added lines, -2 removed lines

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

app/Contracts/MarkdownFactoryInterface.php

Spacing +2 added lines, -2 removed lines

@@ -32,7 +32,7 @@ 
      *
      * @return string
      */
-    public function autolink(string $markdown, Tree|null $tree = null): string;
+    public function autolink(string $markdown, Tree | null $tree = null): string;
 
     /**
      * @param string    $markdown
@@ -40,5 +40,5 @@ 
      *
      * @return string
      */
-    public function markdown(string $markdown, Tree|null $tree = null): string;
+    public function markdown(string $markdown, Tree | null $tree = null): string;
 }

app/Contracts/MediaFactoryInterface.php

Spacing +2 added lines, -2 removed lines

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

app/Contracts/SubmissionFactoryInterface.php

Spacing +2 added lines, -2 removed lines

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

app/Statistics.php

Spacing +20 added lines, -20 removed lines

@@ -320,7 +320,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);
@@ -373,7 +373,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);
@@ -585,8 +585,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);
@@ -630,7 +630,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);
     }
@@ -801,7 +801,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);
     }
@@ -953,7 +953,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);
     }
@@ -1050,7 +1050,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);
     }
@@ -1472,7 +1472,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);
     }
@@ -1547,7 +1547,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);
     }
@@ -1982,8 +1982,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);
@@ -2193,8 +2193,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
@@ -2429,8 +2429,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);
@@ -2555,7 +2555,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);
     }
@@ -2565,7 +2565,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);
     }
@@ -2576,7 +2576,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);
     }
@@ -2805,7 +2805,7 @@ 
         /** @var ModuleBlockInterface|null $module */
         $module = $this->module_service
             ->findByComponent(ModuleBlockInterface::class, $this->tree, Auth::user())
-            ->first(static function (ModuleInterface $module) use ($block): bool {
+            ->first(static function (ModuleInterface $module) use ($block) : bool {
                 return $module->name() === $block && $module->name() !== 'html';
             });
 

app/Family.php

Spacing +6 added lines, -6 removed lines

@@ -107,7 +107,7 @@ 
      *
      * @return Individual|null
      */
-    public function husband(int|null $access_level = null): ?Individual
+    public function husband(int | null $access_level = null): ?Individual
     {
         if ($this->tree->getPreference('SHOW_PRIVATE_RELATIONSHIPS') === '1') {
             $access_level = Auth::PRIV_HIDE;
@@ -127,7 +127,7 @@ 
      *
      * @return Individual|null
      */
-    public function wife(int|null $access_level = null): ?Individual
+    public function wife(int | null $access_level = null): ?Individual
     {
         if ($this->tree->getPreference('SHOW_PRIVATE_RELATIONSHIPS') === '1') {
             $access_level = Auth::PRIV_HIDE;
@@ -168,7 +168,7 @@ 
      *
      * @return bool
      */
-    public function canShowName(int|null $access_level = null): bool
+    public function canShowName(int | null $access_level = null): bool
     {
         // We can always see the name (Husband-name + Wife-name), however,
         // the name will often be "private + private"
@@ -183,7 +183,7 @@ 
      *
      * @return Individual|null
      */
-    public function spouse(Individual $person, int|null $access_level = null): ?Individual
+    public function spouse(Individual $person, int | null $access_level = null): ?Individual
     {
         if ($person === $this->wife) {
             return $this->husband($access_level);
@@ -199,7 +199,7 @@ 
      *
      * @return Collection<int,Individual>
      */
-    public function spouses(int|null $access_level = null): Collection
+    public function spouses(int | null $access_level = null): Collection
     {
         $spouses = new Collection([
             $this->husband($access_level),
@@ -216,7 +216,7 @@ 
      *
      * @return Collection<int,Individual>
      */
-    public function children(int|null $access_level = null): Collection
+    public function children(int | null $access_level = null): Collection
     {
         $access_level ??= Auth::accessLevel($this->tree);
 

app/Elements/AbstractElement.php

Spacing +1 added lines, -1 removed lines

@@ -78,7 +78,7 @@
      * @param string             $label
      * @param array<string>|null $subtags
      */
-    public function __construct(string $label, array|null $subtags = null)
+    public function __construct(string $label, array | null $subtags = null)
     {
         $this->label   = $label;
         $this->subtags = $subtags ?? static::SUBTAGS;

app/Elements/NamePersonal.php

Spacing +1 added lines, -1 removed lines

@@ -89,7 +89,7 @@
      * @param string             $label
      * @param array<string>|null $subtags
      */
-    public function __construct(string $label, array|null $subtags = null)
+    public function __construct(string $label, array | null $subtags = null)
     {
         if ($subtags === null && in_array(I18N::languageTag(), static::SURNAME_FIRST_LANGUAGES, true)) {
             $subtags = static::SUBTAGS_SURNAME_FIRST;

app/Individual.php

Spacing +3 added lines, -3 removed lines

@@ -82,7 +82,7 @@ 
      *
      * @return bool
      */
-    public function canShowName(int|null $access_level = null): bool
+    public function canShowName(int | null $access_level = null): bool
     {
         $access_level ??= Auth::accessLevel($this->tree);
 
@@ -703,7 +703,7 @@ 
      *
      * @return Collection<int,Family>
      */
-    public function spouseFamilies(int|null $access_level = null): Collection
+    public function spouseFamilies(int | null $access_level = null): Collection
     {
         $access_level ??= Auth::accessLevel($this->tree);
 
@@ -769,7 +769,7 @@ 
      *
      * @return Collection<int,Family>
      */
-    public function childFamilies(int|null $access_level = null): Collection
+    public function childFamilies(int | null $access_level = null): Collection
     {
         $access_level ??= Auth::accessLevel($this->tree);