Merge pull request #294 from cybercog/fix/priority-package-config-over-app

cmgmyr · web-flow · commit 2534abe89e15 · 2018-06-07T08:20:49.000-04:00
Prioritize package user_model config value over auth user
diff --git a/src/MessengerServiceProvider.php b/src/MessengerServiceProvider.php
@@ -92,8 +92,8 @@ protected function setUserModel()
     {
         $config = $this->app->make('config');
 
-        $model = $config->get('auth.providers.users.model', function () use ($config) {
-            return $config->get('auth.model', $config->get('messenger.user_model'));
+        $model = $config->get('messenger.user_model', function () use ($config) {
+            return $config->get('auth.providers.users.model', $config->get('auth.model'));
         });
 
         Models::setUserModel($model);

Original file line number	Diff line number	Diff line change
`@@ -92,8 +92,8 @@ protected function setUserModel()`
`92`	`92`	`{`
`93`	`93`	`$config = $this->app->make('config');`
`94`	`94`
`95`		`- $model = $config->get('auth.providers.users.model', function () use ($config) {`
`96`		`- return $config->get('auth.model', $config->get('messenger.user_model'));`
	`95`	`+ $model = $config->get('messenger.user_model', function () use ($config) {`
	`96`	`+ return $config->get('auth.providers.users.model', $config->get('auth.model'));`
`97`	`97`	`});`
`98`	`98`
`99`	`99`	`Models::setUserModel($model);`