allow unsetting parentAcl on MutableAclInterface

symfony · Jan 30, 2012 · dbd3a1b · dbd3a1b
1 parent 916597e
commit dbd3a1b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/src/Symfony/Component/Security/Acl/Domain/Acl.php b/src/Symfony/Component/Security/Acl/Domain/Acl.php
@@ -311,9 +311,9 @@ public function setEntriesInheriting($boolean)
     /**
      * {@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.');
         }
 

diff --git a/src/Symfony/Component/Security/Acl/Model/MutableAclInterface.php b/src/Symfony/Component/Security/Acl/Model/MutableAclInterface.php
@@ -114,9 +114,10 @@ function setEntriesInheriting($boolean);
     /**
      * 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

diff --git a/tests/Symfony/Tests/Component/Security/Acl/Domain/AclTest.php b/tests/Symfony/Tests/Component/Security/Acl/Domain/AclTest.php
@@ -250,6 +250,9 @@ public function testSetGetParentAcl()
         $this->assertNull($acl->getParentAcl());
         $acl->setParentAcl($parentAcl);
         $this->assertSame($parentAcl, $acl->getParentAcl());
+
+        $acl->setParentAcl(null);
+        $this->assertNull($acl->getParentAcl());
     }
 
     public function testSetIsEntriesInheriting()