Merge pull request #45 from mgsmus/master

Rename is() method to isRole() for Laravel 5.3 compatibility.
caffeinated · Oct 11, 2016 · 4930aee · 4930aee
2 parents abcbd2e + 44cdeaf
commit 4930aee
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Shinobi.php b/src/Shinobi.php
@@ -71,10 +71,10 @@ public function canAtLeast($permissions)
 	 * @param  string $slug
 	 * @return bool
 	 */
-    public function is($role)
+    public function isRole($role)
     {
         if ($this->auth->check()) {
-            return $this->auth->user()->is($role);
+            return $this->auth->user()->isRole($role);
         } else {
             if ($role === 'guest') {
                 return true;

diff --git a/src/ShinobiServiceProvider.php b/src/ShinobiServiceProvider.php
@@ -65,7 +65,7 @@ protected function registerBladeDirectives()
 		});
 
 		Blade::directive('role', function($expression) {
-			return "<?php if (\\Shinobi::is({$expression})): ?>";
+			return "<?php if (\\Shinobi::isRole({$expression})): ?>";
 		});
 
 		Blade::directive('endrole', function($expression) {