Merge pull request #31 from landjea/master

Reversed "no" and "all" access returns
caffeinated · Jan 29, 2016 · 53ad482 · 53ad482
2 parents 5be036d + baece82
commit 53ad482
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/src/Models/Role.php b/src/Models/Role.php
@@ -58,14 +58,14 @@ public function getPermissions()
 	 */
 	public function can($permission)
 	{
-		if ($this->special === 'all-access') {
-			return true;
-		}
-
 		if ($this->special === 'no-access') {
 			return false;
 		}
 
+		if ($this->special === 'all-access') {
+			return true;
+		}
+
 		$permissions = $this->getPermissions();
 
 		if (is_array($permission)) {
@@ -87,14 +87,14 @@ public function can($permission)
 	 */
 	public function canAtLeast(array $permission = array())
 	{
-		if ($this->special === 'all-access') {
-			return true;
-		}
-
 		if ($this->special === 'no-access') {
 			return false;
 		}
 
+		if ($this->special === 'all-access') {
+			return true;
+		}
+
 		$permissions = $this->getPermissions();
 
 		$intersection       = array_intersect($permissions, $permission);

diff --git a/src/Traits/ShinobiTrait.php b/src/Traits/ShinobiTrait.php
@@ -135,14 +135,14 @@ public function can($permission, $arguments = [])
 		$can = false;
 
 		foreach ($this->roles as $role) {
-			if ($role->special === 'all-access') {
-				return true;
-			}
-
 			if ($role->special === 'no-access') {
 				return false;
 			}
 
+			if ($role->special === 'all-access') {
+				return true;
+			}
+
 			if ($role->can($permission)) {
 				$can = true;
 			}
@@ -162,14 +162,14 @@ public function canAtLeast(array $permissions)
 		$can = false;
 
 		foreach ($this->roles as $role) {
-			if ($role->special === 'all-access') {
-				return true;
-			}
-
 			if ($role->special === 'no-access') {
 				return false;
 			}
 
+			if ($role->special === 'all-access') {
+				return true;
+			}
+
 			if ($role->canAtLeast($permissions)) {
 				$can = true;
 			}