Permalink
Browse files

Merge pull request #71 from sterrien/2.0

2.0 Jquery autocomplete entity (rollback)
  • Loading branch information...
2 parents b8eed2c + 85adf0d commit 236030095204dbdacf365af4f9f32e8493387db3 @genemu committed Mar 19, 2012
Showing with 3 additions and 3 deletions.
  1. +2 −2 Form/Doctrine/ChoiceList/AjaxEntityChoiceList.php
  2. +1 −1 Form/Doctrine/Type/AjaxEntityType.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;
@@ -49,7 +49,7 @@ public function getDefaultOptions(array $options)
'class' => null,
'property' => null,
'query_builder' => null,
- 'choices' => array(),
+ 'choices' => null,
'ajax' => false
);

0 comments on commit 2360300

Please sign in to comment.