fisharebest / webtrees

app/Statistics/Google/ChartMortality.php

Spacing +2 added lines, -2 removed lines

@@ -53,8 +53,8 @@
     public function chartMortality(
         int $tot_l,
         int $tot_d,
-        string|null $color_living = null,
-        string|null $color_dead = null
+        string | null $color_living = null,
+        string | null $color_dead = null
     ): string {
         $color_living ??= '#ffffff';
         $color_dead ??= '#cccccc';

app/Statistics/Google/ChartCommonGiven.php

Spacing +2 added lines, -2 removed lines

@@ -53,8 +53,8 @@
     public function chartCommonGiven(
         int $tot_indi,
         array $given,
-        string|null $color_from = null,
-        string|null $color_to = null
+        string | null $color_from = null,
+        string | null $color_to = null
     ): string {
         $color_from ??= 'ffffff';
         $color_to ??= '84beff';

app/Statistics/Google/ChartSex.php

Spacing +3 added lines, -3 removed lines

@@ -42,9 +42,9 @@
         int $tot_m,
         int $tot_f,
         int $tot_u,
-        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 {
         $color_female ??= '#ffd1dc';
         $color_male ??= '#84beff';

app/Statistics/Google/ChartFamilyWithSources.php

Spacing +2 added lines, -2 removed lines

@@ -53,8 +53,8 @@
     public function chartFamsWithSources(
         int $tot_fam,
         int $tot_fam_source,
-        string|null $color_from = null,
-        string|null $color_to = null
+        string | null $color_from = null,
+        string | null $color_to = null
     ): string {
         $color_from ??= 'ffffff';
         $color_to ??= '84beff';

app/Statistics/Repository/Interfaces/IndividualRepositoryInterface.php

Spacing +3 added lines, -3 removed lines

@@ -188,8 +188,8 @@
      * @return string
      */
     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;
 }

app/Statistics/Repository/IndividualRepository.php

Spacing +14 added lines, -14 removed lines

@@ -724,7 +724,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 (new ChartBirth($this->century_service, $this->color_service, $this->tree))
             ->chartBirth($color_from, $color_to);
@@ -782,7 +782,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 (new ChartDeath($this->century_service, $this->color_service, $this->tree))
             ->chartDeath($color_from, $color_to);
@@ -1815,8 +1815,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,
         int $maxtoshow = 7
     ): string {
         $tot_indi = $this->totalIndividualsQuery();
@@ -1840,8 +1840,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,
         int $number_of_surnames = 10
     ): string {
         $tot_indi     = $this->totalIndividualsQuery();
@@ -1866,7 +1866,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
     {
         $tot_l = $this->totalLivingQuery();
         $tot_d = $this->totalDeceasedQuery();
@@ -1884,8 +1884,8 @@ 
      * @return string
      */
     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();
@@ -1903,8 +1903,8 @@ 
      * @return string
      */
     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();
@@ -1921,9 +1921,9 @@ 
      * @return string
      */
     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();

app/Services/HomePageService.php

Spacing +1 added lines, -1 removed lines

@@ -385,7 +385,7 @@
      */
     private function filterActiveBlocks(Collection $blocks, Collection $active_blocks): Collection
     {
-        return $blocks->map(static fn (string $block_name): ModuleBlockInterface|null => $active_blocks->filter(static fn (ModuleInterface $block): bool => $block->name() === $block_name)->first())
+        return $blocks->map(static fn (string $block_name): ModuleBlockInterface | null => $active_blocks->filter(static fn (ModuleInterface $block): bool => $block->name() === $block_name)->first())
             ->filter();
     }
 }

app/Services/ModuleService.php

Spacing +3 added lines, -3 removed lines

@@ -696,7 +696,7 @@ 
 
                 return strlen($module_name) <= 30;
             })
-            ->map(static function (string $filename): ModuleCustomInterface|null {
+            ->map(static function (string $filename): ModuleCustomInterface | null {
                 $module = self::load($filename);
 
                 if ($module instanceof ModuleCustomInterface) {
@@ -714,7 +714,7 @@ 
     /**
      * Load a custom module in a static scope, to prevent it from modifying local or object variables.
      */
-    private static function load(string $filename): ModuleInterface|null
+    private static function load(string $filename): ModuleInterface | null
     {
         try {
             return include $filename;
@@ -826,7 +826,7 @@ 
     /**
      * Find a specified module, if it is currently active.
      */
-    public function findByName(string $module_name, bool $include_disabled = false): ModuleInterface|null
+    public function findByName(string $module_name, bool $include_disabled = false): ModuleInterface | null
     {
         return $this->all($include_disabled)
             ->first(static fn (ModuleInterface $module): bool => $module->name() === $module_name);

app/Services/UserService.php

Spacing +6 added lines, -6 removed lines

@@ -45,10 +45,10 @@ 
     /**
      * Find the user with a specified user_id.
      */
-    public function find(int|null $user_id): User|null
+    public function find(int | null $user_id): User | null
     {
         return Registry::cache()->array()
-            ->remember('user-' . $user_id, static fn (): User|null => DB::table('user')
+            ->remember('user-' . $user_id, static fn (): User | null => DB::table('user')
                 ->where('user_id', '=', $user_id)
                 ->get()
                 ->map(User::rowMapper())
@@ -58,7 +58,7 @@ 
     /**
      * Find the user with a specified email address.
      */
-    public function findByEmail(string $email): User|null
+    public function findByEmail(string $email): User | null
     {
         return DB::table('user')
             ->where('email', '=', $email)
@@ -70,7 +70,7 @@ 
     /**
      * Find the user with a specified user_name or email address.
      */
-    public function findByIdentifier(string $identifier): User|null
+    public function findByIdentifier(string $identifier): User | null
     {
         return DB::table('user')
             ->where('user_name', '=', $identifier)
@@ -102,7 +102,7 @@ 
     /**
      * Find the user with a specified password reset token.
      */
-    public function findByToken(string $token): User|null
+    public function findByToken(string $token): User | null
     {
         return DB::table('user')
             ->join('user_setting AS us1', 'us1.user_id', '=', 'user.user_id')
@@ -120,7 +120,7 @@ 
     /**
      * Find the user with a specified user_name.
      */
-    public function findByUserName(string $user_name): User|null
+    public function findByUserName(string $user_name): User | null
     {
         return DB::table('user')
             ->where('user_name', '=', $user_name)