Просмотр исходного кода

Updating type hinting to Iterator for object ACL building.

Benjamin Scholler 11 лет назад
Родитель
Сommit
c959742093
2 измененных файлов с 2 добавлено и 5 удалено
  1. 0 3
      Controller/CRUDController.php
  2. 2 2
      Util/AdminObjectAclData.php

+ 0 - 3
Controller/CRUDController.php

@@ -770,9 +770,6 @@ class CRUDController extends Controller
 
         $this->admin->setSubject($object);
         $aclUsers = $this->getAclUsers();
-        if (is_object($aclUsers) && method_exists($aclUsers, 'toArray')) {
-            $aclUsers = $aclUsers->toArray();
-        }
 
         $adminObjectAclManipulator = $this->get('sonata.admin.object.manipulator.acl.admin');
         $adminObjectAclData = new AdminObjectAclData(

+ 2 - 2
Util/AdminObjectAclData.php

@@ -73,10 +73,10 @@ class AdminObjectAclData
     /**
      * @param \Sonata\AdminBundle\Admin\AdminInterface $admin
      * @param mixed                                    $object
-     * @param array                                    $aclUsers
+     * @param \Iterator                                $aclUsers
      * @param string                                   $maskBuilderClass
      */
-    public function __construct(AdminInterface $admin, $object, array $aclUsers, $maskBuilderClass)
+    public function __construct(AdminInterface $admin, $object, \Iterator $aclUsers, $maskBuilderClass)
     {
         $this->admin = $admin;
         $this->object = $object;