Move file config/phpsoft.users.php to package Users #86

php-soft · Nov 26, 2015 · a8e394b · a8e394b
1 parent e77a2bb
commit a8e394b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/packages/Users/Controllers/UserController.php b/packages/Users/Controllers/UserController.php
@@ -17,7 +17,7 @@ class UserController extends Controller
 
     public function __construct()
     {
-        $this->userModel = config('phpsoft.user.model');
+        $this->userModel = config('phpsoft.users.model');
     }
 
     /**
@@ -66,7 +66,6 @@ public function store(Request $request)
         }
 
         $userModel = $this->userModel;
-
         $user = $userModel::create($request->all());
 
         return response()->json(arrayView('phpsoft.users::user/read', [

diff --git a/packages/Users/Models/User.php b/packages/Users/Models/User.php
@@ -55,7 +55,7 @@ class User extends Model
      */
     public static function create(array $attributes = [])
     {
-        $userModel = config('phpsoft.user.model');
+        $userModel = config('phpsoft.users.model');
         $attributes['password'] = bcrypt($attributes['password']);
 
         $user = new $userModel($attributes);
@@ -99,7 +99,7 @@ public function changePassword($newPassword)
      */
     public static function browse($options = [])
     {
-        $userModel = config('phpsoft.user.model');
+        $userModel = config('phpsoft.users.model');
 
         $find = new $userModel;
         $fillable = $find->fillable;

diff --git a/packages/Users/Providers/UserServiceProvider.php b/packages/Users/Providers/UserServiceProvider.php
@@ -24,7 +24,7 @@ public function boot()
         $this->publishes([
             __DIR__ . '/../config/jwt.php' => config_path('jwt.php'),
             __DIR__ . '/../config/entrust.php' => config_path('entrust.php'),
-            __DIR__ . '/../config/phpsoft.user.php' => config_path('phpsoft.user.php'),
+            __DIR__ . '/../config/phpsoft.users.php' => config_path('phpsoft.users.php'),
         ]);
 
         // Register commands
@@ -38,6 +38,10 @@ public function boot()
      */
     public function register()
     {
+        $this->mergeConfigFrom(
+            __DIR__ . '/../config/phpsoft.users.php', 'phpsoft.users'
+        );
+
         $this->registerCommands();
     }
 

diff --git a/config/phpsoft.user.php → packages/Users/config/phpsoft.users.php b/config/phpsoft.user.php → packages/Users/config/phpsoft.users.php