Merge pull request Zizaco#565 from mizwardomlank/dev-mif

andrewelkins · andrewelkins · commit b7776fd80356 · 2016-06-06T21:07:53.000-07:00
Update MigrationCommand.php
diff --git a/src/commands/MigrationCommand.php b/src/commands/MigrationCommand.php
@@ -81,8 +81,8 @@ protected function createMigration($rolesTable, $roleUserTable, $permissionsTabl
     {
         $migrationFile = base_path("/database/migrations")."/".date('Y_m_d_His')."_entrust_setup_tables.php";
 
-        $usersTable  = Config::get('auth.providers.users.table') ?: 'users';
-        $userModel   = Config::get('auth.providers.users.model');
+        $usersTable  = Config::get('auth.table');
+        $userModel   = Config::get('auth.model');
         $userKeyName = (new $userModel())->getKeyName();
 
         $data = compact('rolesTable', 'roleUserTable', 'permissionsTable', 'permissionRoleTable', 'usersTable', 'userKeyName');

Original file line number	Diff line number	Diff line change
`@@ -81,8 +81,8 @@ protected function createMigration($rolesTable, $roleUserTable, $permissionsTabl`
`81`	`81`	`{`
`82`	`82`	`$migrationFile = base_path("/database/migrations")."/".date('Y_m_d_His')."_entrust_setup_tables.php";`
`83`	`83`
`84`		`- $usersTable = Config::get('auth.providers.users.table') ?: 'users';`
`85`		`- $userModel = Config::get('auth.providers.users.model');`
	`84`	`+ $usersTable = Config::get('auth.table');`
	`85`	`+ $userModel = Config::get('auth.model');`
`86`	`86`	`$userKeyName = (new $userModel())->getKeyName();`
`87`	`87`
`88`	`88`	`$data = compact('rolesTable', 'roleUserTable', 'permissionsTable', 'permissionRoleTable', 'usersTable', 'userKeyName');`