Merge pull request #4 from yosmanyga/patch-1

Allow custom queryBuilder
Gregwar · Jul 6, 2012 · 2f1620e · 2f1620e
2 parents 6ff2bbf + 7b60901
commit 2f1620e
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/DataTransformer/OneEntityToIdTransformer.php b/DataTransformer/OneEntityToIdTransformer.php
@@ -9,6 +9,7 @@
 use Symfony\Component\Form\FormError;
 use Symfony\Component\Form\FormInterface;
 use Doctrine\ORM\EntityManager;
+use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\Util\PropertyPath;
 
 use Doctrine\ORM\NoResultException;
@@ -29,7 +30,7 @@ class OneEntityToIdTransformer implements DataTransformerInterface
 
     public function __construct(EntityManager $em, $class, $property, $queryBuilder)
     {
-        if (null !== $queryBuilder && ! $queryBuilder instanceof \Closure) {
+        if (!(null === $queryBuilder || $queryBuilder instanceof QueryBuilder || $queryBuilder instanceof \Closure)) {
             throw new UnexpectedTypeException($queryBuilder, 'Doctrine\ORM\QueryBuilder or \Closure');
         }