Fix finding ACLs from ObjectIdentity's with different types
This commit is contained in:
parent
b11b0f7f26
commit
8a9e898c9a
@ -263,7 +263,11 @@ SELECTCLAUSE;
|
||||
for ($i = 0; $i < $count; $i++) {
|
||||
if (!isset($types[$batch[$i]->getType()])) {
|
||||
$types[$batch[$i]->getType()] = true;
|
||||
if ($count > 1) {
|
||||
|
||||
// if there is more than one type we can safely break out of the
|
||||
// loop, because it is the differentiator factor on whether to
|
||||
// query for only one or more class types
|
||||
if (count($types) > 1) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
@ -72,6 +72,23 @@ class AclProviderTest extends \PHPUnit_Framework_TestCase
|
||||
$this->assertTrue($oids[1]->equals($acl1->getObjectIdentity()));
|
||||
}
|
||||
|
||||
public function testFindAclsWithDifferentTypes()
|
||||
{
|
||||
$oids = array();
|
||||
$oids[] = new ObjectIdentity('123', 'Bundle\SomeVendor\MyBundle\Entity\SomeEntity');
|
||||
$oids[] = new ObjectIdentity('123', 'Bundle\MyBundle\Entity\AnotherEntity');
|
||||
|
||||
$provider = $this->getProvider();
|
||||
|
||||
$acls = $provider->findAcls($oids);
|
||||
$this->assertInstanceOf('SplObjectStorage', $acls);
|
||||
$this->assertCount(2, $acls);
|
||||
$this->assertInstanceOf('Symfony\Component\Security\Acl\Domain\Acl', $acl0 = $acls->offsetGet($oids[0]));
|
||||
$this->assertInstanceOf('Symfony\Component\Security\Acl\Domain\Acl', $acl1 = $acls->offsetGet($oids[1]));
|
||||
$this->assertTrue($oids[0]->equals($acl0->getObjectIdentity()));
|
||||
$this->assertTrue($oids[1]->equals($acl1->getObjectIdentity()));
|
||||
}
|
||||
|
||||
public function testFindAclCachesAclInMemory()
|
||||
{
|
||||
$oid = new ObjectIdentity('1', 'foo');
|
||||
|
Reference in New Issue
Block a user