rename Datagrid/ListCollection.php -> Admin/FieldDescriptionCollection.php

Admin/Admin.php

@@ -999,7 +999,7 @@ abstract class Admin implements AdminInterface, DomainObjectInterface
      * Returns a list depend on the given $object
      *
      * @param array $options
-     * @return \Sonata\AdminBundle\Datagrid\ListCollection
+     * @return \Sonata\AdminBundle\Admin\FieldDescriptionCollection
      */
     public function getList(array $options = array())
     {

Datagrid/ListCollection.php

@@ -8,13 +8,12 @@
  * file that was distributed with this source code.
  *
  */
-namespace Sonata\AdminBundle\Datagrid;
+namespace Sonata\AdminBundle\Admin;
 
 use Sonata\AdminBundle\Admin\FieldDescriptionInterface;
 
-class ListCollection
+class FieldDescriptionCollection
 {
-
     protected $elements = array();
 
     /**

Builder/ListBuilderInterface.php

@@ -14,7 +14,7 @@ namespace Sonata\AdminBundle\Builder;
 use Sonata\AdminBundle\Admin\FieldDescriptionInterface;
 use Sonata\AdminBundle\Model\ModelManagerInterface;
 use Sonata\AdminBundle\Admin\AdminInterface;
-use Sonata\AdminBundle\Datagrid\ListCollection;
+use Sonata\AdminBundle\Admin\FieldDescriptionCollection;
 
 
 interface ListBuilderInterface
@@ -28,11 +28,11 @@ interface ListBuilderInterface
 
     /**
      * @abstract
-     * @param \Sonata\AdminBundle\Datagrid\ListCollection $list
+     * @param \Sonata\AdminBundle\Admin\FieldDescriptionCollection $list
      * @param \Sonata\AdminBundle\Admin\FieldDescription $fieldDescription
      * @return void
      */
-    function addField(ListCollection $list, FieldDescriptionInterface $fieldDescription);
+    function addField(FieldDescriptionCollection $list, FieldDescriptionInterface $fieldDescription);
 
     /**
      * @abstract

Builder/ORM/FormContractor.php

@@ -27,7 +27,6 @@ use Doctrine\ORM\Mapping\ClassMetadataInfo;
 
 class FormContractor implements FormContractorInterface
 {
-
     protected $fieldFactory;
 
     protected $validator;

Builder/ORM/ListBuilder.php

@@ -14,29 +14,29 @@ namespace Sonata\AdminBundle\Builder\ORM;
 use Sonata\AdminBundle\Admin\FieldDescriptionInterface;
 use Sonata\AdminBundle\Model\ModelManagerInterface;
 use Sonata\AdminBundle\Admin\AdminInterface;
-use Sonata\AdminBundle\Datagrid\ListCollection;
+use Sonata\AdminBundle\Admin\FieldDescriptionCollection;
 use Sonata\AdminBundle\Builder\ListBuilderInterface;
 
 use Doctrine\ORM\Mapping\ClassMetadataInfo;
 
 class ListBuilder implements ListBuilderInterface
 {
-
     public function getBaseList(array $options = array())
     {
-        return new ListCollection;
+        return new FieldDescriptionCollection;
     }
 
-
-    public function addField(ListCollection $list, FieldDescriptionInterface $fieldDescription)
+    public function addField(FieldDescriptionCollection $list, FieldDescriptionInterface $fieldDescription)
     {
         return $list->add($fieldDescription);
     }
 
     /**
-     * The method define the correct default settings for the provided FieldDescription
+     * The method defines the correct default settings for the provided FieldDescription
      *
-     * @param \Sonata\AdminBundle\Admin\FieldDescription $fieldDescription
+     * @param \Sonata\AdminBundle\Admin\AdminInterface $admin
+     * @param \Sonata\AdminBundle\Admin\FieldDescriptionInterface $fieldDescription
+     * @param array $options
      * @return void
      */
     public function fixFieldDescription(AdminInterface $admin, FieldDescriptionInterface $fieldDescription, array $options = array())
@@ -113,8 +113,8 @@ class ListBuilder implements ListBuilderInterface
     }
 
     /**
-     * @param \Sonata\AdminBundle\Admin\FieldDescription $fieldDescription
-     * @return \Sonata\AdminBundle\Admin\FieldDescription
+     * @param \Sonata\AdminBundle\Admin\FieldDescriptionInterface $fieldDescription
+     * @return \Sonata\AdminBundle\Admin\FieldDescriptionInterface
      */
     public function buildActionFieldDescription(FieldDescriptionInterface $fieldDescription)
     {

Datagrid/Datagrid.php

@@ -14,6 +14,8 @@ namespace Sonata\AdminBundle\Datagrid;
 use Sonata\AdminBundle\Datagrid\PagerInterface;
 use Sonata\AdminBundle\Datagrid\ProxyQueryInterface;
 use Sonata\AdminBundle\Filter\FilterInterface;
+use Sonata\AdminBundle\Admin\FieldDescriptionCollection;
+
 use Symfony\Component\Form\FormFactory;
 
 class Datagrid implements DatagridInterface
@@ -39,7 +41,7 @@ class Datagrid implements DatagridInterface
 
     protected $results;
 
-    public function __construct(ProxyQueryInterface $query, ListCollection $columns, PagerInterface $pager, FormFactory $formFactory, array $values = array())
+    public function __construct(ProxyQueryInterface $query, FieldDescriptionCollection $columns, PagerInterface $pager, FormFactory $formFactory, array $values = array())
     {
         $this->pager    = $pager;
         $this->query    = $query;

Datagrid/ListMapper.php

@@ -13,7 +13,7 @@ namespace Sonata\AdminBundle\Datagrid;
 use Sonata\AdminBundle\Admin\AdminInterface;
 use Sonata\AdminBundle\Admin\FieldDescriptionInterface;
 use Sonata\AdminBundle\Model\ModelManagerInterface;
-use Sonata\AdminBundle\Datagrid\ListCollection;
+use Sonata\AdminBundle\Admin\FieldDescriptionCollection;
 use Sonata\AdminBundle\Builder\ListBuilderInterface;
 
 /**
@@ -28,7 +28,7 @@ class ListMapper
 
     protected $admin;
 
-    public function __construct(ListBuilderInterface $listBuilder, ListCollection $list, AdminInterface $admin)
+    public function __construct(ListBuilderInterface $listBuilder, FieldDescriptionCollection $list, AdminInterface $admin)
     {
         $this->listBuilder  = $listBuilder;
         $this->list         = $list;
@@ -51,7 +51,7 @@ class ListMapper
         } else if (is_string($name) && !$this->admin->hasListFieldDescription($name)) {
 
             $fieldDescription = $this->admin->getModelManager()->getNewFieldDescriptionInstance(
-                $this->admin->getClass(),   
+                $this->admin->getClass(),
                 $name,
                 $fieldDescriptionOptions
             );