Cast permissions to array directly without testing

Whyounes · Whyounes · commit 227de353c872 · 2015-05-30T18:24:47.000+01:00
diff --git a/src/Cartalyst/Sentry/Groups/Eloquent/Group.php b/src/Cartalyst/Sentry/Groups/Eloquent/Group.php
@@ -109,12 +109,7 @@ public function hasAccess($permissions, $all = true)
 	{
 		$groupPermissions = $this->getPermissions();
 
-		if ( ! is_array($permissions))
-		{
-			$permissions = (array) $permissions;
-		}
-
-		foreach ($permissions as $permission)
+		foreach ((array) $permissions as $permission)
 		{
 			// We will set a flag now for whether this permission was
 			// matched at all.
diff --git a/src/Cartalyst/Sentry/Groups/Kohana/Group.php b/src/Cartalyst/Sentry/Groups/Kohana/Group.php
@@ -122,12 +122,7 @@ public function hasAccess($permissions, $all = true)
 	{
 		$groupPermissions = $this->getPermissions();
 
-		if ( ! is_array($permissions) )
-		{
-			$permissions = (array) $permissions;
-		}
-
-		foreach ($permissions as $permission)
+		foreach ((array) $permissions as $permission)
 		{
 			// We will set a flag now for whether this permission was
 			// matched at all.
diff --git a/src/Cartalyst/Sentry/Users/Eloquent/User.php b/src/Cartalyst/Sentry/Users/Eloquent/User.php
@@ -630,12 +630,7 @@ public function hasPermission($permissions, $all = true)
 	{
 		$mergedPermissions = $this->getMergedPermissions();
 
-		if ( ! is_array($permissions))
-		{
-			$permissions = (array) $permissions;
-		}
-
-		foreach ($permissions as $permission)
+		foreach ((array) $permissions as $permission)
 		{
 			// We will set a flag now for whether this permission was
 			// matched at all.
diff --git a/src/Cartalyst/Sentry/Users/Kohana/User.php b/src/Cartalyst/Sentry/Users/Kohana/User.php
@@ -605,12 +605,7 @@ public function hasPermission($permissions, $all = true)
 	{
 		$mergedPermissions = $this->getMergedPermissions();
 
-		if ( ! is_array($permissions))
-		{
-			$permissions = (array) $permissions;
-		}
-
-		foreach ($permissions as $permission)
+		foreach ((array) $permissions as $permission)
 		{
 			// We will set a flag now for whether this permission was
 			// matched at all.
diff --git a/tests/EloquentGroupTest.php b/tests/EloquentGroupTest.php
@@ -297,4 +297,16 @@ public function testDeletingGroupDetachesAllUserRelationships()
 		$group->delete();
 	}
 
+	public function testGroupHasAccess()
+	{
+		$group = new \Cartalyst\Sentry\Groups\Eloquent\Group;
+		$group->name = 'foo';
+		$group->permissions = array(
+			'user.update' => 1
+		);
+
+		$this->assertTrue($group->hasAccess('user.update'));
+		$this->assertFalse($group->hasAccess('user.delete'));
+	}
+
 }

Original file line number	Diff line number	Diff line change
`@@ -109,12 +109,7 @@ public function hasAccess($permissions, $all = true)`
`109`	`109`	`{`
`110`	`110`	`$groupPermissions = $this->getPermissions();`
`111`	`111`
`112`		`- if ( ! is_array($permissions))`
`113`		`- {`
`114`		`- $permissions = (array) $permissions;`
`115`		`- }`
`116`		`-`
`117`		`- foreach ($permissions as $permission)`
	`112`	`+ foreach ((array) $permissions as $permission)`
`118`	`113`	`{`
`119`	`114`	`// We will set a flag now for whether this permission was`
`120`	`115`	`// matched at all.`
Original file line number	Diff line number	Diff line change
`@@ -122,12 +122,7 @@ public function hasAccess($permissions, $all = true)`
`122`	`122`	`{`
`123`	`123`	`$groupPermissions = $this->getPermissions();`
`124`	`124`
`125`		`- if ( ! is_array($permissions) )`
`126`		`- {`
`127`		`- $permissions = (array) $permissions;`
`128`		`- }`
`129`		`-`
`130`		`- foreach ($permissions as $permission)`
	`125`	`+ foreach ((array) $permissions as $permission)`
`131`	`126`	`{`
`132`	`127`	`// We will set a flag now for whether this permission was`
`133`	`128`	`// matched at all.`
Original file line number	Diff line number	Diff line change
`@@ -630,12 +630,7 @@ public function hasPermission($permissions, $all = true)`
`630`	`630`	`{`
`631`	`631`	`$mergedPermissions = $this->getMergedPermissions();`
`632`	`632`
`633`		`- if ( ! is_array($permissions))`
`634`		`- {`
`635`		`- $permissions = (array) $permissions;`
`636`		`- }`
`637`		`-`
`638`		`- foreach ($permissions as $permission)`
	`633`	`+ foreach ((array) $permissions as $permission)`
`639`	`634`	`{`
`640`	`635`	`// We will set a flag now for whether this permission was`
`641`	`636`	`// matched at all.`
Original file line number	Diff line number	Diff line change
`@@ -605,12 +605,7 @@ public function hasPermission($permissions, $all = true)`
`605`	`605`	`{`
`606`	`606`	`$mergedPermissions = $this->getMergedPermissions();`
`607`	`607`
`608`		`- if ( ! is_array($permissions))`
`609`		`- {`
`610`		`- $permissions = (array) $permissions;`
`611`		`- }`
`612`		`-`
`613`		`- foreach ($permissions as $permission)`
	`608`	`+ foreach ((array) $permissions as $permission)`
`614`	`609`	`{`
`615`	`610`	`// We will set a flag now for whether this permission was`
`616`	`611`	`// matched at all.`