fisharebest / webtrees

app/Services/GedcomEditService.php

Spacing +2 added lines, -2 removed lines

@@ -157,7 +157,7 @@ 
                 }
             }
 
-            if ($values[$i] !== '' || $children_with_values  && !$element instanceof AbstractXrefElement) {
+            if ($values[$i] !== '' || $children_with_values && !$element instanceof AbstractXrefElement) {
                 if ($values[$i] === '') {
                     $gedcom_lines[] = $levels[$i] . ' ' . $tags[$i];
                 } else {
@@ -231,7 +231,7 @@ 
      *
      * @return array<string>
      */
-    public function factsToAdd(Family|Individual $record, bool $include_hidden): array
+    public function factsToAdd(Family | Individual $record, bool $include_hidden): array
     {
         $subtags = Registry::elementFactory()->make($record->tag())->subtags();
 

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/WebtreesSchema.php

Indentation +5 added lines, -5 removed lines

@@ -97,11 +97,11 @@
         ]);
 
         $block_setting = Schema::table('block_setting', [
-           Schema::integer('block_id'),
-           Schema::varchar('setting_name', 32),
-           Schema::text('setting_value'),
-           Schema::primaryKey(['block_id', 'setting_name']),
-           Schema::foreignKey('block_id', 'block')->onDeleteCascade()->onUpdateCascade(),
+            Schema::integer('block_id'),
+            Schema::varchar('setting_name', 32),
+            Schema::text('setting_value'),
+            Schema::primaryKey(['block_id', 'setting_name']),
+            Schema::foreignKey('block_id', 'block')->onDeleteCascade()->onUpdateCascade(),
         ]);
 
         $change = Schema::table('change', [

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;

Braces +2 added lines, -1 removed lines

@@ -30,7 +30,8 @@
     /**
      * @param array<Table> $tables
      */
-    public function __construct(array $tables = []) {
+    public function __construct(array $tables = [])
+    {
         foreach ($tables as $table) {
             $this->tables[$table->getName()] = $table;
         }

app/DB/Drivers/MySQLDriver.php

Spacing +2 added lines, -4 removed lines

@@ -352,8 +352,7 @@ 
             'binary'     => Schema::binary($data->COLUMN_NAME, $data->CHARACTER_MAXIMUM_LENGTH),
             'blob'       => Schema::blob($data->COLUMN_NAME, 2),
             'char'       => str_starts_with($data->COLLATION, 'utf') ?
-                Schema::nChar($data->COLUMN_NAME, $data->CHARACTER_MAXIMUM_LENGTH)->collation($data->COLLATION_NAME) :
-                Schema::char($data->COLUMN_NAME, $data->CHARACTER_MAXIMUM_LENGTH)->collation($data->COLLATION_NAME),
+                Schema::nChar($data->COLUMN_NAME, $data->CHARACTER_MAXIMUM_LENGTH)->collation($data->COLLATION_NAME) : Schema::char($data->COLUMN_NAME, $data->CHARACTER_MAXIMUM_LENGTH)->collation($data->COLLATION_NAME),
             'date'       => Schema::date($data->COLUMN_NAME),
             'datetime'   => Schema::datetime($data->COLUMN_NAME, $data->DATETIME_PRECISION),
             'decimal'    => Schema::decimal($data->COLUMN_NAME, $data->NUMERIC_PRECISION, $data->NUMERIC_SCALE),
@@ -379,8 +378,7 @@ 
             'tinytext'   => Schema::text($data->COLUMN_NAME, 1),
             'varbinary'  => Schema::varBinary($data->COLUMN_NAME, $data->CHARACTER_MAXIMUM_LENGTH),
             'varchar'    => str_starts_with($data->COLLATION, 'utf') ?
-                Schema::nVarchar($data->COLUMN_NAME, $data->CHARACTER_MAXIMUM_LENGTH)->collation($data->COLLATION_NAME) :
-                Schema::varchar($data->COLUMN_NAME, $data->CHARACTER_MAXIMUM_LENGTH)->collation($data->COLLATION_NAME),
+                Schema::nVarchar($data->COLUMN_NAME, $data->CHARACTER_MAXIMUM_LENGTH)->collation($data->COLLATION_NAME) : Schema::varchar($data->COLUMN_NAME, $data->CHARACTER_MAXIMUM_LENGTH)->collation($data->COLLATION_NAME),
             default      => throw new SchemaException('INFORMATION_SCHEMA.COLUMNS.DATA_TYPE: ' . $data->DATA_TYPE),
         };