fisharebest / webtrees

app/SurnameTradition/SpanishSurnameTradition.php

Spacing +1 added lines, -1 removed lines

@@ -72,7 +72,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_SURNS, $this->extractName($father), $match_father) === 1) {
             $father_surname = $match_father['SURN1'];

app/SurnameTradition/PortugueseSurnameTradition.php

Spacing +1 added lines, -1 removed lines

@@ -72,7 +72,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_SURNS, $this->extractName($father), $match_father) === 1) {
             $father_surname = $match_father['SURN2'];

app/SurnameTradition/IcelandicSurnameTradition.php

Spacing +1 added lines, -1 removed lines

@@ -71,7 +71,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_GIVN, $this->extractName($father), $match) === 1) {
             switch ($sex) {

app/SurnameTradition/MatrilinealSurnameTradition.php

Spacing +1 added lines, -1 removed lines

@@ -59,7 +59,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_SPFX_SURN, $this->extractName($mother), $match) === 1) {
             $name = $match['NAME'];

app/SurnameTradition/PatrilinealSurnameTradition.php

Spacing +1 added lines, -1 removed lines

@@ -59,7 +59,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_SPFX_SURN, $this->extractName($father), $match) === 1) {
             $name = $match['NAME'];

app/CommonMark/CensusTableStartParser.php

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
  */
 class CensusTableStartParser implements BlockStartParserInterface
 {
-    public function tryStart(Cursor $cursor, MarkdownParserStateInterface $parserState): BlockStart|null
+    public function tryStart(Cursor $cursor, MarkdownParserStateInterface $parserState): BlockStart | null
     {
         if ($cursor->getLine() === CensusTableExtension::CA_PREFIX) {
             return BlockStart::of(new CensusTableContinueParser())

app/CommonMark/CensusTableContinueParser.php

Spacing +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
      *
      * @return BlockContinue|null
      */
-    public function tryContinue(Cursor $cursor, BlockContinueParserInterface $activeBlockParser): BlockContinue|null
+    public function tryContinue(Cursor $cursor, BlockContinueParserInterface $activeBlockParser): BlockContinue | null
     {
         $line = $cursor->getLine();
 

app/Family.php

Spacing +10 added lines, -10 removed lines

@@ -33,10 +33,10 @@ 
     protected const ROUTE_NAME = FamilyPage::class;
 
     // The husband (or first spouse for same-sex couples)
-    private Individual|null $husb = null;
+    private Individual | null $husb = null;
 
     // The wife (or second spouse for same-sex couples)
-    private Individual|null $wife = null;
+    private Individual | null $wife = null;
 
     /**
      * Create a GedcomRecord object from raw GEDCOM data.
@@ -47,7 +47,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)
     {
         parent::__construct($xref, $gedcom, $pending, $tree);
 
@@ -105,7 +105,7 @@ 
      *
      * @return Individual|null
      */
-    public function husband(int|null $access_level = null): Individual|null
+    public function husband(int | null $access_level = null): Individual | null
     {
         if ($this->tree->getPreference('SHOW_PRIVATE_RELATIONSHIPS') === '1') {
             $access_level = Auth::PRIV_HIDE;
@@ -125,7 +125,7 @@ 
      *
      * @return Individual|null
      */
-    public function wife(int|null $access_level = null): Individual|null
+    public function wife(int | null $access_level = null): Individual | null
     {
         if ($this->tree->getPreference('SHOW_PRIVATE_RELATIONSHIPS') === '1') {
             $access_level = Auth::PRIV_HIDE;
@@ -166,7 +166,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"
@@ -181,7 +181,7 @@ 
      *
      * @return Individual|null
      */
-    public function spouse(Individual $person, int|null $access_level = null): Individual|null
+    public function spouse(Individual $person, int | null $access_level = null): Individual | null
     {
         if ($person === $this->wife) {
             return $this->husband($access_level);
@@ -197,7 +197,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),
@@ -214,7 +214,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);
 
@@ -254,7 +254,7 @@ 
     /**
      * get the marriage event
      */
-    public function getMarriage(): Fact|null
+    public function getMarriage(): Fact | null
     {
         return $this->facts(['MARR'])->first();
     }

app/Individual.php

Spacing +8 added lines, -8 removed lines

@@ -45,11 +45,11 @@ 
     protected const ROUTE_NAME = IndividualPage::class;
 
     /** Used in some lists to keep track of this individual’s generation in that list */
-    public int|null $generation = null;
+    public int | null $generation = null;
 
-    private Date|null $estimated_birth_date = null;
+    private Date | null $estimated_birth_date = null;
 
-    private Date|null $estimated_death_date = null;
+    private Date | null $estimated_death_date = null;
 
     /**
      * A closure which will compare individuals by birth date.
@@ -78,7 +78,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);
 
@@ -346,7 +346,7 @@ 
     /**
      * Find the highlighted media object for an individual
      */
-    public function findHighlightedMediaFile(): MediaFile|null
+    public function findHighlightedMediaFile(): MediaFile | null
     {
         $fact = $this->facts(['OBJE'])
             ->first(static function (Fact $fact): bool {
@@ -697,7 +697,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);
 
@@ -724,7 +724,7 @@ 
      *
      * @return Individual|null
      */
-    public function getCurrentSpouse(): Individual|null
+    public function getCurrentSpouse(): Individual | null
     {
         $family = $this->spouseFamilies()->last();
 
@@ -763,7 +763,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);