fix: use the object identity to delete ACL

youbs · Dec 28, 2011 · 03377a3 · 03377a3
1 parent 32ef4b5
commit 03377a3
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 10 deletions.
diff --git a/Admin/Admin.php b/Admin/Admin.php
@@ -530,9 +530,9 @@ public function create($object)
     public function delete($object)
     {
         $this->preRemove($object);
+        $this->getSecurityHandler()->deleteObjectSecurity($this, $object);
         $this->getModelManager()->delete($object);
         $this->postRemove($object);
-        $this->getSecurityHandler()->deleteObjectSecurity($this, $object);
     }
 
     public function preUpdate($object)

diff --git a/Security/Handler/AclSecurityHandler.php b/Security/Handler/AclSecurityHandler.php
@@ -146,10 +146,7 @@ public function createObjectSecurity(AdminInterface $admin, $object)
     public function deleteObjectSecurity(AdminInterface $admin, $object)
     {
         $objectIdentity = ObjectIdentity::fromDomainObject($object);
-        if (!is_null($acl = $this->getObjectAcl($objectIdentity)))
-        {
-            $this->deleteAcl($acl);
-        }
+        $this->deleteAcl($objectIdentity);
     }
 
     /**
@@ -250,9 +247,9 @@ public function updateAcl(AclInterface $acl)
     /**
      * {@inheritDoc}
      */
-    public function deleteAcl(AclInterface $acl)
+    public function deleteAcl(ObjectIdentityInterface $objectIdentity)
     {
-        $this->aclProvider->deleteAcl($acl);
+        $this->aclProvider->deleteAcl($objectIdentity);
     }
 
     /**

diff --git a/Security/Handler/AclSecurityHandlerInterface.php b/Security/Handler/AclSecurityHandlerInterface.php
@@ -110,10 +110,10 @@ function updateAcl(AclInterface $acl);
      * Delete the ACL
      *
      * @abstract
-     * @param AclInterface $acl
+     * @param ObjectIdentityInterface $objectIdentity
      * @return void
      */
-    function deleteAcl(AclInterface $acl);
+    function deleteAcl(ObjectIdentityInterface $objectIdentity);
 
     /**
      * Helper method to find the index of a class ACE for a role

diff --git a/Util/AdminAclManipulator.php b/Util/AdminAclManipulator.php
@@ -56,7 +56,7 @@ public function configureAcls(OutputInterface $output, AdminInterface $admin)
             $this->securityHandler->updateAcl($acl);
         } else {
             $output->writeln(sprintf('   - %s , no roles and permissions found', ($newAcl ? 'skip' : 'removed')));
-            $this->securityHandler->deleteAcl($acl);
+            $this->securityHandler->deleteAcl($objectIdentity);
         }
     }