fisharebest / webtrees

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/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,
             ) {
             }
 

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/Factories/SlugFactory.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
  */
 class SlugFactory implements SlugFactoryInterface
 {
-    private Transliterator|null $transliterator = null;
+    private Transliterator | null $transliterator = null;
 
     public function __construct(private PhpService $php_service)
     {

app/Http/Middleware/CompressResponse.php

Spacing +1 added lines, -1 removed lines

@@ -94,7 +94,7 @@
         return $response;
     }
 
-    protected function compressionMethod(RequestInterface $request): string|null
+    protected function compressionMethod(RequestInterface $request): string | null
     {
         $accept_encoding = strtolower($request->getHeaderLine('accept-encoding'));
         $zlib_available  = $this->php_service->extensionLoaded(extension: 'zlib');

app/Services/TimeoutService.php

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
 
     public function __construct(
         private PhpService $php_service,
-        float|null $start_time = null,
+        float | null $start_time = null,
     ) {
         $this->start_time = $start_time ?? Registry::timeFactory()->now();
     }

app/Cli/Commands/TreeList.php

Spacing +1 added lines, -1 removed lines

@@ -112,7 +112,7 @@
         return implode(separator: ',', array: $columns);
     }
 
-    private function quoteCsvValue(string|int $value): string
+    private function quoteCsvValue(string | int $value): string
     {
         return '"' . addcslashes(string: (string) $value, characters: '"') . '"';
     }

app/Cli/Commands/UserList.php

Spacing +8 added lines, -8 removed lines

@@ -71,13 +71,13 @@ 
             'real_name'  => $user->realName(),
             'email'      => $user->email(),
             'admin'      => $user->getPreference(setting_name: UserInterface::PREF_IS_ADMINISTRATOR) ? 'yes' : 'no',
-            'approved'   => $user->getPreference(setting_name: UserInterface::PREF_IS_ACCOUNT_APPROVED) ? 'yes' : 'no',
-            'verified'   => $user->getPreference(setting_name: UserInterface::PREF_IS_EMAIL_VERIFIED) ? 'yes' : 'no',
-            'language'   => $user->getPreference(setting_name: UserInterface::PREF_LANGUAGE),
-            'timezone'   => $user->getPreference(setting_name: UserInterface::PREF_TIME_ZONE),
-            'contact'    => $user->getPreference(setting_name: UserInterface::PREF_CONTACT_METHOD),
-            'registered' => $this->formatTimestamp(timestamp: (int) $user->getPreference(setting_name: UserInterface::PREF_TIMESTAMP_REGISTERED)),
-            'last_login' => $this->formatTimestamp(timestamp: (int) $user->getPreference(setting_name: UserInterface::PREF_TIMESTAMP_ACTIVE)),
+            'approved'   => $user->getPreference(setting_name : UserInterface::PREF_IS_ACCOUNT_APPROVED) ? 'yes' : 'no',
+            'verified'   => $user->getPreference(setting_name : UserInterface::PREF_IS_EMAIL_VERIFIED) ? 'yes' : 'no',
+            'language'   => $user->getPreference(setting_name : UserInterface::PREF_LANGUAGE),
+            'timezone'   => $user->getPreference(setting_name : UserInterface::PREF_TIME_ZONE),
+            'contact'    => $user->getPreference(setting_name : UserInterface::PREF_CONTACT_METHOD),
+            'registered' => $this->formatTimestamp(timestamp : (int) $user->getPreference(setting_name : UserInterface::PREF_TIMESTAMP_REGISTERED)),
+            'last_login' => $this->formatTimestamp(timestamp : (int) $user->getPreference(setting_name : UserInterface::PREF_TIMESTAMP_ACTIVE)),
         ])
         ->values()
         ->all();
@@ -131,7 +131,7 @@ 
         return implode(separator: ',', array: $columns);
     }
 
-    private function quoteCsvValue(string|int $value): string
+    private function quoteCsvValue(string | int $value): string
     {
         return '"' . addcslashes(string: (string) $value, characters: '"') . '"';
     }

app/DB.php

Spacing +2 added lines, -2 removed lines

@@ -141,7 +141,7 @@ 
         return self::pdo()->getAttribute(PDO::ATTR_DRIVER_NAME);
     }
 
-    public static function exec(string $sql): int|false
+    public static function exec(string $sql): int | false
     {
         return self::pdo()->exec($sql);
     }
@@ -227,7 +227,7 @@ 
     /**
      * @return Expression<string>
      */
-    public static function binaryColumn(string $column, string|null $alias = null): Expression
+    public static function binaryColumn(string $column, string | null $alias = null): Expression
     {
         if (self::driverName() === self::MYSQL) {
             $sql = 'CAST(' . $column . ' AS binary)';