Unify migration style and cleanup (#1037)

* unify helper methods access type to private
* unify codestyle
* remove unused down methods

db/migrations/2018_01_01_000003_fix_old_tables.php

@@ -36,11 +36,4 @@ class FixOldTables extends Migration
             });
         }
     }
-
-    /**
-     * Reverse the migration
-     */
-    public function down(): void
-    {
-    }
 }

db/migrations/2018_01_01_000005_add_angel_supporter_permissions.php

@@ -54,7 +54,7 @@ class AddAngelSupporterPermissions extends Migration
         );
     }
 
-    protected function getQuery(string $type): string
+    private function getQuery(string $type): string
     {
         return sprintf('
                 %s FROM GroupPrivileges

db/migrations/2018_09_24_000000_create_event_config_table.php

@@ -114,7 +114,7 @@ class CreateEventConfigTable extends Migration
         $this->schema->dropIfExists('event_config');
     }
 
-    protected function getConfigValue(Collection $config, string $name): mixed
+    private function getConfigValue(Collection $config, string $name): mixed
     {
         $value = $config->where('name', $name)->first('value', (object) ['value' => null])->value;
 

db/migrations/2018_12_21_000000_change_users_contact_dect_field_size.php

@@ -31,7 +31,7 @@ class ChangeUsersContactDectFieldSize extends Migration
         $this->changeDectTo(5);
     }
 
-    protected function changeDectTo(int $length): void
+    private function changeDectTo(int $length): void
     {
         foreach ($this->tables as $table => $column) {
             if (!$this->schema->hasTable($table)) {

db/migrations/2018_12_27_000000_fix_missing_arrival_dates.php

@@ -34,11 +34,4 @@ class FixMissingArrivalDates extends Migration
                 ->update((array) $state);
         }
     }
-
-    /**
-     * Down is not possible and not needed since this is a bugfix.
-     */
-    public function down(): void
-    {
-    }
 }

db/migrations/2019_09_07_000001_create_schedule_shift_table.php

@@ -16,47 +16,35 @@ class CreateScheduleShiftTable extends Migration
      */
     public function up(): void
     {
-        $this->schema->create(
+        $this->schema->create('schedules', function (Blueprint $table): void {
-            'schedules',
+            $table->increments('id');
-            function (Blueprint $table): void {
+            $table->string('url');
-                $table->increments('id');
+        });
-                $table->string('url');
-            }
-        );
 
-        $this->schema->create(
+        $this->schema->create('schedule_shift', function (Blueprint $table): void {
-            'schedule_shift',
+            $table->integer('shift_id')->index()->unique();
-            function (Blueprint $table): void {
+            if ($this->schema->hasTable('Shifts')) {
-                $table->integer('shift_id')->index()->unique();
+                // Legacy table access
-                if ($this->schema->hasTable('Shifts')) {
+                $table->foreign('shift_id')
-                    // Legacy table access
+                    ->references('SID')->on('Shifts')
-                    $table->foreign('shift_id')
+                    ->onUpdate('cascade')
-                        ->references('SID')->on('Shifts')
+                    ->onDelete('cascade');
-                        ->onUpdate('cascade')
-                        ->onDelete('cascade');
-                }
-
-                $this->references($table, 'schedules');
-                $table->uuid('guid');
             }
-        );
+
+            $this->references($table, 'schedules');
+            $table->uuid('guid');
+        });
 
         if ($this->schema->hasTable('Shifts')) {
-            $this->schema->table(
+            $this->schema->table('Shifts', function (Blueprint $table): void {
-                'Shifts',
+                $table->dropColumn('PSID');
-                function (Blueprint $table): void {
+            });
-                    $table->dropColumn('PSID');
-                }
-            );
         }
 
         if ($this->schema->hasTable('Room')) {
-            $this->schema->table(
+            $this->schema->table('Room', function (Blueprint $table): void {
-                'Room',
+                $table->dropColumn('from_frab');
-                function (Blueprint $table): void {
+            });
-                    $table->dropColumn('from_frab');
-                }
-            );
         }
     }
 
@@ -66,24 +54,15 @@ class CreateScheduleShiftTable extends Migration
     public function down(): void
     {
         if ($this->schema->hasTable('Room')) {
-            $this->schema->table(
+            $this->schema->table('Room', function (Blueprint $table): void {
-                'Room',
+                $table->boolean('from_frab')->default(false);
-                function (Blueprint $table): void {
+            });
-                    $table->boolean('from_frab')
-                        ->default(false);
-                }
-            );
         }
 
         if ($this->schema->hasTable('Shifts')) {
-            $this->schema->table(
+            $this->schema->table('Shifts', function (Blueprint $table): void {
-                'Shifts',
+                $table->integer('PSID')->nullable()->default(null)->unique();
-                function (Blueprint $table): void {
+            });
-                    $table->integer('PSID')
-                        ->nullable()->default(null)
-                        ->unique();
-                }
-            );
         }
 
         $this->schema->drop('schedule_shift');

db/migrations/2019_10_15_000000_create_news_table.php

@@ -103,8 +103,7 @@ class CreateNewsTable extends Migration
         $this->schema->create('News', function (Blueprint $table): void {
             $table->increments('ID');
             $table->integer('Datum');
-            $table->string('Betreff', 150)
+            $table->string('Betreff', 150)->default('');
-                ->default('');
             $table->text('Text');
             $this->references($table, 'users', 'UID');
             $table->boolean('Treffen')->default(false);

db/migrations/2019_11_25_000000_create_messages_table.php

@@ -66,17 +66,14 @@ class CreateMessagesTable extends Migration
 
     private function createNewMessagesTable(): void
     {
-        $this->schema->create(
+        $this->schema->create('messages', function (Blueprint $table): void {
-            'messages',
+            $table->increments('id');
-            function (Blueprint $table): void {
+            $this->referencesUser($table);
-                $table->increments('id');
+            $this->references($table, 'users', 'receiver_id');
-                $this->referencesUser($table);
+            $table->boolean('read')->default(0);
-                $this->references($table, 'users', 'receiver_id');
+            $table->text('text');
-                $table->boolean('read')->default(0);
+            $table->timestamps();
-                $table->text('text');
+        });
-                $table->timestamps();
-            }
-        );
     }
 
     private function copyPreviousToNewMessagesTable(): void
@@ -105,18 +102,14 @@ class CreateMessagesTable extends Migration
 
     private function createPreviousMessagesTable(): void
     {
-        $this->schema->create(
+        $this->schema->create('Messages', function (Blueprint $table): void {
-            'Messages',
+            $table->increments('id');
-            function (Blueprint $table): void {
+            $table->integer('Datum');
-                $table->increments('id');
+            $this->references($table, 'users', 'SUID');
-                $table->integer('Datum');
+            $this->references($table, 'users', 'RUID');
-                $this->references($table, 'users', 'SUID');
+            $table->char('isRead')->default('N');
-                $this->references($table, 'users', 'RUID');
+            $table->text('Text');
-                $table->char('isRead')
+        });
-                    ->default('N');
-                $table->text('Text');
-            }
-        );
     }
 
     private function copyNewToPreviousMessagesTable(): void

db/migrations/2019_11_29_000000_create_questions_table.php

@@ -59,18 +59,13 @@ class CreateQuestionsTable extends Migration
 
     private function createNewQuestionsTable(): void
     {
-        $this->schema->create(
+        $this->schema->create('questions', function (Blueprint $table): void {
-            'questions',
+            $table->increments('id');
-            function (Blueprint $table): void {
+            $this->referencesUser($table);
-                $table->increments('id');
+            $table->text('text');
-                $this->referencesUser($table);
+            $table->text('answer')->nullable();
-                $table->text('text');
+            $this->references($table, 'users', 'answerer_id')->nullable();
-                $table->text('answer')
+        });
-                    ->nullable();
-                $this->references($table, 'users', 'answerer_id')
-                    ->nullable();
-            }
-        );
     }
 
     private function copyPreviousToNewQuestionsTable(): void
@@ -94,18 +89,13 @@ class CreateQuestionsTable extends Migration
 
     private function createPreviousQuestionsTable(): void
     {
-        $this->schema->create(
+        $this->schema->create('Questions', function (Blueprint $table): void {
-            'Questions',
+            $table->increments('QID');
-            function (Blueprint $table): void {
+            $this->references($table, 'users', 'UID');
-                $table->increments('QID');
+            $table->text('Question');
-                $this->references($table, 'users', 'UID');
+            $this->references($table, 'users', 'AID')->nullable();
-                $table->text('Question');
+            $table->text('Answer')->nullable();
-                $this->references($table, 'users', 'AID')
+        });
-                    ->nullable();
-                $table->text('Answer')
-                    ->nullable();
-            }
-        );
     }
 
     private function copyNewToPreviousQuestionsTable(): void

db/migrations/2019_12_03_000000_user_personal_data_add_pronoun_field.php

@@ -15,10 +15,7 @@ class UserPersonalDataAddPronounField extends Migration
     public function up(): void
     {
         $this->schema->table('users_personal_data', function (Blueprint $table): void {
-            $table->string('pronoun', 15)
+            $table->string('pronoun', 15)->nullable()->default(null)->after('last_name');
-                ->nullable()
-                ->default(null)
-                ->after('last_name');
         });
     }
 

db/migrations/2020_04_07_000000_change_mysql_database_encoding_to_utf8mb4.php

@@ -28,11 +28,5 @@ class ChangeMysqlDatabaseEncodingToUtf8mb4 extends Migration
         }
     }
 
-    /**
+    // As utf8mb4 is a superset of utf8, there is nothing to do in the downgrade
-     * Reverse the migration
-     */
-    public function down(): void
-    {
-        // As utf8mb4 is a superset of utf8, there is nothing to do here
-    }
 }

db/migrations/2020_11_20_000000_add_name_minutes_and_timestamps_to_schedules.php

@@ -19,16 +19,13 @@ class AddNameMinutesAndTimestampsToSchedules extends Migration
     {
         $connection = $this->schema->getConnection();
 
-        $this->schema->table(
+        $this->schema->table('schedules', function (Blueprint $table): void {
-            'schedules',
+            $table->string('name')->default('')->after('id');
-            function (Blueprint $table): void {
+            $table->integer('shift_type')->default(0)->after('name');
-                $table->string('name')->default('')->after('id');
+            $table->integer('minutes_before')->default(0)->after('shift_type');
-                $table->integer('shift_type')->default(0)->after('name');
+            $table->integer('minutes_after')->default(0)->after('minutes_before');
-                $table->integer('minutes_before')->default(0)->after('shift_type');
+            $table->timestamps();
-                $table->integer('minutes_after')->default(0)->after('minutes_before');
+        });
-                $table->timestamps();
-            }
-        );
 
         $connection->table('schedules')
             ->update([
@@ -37,15 +34,12 @@ class AddNameMinutesAndTimestampsToSchedules extends Migration
                 'minutes_after'  => 15,
             ]);
 
-        $this->schema->table(
+        $this->schema->table('schedules', function (Blueprint $table): void {
-            'schedules',
+            $table->string('name')->default(null)->change();
-            function (Blueprint $table): void {
+            $table->integer('shift_type')->default(null)->change();
-                $table->string('name')->default(null)->change();
+            $table->integer('minutes_before')->default(null)->change();
-                $table->integer('shift_type')->default(null)->change();
+            $table->integer('minutes_after')->default(null)->change();
-                $table->integer('minutes_before')->default(null)->change();
+        });
-                $table->integer('minutes_after')->default(null)->change();
-            }
-        );
 
         // Add legacy reference
         if ($this->schema->hasTable('ShiftTypes')) {
@@ -61,12 +55,9 @@ class AddNameMinutesAndTimestampsToSchedules extends Migration
                     'shift_type' => $connection->raw('(' . $query->toSql() . ')')
                 ]);
 
-            $this->schema->table(
+            $this->schema->table('schedules', function (Blueprint $table): void {
-                'schedules',
+                $this->addReference($table, 'shift_type', 'ShiftTypes');
-                function (Blueprint $table): void {
+            });
-                    $this->addReference($table, 'shift_type', 'ShiftTypes');
-                }
-            );
         }
     }
 
@@ -75,16 +66,13 @@ class AddNameMinutesAndTimestampsToSchedules extends Migration
      */
     public function down(): void
     {
-        $this->schema->table(
+        $this->schema->table('schedules', function (Blueprint $table): void {
-            'schedules',
+            $table->dropForeign('schedules_shift_type_foreign');
-            function (Blueprint $table): void {
+            $table->dropColumn('name');
-                $table->dropForeign('schedules_shift_type_foreign');
+            $table->dropColumn('shift_type');
-                $table->dropColumn('name');
+            $table->dropColumn('minutes_before');
-                $table->dropColumn('shift_type');
+            $table->dropColumn('minutes_after');
-                $table->dropColumn('minutes_before');
+            $table->dropTimestamps();
-                $table->dropColumn('minutes_after');
+        });
-                $table->dropTimestamps();
-            }
-        );
     }
 }

db/migrations/2020_12_25_000000_add_email_news_to_users_settings.php

@@ -16,12 +16,9 @@ class AddEmailNewsToUsersSettings extends Migration
      */
     public function up(): void
     {
-        $this->schema->table(
+        $this->schema->table('users_settings', function (Blueprint $table): void {
-            'users_settings',
+            $table->boolean('email_news')->default(false)->after('email_shiftinfo');
-            function (Blueprint $table): void {
+        });
-                $table->boolean('email_news')->default(false)->after('email_shiftinfo');
-            }
-        );
     }
 
     /**
@@ -29,11 +26,8 @@ class AddEmailNewsToUsersSettings extends Migration
      */
     public function down(): void
     {
-        $this->schema->table(
+        $this->schema->table('users_settings', function (Blueprint $table): void {
-            'users_settings',
+            $table->dropColumn('email_news');
-            function (Blueprint $table): void {
+        });
-                $table->dropColumn('email_news');
-            }
-        );
     }
 }

db/migrations/2020_12_25_000000_oauth_add_tokens.php

@@ -16,14 +16,11 @@ class OauthAddTokens extends Migration
      */
     public function up(): void
     {
-        $this->schema->table(
+        $this->schema->table('oauth', function (Blueprint $table): void {
-            'oauth',
+            $table->string('access_token')->nullable()->default(null)->after('identifier');
-            function (Blueprint $table): void {
+            $table->string('refresh_token')->nullable()->default(null)->after('access_token');
-                $table->string('access_token')->nullable()->default(null)->after('identifier');
+            $table->dateTime('expires_at')->nullable()->default(null)->after('refresh_token');
-                $table->string('refresh_token')->nullable()->default(null)->after('access_token');
+        });
-                $table->dateTime('expires_at')->nullable()->default(null)->after('refresh_token');
-            }
-        );
     }
 
     /**
@@ -31,13 +28,10 @@ class OauthAddTokens extends Migration
      */
     public function down(): void
     {
-        $this->schema->table(
+        $this->schema->table('oauth', function (Blueprint $table): void {
-            'oauth',
+            $table->dropColumn('access_token');
-            function (Blueprint $table): void {
+            $table->dropColumn('refresh_token');
-                $table->dropColumn('access_token');
+            $table->dropColumn('expires_at');
-                $table->dropColumn('refresh_token');
+        });
-                $table->dropColumn('expires_at');
-            }
-        );
     }
 }

db/migrations/2020_12_26_000000_news_add_is_pinned.php

@@ -16,12 +16,9 @@ class NewsAddIsPinned extends Migration
      */
     public function up(): void
     {
-        $this->schema->table(
+        $this->schema->table('news', function (Blueprint $table): void {
-            'news',
+            $table->boolean('is_pinned')->default(false)->after('is_meeting');
-            function (Blueprint $table): void {
+        });
-                $table->boolean('is_pinned')->default(false)->after('is_meeting');
-            }
-        );
     }
 
     /**
@@ -29,11 +26,8 @@ class NewsAddIsPinned extends Migration
      */
     public function down(): void
     {
-        $this->schema->table(
+        $this->schema->table('news', function (Blueprint $table): void {
-            'news',
+            $table->dropColumn('is_pinned');
-            function (Blueprint $table): void {
+        });
-                $table->dropColumn('is_pinned');
-            }
-        );
     }
 }

db/migrations/2020_12_28_000001_oauth_change_tokens_to_text.php

@@ -16,13 +16,10 @@ class OauthChangeTokensToText extends Migration
      */
     public function up(): void
     {
-        $this->schema->table(
+        $this->schema->table('oauth', function (Blueprint $table): void {
-            'oauth',
+            $table->text('access_token')->change();
-            function (Blueprint $table): void {
+            $table->text('refresh_token')->change();
-                $table->text('access_token')->change();
+        });
-                $table->text('refresh_token')->change();
-            }
-        );
     }
 
     /**
@@ -30,12 +27,9 @@ class OauthChangeTokensToText extends Migration
      */
     public function down(): void
     {
-        $this->schema->table(
+        $this->schema->table('oauth', function (Blueprint $table): void {
-            'oauth',
+            $table->string('access_token')->change();
-            function (Blueprint $table): void {
+            $table->string('refresh_token')->change();
-                $table->string('access_token')->change();
+        });
-                $table->string('refresh_token')->change();
-            }
-        );
     }
 }

db/migrations/2021_10_12_000000_add_shifts_description.php

@@ -20,12 +20,9 @@ class AddShiftsDescription extends Migration
             return;
         }
 
-        $this->schema->table(
+        $this->schema->table('Shifts', function (Blueprint $table): void {
-            'Shifts',
+            $table->text('description')->nullable()->after('shifttype_id');
-            function (Blueprint $table): void {
+        });
-                $table->text('description')->nullable()->after('shifttype_id');
-            }
-        );
     }
 
     /**
@@ -37,11 +34,8 @@ class AddShiftsDescription extends Migration
             return;
         }
 
-        $this->schema->table(
+        $this->schema->table('Shifts', function (Blueprint $table): void {
-            'Shifts',
+            $table->dropColumn('description');
-            function (Blueprint $table): void {
+        });
-                $table->dropColumn('description');
-            }
-        );
     }
 }

db/migrations/2021_12_29_000000_users_settings_add_email_goody.php

@@ -18,12 +18,9 @@ class UsersSettingsAddEmailGoody extends Migration
     {
         $connection = $this->schema->getConnection();
 
-        $this->schema->table(
+        $this->schema->table('users_settings', function (Blueprint $table): void {
-            'users_settings',
+            $table->boolean('email_goody')->default(false)->after('email_human');
-            function (Blueprint $table): void {
+        });
-                $table->boolean('email_goody')->default(false)->after('email_human');
-            }
-        );
 
         $connection
             ->table('users_settings')
@@ -35,11 +32,8 @@ class UsersSettingsAddEmailGoody extends Migration
      */
     public function down(): void
     {
-        $this->schema->table(
+        $this->schema->table('users_settings', function (Blueprint $table): void {
-            'users_settings',
+            $table->dropColumn('email_goody');
-            function (Blueprint $table): void {
+        });
-                $table->dropColumn('email_goody');
-            }
-        );
     }
 }

db/migrations/2022_07_21_000000_fix_old_groups_table_id_and_name.php

@@ -51,7 +51,7 @@ class FixOldGroupsTableIdAndName extends Migration
      * @param string[] $naming
      * @param int[] $ids
      */
-    protected function migrate(array $naming, array $ids): void
+    private function migrate(array $naming, array $ids): void
     {
         if (!$this->schema->hasTable('Groups')) {
             return;

db/migrations/2022_10_16_000000_add_mobile_show_to_users_settings.php

@@ -14,12 +14,9 @@ class AddMobileShowToUsersSettings extends Migration
      */
     public function up(): void
     {
-        $this->schema->table(
+        $this->schema->table('users_settings', function (Blueprint $table): void {
-            'users_settings',
+            $table->boolean('mobile_show')->default(false)->after('email_news');
-            function (Blueprint $table): void {
+        });
-                $table->boolean('mobile_show')->default(false)->after('email_news');
-            }
-        );
     }
 
     /**
@@ -27,11 +24,8 @@ class AddMobileShowToUsersSettings extends Migration
      */
     public function down(): void
     {
-        $this->schema->table(
+        $this->schema->table('users_settings', function (Blueprint $table): void {
-            'users_settings',
+            $table->dropColumn('mobile_show');
-            function (Blueprint $table): void {
+        });
-                $table->dropColumn('mobile_show');
-            }
-        );
     }
 }

db/migrations/2022_10_17_000000_add_dect_to_rooms.php

@@ -14,12 +14,9 @@ class AddDectToRooms extends Migration
      */
     public function up(): void
     {
-        $this->schema->table(
+        $this->schema->table('rooms', function (Blueprint $table): void {
-            'rooms',
+            $table->text('dect')->nullable()->after('description');
-            function (Blueprint $table): void {
+        });
-                $table->text('dect')->nullable()->after('description');
-            }
-        );
     }
 
     /**
@@ -27,11 +24,8 @@ class AddDectToRooms extends Migration
      */
     public function down(): void
     {
-        $this->schema->table(
+        $this->schema->table('rooms', function (Blueprint $table): void {
-            'rooms',
+            $table->dropColumn('dect');
-            function (Blueprint $table): void {
+        });
-                $table->dropColumn('dect');
-            }
-        );
     }
 }

db/migrations/2022_10_21_000000_add_hide_register_to_angeltypes.php

@@ -18,12 +18,9 @@ class AddHideRegisterToAngeltypes extends Migration
             return;
         }
 
-        $this->schema->table(
+        $this->schema->table('AngelTypes', function (Blueprint $table): void {
-            'AngelTypes',
+            $table->boolean('hide_register')->default(false)->after('show_on_dashboard');
-            function (Blueprint $table): void {
+        });
-                $table->boolean('hide_register')->default(false)->after('show_on_dashboard');
-            }
-        );
     }
 
     /**
@@ -35,11 +32,8 @@ class AddHideRegisterToAngeltypes extends Migration
             return;
         }
 
-        $this->schema->table(
+        $this->schema->table('AngelTypes', function (Blueprint $table): void {
-            'AngelTypes',
+            $table->dropColumn('hide_register');
-            function (Blueprint $table): void {
+        });
-                $table->dropColumn('hide_register');
-            }
-        );
     }
 }

db/migrations/2022_10_23_000000_create_privileges_and_groups_related_tables.php

@@ -108,7 +108,7 @@ class CreatePrivilegesAndGroupsRelatedTables extends Migration
         $this->schema->drop('privileges_new');
     }
 
-    protected function createNew(): void
+    private function createNew(): void
     {
         $this->schema->create('groups', function (Blueprint $table): void {
             $table->increments('id');
@@ -134,7 +134,7 @@ class CreatePrivilegesAndGroupsRelatedTables extends Migration
         });
     }
 
-    protected function createOldTable(): void
+    private function createOldTable(): void
     {
         $this->schema->create('Groups', function (Blueprint $table): void {
             $table->string('Name', 35);
@@ -162,7 +162,7 @@ class CreatePrivilegesAndGroupsRelatedTables extends Migration
         });
     }
 
-    protected function copyOldToNew(): void
+    private function copyOldToNew(): void
     {
         $connection = $this->schema->getConnection();
 
@@ -211,7 +211,7 @@ class CreatePrivilegesAndGroupsRelatedTables extends Migration
         }
     }
 
-    protected function copyNewToOld(): void
+    private function copyNewToOld(): void
     {
         $connection = $this->schema->getConnection();
 

db/migrations/2022_11_06_000000_shifttype_remove_angeltype.php

@@ -20,13 +20,10 @@ class ShifttypeRemoveAngeltype extends Migration
             return;
         }
 
-        $this->schema->table(
+        $this->schema->table('ShiftTypes', function (Blueprint $table): void {
-            'ShiftTypes',
+            $table->dropForeign('shifttypes_ibfk_1');
-            function (Blueprint $table): void {
+            $table->dropColumn('angeltype_id');
-                $table->dropForeign('shifttypes_ibfk_1');
+        });
-                $table->dropColumn('angeltype_id');
-            }
-        );
     }
 
     /**
@@ -38,15 +35,9 @@ class ShifttypeRemoveAngeltype extends Migration
             return;
         }
 
-        $this->schema->table(
+        $this->schema->table('ShiftTypes', function (Blueprint $table): void {
-            'ShiftTypes',
+            $table->integer('angeltype_id')->after('name')->index()->nullable();
-            function (Blueprint $table): void {
+            $this->addReference($table, 'angeltype_id', 'AngelTypes', null, 'shifttypes_ibfk_1');
-                $table->integer('angeltype_id')
+        });
-                    ->after('name')
-                    ->index()
-                    ->nullable();
-                $this->addReference($table, 'angeltype_id', 'AngelTypes', null, 'shifttypes_ibfk_1');
-            }
-        );
     }
 }