clean up

readme.md

@@ -29,7 +29,7 @@ Add the Permission trait to your User model
 
 namespace App;
 
-use BRamalho\LaravelUserPermissions\Permission;
+use BRamalho\LaravelUserPermissions\Traits\Permission;
 use Illuminate\Notifications\Notifiable;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 
@@ -48,17 +48,17 @@ Register the Middleware in `app\Http\Kernel.php`
 namespace App\Http;
 
 use Illuminate\Foundation\Http\Kernel as HttpKernel;
-use BRamalho\LaravelUserPermissions\UserRoleMiddleware;
-use BRamalho\LaravelUserPermissions\UserHasPermissionMiddleware;
+use BRamalho\LaravelUserPermissions\Http\Middleware\UserHasRole;
+use BRamalho\LaravelUserPermissions\Http\Middleware\UserHasPermission;
 
 class Kernel extends HttpKernel
 {
     // ...
 
     protected $routeMiddleware = [
         // ...
-        'role' => UserRoleMiddleware::class,
-        'permission' => UserHasPermissionMiddleware::class
+        'role' => UserHasRole::class,
+        'permission' => UserHasPermission::class
     ];
 }
 ```
@@ -71,14 +71,14 @@ php artisan migrate
 
 ## Usage
 
-You can assing or remove roles simply like this
+You can assign or remove roles simply like this
 ```php
 <?php
 
 use Illuminate\Database\Seeder;
 use App\User;
-use BRamalho\LaravelUserPermissions\UserRole;
-use BRamalho\LaravelUserPermissions\UserPermission;
+use BRamalho\LaravelUserPermissions\Models\UserRole;
+use BRamalho\LaravelUserPermissions\Models\UserPermission;
 
 class UsersTableSeeder extends Seeder
 {

src/UserHasPermissionMiddleware.php → src/Http/Middleware/UserHasPermission.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace BRamalho\LaravelUserPermissions;
+namespace BRamalho\LaravelUserPermissions\Http\Middleware;
 
 use Closure;
 use Illuminate\Support\Facades\Auth;
 
-class UserHasPermissionMiddleware
+class UserHasPermission
 {
     /**
      * @param $request

src/UserRoleMiddleware.php → src/Http/Middleware/UserHasRole.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace BRamalho\LaravelUserPermissions;
+namespace BRamalho\LaravelUserPermissions\Http\Middleware;
 
 use Closure;
 use Illuminate\Support\Facades\Auth;
 
-class UserRoleMiddleware
+class UserHasRole
 {
     /**
      * @param $request

src/LaravelUserPermissionsServiceProvider.php

@@ -6,23 +6,17 @@
 
 class LaravelUserPermissionsServiceProvider extends ServiceProvider
 {
-    /**
-     * @return void
-     */
     public function boot()
     {
         $this->publishes(
             [
-                __DIR__ . '/migrations' => base_path('database/migrations')
+                __DIR__ . '/../database/migrations' => base_path('database/migrations')
             ]
         );
     }
 
-    /**
-     * @return void
-     */
     public function register()
     {
-        //
+
     }
 }

src/UserPermission.php → src/Models/UserPermission.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace BRamalho\LaravelUserPermissions;
+namespace BRamalho\LaravelUserPermissions\Models;
 
 use Illuminate\Database\Eloquent\Model;
 

src/UserRole.php → src/Models/UserRole.php

@@ -1,11 +1,12 @@
 <?php
 
-namespace BRamalho\LaravelUserPermissions;
+namespace BRamalho\LaravelUserPermissions\Models;
 
 use Illuminate\Database\Eloquent\Model;
 
 class UserRole extends Model
 {
+    /** @var array $fillable */
     protected $fillable = ['name'];
 
     /**

src/Permission.php → src/Traits/Permission.php

@@ -1,6 +1,9 @@
 <?php
 
-namespace BRamalho\LaravelUserPermissions;
+namespace BRamalho\LaravelUserPermissions\Traits;
+
+use BRamalho\LaravelUserPermissions\Models\UserPermission;
+use BRamalho\LaravelUserPermissions\Models\UserRole;
 
 trait Permission
 {