Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[feat] simplify the definition of multiple Blade "if" directives #2628

Merged
merged 3 commits into from
Mar 1, 2024
Merged

[feat] simplify the definition of multiple Blade "if" directives #2628

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c64836a
[feat] simplify the definition of a Blade directives
alissn Feb 29, 2024
49ba3ed
Blade Fixes
erikn69 Feb 29, 2024
5b152ce
Merge pull request #1 from erikn69/patch-46
alissn Mar 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 9 additions & 21 deletions src/PermissionServiceProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,32 +122,20 @@ public static function bladeMethodWrapper($method, $role, $guard = null): bool
return auth($guard)->check() && auth($guard)->user()->{$method}($role);
}

protected function registerBladeExtensions($bladeCompiler): void
protected function registerBladeExtensions(BladeCompiler $bladeCompiler): void
{
$bladeMethodWrapper = '\\Spatie\\Permission\\PermissionServiceProvider::bladeMethodWrapper';

$bladeCompiler->directive('role', fn ($args) => "<?php if({$bladeMethodWrapper}('hasRole', {$args})): ?>");
$bladeCompiler->directive('elserole', fn ($args) => "<?php elseif({$bladeMethodWrapper}('hasRole', {$args})): ?>");
$bladeCompiler->directive('endrole', fn () => '<?php endif; ?>');
// permission checks
$bladeCompiler->if('haspermission', fn () => $bladeMethodWrapper('checkPermissionTo', ...func_get_args()));

$bladeCompiler->directive('haspermission', fn ($args) => "<?php if({$bladeMethodWrapper}('checkPermissionTo', {$args})): ?>");
$bladeCompiler->directive('elsehaspermission', fn ($args) => "<?php elseif({$bladeMethodWrapper}('checkPermissionTo', {$args})): ?>");
$bladeCompiler->directive('endhaspermission', fn () => '<?php endif; ?>');

$bladeCompiler->directive('hasrole', fn ($args) => "<?php if({$bladeMethodWrapper}('hasRole', {$args})): ?>");
$bladeCompiler->directive('endhasrole', fn () => '<?php endif; ?>');

$bladeCompiler->directive('hasanyrole', fn ($args) => "<?php if({$bladeMethodWrapper}('hasAnyRole', {$args})): ?>");
$bladeCompiler->directive('endhasanyrole', fn () => '<?php endif; ?>');

$bladeCompiler->directive('hasallroles', fn ($args) => "<?php if({$bladeMethodWrapper}('hasAllRoles', {$args})): ?>");
$bladeCompiler->directive('endhasallroles', fn () => '<?php endif; ?>');

$bladeCompiler->directive('unlessrole', fn ($args) => "<?php if(! {$bladeMethodWrapper}('hasRole', {$args})): ?>");
drbyte marked this conversation as resolved.
Show resolved Hide resolved
// 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()));
$bladeCompiler->if('hasallroles', fn () => $bladeMethodWrapper('hasAllRoles', ...func_get_args()));
$bladeCompiler->if('hasexactroles', fn () => $bladeMethodWrapper('hasExactRoles', ...func_get_args()));
$bladeCompiler->directive('endunlessrole', fn () => '<?php endif; ?>');

$bladeCompiler->directive('hasexactroles', fn ($args) => "<?php if({$bladeMethodWrapper}('hasExactRoles', {$args})): ?>");
$bladeCompiler->directive('endhasexactroles', fn () => '<?php endif; ?>');
}

protected function registerMacroHelpers(): void
Expand Down