From 82334d2640747ccd18c3d569114b9771240a59eb Mon Sep 17 00:00:00 2001
From: Thomas Tourlourat <thomas@tourlourat.com>
Date: Thu, 15 Nov 2012 16:44:00 +0100
Subject: [PATCH] Force loader to be null or a EntityLoaderInterface

---
 src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php b/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php
index 53e55bab29..14d88e3403 100644
--- a/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php
+++ b/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php
@@ -148,6 +148,10 @@ abstract class DoctrineType extends AbstractType
         $resolver->setNormalizers(array(
             'em' => $emNormalizer,
         ));
+
+        $resolver->setAllowedTypes(array(
+            'loader' => array('null', 'Symfony\Bridge\Doctrine\Form\ChoiceList\EntityLoaderInterface'),
+        ));
     }
 
     /**