fisharebest / webtrees

app/Individual.php

Spacing +8 added lines, -8 removed lines

@@ -45,11 +45,11 @@ 
     protected const string 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);
 
@@ -312,7 +312,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 {
@@ -663,7 +663,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);
 
@@ -690,7 +690,7 @@ 
      *
      * @return Individual|null
      */
-    public function getCurrentSpouse(): Individual|null
+    public function getCurrentSpouse(): Individual | null
     {
         $family = $this->spouseFamilies()->last();
 
@@ -729,7 +729,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);
 

app/User.php

Indentation +2 added lines, -2 removed lines

@@ -291,8 +291,8 @@
     public function check2facode(string $code2fa): bool
     {
         $secret = DB::table('user')
-             ->where('user_id', '=', $this->id())
-             ->value('secret');
+                ->where('user_id', '=', $this->id())
+                ->value('secret');
         settype($secret, "string");
         $google2fa = new Google2FA();
         $googleverifystatus = $google2fa->verifyKey($secret, $code2fa);

app/GedcomRecord.php

Spacing +10 added lines, -10 removed lines

@@ -78,7 +78,7 @@ 
     protected string $gedcom;
 
     // GEDCOM data (after any pending edits)
-    protected string|null $pending;
+    protected string | null $pending;
 
     /** @var array<Fact> Facts extracted from $gedcom/$pending */
     protected array $facts;
@@ -87,10 +87,10 @@ 
     protected array $getAllNames = [];
 
     /** @var int|null Cached result */
-    private int|null $getPrimaryName = null;
+    private int | null $getPrimaryName = null;
 
     /** @var int|null Cached result */
-    private int|null $getSecondaryName = null;
+    private int | null $getSecondaryName = null;
 
     /**
      * Create a GedcomRecord object from raw GEDCOM data.
@@ -101,7 +101,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)
     {
         $this->xref    = $xref;
         $this->gedcom  = $gedcom;
@@ -240,7 +240,7 @@ 
      *
      * @return bool
      */
-    public function canShow(int|null $access_level = null): bool
+    public function canShow(int | null $access_level = null): bool
     {
         $access_level ??= Auth::accessLevel($this->tree);
 
@@ -262,7 +262,7 @@ 
      *
      * @return bool
      */
-    public function canShowName(int|null $access_level = null): bool
+    public function canShowName(int | null $access_level = null): bool
     {
         return $this->canShow($access_level);
     }
@@ -312,7 +312,7 @@ 
         }
 
         // Remove links to missing and private records
-        $pattern =  '/\n(\d) ' . Gedcom::REGEX_TAG . ' @(' . Gedcom::REGEX_XREF . ')@/';
+        $pattern = '/\n(\d) ' . Gedcom::REGEX_TAG . ' @(' . Gedcom::REGEX_XREF . ')@/';
         preg_match_all($pattern, $gedcom, $matches, PREG_SET_ORDER);
 
         foreach ($matches as $match) {
@@ -432,7 +432,7 @@ 
      *
      * @return void
      */
-    public function setPrimaryName(int|null $n = null): void
+    public function setPrimaryName(int | null $n = null): void
     {
         $this->getPrimaryName   = $n;
         $this->getSecondaryName = null;
@@ -483,7 +483,7 @@ 
      *
      * @return string|null
      */
-    public function alternateName(): string|null
+    public function alternateName(): string | null
     {
         if ($this->canShowName() && $this->getPrimaryName() !== $this->getSecondaryName()) {
             $all_names = $this->getAllNames();
@@ -611,7 +611,7 @@ 
     public function facts(
         array $filter = [],
         bool $sort = false,
-        int|null $access_level = null,
+        int | null $access_level = null,
         bool $ignore_deleted = false
     ): Collection {
         $access_level ??= Auth::accessLevel($this->tree);

app/SessionDatabaseHandler.php

Spacing +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
 
             // Only update session once a minute to reduce contention on the session table.
             if (date('Y-m-d H:i:s', time() - 60) > $this->row->session_time) {
-                $updates['session_time'] =  date('Y-m-d H:i:s');
+                $updates['session_time'] = date('Y-m-d H:i:s');
             }
 
             if ($updates !== []) {

app/Http/Dispatcher.php

Spacing +2 added lines, -2 removed lines

@@ -52,7 +52,7 @@ 
      */
     private static function reduceMiddleware(
         RequestHandlerInterface $carry,
-        string|MiddlewareInterface $item,
+        string | MiddlewareInterface $item,
     ): RequestHandlerInterface {
         return new readonly class (carry: $carry, item: $item) implements RequestHandlerInterface {
             /**
@@ -60,7 +60,7 @@ 
              */
             public function __construct(
                 private RequestHandlerInterface $carry,
-                private string|MiddlewareInterface $item,
+                private string | MiddlewareInterface $item,
             ) {
             }
 

Braces +2 added lines, -1 removed lines

@@ -54,7 +54,8 @@
         RequestHandlerInterface $carry,
         string|MiddlewareInterface $item,
     ): RequestHandlerInterface {
-        return new readonly class (carry: $carry, item: $item) implements RequestHandlerInterface {
+        return new readonly class (carry: $carry, item: $item) implements RequestHandlerInterface
+        {
             /**
              * @param class-string|MiddlewareInterface $item
              */

app/Services/LinkedRecordService.php

Spacing +2 added lines, -2 removed lines

@@ -76,7 +76,7 @@ 
     /**
      * @return Collection<int,Family>
      */
-    public function linkedFamilies(GedcomRecord $record, string|null $link_type = null): Collection
+    public function linkedFamilies(GedcomRecord $record, string | null $link_type = null): Collection
     {
         $query = DB::table('families')
             ->join('link', static function (JoinClause $join): void {
@@ -102,7 +102,7 @@ 
     /**
      * @return Collection<int,Individual>
      */
-    public function linkedIndividuals(GedcomRecord $record, string|null $link_type = null): Collection
+    public function linkedIndividuals(GedcomRecord $record, string | null $link_type = null): Collection
     {
         $query = DB::table('individuals')
             ->join('link', static function (JoinClause $join): void {

app/Http/Middleware/BadBotBlocker.php

Spacing +1 added lines, -1 removed lines

@@ -339,7 +339,7 @@
         return Registry::cache()->file()->remember('whois-asn-' . $asn, function () use ($asn): array {
             $ranges = $this->network_service->findIpRangesForAsn($asn);
 
-            $mapper = static fn (string $range): RangeInterface|null => Factory::parseRangeString($range);
+            $mapper = static fn (string $range): RangeInterface | null => Factory::parseRangeString($range);
 
             $ranges = array_map($mapper, $ranges);
 

app/Statistics/Repository/MediaRepository.php

Spacing +1 added lines, -1 removed lines

@@ -172,7 +172,7 @@
         return $this->totalMedia(self::MEDIA_TYPE_UNKNOWN);
     }
 
-    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
     {
         $media = DB::table('media_file')
             ->where('m_file', '=', $this->tree->id())

app/Statistics/Repository/IndividualRepository.php

Spacing +14 added lines, -14 removed lines

@@ -469,7 +469,7 @@ 
             ->groupBy(['i_sex']);
     }
 
-    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 (new ChartBirth($this->century_service, $this->color_service, $this->tree))
             ->chartBirth($color_from, $color_to);
@@ -503,7 +503,7 @@ 
             ->groupBy(['i_sex']);
     }
 
-    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 (new ChartDeath($this->century_service, $this->color_service, $this->tree))
             ->chartDeath($color_from, $color_to);
@@ -1160,8 +1160,8 @@ 
     }
 
     public function chartCommonGiven(
-        string|null $color_from = null,
-        string|null $color_to = null,
+        string | null $color_from = null,
+        string | null $color_to = null,
         int $maxtoshow = 7
     ): string {
         $tot_indi = $this->totalIndividualsQuery();
@@ -1176,8 +1176,8 @@ 
     }
 
     public function chartCommonSurnames(
-        string|null $color_from = null,
-        string|null $color_to = null,
+        string | null $color_from = null,
+        string | null $color_to = null,
         int $number_of_surnames = 10
     ): string {
         $tot_indi     = $this->totalIndividualsQuery();
@@ -1194,7 +1194,7 @@ 
             ->chartCommonSurnames($tot_indi, $all_surnames, $color_from, $color_to);
     }
 
-    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
     {
         $tot_l = $this->totalLivingQuery();
         $tot_d = $this->totalDeceasedQuery();
@@ -1204,8 +1204,8 @@ 
     }
 
     public function chartIndisWithSources(
-        string|null $color_from = null,
-        string|null $color_to = null
+        string | null $color_from = null,
+        string | null $color_to = null
     ): string {
         $tot_indi        = $this->totalIndividualsQuery();
         $tot_indi_source = $this->totalIndisWithSourcesQuery();
@@ -1215,8 +1215,8 @@ 
     }
 
     public function chartFamsWithSources(
-        string|null $color_from = null,
-        string|null $color_to = null
+        string | null $color_from = null,
+        string | null $color_to = null
     ): string {
         $tot_fam        = $this->totalFamiliesQuery();
         $tot_fam_source = $this->totalFamsWithSourcesQuery();
@@ -1226,9 +1226,9 @@ 
     }
 
     public function chartSex(
-        string|null $color_female = null,
-        string|null $color_male = null,
-        string|null $color_unknown = null
+        string | null $color_female = null,
+        string | null $color_male = null,
+        string | null $color_unknown = null
     ): string {
         $tot_m = $this->totalSexMalesQuery();
         $tot_f = $this->totalSexFemalesQuery();