update regrading functionality

Author: subhobiswas

src/PermissionsServiceProvider.php

@@ -6,21 +6,57 @@
 
 class PermissionsServiceProvider extends ServiceProvider
 {
-    public function boot()
+    /**
+     * Bootstrap the application services.
+     *
+     * This method is called after all other service providers have been registered,
+     * allowing you to register things like Blade directives and publish files.
+     *
+     * @return void
+     */
+    public function boot(): void
     {
         // Publish the configuration and migration files
         $this->publishes([
-            __DIR__ . '\config\permissions.php' => config_path('permissions.php'), // Note the correct file name
-            __DIR__ . '\database\migrations\create_permission_tables.php' => database_path('migrations/' . date('Y_m_d_His', time()) . '_create_permission_tables.php'),
+            __DIR__ . '/config/permissions.php' => config_path('permissions.php'), // Note the correct file name
+            __DIR__ . '/database/migrations/create_permission_tables.php' => database_path('migrations/' . date('Y_m_d_His', time()) . '_create_permission_tables.php'),
         ], 'config');
 
         // Load migrations
-        $this->loadMigrationsFrom(__DIR__.'\database\migrations');
+        $this->loadMigrationsFrom(__DIR__ . '/database/migrations');
+
+        $bladeCompiler = $this->app->make('blade.compiler');
+
+        $bladeMethodWrapper = function ($method, ...$args) {
+            return "<?php if(auth()->user()->{$method}(" . implode(',', array_map(fn($arg) => var_export($arg, true), $args)) . ")): ?>";
+        };
+
+        // Role checks
+        $bladeCompiler->if('role', fn() => $bladeMethodWrapper('hasRole', ...func_get_args()));
+        $bladeCompiler->if('hasrole', fn() => $bladeMethodWrapper('hasRole', ...func_get_args()));
+        $bladeCompiler->if('hasanyrole', fn() => $bladeMethodWrapper('hasAnyRole', ...func_get_args()));
+
+        // Permission checks
+        $bladeCompiler->if('permission', fn() => $bladeMethodWrapper('hasPermission', ...func_get_args()));
+        $bladeCompiler->if('haspermission', fn() => $bladeMethodWrapper('hasPermission', ...func_get_args()));
+        $bladeCompiler->if('hasanypermission', fn() => $bladeMethodWrapper('hasAnyPermission', ...func_get_args()));
+        $bladeCompiler->if('hasallpermissions', fn() => $bladeMethodWrapper('hasAllPermissions', ...func_get_args()));
+        $bladeCompiler->if('hasexactpermissions', fn() => $bladeMethodWrapper('hasExactPermissions', ...func_get_args()));
+
+        // Ending directive for permissions
+        $bladeCompiler->directive('endunlesspermission', fn() => '<?php endif; ?>');
     }
 
-    public function register()
+    /**
+     * Register the application services.
+     *
+     * This method is called before the application is bootstrapped.
+     *
+     * @return void
+     */
+    public function register(): void
     {
         // Merge configuration
-        $this->mergeConfigFrom(__DIR__ . '\config\permissions.php', 'permissions'); // Ensure this matches the config file
+        $this->mergeConfigFrom(__DIR__ . '/config/permissions.php', 'permissions'); // Ensure this matches the config file
     }
 }

src/Traits/HasRolesAndPermissions.php

@@ -1,13 +1,20 @@
 <?php
+
 namespace Lazycode\Permissions\Traits;
 
 use Lazycode\Permissions\Models\Permission;
 use Lazycode\Permissions\Models\Role;
 
 trait HasRolesAndPermissions
 {
-    // Assign a role by name (one role per user)
-    public function assignRoleByName(string $roleName)
+    /**
+     * Assign a role to the user by role name.
+     * Each user can have only one role.
+     *
+     * @param string $roleName
+     * @return $this
+     */
+    public function assignRole(string $roleName): self
     {
         $role = Role::where('name', $roleName)->first();
 
@@ -20,14 +27,22 @@ public function assignRoleByName(string $roleName)
         return $this;
     }
 
-    // Get the user's role
-    public function getRole()
+    /**
+     * Get the current role of the user.
+     *
+     * @return Role|null
+     */
+    public function getRole(): ?Role
     {
         return $this->role;
     }
 
-    // Disassociate (remove) the current role from the user
-    public function removeRole()
+    /**
+     * Disassociate (remove) the current role from the user.
+     *
+     * @return $this
+     */
+    public function removeRole(): self
     {
         if ($this->role) {
             $this->role()->dissociate();
@@ -37,22 +52,16 @@ public function removeRole()
         return $this;
     }
 
-    // Check if the user has a specific permission
-    public function hasPermission(string $permissionName)
+    /**
+     * Assign a permission to the user's role by permission name.
+     *
+     * @param string $permissionName
+     * @return $this
+     */
+    public function assignPermissionToRole(string $permissionName): self
     {
         $role = $this->role;
 
-        if ($role) {
-            return $role->permissions()->where('name', $permissionName)->exists();
-        }
-
-        return false;
-    }
-
-    // Assign a permission to the role by permission name
-    public function assignPermissionToRole(string $permissionName)
-    {
-        $role = $this->role;
         if ($role) {
             $permission = Permission::where('name', $permissionName)->first();
 
@@ -64,10 +73,16 @@ public function assignPermissionToRole(string $permissionName)
         return $this;
     }
 
-    // Remove a permission from the role by permission name
-    public function removePermissionFromRole(string $permissionName)
+    /**
+     * Remove a permission from the user's role by permission name.
+     *
+     * @param string $permissionName
+     * @return $this
+     */
+    public function removePermissionFromRole(string $permissionName): self
     {
         $role = $this->role;
+
         if ($role) {
             $permission = Permission::where('name', $permissionName)->first();
 
@@ -79,15 +94,79 @@ public function removePermissionFromRole(string $permissionName)
         return $this;
     }
 
-    // Check if the user has the specified role
-    public function hasRole(string $roleName)
+    /**
+     * Check if the user has the specified role.
+     *
+     * @param string $roleName
+     * @return bool
+     */
+    public function hasRole(string $roleName): bool
     {
         return $this->role && $this->role->name === $roleName;
     }
 
-    // Relationship for user role (one-to-one)
-    public function role()
+    /**
+     * Define a one-to-one relationship with the Role model.
+     *
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function role(): \Illuminate\Database\Eloquent\Relations\BelongsTo
     {
         return $this->belongsTo(Role::class);
     }
+
+    /**
+     * Check if the user has any of the specified roles.
+     *
+     * @param string ...$roles
+     * @return bool
+     */
+    public function hasAnyRole(string ...$roles): bool
+    {
+        return $this->roles->whereIn('name', $roles)->isNotEmpty();
+    }
+
+    /**
+     * Check if the user has a specific permission.
+     *
+     * @param string $permission
+     * @return bool
+     */
+    public function hasPermission(string $permission): bool
+    {
+        return $this->permissions->contains('name', $permission);
+    }
+
+    /**
+     * Check if the user has any of the specified permissions.
+     *
+     * @param string ...$permissions
+     * @return bool
+     */
+    public function hasAnyPermission(string ...$permissions): bool
+    {
+        return $this->permissions->whereIn('name', $permissions)->isNotEmpty();
+    }
+
+    /**
+     * Check if the user has all of the specified permissions.
+     *
+     * @param string ...$permissions
+     * @return bool
+     */
+    public function hasAllPermissions(string ...$permissions): bool
+    {
+        return $this->permissions->pluck('name')->intersect($permissions)->count() == count($permissions);
+    }
+
+    /**
+     * Check if the user has exactly the specified permissions.
+     *
+     * @param string ...$permissions
+     * @return bool
+     */
+    public function hasExactPermissions(string ...$permissions): bool
+    {
+        return $this->permissions->pluck('name')->sort()->values()->all() === collect($permissions)->sort()->values()->all();
+    }
 }