Update user model and migrations to match Laravel 6.0 defaults

Author: ajoy39

src/Kodeine/Acl/Models/Eloquent/User.php

@@ -1,28 +1,20 @@
-<?php namespace Kodeine\Acl\Models\Eloquent;
-
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Auth\Authenticatable;
+<?php 
+namespace Kodeine\Acl\Models\Eloquent;
 
+use Illuminate\Contracts\Auth\MustVerifyEmail;
 use Illuminate\Database\Eloquent\SoftDeletes;
-
-use Illuminate\Auth\Passwords\CanResetPassword;
+use Illuminate\Foundation\Auth\User as Authenticatable;
+use Illuminate\Notifications\Notifiable;
 use Kodeine\Acl\Traits\HasRole;
 
-class User extends Model
+class User extends Authenticatable
 {
-    use Authenticatable, CanResetPassword, HasRole, SoftDeletes;
+    use HasRole, SoftDeletes;
 
     /**
      * The attributes that are fillable via mass assignment.
      *
      * @var array
      */
-    protected $fillable = ['username', 'first_name', 'last_name', 'email', 'password',];
-
-    /**
-     * The database table used by the model.
-     *
-     * @var string
-     */
-    protected $table = 'users';
+    protected $fillable = ['name', 'email', 'password',];
 }

src/migrations/2015_02_07_172633_create_role_user_table.php

@@ -26,7 +26,7 @@ public function up()
             $table->increments('id');
 
             $table->integer('role_id')->unsigned()->index()->foreign()->references("id")->on("roles")->onDelete("cascade");
-            $table->integer('user_id')->unsigned()->index()->foreign()->references("id")->on("users")->onDelete("cascade");
+            $table->bigInteger('user_id')->unsigned()->index()->foreign()->references("id")->on("users")->onDelete("cascade");
 
             $table->timestamps();
 

src/migrations/2015_02_17_152439_create_permission_user_table.php

@@ -25,7 +25,7 @@ public function up()
 		Schema::create($this->prefix . 'permission_user', function (Blueprint $table) {
 			$table->increments('id');
 			$table->integer('permission_id')->unsigned()->index()->references('id')->on('permissions')->onDelete('cascade');
-			$table->integer('user_id')->unsigned()->index()->references('id')->on('users')->onDelete('cascade');
+			$table->bigInteger('user_id')->unsigned()->index()->references('id')->on('users')->onDelete('cascade');
 			$table->timestamps();
 		});
 	}

src/migrations/2016_02_06_172606_create_users_table.php renamed to src/migrations/2016_02_06_172606_create_users_table_if_doesnt_exist.php

@@ -3,7 +3,7 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
 
-class CreateUsersTable extends Migration
+class CreateUsersTableIfDoesntExist extends Migration
 {
 
     /**

tests/Models/UserTest.php

@@ -60,7 +60,7 @@ public function itCanAttachRole()
         ]);
 
         $user = new User();
-        $user->username = 'Role test';
+        $user->name = 'Role test';
         $user->email = '[email protected]';
         $user->password = 'RoleTest';
         $user->save();
@@ -97,7 +97,7 @@ public function itCanAttachRoleAndPermission()
         $role->syncPermissions($permission);
 
         $user = new User();
-        $user->username = 'Role test';
+        $user->name = 'Role test';
         $user->email = '[email protected]';
         $user->password = 'RoleTest';
         $user->save();
@@ -134,7 +134,7 @@ public function cacheTest()
         $role->syncPermissions($permission);
 
         $user = new User();
-        $user->username = 'Cache test';
+        $user->name = 'Cache test';
         $user->email = '[email protected]';
         $user->password = 'CacheTest';
         $user->save();

tests/TestCase.php

@@ -119,6 +119,7 @@ protected function getMigrationsDestPath()
      */
     protected function migrate()
     {
+        $this->loadLaravelMigrations();
         $this->loadMigrationsFrom($this->getMigrationsSrcPath());
     }