fisharebest / webtrees

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