Merge branch 'master' into hotfix/translator-caching

src/Acl.php

@@ -839,7 +839,7 @@ protected function roleDFSVisitAllPrivileges(Role\RoleInterface $role, Resource\
         }
 
         $dfs['visited'][$role->getRoleId()] = true;
-        foreach ($this->getRoleRegistry()->getParents($role) as $roleParentId => $roleParent) {
+        foreach ($this->getRoleRegistry()->getParents($role) as $roleParent) {
             $dfs['stack'][] = $roleParent;
         }
 
@@ -925,7 +925,7 @@ protected function roleDFSVisitOnePrivilege(Role\RoleInterface $role, Resource\R
         }
 
         $dfs['visited'][$role->getRoleId()] = true;
-        foreach ($this->getRoleRegistry()->getParents($role) as $roleParentId => $roleParent) {
+        foreach ($this->getRoleRegistry()->getParents($role) as $roleParent) {
             $dfs['stack'][] = $roleParent;
         }
 

test/AclTest.php

@@ -1210,8 +1210,8 @@ public function testAclPassesPrivilegeToAssertClass()
         $acl = new Acl\Acl();
         $acl->addRole('role');
         $acl->addResource('resource');
-        $acl->allow('role',null,null,$assertion);
-        $allowed = $acl->isAllowed('role','resource','privilege',$assertion);
+        $acl->allow('role', null, null, $assertion);
+        $allowed = $acl->isAllowed('role','resource','privilege', $assertion);
 
         $this->assertTrue($allowed);
     }
@@ -1221,7 +1221,7 @@ public function testAclPassesPrivilegeToAssertClass()
      */
     public function testgetRoles()
     {
-        $this->assertEquals(array(),$this->_acl->getRoles());
+        $this->assertEquals(array(), $this->_acl->getRoles());
 
         $roleGuest = new Role\GenericRole('guest');
         $this->_acl->addRole($roleGuest);
@@ -1238,7 +1238,7 @@ public function testgetRoles()
      */
     public function testgetResources()
     {
-        $this->assertEquals(array(),$this->_acl->getResources());
+        $this->assertEquals(array(), $this->_acl->getResources());
 
         $this->_acl->addResource(new Resource\GenericResource('someResource'));
         $this->_acl->addResource(new Resource\GenericResource('someOtherResource'));