Fix ACL editor

sonata-project · Sep 13, 2013 · 56d6929 · 56d6929
1 parent 3d9d5d4
commit 56d6929
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/Controller/CRUDController.php b/Controller/CRUDController.php
@@ -724,20 +724,22 @@ public function exportAction(Request $request)
     /**
      * Gets ACL users
      * 
-     * @return array
+     * @return \Traversable
      */
     protected function getAclUsers()
     {
+        $aclUsers = array();
+
         $userManagerServiceName = $this->container->getParameter('sonata.admin.security.acl_user_manager');
         if ($userManagerServiceName !== null && $this->has($userManagerServiceName)) {
             $userManager = $this->get($userManagerServiceName);
 
             if (method_exists($userManager, 'findUsers')) {
-                return $userManager->findUsers();
+                $aclUsers = $userManager->findUsers();
             }
         }
 
-        return array();
+        return is_array($aclUsers) ? new \ArrayIterator($aclUsers) : $aclUsers;
     }
 
     /**

diff --git a/Security/Handler/AclSecurityHandler.php b/Security/Handler/AclSecurityHandler.php
@@ -166,10 +166,10 @@ public function getObjectAcl(ObjectIdentityInterface $objectIdentity)
     /**
      * {@inheritDoc}
      */
-    public function findObjectAcls(array $oids, array $sids = array())
+    public function findObjectAcls(\Traversable $oids, array $sids = array())
     {
         try {
-            $acls = $this->aclProvider->findAcls($oids, $sids);
+            $acls = $this->aclProvider->findAcls(iterator_to_array($oids), $sids);
         } catch (\Exception $e) {
             if ($e instanceof NotAllAclsFoundException) {
                 $acls = $e->getPartialResult();

diff --git a/Security/Handler/AclSecurityHandlerInterface.php b/Security/Handler/AclSecurityHandlerInterface.php
@@ -67,13 +67,13 @@ public function getObjectAcl(ObjectIdentityInterface $objectIdentity);
      *
      * @abstract
      *
-     * @param array $oids an array of ObjectIdentityInterface implementations
+     * @param \Traversable $oids a collection of ObjectIdentityInterface implementations
      * @param array $sids an array of SecurityIdentityInterface implementations
      *
      * @throws \Exception
      * @return \SplObjectStorage mapping the passed object identities to ACLs
      */
-    public function findObjectAcls(array $oids, array $sids = array());
+    public function findObjectAcls(\Traversable $oids, array $sids = array());
 
     /**
      * Add an object owner ACE to the object ACL

diff --git a/Util/ObjectAclManipulator.php b/Util/ObjectAclManipulator.php
@@ -23,14 +23,14 @@ abstract class ObjectAclManipulator implements ObjectAclManipulatorInterface
      *
      * @param OutputInterface      $output
      * @param AdminInterface       $admin
-     * @param array                $oids             an array of ObjectIdentityInterface implementations
+     * @param \Traversable         $oids              a collection of ObjectIdentityInterface implementations
      * @param UserSecurityIdentity $securityIdentity
      *
      * @throws \Exception
      *
      * @return array [countAdded, countUpdated]
      */
-    public function configureAcls(OutputInterface $output, AdminInterface $admin, array $oids, UserSecurityIdentity $securityIdentity = null)
+    public function configureAcls(OutputInterface $output, AdminInterface $admin, \Traversable $oids, UserSecurityIdentity $securityIdentity = null)
     {
         $countAdded      = 0;
         $countUpdated    = 0;