Merge pull request #284 from pierrerolland/fix-array-db-type

Issue #186 : allows "array" db type to be used with a collection form type
symfony2admingenerator · May 23, 2016 · fab4312 · fab4312
2 parents 3ce13c7 + 134f79a
commit fab4312
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/Guesser/DoctrineFieldGuesser.php b/Guesser/DoctrineFieldGuesser.php
@@ -286,17 +286,21 @@ protected function getOptions($type, $dbType, $model, $fieldPath, $filter = fals
         }
 
         if (preg_match("/CollectionType$/i", $type)) {
-            $mapping = $this->getMetadatas($class)->getAssociationMapping($columnName);
-
-            return array(
+            $options = array(
                 'allow_add'     => true,
                 'allow_delete'  => true,
                 'by_reference'  => false,
                 'entry_type' => $filter ? $this->filterTypes[$this->objectModel] : $this->formTypes[$this->objectModel],
-                'entry_options' => array(
-                    'class' => $mapping['target'.ucfirst($this->objectModel)]
-                )
             );
+
+            if ($this->getMetadatas($class)->hasAssociation($columnName)) {
+                $mapping = $this->getMetadatas($class)->getAssociationMapping($columnName);
+                $options['entry_options'] = array(
+                    'class' => $mapping['target'.ucfirst($this->objectModel)]
+                );
+            }
+
+            return $options;
         }
 
         return array(