R renamed config & files

This commit is contained in:
a6a2f5842 2025-06-16 07:37:35 +02:00
parent 19f4b8a220
commit 7ddd3491e1
9 changed files with 34 additions and 21 deletions

View File

@ -8,7 +8,6 @@ return [
'role_permission' => \Blax\Roles\Models\RolePermission::class, 'role_permission' => \Blax\Roles\Models\RolePermission::class,
'permission' => \Blax\Roles\Models\Permission::class, 'permission' => \Blax\Roles\Models\Permission::class,
'permission_usage' => \Blax\Roles\Models\PermissionUsage::class, 'permission_usage' => \Blax\Roles\Models\PermissionUsage::class,
], ],
'table_names' => [ 'table_names' => [

View File

@ -14,7 +14,7 @@ return new class extends Migration
public function up(): void public function up(): void
{ {
// Permission // Permission
Schema::create(config('permissions.table_names.permissions'), function (Blueprint $table) { Schema::create(config('roles.table_names.permissions'), function (Blueprint $table) {
$table->id(); $table->id();
$table->string('name')->unique(); $table->string('name')->unique();
$table->string('description')->nullable(); $table->string('description')->nullable();
@ -22,7 +22,7 @@ return new class extends Migration
}); });
// PermissionUsage // PermissionUsage
Schema::create(config('permissions.table_names.permission_usage'), function (Blueprint $table) { Schema::create(config('roles.table_names.permission_usage'), function (Blueprint $table) {
$table->id(); $table->id();
$table->foreignId('permission_id')->constrained('permissions')->onDelete('cascade'); $table->foreignId('permission_id')->constrained('permissions')->onDelete('cascade');
$table->morphs('user'); $table->morphs('user');
@ -31,7 +31,7 @@ return new class extends Migration
}); });
// Role // Role
Schema::create(config('permissions.table_names.roles'), function (Blueprint $table) { Schema::create(config('roles.table_names.roles'), function (Blueprint $table) {
$table->id(); $table->id();
$table->foreignId('parent_id') $table->foreignId('parent_id')
->nullable() ->nullable()
@ -44,7 +44,7 @@ return new class extends Migration
}); });
// RoleMember // RoleMember
Schema::create(config('permissions.table_names.role_members'), function (Blueprint $table) { Schema::create(config('roles.table_names.role_members'), function (Blueprint $table) {
$table->id(); $table->id();
$table->foreignId('role_id')->constrained('roles')->onDelete('cascade'); $table->foreignId('role_id')->constrained('roles')->onDelete('cascade');
$table->morphs('member'); $table->morphs('member');
@ -54,7 +54,7 @@ return new class extends Migration
}); });
// RolePermission // RolePermission
Schema::create(config('permissions.table_names.role_permission'), function (Blueprint $table) { Schema::create(config('roles.table_names.role_permission'), function (Blueprint $table) {
$table->id(); $table->id();
$table->foreignId('role_id')->constrained('roles')->onDelete('cascade'); $table->foreignId('role_id')->constrained('roles')->onDelete('cascade');
$table->foreignId('permission_id')->constrained('permissions')->onDelete('cascade'); $table->foreignId('permission_id')->constrained('permissions')->onDelete('cascade');
@ -69,6 +69,10 @@ return new class extends Migration
*/ */
public function down(): void public function down(): void
{ {
// Schema::dropIfExists(config('roles.table_names.role_permission'));
Schema::dropIfExists(config('roles.table_names.role_members'));
Schema::dropIfExists(config('roles.table_names.roles'));
Schema::dropIfExists(config('roles.table_names.permission_usage'));
Schema::dropIfExists(config('roles.table_names.permissions'));
} }
}; };

View File

@ -15,7 +15,7 @@ class Permission extends Model {
{ {
parent::__construct($attributes); parent::__construct($attributes);
$this->table = config('permissions.table_names.permissions') ?: parent::getTable(); $this->table = config('roles.table_names.permissions') ?: parent::getTable();
} }
public function usages() public function usages()

View File

@ -14,7 +14,7 @@ class PermissionUsage extends Model {
{ {
parent::__construct($attributes); parent::__construct($attributes);
$this->table = config('permissions.table_names.permission_usages') ?: parent::getTable(); $this->table = config('roles.table_names.permission_usages') ?: parent::getTable();
} }
public function permission() public function permission()

View File

@ -16,7 +16,7 @@ class Role extends Model {
{ {
parent::__construct($attributes); parent::__construct($attributes);
$this->table = config('permissions.table_names.roles') ?: parent::getTable(); $this->table = config('roles.table_names.roles') ?: parent::getTable();
} }
public function members() { public function members() {

View File

@ -16,7 +16,7 @@ class RoleMember extends Model {
{ {
parent::__construct($attributes); parent::__construct($attributes);
$this->table = config('permissions.table_names.role_members') ?: parent::getTable(); $this->table = config('roles.table_names.role_members') ?: parent::getTable();
} }
public function role() { public function role() {

View File

@ -14,7 +14,7 @@ class RolePermission extends Model {
{ {
parent::__construct($attributes); parent::__construct($attributes);
$this->table = config('permissions.table_names.role_permission') ?: parent::getTable(); $this->table = config('roles.table_names.role_permission') ?: parent::getTable();
} }
public function role() { public function role() {

View File

@ -11,8 +11,7 @@ class PermissionsServiceProvider extends \Illuminate\Support\ServiceProvider
*/ */
public function register() public function register()
{ {
$this->offerPublishing(); //
} }
/** /**
@ -22,7 +21,9 @@ class PermissionsServiceProvider extends \Illuminate\Support\ServiceProvider
*/ */
public function boot() public function boot()
{ {
// Load routes, migrations, etc. if needed $this->offerPublishing();
$this->registerModelBindings();
} }
/** /**
@ -42,11 +43,20 @@ class PermissionsServiceProvider extends \Illuminate\Support\ServiceProvider
} }
$this->publishes([ $this->publishes([
__DIR__.'/../config/permission.php' => config_path('permission.php'), __DIR__.'/../config/roles.php' => config_path('roles.php'),
], 'permission-config'); ], 'roles-config');
$this->publishes([ $this->publishes([
__DIR__.'/../database/migrations/create_permission_tables.php.stub' => $this->getMigrationFileName('create_permission_tables.php'), __DIR__.'/../database/migrations/create_blax_role_tables.php.stub' => $this->getMigrationFileName('create_blax_role_tables.php'),
], 'permission-migrations'); ], 'roles-migrations');
}
protected function registerModelBindings(): void
{
$this->app->bind(\Blax\Roles\Models\Role::class, fn ($app) => $app->make($app->config['roles.models.role']));
$this->app->bind(\Blax\Roles\Models\RoleMember::class, fn ($app) => $app->make($app->config['roles.models.role_member']));
$this->app->bind(\Blax\Roles\Models\RolePermission::class, fn ($app) => $app->make($app->config['roles.models.role_permission']));
$this->app->bind(\Blax\Roles\Models\Permission::class, fn ($app) => $app->make($app->config['roles.models.permission']));
$this->app->bind(\Blax\Roles\Models\PermissionUsage::class, fn ($app) => $app->make($app->config['roles.models.permission_usage']));
} }
} }

View File

@ -12,9 +12,9 @@ trait HasRoles
public function roles() public function roles()
{ {
return $this->morphToMany( return $this->morphToMany(
config('permissions.models.role', \Blax\Roles\Models\Role::class), config('roles.models.role', \Blax\Roles\Models\Role::class),
'member', 'member',
config('permissions.table_names.role_members', 'role_members') config('roles.table_names.role_members', 'role_members')
); );
} }