From 04fd9afd3fa9accf5b998fb4b812807ad5aefeb3 Mon Sep 17 00:00:00 2001 From: Edward Kawas Date: Mon, 23 Sep 2019 08:54:29 -0700 Subject: [PATCH 1/6] migrations-toggle: re: issue 76 & 40 --- .env.example | 3 +++ src/RolesServiceProvider.php | 7 ++++++- src/config/roles.php | 13 +++++++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/.env.example b/.env.example index 21fcde8..555bf18 100644 --- a/.env.example +++ b/.env.example @@ -14,6 +14,9 @@ ROLES_PERMISSION_USER_DATABASE_TABLE=permission_user # Roles Misc Settings ROLES_DEFAULT_SEPARATOR='.' +# Roles Database Migrations Settings +ROLES_MIGRATION_DEFAULT_ENABLED=true + # Roles Database Seeder Settings ROLES_SEED_DEFAULT_PERMISSIONS=true ROLES_SEED_DEFAULT_ROLES=true diff --git a/src/RolesServiceProvider.php b/src/RolesServiceProvider.php index 967ddd9..0f8cbf7 100755 --- a/src/RolesServiceProvider.php +++ b/src/RolesServiceProvider.php @@ -49,7 +49,7 @@ public function boot() public function register() { $this->mergeConfigFrom(__DIR__.'/config/roles.php', 'roles'); - $this->loadMigrationsFrom(__DIR__.'/Database/Migrations'); + $this->loadMigrations(); if (config('roles.rolesGuiEnabled')) { $this->loadViewsFrom(__DIR__.'/resources/views/', $this->_packageTag); } @@ -57,6 +57,11 @@ public function register() $this->loadSeedsFrom(); } + private function loadMigrations() { + if (config('roles.defaultMigrations.enabled')) { + $this->loadMigrationsFrom(__DIR__.'/Database/Migrations'); + } + } /** * Loads a seeds. * diff --git a/src/config/roles.php b/src/config/roles.php index 86b7f3f..bb9bccd 100644 --- a/src/config/roles.php +++ b/src/config/roles.php @@ -69,7 +69,20 @@ 'allowed' => true, ], ], + /* + |-------------------------------------------------------------------------- + | Default Migrations + |-------------------------------------------------------------------------- + | + | These are the default package migrations. If you publish the migrations + | to your project, then this is not necessary and should be disabled. This + | will enable our default migrations. + | + */ + 'defaultMigrations' => [ + 'enabled' => env('ROLES_MIGRATION_DEFAULT_ENABLED', false) + ], /* |-------------------------------------------------------------------------- | Default Seeds From e55faaeb266dc8efe863602b054436058350cd14 Mon Sep 17 00:00:00 2001 From: Edward Kawas Date: Tue, 24 Sep 2019 09:43:25 -0700 Subject: [PATCH 2/6] nitpick-CI fixes --- src/RolesServiceProvider.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/RolesServiceProvider.php b/src/RolesServiceProvider.php index 0f8cbf7..9092b78 100755 --- a/src/RolesServiceProvider.php +++ b/src/RolesServiceProvider.php @@ -57,7 +57,8 @@ public function register() $this->loadSeedsFrom(); } - private function loadMigrations() { + private function loadMigrations() + { if (config('roles.defaultMigrations.enabled')) { $this->loadMigrationsFrom(__DIR__.'/Database/Migrations'); } From 402f783ddad169dcb09f17823e0a437185cd1d85 Mon Sep 17 00:00:00 2001 From: Edward Kawas Date: Tue, 24 Sep 2019 09:44:26 -0700 Subject: [PATCH 3/6] nitpick-CI fixes --- src/RolesServiceProvider.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/RolesServiceProvider.php b/src/RolesServiceProvider.php index 9092b78..f66a91a 100755 --- a/src/RolesServiceProvider.php +++ b/src/RolesServiceProvider.php @@ -57,7 +57,7 @@ public function register() $this->loadSeedsFrom(); } - private function loadMigrations() + private function loadMigrations() { if (config('roles.defaultMigrations.enabled')) { $this->loadMigrationsFrom(__DIR__.'/Database/Migrations'); From 3d021ddcf51089531a52b42fb27a0060b3d617db Mon Sep 17 00:00:00 2001 From: Edward Kawas Date: Tue, 24 Sep 2019 09:45:24 -0700 Subject: [PATCH 4/6] nitpick-CI fixes --- src/config/roles.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config/roles.php b/src/config/roles.php index bb9bccd..18b8137 100644 --- a/src/config/roles.php +++ b/src/config/roles.php @@ -74,7 +74,7 @@ | Default Migrations |-------------------------------------------------------------------------- | - | These are the default package migrations. If you publish the migrations + | These are the default package migrations. If you publish the migrations | to your project, then this is not necessary and should be disabled. This | will enable our default migrations. | From 569af7e6e0bb070ad56b6654c638f78ac4aca6b1 Mon Sep 17 00:00:00 2001 From: Edward Kawas Date: Tue, 24 Sep 2019 09:46:05 -0700 Subject: [PATCH 5/6] nitpick-CI fixes --- src/config/roles.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config/roles.php b/src/config/roles.php index 18b8137..b3c70f6 100644 --- a/src/config/roles.php +++ b/src/config/roles.php @@ -81,7 +81,7 @@ */ 'defaultMigrations' => [ - 'enabled' => env('ROLES_MIGRATION_DEFAULT_ENABLED', false) + 'enabled' => env('ROLES_MIGRATION_DEFAULT_ENABLED', false), ], /* |-------------------------------------------------------------------------- From 64f8b71385c7c3e8aff9f7d8d9ccb3c24267872d Mon Sep 17 00:00:00 2001 From: Edward Kawas Date: Tue, 24 Sep 2019 09:47:48 -0700 Subject: [PATCH 6/6] nitpick-CI fixes --- src/RolesServiceProvider.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/RolesServiceProvider.php b/src/RolesServiceProvider.php index f66a91a..b38b815 100755 --- a/src/RolesServiceProvider.php +++ b/src/RolesServiceProvider.php @@ -63,6 +63,7 @@ private function loadMigrations() $this->loadMigrationsFrom(__DIR__.'/Database/Migrations'); } } + /** * Loads a seeds. *