fisharebest / webtrees

app/Family.php

Spacing +10 added lines, -10 removed lines

@@ -33,10 +33,10 @@ 
     protected const string 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);
 
@@ -79,7 +79,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;
@@ -99,7 +99,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;
@@ -140,7 +140,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"
@@ -155,7 +155,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);
@@ -171,7 +171,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),
@@ -188,7 +188,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);
 
@@ -228,7 +228,7 @@ 
     /**
      * get the marriage event
      */
-    public function getMarriage(): Fact|null
+    public function getMarriage(): Fact | null
     {
         return $this->facts(['MARR'])->first();
     }

app/Contracts/SurnameTraditionFactoryInterface.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
     public const string POLISH      = 'polish';
     public const string LITHUANIAN  = 'lithuanian';
     public const string ICELANDIC   = 'icelandic';
-    public const string DEFAULT     = '';
+    public const string default     = '';
 
     /**
      * A list of supported surname traditions and their names.

app/Module/AncestorsChartModule.php

Spacing +2 added lines, -2 removed lines

@@ -50,7 +50,7 @@ 
     // Defaults
     public const string DEFAULT_GENERATIONS = '4';
     public const string DEFAULT_STYLE       = self::CHART_STYLE_TREE;
-    protected const array DEFAULT_PARAMETERS  = [
+    protected const array DEFAULT_PARAMETERS = [
         'generations' => self::DEFAULT_GENERATIONS,
         'style'       => self::DEFAULT_STYLE,
     ];
@@ -115,7 +115,7 @@ 
     /**
      * Return a menu item for this chart - for use in individual boxes.
      */
-    public function chartBoxMenu(Individual $individual): Menu|null
+    public function chartBoxMenu(Individual $individual): Menu | null
     {
         return $this->chartMenu($individual);
     }

app/Module/DescendancyChartModule.php

Spacing +2 added lines, -2 removed lines

@@ -50,7 +50,7 @@ 
     // Defaults
     public const    string DEFAULT_STYLE       = self::CHART_STYLE_TREE;
     public const    string DEFAULT_GENERATIONS = '3';
-    protected const array DEFAULT_PARAMETERS  = [
+    protected const array DEFAULT_PARAMETERS = [
         'generations' => self::DEFAULT_GENERATIONS,
         'style'       => self::DEFAULT_STYLE,
     ];
@@ -111,7 +111,7 @@ 
     /**
      * Return a menu item for this chart - for use in individual boxes.
      */
-    public function chartBoxMenu(Individual $individual): Menu|null
+    public function chartBoxMenu(Individual $individual): Menu | null
     {
         return $this->chartMenu($individual);
     }

app/Module/SlideShowModule.php

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
     use ModuleBlockTrait;
 
     // Show media linked to events or individuals.
-    private const string LINK_ALL   = 'all';
+    private const string LINK_ALL = 'all';
     private const string LINK_EVENT      = 'event';
     private const string LINK_INDIVIDUAL = 'indi';
 

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/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
              */