fisharebest / webtrees

app/Factories/TimestampFactory.php

Spacing +5 added lines, -5 removed lines

@@ -43,9 +43,9 @@ 
      *
      * @return TimestampInterface
      */
-    public function make(int $timestamp, UserInterface|null $user = null): TimestampInterface
+    public function make(int $timestamp, UserInterface | null $user = null): TimestampInterface
     {
-        $user     ??= Auth::user();
+        $user ??= Auth::user();
         $timezone = $user->getPreference(UserInterface::PREF_TIME_ZONE, Site::getPreference('TIMEZONE'));
         $locale   = I18N::locale()->code();
 
@@ -59,9 +59,9 @@ 
      *
      * @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
     {
-        $string    ??= date($format);
+        $string ??= date($format);
         $timestamp = date_create_from_format($format, $string);
 
         if ($timestamp === false) {
@@ -76,7 +76,7 @@ 
      *
      * @return TimestampInterface
      */
-    public function now(UserInterface|null $user = null): TimestampInterface
+    public function now(UserInterface | null $user = null): TimestampInterface
     {
         return $this->make(time(), $user);
     }

app/Factories/ElementFactory.php

Spacing +1 added lines, -1 removed lines

@@ -71,7 +71,7 @@
         }
     }
 
-    private function findElementByWildcard(string $tag): ElementInterface|null
+    private function findElementByWildcard(string $tag): ElementInterface | null
     {
         foreach ($this->elements as $tags => $element) {
             if (str_contains($tags, '*')) {

app/Factories/SubmissionFactory.php

Spacing +3 added lines, -3 removed lines

@@ -38,7 +38,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
     {
         return Registry::cache()->array()->remember(self::class . $xref . '@' . $tree->id(), function () use ($xref, $tree, $gedcom) {
             $gedcom ??= $this->gedcom($xref, $tree);
@@ -77,7 +77,7 @@ 
      *
      * @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
     {
         return new Submission($xref, $gedcom, $pending, $tree);
     }
@@ -90,7 +90,7 @@ 
      *
      * @return string|null
      */
-    protected function gedcom(string $xref, Tree $tree): string|null
+    protected function gedcom(string $xref, Tree $tree): string | null
     {
         return DB::table('other')
             ->where('o_id', '=', $xref)

app/Factories/LocationFactory.php

Spacing +3 added lines, -3 removed lines

@@ -38,7 +38,7 @@ 
     /**
      * Create a Location.
      */
-    public function make(string $xref, Tree $tree, string|null $gedcom = null): Location|null
+    public function make(string $xref, Tree $tree, string | null $gedcom = null): Location | null
     {
         return Registry::cache()->array()->remember(self::class . $xref . '@' . $tree->id(), function () use ($xref, $tree, $gedcom) {
             $gedcom ??= $this->gedcom($xref, $tree);
@@ -77,7 +77,7 @@ 
      *
      * @return Location
      */
-    public function new(string $xref, string $gedcom, string|null $pending, Tree $tree): Location
+    public function new(string $xref, string $gedcom, string | null $pending, Tree $tree): Location
     {
         return new Location($xref, $gedcom, $pending, $tree);
     }
@@ -90,7 +90,7 @@ 
      *
      * @return string|null
      */
-    protected function gedcom(string $xref, Tree $tree): string|null
+    protected function gedcom(string $xref, Tree $tree): string | null
     {
         return DB::table('other')
             ->where('o_id', '=', $xref)

app/Factories/GedcomRecordFactory.php

Spacing +4 added lines, -4 removed lines

@@ -46,7 +46,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
     {
         // We know the type of the record.  Return it directly.
         if ($gedcom !== null && preg_match('/^0(?: @[^@]+@)? ([A-Z_]+)/', $gedcom, $match)) {
@@ -113,7 +113,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
     {
         return new GedcomRecord($xref, $gedcom, $pending, $tree);
     }
@@ -139,7 +139,7 @@ 
      *
      * @return GedcomRecord
      */
-    private function newGedcomRecord(string $type, string $xref, string $gedcom, string|null $pending, Tree $tree): GedcomRecord
+    private function newGedcomRecord(string $type, string $xref, string $gedcom, string | null $pending, Tree $tree): GedcomRecord
     {
         switch ($type) {
             case Family::RECORD_TYPE:
@@ -199,7 +199,7 @@ 
      *
      * @return string|null
      */
-    private function gedcom(string $xref, Tree $tree): string|null
+    private function gedcom(string $xref, Tree $tree): string | null
     {
         return DB::table('other')
             ->where('o_id', '=', $xref)

app/Factories/NoteFactory.php

Spacing +3 added lines, -3 removed lines

@@ -38,7 +38,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
     {
         return Registry::cache()->array()->remember(self::class . $xref . '@' . $tree->id(), function () use ($xref, $tree, $gedcom) {
             $gedcom ??= $this->gedcom($xref, $tree);
@@ -77,7 +77,7 @@ 
      *
      * @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
     {
         return new Note($xref, $gedcom, $pending, $tree);
     }
@@ -90,7 +90,7 @@ 
      *
      * @return string|null
      */
-    protected function gedcom(string $xref, Tree $tree): string|null
+    protected function gedcom(string $xref, Tree $tree): string | null
     {
         return DB::table('other')
             ->where('o_id', '=', $xref)

app/Factories/SlugFactory.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
  */
 class SlugFactory implements SlugFactoryInterface
 {
-    private Transliterator|null $transliterator = null;
+    private Transliterator | null $transliterator = null;
 
     public function __construct()
     {

app/SurnameTradition/LithuanianSurnameTradition.php

Spacing +1 added lines, -1 removed lines

@@ -87,7 +87,7 @@
      *
      * @return array<int,string>
      */
-    public function newChildNames(Individual|null $father, Individual|null $mother, string $sex): array
+    public function newChildNames(Individual | null $father, Individual | null $mother, string $sex): array
     {
         if (preg_match(self::REGEX_SURN, $this->extractName($father), $match) === 1) {
             if ($sex === 'F') {

app/SurnameTradition/DefaultSurnameTradition.php

Spacing +2 added lines, -2 removed lines

@@ -86,7 +86,7 @@ 
      *
      * @return array<int,string>
      */
-    public function newChildNames(Individual|null $father, Individual|null $mother, string $sex): array
+    public function newChildNames(Individual | null $father, Individual | null $mother, string $sex): array
     {
         return [
             $this->buildName('//', ['TYPE' => NameType::VALUE_BIRTH]),
@@ -155,7 +155,7 @@ 
      *
      * @return string
      */
-    protected function extractName(Individual|null $individual): string
+    protected function extractName(Individual | null $individual): string
     {
         if ($individual instanceof Individual) {
             $fact = $individual