fisharebest / webtrees

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/Module/IndividualListModule.php

Braces +3 added lines, -1 removed lines

@@ -304,7 +304,8 @@ 
                     <li class="wt-initials-list-item d-flex">
                         <?php if ($count > 0) : ?>
                             <a href="<?= e($this->listUrl($tree, ['alpha' => $letter, 'show_marnm' => $show_marnm, 'tree' => $tree->name()])) ?>" class="wt-initial px-1<?= $letter === $alpha ? ' active' : '' ?> '" title="<?= I18N::number($count) ?>"><?= $this->displaySurnameInitial((string) $letter) ?></a>
-                        <?php else : ?>
+                        <?php else {
+    : ?>
                             <span class="wt-initial px-1 text-muted"><?= $this->displaySurnameInitial((string) $letter) ?></span>
 
                         <?php endif ?>
@@ -359,6 +360,7 @@ 
                 switch ($alpha) {
                     case '@':
                         $filter = static fn (string $x): bool => $x === Individual::NOMEN_NESCIO;
+}
                         break;
                     case ',':
                         $filter = static fn (string $x): bool => $x === '';

Spacing +2 added lines, -2 removed lines

@@ -216,7 +216,7 @@ 
         $surname_initials = $this->surnameInitials($surname_data);
 
         // We've requested a surname that doesn't currently exist.
-        if ($surname !== ''  && !array_key_exists($surname, $all_surns)) {
+        if ($surname !== '' && !array_key_exists($surname, $all_surns)) {
             $message = I18N::translate('There are no individuals with the surname “%s”', e($surname));
             FlashMessages::addMessage($message);
 
@@ -604,7 +604,7 @@ 
             ->groupBy([DB::binaryColumn('n_givn')]);
 
         foreach ($query->get() as $row) {
-            $initial            = I18N::strtoupper(I18N::language()->initialLetter($row->n_givn));
+            $initial = I18N::strtoupper(I18N::language()->initialLetter($row->n_givn));
             $initials[$initial] ??= 0;
             $initials[$initial] += (int) $row->count;
         }

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)

app/Http/RequestHandlers/DataFixUpdateAll.php

Spacing +2 added lines, -2 removed lines

@@ -89,8 +89,8 @@
 
         /** @var Collection<int,GedcomRecord> $records */
         $records = $rows
-            ->map(fn (object $row): GedcomRecord|null => $this->data_fix_service->getRecordByType($row->xref, $tree, $row->type))
-            ->filter(static fn (GedcomRecord|null $record): bool => $record instanceof GedcomRecord && !$record->isPendingDeletion() && $module->doesRecordNeedUpdate($record, $params));
+            ->map(fn (object $row): GedcomRecord | null => $this->data_fix_service->getRecordByType($row->xref, $tree, $row->type))
+            ->filter(static fn (GedcomRecord | null $record): bool => $record instanceof GedcomRecord && !$record->isPendingDeletion() && $module->doesRecordNeedUpdate($record, $params));
 
         foreach ($records as $record) {
             $module->updateRecord($record, $params);

app/Module/ListsMenuModule.php

Spacing +2 added lines, -2 removed lines

@@ -81,10 +81,10 @@
      *
      * @return Menu|null
      */
-    public function getMenu(Tree $tree): Menu|null
+    public function getMenu(Tree $tree): Menu | null
     {
         $submenus = $this->module_service->findByComponent(ModuleListInterface::class, $tree, Auth::user())
-            ->map(static fn (ModuleListInterface $module): Menu|null => $module->listMenu($tree))
+            ->map(static fn (ModuleListInterface $module): Menu | null => $module->listMenu($tree))
             ->filter()
             ->sort(static fn (Menu $x, Menu $y): int => I18N::comparator()($x->getLabel(), $y->getLabel()));
 

app/Module/TimelineChartModule.php

Spacing +5 added lines, -5 removed lines

@@ -160,7 +160,7 @@ 
         // Find the requested individuals.
         $individuals = (new Collection($xrefs))
             ->uniqueStrict()
-            ->map(static fn (string $xref): Individual|null => Registry::individualFactory()->make($xref, $tree))
+            ->map(static fn (string $xref): Individual | null => Registry::individualFactory()->make($xref, $tree))
             ->filter()
             ->filter(GedcomRecord::accessFilter());
 
@@ -179,9 +179,9 @@ 
             ]);
         }
 
-        $individuals = array_map(static fn (string $xref): Individual|null => Registry::individualFactory()->make($xref, $tree), $xrefs);
+        $individuals = array_map(static fn (string $xref): Individual | null => Registry::individualFactory()->make($xref, $tree), $xrefs);
 
-        $individuals = array_filter($individuals, static fn (Individual|null $individual): bool => $individual instanceof Individual && $individual->canShow());
+        $individuals = array_filter($individuals, static fn (Individual | null $individual): bool => $individual instanceof Individual && $individual->canShow());
 
         if ($ajax) {
             $this->layout = 'layouts/ajax';
@@ -237,9 +237,9 @@ 
     protected function chart(Tree $tree, array $xrefs, int $scale): ResponseInterface
     {
         /** @var Individual[] $individuals */
-        $individuals = array_map(static fn (string $xref): Individual|null => Registry::individualFactory()->make($xref, $tree), $xrefs);
+        $individuals = array_map(static fn (string $xref): Individual | null => Registry::individualFactory()->make($xref, $tree), $xrefs);
 
-        $individuals = array_filter($individuals, static fn (Individual|null $individual): bool => $individual instanceof Individual && $individual->canShow());
+        $individuals = array_filter($individuals, static fn (Individual | null $individual): bool => $individual instanceof Individual && $individual->canShow());
 
         $baseyear    = (int) date('Y');
         $topyear     = 0;

app/Module/ClippingsCartModule.php

Spacing +2 added lines, -2 removed lines

@@ -147,7 +147,7 @@ 
     /**
      * A menu, to be added to the main application menu.
      */
-    public function getMenu(Tree $tree): Menu|null
+    public function getMenu(Tree $tree): Menu | null
     {
         $request = Registry::container()->get(ServerRequestInterface::class);
         $route   = Validator::attributes($request)->route();
@@ -409,7 +409,7 @@ 
         $xrefs = array_map('strval', $xrefs); // PHP converts numeric keys to integers.
 
         // Fetch all the records in the cart.
-        $records = array_map(static fn (string $xref): GedcomRecord|null => Registry::gedcomRecordFactory()->make($xref, $tree), $xrefs);
+        $records = array_map(static fn (string $xref): GedcomRecord | null => Registry::gedcomRecordFactory()->make($xref, $tree), $xrefs);
 
         // Some records may have been deleted after they were added to the cart.
         $records = array_filter($records);