From 1231d47acf75ea59848a54f8e471ecfb9accc55c Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 16 May 2013 10:06:37 +0200 Subject: [PATCH] Revert "merged branch armetiz/master (PR #8045)" This reverts commit a6dd5db60d1eb56be917fcc38244bcca168740a9, reversing changes made to da6f190a6b630d6fc17729e04061308e573b47c7. --- .../Doctrine/Form/ChoiceList/ORMQueryBuilderLoader.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/ORMQueryBuilderLoader.php b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/ORMQueryBuilderLoader.php index c801240a89..ef9eb14bf5 100644 --- a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/ORMQueryBuilderLoader.php +++ b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/ORMQueryBuilderLoader.php @@ -13,7 +13,6 @@ namespace Symfony\Bridge\Doctrine\Form\ChoiceList; use Symfony\Component\Form\Exception\UnexpectedTypeException; use Doctrine\ORM\QueryBuilder; -use Doctrine\ORM\EntityManagerInterface; use Doctrine\DBAL\Connection; /** @@ -34,13 +33,13 @@ class ORMQueryBuilderLoader implements EntityLoaderInterface /** * Construct an ORM Query Builder Loader * - * @param QueryBuilder|\Closure $queryBuilder - * @param EntityManagerInterface $manager - * @param string $class + * @param QueryBuilder|\Closure $queryBuilder + * @param EntityManager $manager + * @param string $class * * @throws UnexpectedTypeException */ - public function __construct($queryBuilder, EntityManagerInterface $manager = null, $class = null) + public function __construct($queryBuilder, $manager = null, $class = null) { // If a query builder was passed, it must be a closure or QueryBuilder // instance