From c57826c39c6b2f546d0e07c35351ea6b3b9410df Mon Sep 17 00:00:00 2001 From: niekdemelker Date: Fri, 7 Sep 2018 20:46:06 +0200 Subject: [PATCH 1/4] Update Role.php --- src/Role.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Role.php b/src/Role.php index c22d3dc..ba7f3ca 100644 --- a/src/Role.php +++ b/src/Role.php @@ -44,7 +44,7 @@ class Role extends Model */ public function users() { - return $this->belongsToMany(config('brandenburg.userModel')); + return $this->belongsToMany(config('auth.providers.users.model')); } /** From 6117eeaa3ccdbcfe35039538a2657c1561f693f4 Mon Sep 17 00:00:00 2001 From: niekdemelker Date: Fri, 7 Sep 2018 20:46:24 +0200 Subject: [PATCH 2/4] Delete brandenburg.php --- src/Config/brandenburg.php | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 src/Config/brandenburg.php diff --git a/src/Config/brandenburg.php b/src/Config/brandenburg.php deleted file mode 100644 index da39843..0000000 --- a/src/Config/brandenburg.php +++ /dev/null @@ -1,8 +0,0 @@ - env('USER_MODEL', 'App\User') -]; From a3d5ae84b7b4b079bacc56f2e3d68073dcad4811 Mon Sep 17 00:00:00 2001 From: niekdemelker Date: Fri, 7 Sep 2018 20:50:45 +0200 Subject: [PATCH 3/4] Update BrandenburgServiceProvider.php --- src/Providers/BrandenburgServiceProvider.php | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/Providers/BrandenburgServiceProvider.php b/src/Providers/BrandenburgServiceProvider.php index 3b3ed65..1bc065f 100644 --- a/src/Providers/BrandenburgServiceProvider.php +++ b/src/Providers/BrandenburgServiceProvider.php @@ -19,10 +19,6 @@ public function boot(Router $router, Kernel $kernel) { $this->loadMigrationsFrom(__DIR__.'/../Database/Migrations'); - $this->publishes([ - __DIR__.'/../Config/brandenburg.php' => config_path('brandenburg.php'), - ]); - $this->registerPolicy(); } @@ -33,9 +29,7 @@ public function boot(Router $router, Kernel $kernel) */ public function register() { - $this->mergeConfigFrom( - __DIR__.'/../Config/brandenburg.php', 'brandenburg' - ); + // } /** From 8b3eb8abc84af41269c249b47f64df9ee3e1f71e Mon Sep 17 00:00:00 2001 From: niekdemelker Date: Fri, 7 Sep 2018 21:30:37 +0200 Subject: [PATCH 4/4] Update TestCase.php --- tests/TestCase.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/TestCase.php b/tests/TestCase.php index 72bd1c5..f6ee570 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -63,7 +63,7 @@ protected function getEnvironmentSetUp($app) 'prefix' => '', ]); - $app['config']->set('brandenburg.userModel', 'Silvanite\Brandenburg\Test\User'); + $app['config']->set('auth.providers.users.model', 'Silvanite\Brandenburg\Test\User'); } protected function setupDatabase($app)