diff --git a/composer.json b/composer.json index 12656da149..c393728d2d 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ ], "require": { "php": "^7.3|^7.4|^8.0|^8.1|^8.2", - "illuminate/support": "~8.0|~9.0|~10.0", + "illuminate/support": "~8.0|~9.0|~10.0|~11.0", "intervention/image": "^2.7", "doctrine/dbal": "^3.1|^3.5", "laravel/ui": ">=1.0", @@ -31,7 +31,7 @@ "require-dev": { "phpunit/phpcov": ">=6.0", "phpunit/phpunit": ">=8.0", - "laravel/framework": "~8.0|~9.0|~10.0", + "laravel/framework": "~8.0|~9.0|~10.0|~11.0", "orchestra/testbench": ">=6.0", "laravel/browser-kit-testing": ">=6.1.0", "orchestra/testbench-browser-kit": ">=4.0" diff --git a/migrations/2016_01_01_000000_add_voyager_user_fields.php b/migrations/2016_01_01_000000_add_voyager_user_fields.php index c88dc5c276..b7eaa00d8d 100644 --- a/migrations/2016_01_01_000000_add_voyager_user_fields.php +++ b/migrations/2016_01_01_000000_add_voyager_user_fields.php @@ -1,13 +1,14 @@ increments('id'); @@ -38,12 +37,10 @@ public function up() /** * Reverse the migrations. - * - * @return void */ - public function down() + public function down(): void { Schema::drop('menu_items'); Schema::drop('menus'); } -} +}; \ No newline at end of file diff --git a/migrations/2016_10_21_190000_create_roles_table.php b/migrations/2016_10_21_190000_create_roles_table.php index b3650f5e2d..45656b1ebb 100644 --- a/migrations/2016_10_21_190000_create_roles_table.php +++ b/migrations/2016_10_21_190000_create_roles_table.php @@ -4,14 +4,12 @@ use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -class CreateRolesTable extends Migration +return new class extends Migration { /** * Run the migrations. - * - * @return void */ - public function up() + public function up(): void { Schema::create('roles', function (Blueprint $table) { $table->bigIncrements('id'); @@ -23,11 +21,9 @@ public function up() /** * Reverse the migrations. - * - * @return void */ - public function down() + public function down(): void { Schema::drop('roles'); } -} +}; \ No newline at end of file diff --git a/migrations/2016_10_21_190000_create_settings_table.php b/migrations/2016_10_21_190000_create_settings_table.php index 15e9f901a0..9910da2bc6 100644 --- a/migrations/2016_10_21_190000_create_settings_table.php +++ b/migrations/2016_10_21_190000_create_settings_table.php @@ -4,14 +4,12 @@ use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -class CreateSettingsTable extends Migration +return new class extends Migration { /** * Run the migrations. - * - * @return void */ - public function up() + public function up(): void { Schema::create('settings', function (Blueprint $table) { $table->increments('id'); @@ -26,11 +24,9 @@ public function up() /** * Reverse the migrations. - * - * @return void */ - public function down() + public function down(): void { Schema::dropIfExists('settings'); } -} +}; \ No newline at end of file diff --git a/migrations/2016_11_30_135954_create_permission_table.php b/migrations/2016_11_30_135954_create_permission_table.php index ff2464d10c..5a2d19534b 100644 --- a/migrations/2016_11_30_135954_create_permission_table.php +++ b/migrations/2016_11_30_135954_create_permission_table.php @@ -4,14 +4,12 @@ use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -class CreatePermissionTable extends Migration +return new class extends Migration { /** * Run the migrations. - * - * @return void */ - public function up() + public function up(): void { Schema::create('permissions', function (Blueprint $table) { $table->bigIncrements('id'); @@ -23,11 +21,9 @@ public function up() /** * Reverse the migrations. - * - * @return void */ - public function down() + public function down(): void { Schema::dropIfExists('permissions'); } -} +}; diff --git a/migrations/2016_11_30_141208_create_permission_role_table.php b/migrations/2016_11_30_141208_create_permission_role_table.php index 9bde6c3451..7293d7695f 100644 --- a/migrations/2016_11_30_141208_create_permission_role_table.php +++ b/migrations/2016_11_30_141208_create_permission_role_table.php @@ -4,14 +4,12 @@ use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -class CreatePermissionRoleTable extends Migration +return new class extends Migration { /** * Run the migrations. - * - * @return void */ - public function up() + public function up(): void { Schema::create('permission_role', function (Blueprint $table) { $table->bigInteger('permission_id')->unsigned()->index(); @@ -24,11 +22,9 @@ public function up() /** * Reverse the migrations. - * - * @return void */ - public function down() + public function down(): void { Schema::dropIfExists('permission_role'); } -} +}; \ No newline at end of file diff --git a/migrations/2016_12_26_201236_data_types__add__server_side.php b/migrations/2016_12_26_201236_data_types__add__server_side.php index d945b73d9c..dc31e38bc8 100644 --- a/migrations/2016_12_26_201236_data_types__add__server_side.php +++ b/migrations/2016_12_26_201236_data_types__add__server_side.php @@ -4,14 +4,12 @@ use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -class DataTypesAddServerSide extends Migration +return new class extends Migration { /** * Run the migrations. - * - * @return void */ - public function up() + public function up(): void { Schema::table('data_types', function (Blueprint $table) { $table->tinyInteger('server_side')->default(0)->after('generate_permissions'); @@ -20,13 +18,11 @@ public function up() /** * Reverse the migrations. - * - * @return void */ - public function down() + public function down(): void { Schema::table('data_types', function (Blueprint $table) { $table->dropColumn('server_side'); }); } -} +}; \ No newline at end of file diff --git a/migrations/2017_01_13_000000_add_route_to_menu_items_table.php b/migrations/2017_01_13_000000_add_route_to_menu_items_table.php index dbb0fab9c0..47854a9c3e 100644 --- a/migrations/2017_01_13_000000_add_route_to_menu_items_table.php +++ b/migrations/2017_01_13_000000_add_route_to_menu_items_table.php @@ -4,14 +4,12 @@ use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -class AddRouteToMenuItemsTable extends Migration +return new class extends Migration { /** * Run the migrations. - * - * @return void */ - public function up() + public function up(): void { Schema::table('menu_items', function (Blueprint $table) { $table->string('route')->nullable()->default(null); @@ -21,10 +19,8 @@ public function up() /** * Reverse the migrations. - * - * @return void */ - public function down() + public function down(): void { if (Schema::hasColumn('menu_items', 'route')) { Schema::table('menu_items', function (Blueprint $table) { @@ -38,4 +34,4 @@ public function down() }); } } -} +}; \ No newline at end of file diff --git a/migrations/2017_01_14_005015_create_translations_table.php b/migrations/2017_01_14_005015_create_translations_table.php index c9887a87e5..492b766177 100644 --- a/migrations/2017_01_14_005015_create_translations_table.php +++ b/migrations/2017_01_14_005015_create_translations_table.php @@ -4,14 +4,12 @@ use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -class CreateTranslationsTable extends Migration +return new class extends Migration { /** * Run the migrations. - * - * @return void */ - public function up() + public function up(): void { Schema::create('translations', function (Blueprint $table) { $table->increments('id'); @@ -31,11 +29,9 @@ public function up() /** * Reverse the migrations. - * - * @return void */ - public function down() + public function down(): void { Schema::dropIfExists('translations'); } -} +}; \ No newline at end of file diff --git a/migrations/2017_01_15_000000_make_table_name_nullable_in_permissions_table.php b/migrations/2017_01_15_000000_make_table_name_nullable_in_permissions_table.php index 5c133a21cf..8925d586fe 100644 --- a/migrations/2017_01_15_000000_make_table_name_nullable_in_permissions_table.php +++ b/migrations/2017_01_15_000000_make_table_name_nullable_in_permissions_table.php @@ -4,14 +4,12 @@ use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -class MakeTableNameNullableInPermissionsTable extends Migration +return new class extends Migration { /** * Run the migrations. - * - * @return void */ - public function up() + public function up(): void { Schema::table('permissions', function (Blueprint $table) { $table->string('table_name')->nullable()->default(null)->change(); @@ -20,11 +18,9 @@ public function up() /** * Reverse the migrations. - * - * @return void */ - public function down() + public function down(): void { - // + } -} +}; \ No newline at end of file diff --git a/migrations/2017_03_06_000000_add_controller_to_data_types_table.php b/migrations/2017_03_06_000000_add_controller_to_data_types_table.php index 1ccce96dbd..1ce8052092 100644 --- a/migrations/2017_03_06_000000_add_controller_to_data_types_table.php +++ b/migrations/2017_03_06_000000_add_controller_to_data_types_table.php @@ -4,14 +4,12 @@ use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -class AddControllerToDataTypesTable extends Migration +return new class extends Migration { /** * Run the migrations. - * - * @return void */ - public function up() + public function up(): void { Schema::table('data_types', function (Blueprint $table) { $table->string('controller')->nullable()->after('model_name'); @@ -20,13 +18,11 @@ public function up() /** * Reverse the migrations. - * - * @return void */ - public function down() + public function down(): void { Schema::table('data_types', function (Blueprint $table) { $table->dropColumn('controller'); }); } -} +}; \ No newline at end of file diff --git a/migrations/2017_04_21_000000_add_order_to_data_rows_table.php b/migrations/2017_04_21_000000_add_order_to_data_rows_table.php index 420bfe131d..98636b9199 100644 --- a/migrations/2017_04_21_000000_add_order_to_data_rows_table.php +++ b/migrations/2017_04_21_000000_add_order_to_data_rows_table.php @@ -4,14 +4,12 @@ use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -class AddOrderToDataRowsTable extends Migration +return new class extends Migration { /** * Run the migrations. - * - * @return void */ - public function up() + public function up(): void { Schema::table('data_rows', function (Blueprint $table) { $table->integer('order')->default(1)->after('details'); @@ -20,13 +18,11 @@ public function up() /** * Reverse the migrations. - * - * @return void */ - public function down() + public function down(): void { Schema::table('data_rows', function (Blueprint $table) { $table->dropColumn('order'); }); } -} +}; \ No newline at end of file diff --git a/migrations/2017_07_05_210000_add_policyname_to_data_types_table.php b/migrations/2017_07_05_210000_add_policyname_to_data_types_table.php index 469e0e79b0..ab12640345 100644 --- a/migrations/2017_07_05_210000_add_policyname_to_data_types_table.php +++ b/migrations/2017_07_05_210000_add_policyname_to_data_types_table.php @@ -2,15 +2,14 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; +use Illuminate\Support\Facades\Schema; -class AddPolicyNameToDataTypesTable extends Migration +return new class extends Migration { /** * Run the migrations. - * - * @return void */ - public function up() + public function up(): void { Schema::table('data_types', function (Blueprint $table) { $table->string('policy_name')->nullable()->after('model_name'); @@ -19,13 +18,11 @@ public function up() /** * Reverse the migrations. - * - * @return void */ - public function down() + public function down(): void { Schema::table('data_types', function (Blueprint $table) { $table->dropColumn('policy_name'); }); } -} +}; \ No newline at end of file diff --git a/migrations/2017_08_05_000000_add_group_to_settings_table.php b/migrations/2017_08_05_000000_add_group_to_settings_table.php index 6c8c68f8c2..e820776509 100644 --- a/migrations/2017_08_05_000000_add_group_to_settings_table.php +++ b/migrations/2017_08_05_000000_add_group_to_settings_table.php @@ -4,14 +4,12 @@ use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -class AddGroupToSettingsTable extends Migration +return new class extends Migration { /** * Run the migrations. - * - * @return void */ - public function up() + public function up(): void { Schema::table('settings', function (Blueprint $table) { $table->string('group')->nullable()->after('order'); @@ -20,13 +18,11 @@ public function up() /** * Reverse the migrations. - * - * @return void */ - public function down() + public function down(): void { Schema::table('settings', function (Blueprint $table) { $table->dropColumn('group'); }); } -} +}; \ No newline at end of file diff --git a/migrations/2017_11_26_013050_add_user_role_relationship.php b/migrations/2017_11_26_013050_add_user_role_relationship.php index 93956d7670..7d47a4a871 100644 --- a/migrations/2017_11_26_013050_add_user_role_relationship.php +++ b/migrations/2017_11_26_013050_add_user_role_relationship.php @@ -3,35 +3,39 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; +use Illuminate\Support\Facades\DB; -class AddUserRoleRelationship extends Migration +return new class extends Migration { /** * Run the migrations. - * - * @return void */ - public function up() + public function up(): void { + DB::table('users')->where('role_id', '<', 0)->update(['role_id' => 0]); + Schema::table('users', function (Blueprint $table) { + // Make 'role_id' unsigned $table->bigInteger('role_id')->unsigned()->change(); + + // Add the foreign key constraint to 'roles' table $table->foreign('role_id')->references('id')->on('roles'); }); } /** * Reverse the migrations. - * - * @return void */ - public function down() + public function down(): void { Schema::table('users', function (Blueprint $table) { + // Drop the foreign key constraint $table->dropForeign(['role_id']); }); Schema::table('users', function (Blueprint $table) { + // Revert 'role_id' back to signed if needed $table->bigInteger('role_id')->change(); }); } -} +}; \ No newline at end of file diff --git a/migrations/2017_11_26_015000_create_user_roles_table.php b/migrations/2017_11_26_015000_create_user_roles_table.php index 08af586771..eebc122871 100644 --- a/migrations/2017_11_26_015000_create_user_roles_table.php +++ b/migrations/2017_11_26_015000_create_user_roles_table.php @@ -3,18 +3,17 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; +use Illuminate\Support\Facades\DB; -class CreateUserRolesTable extends Migration +return new class extends Migration { /** * Run the migrations. - * - * @return void */ - public function up() + public function up(): void { Schema::create('user_roles', function (Blueprint $table) { - $type = DB::connection()->getDoctrineColumn(DB::getTablePrefix().'users', 'id')->getType()->getName(); + $type = Schema::getColumnType(DB::getTablePrefix().'users','id'); if ($type == 'bigint') { $table->bigInteger('user_id')->unsigned()->index(); } else { @@ -30,11 +29,9 @@ public function up() /** * Reverse the migrations. - * - * @return void */ - public function down() + public function down(): void { Schema::dropIfExists('user_roles'); } -} +}; \ No newline at end of file diff --git a/migrations/2018_03_11_000000_add_user_settings.php b/migrations/2018_03_11_000000_add_user_settings.php index ed99502436..d33e74e87b 100644 --- a/migrations/2018_03_11_000000_add_user_settings.php +++ b/migrations/2018_03_11_000000_add_user_settings.php @@ -4,14 +4,12 @@ use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -class AddUserSettings extends Migration +return new class extends Migration { /** * Run the migrations. - * - * @return void */ - public function up() + public function up(): void { Schema::table('users', function (Blueprint $table) { $table->text('settings')->nullable()->default(null)->after('remember_token'); @@ -20,13 +18,11 @@ public function up() /** * Reverse the migrations. - * - * @return void */ - public function down() + public function down(): void { Schema::table('users', function (Blueprint $table) { $table->dropColumn('settings'); }); } -} +}; \ No newline at end of file diff --git a/migrations/2018_03_14_000000_add_details_to_data_types_table.php b/migrations/2018_03_14_000000_add_details_to_data_types_table.php index 895d4e7781..895187122a 100644 --- a/migrations/2018_03_14_000000_add_details_to_data_types_table.php +++ b/migrations/2018_03_14_000000_add_details_to_data_types_table.php @@ -4,14 +4,12 @@ use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -class AddDetailsToDatatypesTable extends Migration +return new class extends Migration { /** * Run the migrations. - * - * @return void */ - public function up() + public function up(): void { Schema::table('data_types', function (Blueprint $table) { $table->text('details')->nullable()->after('server_side'); @@ -20,13 +18,11 @@ public function up() /** * Reverse the migrations. - * - * @return void */ - public function down() + public function down(): void { Schema::table('data_types', function (Blueprint $table) { $table->dropColumn('details'); }); } -} +}; diff --git a/migrations/2018_03_16_000000_make_settings_value_nullable.php b/migrations/2018_03_16_000000_make_settings_value_nullable.php index 1a779558aa..fadaee396b 100644 --- a/migrations/2018_03_16_000000_make_settings_value_nullable.php +++ b/migrations/2018_03_16_000000_make_settings_value_nullable.php @@ -2,17 +2,15 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; -use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Schema; +use Illuminate\Support\Facades\DB; -class MakeSettingsValueNullable extends Migration +return new class extends Migration { /** * Run the migrations. - * - * @return void */ - public function up() + public function up(): void { Schema::table('settings', function (Blueprint $table) { $table->text('value')->nullable()->change(); @@ -21,10 +19,8 @@ public function up() /** * Reverse the migrations. - * - * @return void */ - public function down() + public function down(): void { DB::table('settings')->whereNull('value')->update(['value' => '']); @@ -32,4 +28,4 @@ public function down() $table->text('value')->nullable(false)->change(); }); } -} +};