fisharebest / webtrees

app/Helpers/functions.php

Spacing +1 added lines, -1 removed lines

@@ -114,7 +114,7 @@
  *
  * @return ResponseInterface
  */
-function response(array|object|string $content = '', int $code = StatusCodeInterface::STATUS_OK, array $headers = []): ResponseInterface
+function response(array | object | string $content = '', int $code = StatusCodeInterface::STATUS_OK, array $headers = []): ResponseInterface
 {
     return Registry::responseFactory()->response($content, $code, $headers);
 }

app/Module/IndividualListModule.php

Spacing +2 added lines, -2 removed lines

@@ -660,11 +660,11 @@
      */
     protected function surnameInitials(array $all_surnames): array
     {
-        $initials    = [];
+        $initials = [];
 
         // Ensure our own language comes before others.
         foreach (I18N::language()->alphabet() as $initial) {
-            $initials[$initial]    = 0;
+            $initials[$initial] = 0;
         }
 
         foreach ($all_surnames as $surn => $surnames) {

Braces +3 added lines, -1 removed lines

@@ -313,7 +313,8 @@ 
                     <li class="wt-initials-list-item d-flex">
                         <?php if ($count > 0) : ?>
                             <a href="<?= e($this->listUrl($tree, ['alpha' => $letter, '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 ?>
@@ -368,6 +369,7 @@ 
                 switch ($alpha) {
                     case '@':
                         $surns = array_filter($all_surnames, static fn (string $x): bool => $x === Individual::NOMEN_NESCIO, ARRAY_FILTER_USE_KEY);
+}
                         break;
                     case ',':
                         $surns = array_filter($all_surnames, static fn (string $x): bool => $x === '', ARRAY_FILTER_USE_KEY);

app/Services/UpgradeService.php

Spacing +1 added lines, -1 removed lines

@@ -301,7 +301,7 @@
     {
         $latest_version = $this->fetchLatestVersion(false);
 
-        [, , $url] = explode('|', $latest_version . '||');
+        [,, $url] = explode('|', $latest_version . '||');
 
         return $url;
     }

app/DB/Schema/ColumnInterface.php

Spacing +2 added lines, -2 removed lines

@@ -38,7 +38,7 @@ 
      *
      * @return $this
      */
-    public function default(int|string|Expression|null $default): static;
+    public function default(int | string | Expression | null $default): static;
 
     /**
      * @param bool $nullable
@@ -62,7 +62,7 @@ 
     /**
      * @return int|string|Expression|null
      */
-    public function getDefault(): int|string|Expression|null;
+    public function getDefault(): int | string | Expression | null;
 
     /**
      * @return bool

app/DB/Schema/AbstractColumn.php

Spacing +3 added lines, -3 removed lines

@@ -28,7 +28,7 @@ 
 {
     public string $comment = '';
 
-    public int|float|string|Expression|null $default = null;
+    public int | float | string | Expression | null $default = null;
 
     public bool $nullable = false;
 
@@ -58,7 +58,7 @@ 
      *
      * @return $this
      */
-    public function default(int|float|string|Expression|null $default): static
+    public function default(int | float | string | Expression | null $default): static
     {
         $this->default = $default;
 
@@ -100,7 +100,7 @@ 
     /**
      * @return int|string|Expression|null
      */
-    public function getDefault(): int|string|Expression|null
+    public function getDefault(): int | string | Expression | null
     {
         return $this->default;
     }

app/DB/Schema/Schema.php

Spacing +4 added lines, -4 removed lines

@@ -437,7 +437,7 @@ 
      *
      * @return PrimaryKey
      */
-    public static function primaryKey(string|array $columns, string $name = ''): PrimaryKey
+    public static function primaryKey(string | array $columns, string $name = ''): PrimaryKey
     {
         return new PrimaryKey(name: $name, columns: (array) $columns);
     }
@@ -448,7 +448,7 @@ 
      *
      * @return Index
      */
-    public static function index(string|array $columns, string $name = ''): Index
+    public static function index(string | array $columns, string $name = ''): Index
     {
         return new Index(name: $name, columns: (array) $columns);
     }
@@ -459,7 +459,7 @@ 
      *
      * @return UniqueIndex
      */
-    public static function uniqueIndex(string|array $columns, string $name = ''): UniqueIndex
+    public static function uniqueIndex(string | array $columns, string $name = ''): UniqueIndex
     {
         return new UniqueIndex(name: $name, columns: (array) $columns);
     }
@@ -472,7 +472,7 @@ 
      *
      * @return ForeignKey
      */
-    public static function foreignKey(string|array $local_columns, string $foreign_table, string|array $foreign_columns = null, string $name = ''): ForeignKey
+    public static function foreignKey(string | array $local_columns, string $foreign_table, string | array $foreign_columns = null, string $name = ''): ForeignKey
     {
         // If the foreign columns have the same name, we don't need to specify them.
         $foreign_columns ??= $local_columns;

app/Services/SearchService.php

Spacing +1 added lines, -1 removed lines

@@ -1072,7 +1072,7 @@
      * @param Expression|string $column
      * @param array<string>     $search_terms
      */
-    private function whereSearch(Builder $query, Expression|string $column, array $search_terms): void
+    private function whereSearch(Builder $query, Expression | string $column, array $search_terms): void
     {
         foreach ($search_terms as $search_term) {
             $query->where($column, 'LIKE', '%' . addcslashes($search_term, '\\%_') . '%');

app/DB/Table.php

Spacing +4 added lines, -4 removed lines

@@ -36,13 +36,13 @@
      * @param string                  $name
      * @param Column|Index|ForeignKey ...$components
      */
-    public function __construct(string $name, Column|Index|ForeignKey ...$components)
+    public function __construct(string $name, Column | Index | ForeignKey ...$components)
     {
         $name = DB::prefix($name);
         
-        $columns = array_filter($components, static fn (Column|Index|ForeignKey $component) => $component instanceof Column);
-        $indexes = array_filter($components, static fn (Column|Index|ForeignKey $component) => $component instanceof Index);
-        $fk_constraints = array_filter($components, static fn (Column|Index|ForeignKey $component) => $component instanceof ForeignKey);
+        $columns = array_filter($components, static fn (Column | Index | ForeignKey $component) => $component instanceof Column);
+        $indexes = array_filter($components, static fn (Column | Index | ForeignKey $component) => $component instanceof Index);
+        $fk_constraints = array_filter($components, static fn (Column | Index | ForeignKey $component) => $component instanceof ForeignKey);
 
         array_walk($indexes, static fn (Index $index, int $n): mixed => $index->_setName($name . '_ix' . ($n + 1)));
         array_walk($fk_constraints, static fn (Index $index, int $n): mixed => $index->_setName($name . '_fk' . ($n + 1)));

app/DB/Column.php

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
         );
     }
 
-    public function default(int|string $default): static
+    public function default(int | string $default): static
     {
         return new static(
             name: $this->getName(),