Fix Blade Directives incompatibility with renderers (#2039)

* Fix Blade Directives incompatibility with renderers * Fix styling Co-authored-by: erikn69 <erikn69@users.noreply.github.com>
spatie · Mar 3, 2022 · 6c46b4e · 6c46b4e
1 parent 20dd894
commit 6c46b4e
Showing 1 changed file with 59 additions and 60 deletions.
diff --git a/src/PermissionServiceProvider.php b/src/PermissionServiceProvider.php
@@ -7,7 +7,6 @@
 use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 use Illuminate\Support\ServiceProvider;
-use Illuminate\View\Compilers\BladeCompiler;
 use Spatie\Permission\Contracts\Permission as PermissionContract;
 use Spatie\Permission\Contracts\Role as RoleContract;
 
@@ -84,65 +83,65 @@ protected function registerModelBindings()
 
     protected function registerBladeExtensions()
     {
-        $this->app->afterResolving('blade.compiler', function (BladeCompiler $bladeCompiler) {
-            $bladeCompiler->directive('role', function ($arguments) {
-                list($role, $guard) = explode(',', $arguments.',');
-
-                return "<?php if(auth({$guard})->check() && auth({$guard})->user()->hasRole({$role})): ?>";
-            });
-            $bladeCompiler->directive('elserole', function ($arguments) {
-                list($role, $guard) = explode(',', $arguments.',');
-
-                return "<?php elseif(auth({$guard})->check() && auth({$guard})->user()->hasRole({$role})): ?>";
-            });
-            $bladeCompiler->directive('endrole', function () {
-                return '<?php endif; ?>';
-            });
-
-            $bladeCompiler->directive('hasrole', function ($arguments) {
-                list($role, $guard) = explode(',', $arguments.',');
-
-                return "<?php if(auth({$guard})->check() && auth({$guard})->user()->hasRole({$role})): ?>";
-            });
-            $bladeCompiler->directive('endhasrole', function () {
-                return '<?php endif; ?>';
-            });
-
-            $bladeCompiler->directive('hasanyrole', function ($arguments) {
-                list($roles, $guard) = explode(',', $arguments.',');
-
-                return "<?php if(auth({$guard})->check() && auth({$guard})->user()->hasAnyRole({$roles})): ?>";
-            });
-            $bladeCompiler->directive('endhasanyrole', function () {
-                return '<?php endif; ?>';
-            });
-
-            $bladeCompiler->directive('hasallroles', function ($arguments) {
-                list($roles, $guard) = explode(',', $arguments.',');
-
-                return "<?php if(auth({$guard})->check() && auth({$guard})->user()->hasAllRoles({$roles})): ?>";
-            });
-            $bladeCompiler->directive('endhasallroles', function () {
-                return '<?php endif; ?>';
-            });
-
-            $bladeCompiler->directive('unlessrole', function ($arguments) {
-                list($role, $guard) = explode(',', $arguments.',');
-
-                return "<?php if(!auth({$guard})->check() || ! auth({$guard})->user()->hasRole({$role})): ?>";
-            });
-            $bladeCompiler->directive('endunlessrole', function () {
-                return '<?php endif; ?>';
-            });
-
-            $bladeCompiler->directive('hasexactroles', function ($arguments) {
-                list($roles, $guard) = explode(',', $arguments.',');
-
-                return "<?php if(auth({$guard})->check() && auth({$guard})->user()->hasExactRoles({$roles})): ?>";
-            });
-            $bladeCompiler->directive('endhasexactroles', function () {
-                return '<?php endif; ?>';
-            });
+        $bladeCompiler = $this->app['blade.compiler'];
+
+        $bladeCompiler->directive('role', function ($arguments) {
+            list($role, $guard) = explode(',', $arguments.',');
+
+            return "<?php if(auth({$guard})->check() && auth({$guard})->user()->hasRole({$role})): ?>";
+        });
+        $bladeCompiler->directive('elserole', function ($arguments) {
+            list($role, $guard) = explode(',', $arguments.',');
+
+            return "<?php elseif(auth({$guard})->check() && auth({$guard})->user()->hasRole({$role})): ?>";
+        });
+        $bladeCompiler->directive('endrole', function () {
+            return '<?php endif; ?>';
+        });
+
+        $bladeCompiler->directive('hasrole', function ($arguments) {
+            list($role, $guard) = explode(',', $arguments.',');
+
+            return "<?php if(auth({$guard})->check() && auth({$guard})->user()->hasRole({$role})): ?>";
+        });
+        $bladeCompiler->directive('endhasrole', function () {
+            return '<?php endif; ?>';
+        });
+
+        $bladeCompiler->directive('hasanyrole', function ($arguments) {
+            list($roles, $guard) = explode(',', $arguments.',');
+
+            return "<?php if(auth({$guard})->check() && auth({$guard})->user()->hasAnyRole({$roles})): ?>";
+        });
+        $bladeCompiler->directive('endhasanyrole', function () {
+            return '<?php endif; ?>';
+        });
+
+        $bladeCompiler->directive('hasallroles', function ($arguments) {
+            list($roles, $guard) = explode(',', $arguments.',');
+
+            return "<?php if(auth({$guard})->check() && auth({$guard})->user()->hasAllRoles({$roles})): ?>";
+        });
+        $bladeCompiler->directive('endhasallroles', function () {
+            return '<?php endif; ?>';
+        });
+
+        $bladeCompiler->directive('unlessrole', function ($arguments) {
+            list($role, $guard) = explode(',', $arguments.',');
+
+            return "<?php if(!auth({$guard})->check() || ! auth({$guard})->user()->hasRole({$role})): ?>";
+        });
+        $bladeCompiler->directive('endunlessrole', function () {
+            return '<?php endif; ?>';
+        });
+
+        $bladeCompiler->directive('hasexactroles', function ($arguments) {
+            list($roles, $guard) = explode(',', $arguments.',');
+
+            return "<?php if(auth({$guard})->check() && auth({$guard})->user()->hasExactRoles({$roles})): ?>";
+        });
+        $bladeCompiler->directive('endhasexactroles', function () {
+            return '<?php endif; ?>';
         });
     }