14 files changed, 17 insertions, 17 deletions
diff --git a/app/Contracts/FamilyFactoryInterface.php b/app/Contracts/FamilyFactoryInterface.php
index 93c1d5356d..d543d94171 100644
--- a/app/Contracts/FamilyFactoryInterface.php
+++ b/app/Contracts/FamilyFactoryInterface.php
@@ -37,7 +37,7 @@ interface FamilyFactoryInterface extends GedcomRecordFactoryInterface
      *
      * @return Family|null
      */
-    public function make(string $xref, Tree $tree, string $gedcom = null): ?Family;
+    public function make(string $xref, Tree $tree, string|null $gedcom = null): ?Family;
 
     /**
      * Create a Family object from a row in the database.
diff --git a/app/Contracts/GedcomRecordFactoryInterface.php b/app/Contracts/GedcomRecordFactoryInterface.php
index f254422428..d10aba8f60 100644
--- a/app/Contracts/GedcomRecordFactoryInterface.php
+++ b/app/Contracts/GedcomRecordFactoryInterface.php
@@ -37,7 +37,7 @@ interface GedcomRecordFactoryInterface
      *
      * @return GedcomRecord|null
      */
-    public function make(string $xref, Tree $tree, string $gedcom = null): ?GedcomRecord;
+    public function make(string $xref, Tree $tree, string|null $gedcom = null): ?GedcomRecord;
 
     /**
      * Create a GedcomRecord object from raw GEDCOM data.
diff --git a/app/Contracts/HeaderFactoryInterface.php b/app/Contracts/HeaderFactoryInterface.php
index b2b7ed3a9e..4cd55fa25e 100644
--- a/app/Contracts/HeaderFactoryInterface.php
+++ b/app/Contracts/HeaderFactoryInterface.php
@@ -37,7 +37,7 @@ interface HeaderFactoryInterface extends GedcomRecordFactoryInterface
      *
      * @return Header|null
      */
-    public function make(string $xref, Tree $tree, string $gedcom = null): ?Header;
+    public function make(string $xref, Tree $tree, string|null $gedcom = null): ?Header;
 
     /**
      * Create a header from a row in the database.
diff --git a/app/Contracts/IndividualFactoryInterface.php b/app/Contracts/IndividualFactoryInterface.php
index 0ed1cc72fa..f72979459d 100644
--- a/app/Contracts/IndividualFactoryInterface.php
+++ b/app/Contracts/IndividualFactoryInterface.php
@@ -37,7 +37,7 @@ interface IndividualFactoryInterface extends GedcomRecordFactoryInterface
      *
      * @return Individual|null
      */
-    public function make(string $xref, Tree $tree, string $gedcom = null): ?Individual;
+    public function make(string $xref, Tree $tree, string|null $gedcom = null): ?Individual;
 
     /**
      * Create an individual from a row in the database.
diff --git a/app/Contracts/LocationFactoryInterface.php b/app/Contracts/LocationFactoryInterface.php
index d440e9eadc..e9fec7becc 100644
--- a/app/Contracts/LocationFactoryInterface.php
+++ b/app/Contracts/LocationFactoryInterface.php
@@ -37,7 +37,7 @@ interface LocationFactoryInterface extends GedcomRecordFactoryInterface
      *
      * @return Location|null
      */
-    public function make(string $xref, Tree $tree, string $gedcom = null): ?Location;
+    public function make(string $xref, Tree $tree, string|null $gedcom = null): ?Location;
 
     /**
      * Create a Location from a row in the database.
diff --git a/app/Contracts/MarkdownFactoryInterface.php b/app/Contracts/MarkdownFactoryInterface.php
index 9cb2d48ed7..20693b3444 100644
--- a/app/Contracts/MarkdownFactoryInterface.php
+++ b/app/Contracts/MarkdownFactoryInterface.php
@@ -32,7 +32,7 @@ interface MarkdownFactoryInterface
      *
      * @return string
      */
-    public function autolink(string $markdown, Tree $tree = null): string;
+    public function autolink(string $markdown, Tree|null $tree = null): string;
 
     /**
      * @param string    $markdown
@@ -40,5 +40,5 @@ interface MarkdownFactoryInterface
      *
      * @return string
      */
-    public function markdown(string $markdown, Tree $tree = null): string;
+    public function markdown(string $markdown, Tree|null $tree = null): string;
 }
diff --git a/app/Contracts/MediaFactoryInterface.php b/app/Contracts/MediaFactoryInterface.php
index b7d32a421d..697fc89ed7 100644
--- a/app/Contracts/MediaFactoryInterface.php
+++ b/app/Contracts/MediaFactoryInterface.php
@@ -37,7 +37,7 @@ interface MediaFactoryInterface extends GedcomRecordFactoryInterface
      *
      * @return Media|null
      */
-    public function make(string $xref, Tree $tree, string $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.
diff --git a/app/Contracts/NoteFactoryInterface.php b/app/Contracts/NoteFactoryInterface.php
index d5b2d81958..4158f7f040 100644
--- a/app/Contracts/NoteFactoryInterface.php
+++ b/app/Contracts/NoteFactoryInterface.php
@@ -37,7 +37,7 @@ interface NoteFactoryInterface extends GedcomRecordFactoryInterface
      *
      * @return Note|null
      */
-    public function make(string $xref, Tree $tree, string $gedcom = null): ?Note;
+    public function make(string $xref, Tree $tree, string|null $gedcom = null): ?Note;
 
     /**
      * Create a note from a row in the database.
diff --git a/app/Contracts/RepositoryFactoryInterface.php b/app/Contracts/RepositoryFactoryInterface.php
index d6fd17ef3d..f1ebb5c09a 100644
--- a/app/Contracts/RepositoryFactoryInterface.php
+++ b/app/Contracts/RepositoryFactoryInterface.php
@@ -37,7 +37,7 @@ interface RepositoryFactoryInterface extends GedcomRecordFactoryInterface
      *
      * @return Repository|null
      */
-    public function make(string $xref, Tree $tree, string $gedcom = null): ?Repository;
+    public function make(string $xref, Tree $tree, string|null $gedcom = null): ?Repository;
 
     /**
      * Create a source from a row in the database.
diff --git a/app/Contracts/SharedNoteFactoryInterface.php b/app/Contracts/SharedNoteFactoryInterface.php
index e5a1de89f0..6130e6f9ea 100644
--- a/app/Contracts/SharedNoteFactoryInterface.php
+++ b/app/Contracts/SharedNoteFactoryInterface.php
@@ -37,7 +37,7 @@ interface SharedNoteFactoryInterface extends GedcomRecordFactoryInterface
      *
      * @return SharedNote|null
      */
-    public function make(string $xref, Tree $tree, string $gedcom = null): ?SharedNote;
+    public function make(string $xref, Tree $tree, string|null $gedcom = null): ?SharedNote;
 
     /**
      * Create a note from a row in the database.
diff --git a/app/Contracts/SourceFactoryInterface.php b/app/Contracts/SourceFactoryInterface.php
index c85776a7e5..9bc7c0a247 100644
--- a/app/Contracts/SourceFactoryInterface.php
+++ b/app/Contracts/SourceFactoryInterface.php
@@ -37,7 +37,7 @@ interface SourceFactoryInterface extends GedcomRecordFactoryInterface
      *
      * @return Source|null
      */
-    public function make(string $xref, Tree $tree, string $gedcom = null): ?Source;
+    public function make(string $xref, Tree $tree, string|null $gedcom = null): ?Source;
 
     /**
      * Create a source from a row in the database.
diff --git a/app/Contracts/SubmissionFactoryInterface.php b/app/Contracts/SubmissionFactoryInterface.php
index 34966081aa..1a17dd513d 100644
--- a/app/Contracts/SubmissionFactoryInterface.php
+++ b/app/Contracts/SubmissionFactoryInterface.php
@@ -37,7 +37,7 @@ interface SubmissionFactoryInterface extends GedcomRecordFactoryInterface
      *
      * @return Submission|null
      */
-    public function make(string $xref, Tree $tree, string $gedcom = null): ?Submission;
+    public function make(string $xref, Tree $tree, string|null $gedcom = null): ?Submission;
 
     /**
      * Create a submission from a row in the database.
diff --git a/app/Contracts/SubmitterFactoryInterface.php b/app/Contracts/SubmitterFactoryInterface.php
index d3328d3339..326b4d6eab 100644
--- a/app/Contracts/SubmitterFactoryInterface.php
+++ b/app/Contracts/SubmitterFactoryInterface.php
@@ -37,7 +37,7 @@ interface SubmitterFactoryInterface extends GedcomRecordFactoryInterface
      *
      * @return Submitter|null
      */
-    public function make(string $xref, Tree $tree, string $gedcom = null): ?Submitter;
+    public function make(string $xref, Tree $tree, string|null $gedcom = null): ?Submitter;
 
     /**
      * Create a submitter from a row in the database.
diff --git a/app/Contracts/TimestampFactoryInterface.php b/app/Contracts/TimestampFactoryInterface.php
index 4e21dad92a..62e754c9cc 100644
--- a/app/Contracts/TimestampFactoryInterface.php
+++ b/app/Contracts/TimestampFactoryInterface.php
@@ -30,7 +30,7 @@ interface TimestampFactoryInterface
      *
      * @return TimestampInterface
      */
-    public function make(int $timestamp, UserInterface $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 @@ interface TimestampFactoryInterface
      *
      * @return TimestampInterface
      */
-    public function fromString(?string $string, string $format = 'Y-m-d H:i:s', UserInterface $user = null): TimestampInterface;
+    public function fromString(?string $string, string $format = 'Y-m-d H:i:s', UserInterface|null $user = null): TimestampInterface;
 
     /**
      * @param UserInterface|null $user
      *
      * @return TimestampInterface
      */
-    public function now(UserInterface $user = null): TimestampInterface;
+    public function now(UserInterface|null $user = null): TimestampInterface;
 }