Updated method 'hasPerm' to 'hasPermission' for better consistency.

Zizaco · Jul 9, 2015 · 23cda54 · 23cda54 · ixperiencenl · Nov 4, 2015
1 parent 87af3cd
commit 23cda54
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/src/Entrust/Traits/EntrustRoleTrait.php b/src/Entrust/Traits/EntrustRoleTrait.php
@@ -62,15 +62,15 @@ public static function boot()
      *
      * @return bool
      */
-    public function hasPerm($name, $requireAll = false)
+    public function hasPermission($name, $requireAll = false)
     {
         if (is_array($name)) {
-            foreach ($name as $permName) {
-                $hasPerm = $this->hasPerm($permName);
+            foreach ($name as $permissionName) {
+                $hasPermission = $this->hasPermission($permissionName);
 
-                if ($hasPerm && !$requireAll) {
+                if ($hasPermission && !$requireAll) {
                     return true;
-                } elseif (!$hasPerm && $requireAll) {
+                } elseif (!$hasPermission && $requireAll) {
                     return false;
                 }
             }
@@ -80,8 +80,8 @@ public function hasPerm($name, $requireAll = false)
             // Return the value of $requireAll;
             return $requireAll;
         } else {
-            foreach ($this->perms as $perm) {
-                if ($perm->name == $name) {
+            foreach ($this->perms as $permission) {
+                if ($permission->name == $name) {
                     return true;
                 }
             }