fisharebest / webtrees

app/Census/AbstractCensusColumn.php

Spacing +3 added lines, -3 removed lines

@@ -65,7 +65,7 @@ 
     /**
      * Find the father of an individual
      */
-    public function father(Individual $individual): Individual|null
+    public function father(Individual $individual): Individual | null
     {
         $family = $individual->childFamilies()->first();
 
@@ -79,7 +79,7 @@ 
     /**
      * Find the mother of an individual
      */
-    public function mother(Individual $individual): Individual|null
+    public function mother(Individual $individual): Individual | null
     {
         $family = $individual->childFamilies()->first();
 
@@ -93,7 +93,7 @@ 
     /**
      * Find the current spouse family of an individual
      */
-    public function spouseFamily(Individual $individual): Family|null
+    public function spouseFamily(Individual $individual): Family | null
     {
         return $individual->spouseFamilies()
                 // Exclude families that were created after this census date

app/Module/AbstractIndividualListModule.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 === '';

app/Module/ClippingsCartModule.php

Spacing +2 added lines, -2 removed lines

@@ -130,7 +130,7 @@ 
         return 6;
     }
 
-    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();
@@ -353,7 +353,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);

app/Elements/AbstractElement.php

Spacing +3 added lines, -3 removed lines

@@ -42,8 +42,8 @@ 
 abstract class AbstractElement implements ElementInterface
 {
     // HTML attributes for an <input>
-    protected const int|false    MAXIMUM_LENGTH = false;
-    protected const string|false PATTERN        = false;
+    protected const int | false    MAXIMUM_LENGTH = false;
+    protected const string | false PATTERN        = false;
 
     private const array WHITESPACE_LINE = [
         "\t"       => ' ',
@@ -78,7 +78,7 @@ 
      * @param string             $label
      * @param array<string>|null $subtags
      */
-    public function __construct(string $label, array|null $subtags = null)
+    public function __construct(string $label, array | null $subtags = null)
     {
         $this->label   = $label;
         $this->subtags = $subtags ?? static::SUBTAGS;

app/Elements/RestrictionNotice.php

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
  */
 class RestrictionNotice extends AbstractElement
 {
-    public const string VALUE_NONE    = 'NONE';
+    public const string VALUE_NONE = 'NONE';
     public const string VALUE_PRIVACY      = 'PRIVACY';
     public const string VALUE_CONFIDENTIAL = 'CONFIDENTIAL';
     public const string VALUE_LOCKED       = 'LOCKED';

app/Http/Middleware/DoHousekeeping.php

Spacing +2 added lines, -2 removed lines

@@ -35,10 +35,10 @@
 {
     // Delete old thumbnails after 90 days.
     private const string THUMBNAIL_DIR = 'thumbnail-cache';
-    private const int MAX_THUMBNAIL_AGE    = 60 * 60 * 24 * 90;
+    private const int MAX_THUMBNAIL_AGE = 60 * 60 * 24 * 90;
 
     // Delete files in /data/tmp after 1 hour.
-    private const string TMP_DIR   = 'data/tmp';
+    private const string TMP_DIR = 'data/tmp';
     private const int    MAX_TMP_FILE_AGE = 60 * 60;
 
     // Delete error logs after 90 days.

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);
     }