FIX default options on CollectionType

Author: sescandell

Guesser/DoctrineFieldGuesser.php

@@ -292,8 +292,8 @@ protected function getOptions($type, $dbType, $model, $fieldPath, $filter = fals
                 'allow_add'     => true,
                 'allow_delete'  => true,
                 'by_reference'  => false,
-                'type' => $filter ? $this->filterTypes[$this->objectModel] : $this->formTypes[$this->objectModel],
-                'options' => array(
+                'entry_type' => $filter ? $this->filterTypes[$this->objectModel] : $this->formTypes[$this->objectModel],
+                'entry_options' => array(
                     'class' => $mapping['target'.ucfirst($this->objectModel)]
                 )
             );

Guesser/PropelORMFieldGuesser.php

@@ -329,8 +329,8 @@ protected function getOptions($type, $dbType, $model, $fieldPath, $filter = fals
                 'allow_add'     => true,
                 'allow_delete'  => true,
                 'by_reference'  => false,
-                'type' => 'entity',
-                'options' => array(
+                'entry_type' => 'entity',
+                'entry_options' => array(
                     'class' => \RelationMap::MANY_TO_ONE === $relation->getType() ? $relation->getForeignTable()->getClassname() : $relation->getLocalTable()->getClassname()
                 )
             );