Merge pull request #71 from sterrien/2.0

2.0 Jquery autocomplete entity (rollback)
genemu · Mar 19, 2012 · 2360300 · 2360300
2 parents b8eed2c + 85adf0d
commit 2360300
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Form/Doctrine/ChoiceList/AjaxEntityChoiceList.php b/Form/Doctrine/ChoiceList/AjaxEntityChoiceList.php
@@ -33,10 +33,10 @@ class AjaxEntityChoiceList extends EntityChoiceList
      * @param string              $class
      * @param string              $property
      * @param QueryBuilder        $qb
-     * @param array|\Closure $choices
+     * @param null|array|\Closure $choices
      * @param boolean             $ajax
      */
-    public function __construct(EntityManager $em, $class, $property = null, $qb = null, $choices = array(), $ajax = false)
+    public function __construct(EntityManager $em, $class, $property = null, $qb = null, $choices = null, $ajax = false)
     {
         $this->ajax = $ajax;
 

diff --git a/Form/Doctrine/Type/AjaxEntityType.php b/Form/Doctrine/Type/AjaxEntityType.php
@@ -49,7 +49,7 @@ public function getDefaultOptions(array $options)
             'class'         => null,
             'property'      => null,
             'query_builder' => null,
-            'choices'       => array(),
+            'choices'       => null,
             'ajax'          => false
         );