diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

allow unsetting parentAcl on MutableAclInterface

Browse Source
This commit is contained in:
Toni Uebernickel 2012-01-18 18:00:58 +01:00
parent 916597eb29
commit dbd3a1bcc0
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Symfony/Component/Security/Acl/Domain/Acl.php
View File

@ -311,9 +311,9 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
/**
* {@inheritDoc}
*/
public function setParentAcl(AclInterface $acl)
public function setParentAcl(AclInterface $acl = null)
{
if (null === $acl->getId()) {
if (null !== $acl && null === $acl->getId()) {
throw new \InvalidArgumentException('$acl must have an ID.');
}

5
src/Symfony/Component/Security/Acl/Model/MutableAclInterface.php
View File

@ -114,9 +114,10 @@ interface MutableAclInterface extends AclInterface
/**
* Sets the parent ACL
*
* @param AclInterface $acl
* @param AclInterface|null $acl
* @return void
*/
function setParentAcl(AclInterface $acl);
function setParentAcl(AclInterface $acl = null);
/**
* Updates a class-based ACE

3
tests/Symfony/Tests/Component/Security/Acl/Domain/AclTest.php
View File

@ -250,6 +250,9 @@ class AclTest extends \PHPUnit_Framework_TestCase
$this->assertNull($acl->getParentAcl());
$acl->setParentAcl($parentAcl);
$this->assertSame($parentAcl, $acl->getParentAcl());
$acl->setParentAcl(null);
$this->assertNull($acl->getParentAcl());
}
public function testSetIsEntriesInheriting()