May 15, 2013 · May 15, 2013 · May 16, 2013 · May 16, 2013 · May 16, 2013 · May 16, 2013
diff --git a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/ORMQueryBuilderLoader.php b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/ORMQueryBuilderLoader.php

 use Symfony\Component\Form\Exception\UnexpectedTypeException;
 use Doctrine\ORM\QueryBuilder;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\DBAL\Connection;

 /**
    /**
     * Construct an ORM Query Builder Loader
     *
     * @param QueryBuilder|\Closure $queryBuilder
     * @paramEntityManager $manager
     * @param string                $class
     * @param QueryBuilder|\Closure$queryBuilder
     * @paramEntityManagerInterface $manager
     * @param string$class
     *
     * @throws UnexpectedTypeException
     */
    public function __construct($queryBuilder, $manager = null, $class = null)
    public function __construct($queryBuilder,EntityManagerInterface$manager = null, $class = null)
    {
        // If a query builder was passed, it must be a closure or QueryBuilder
        // instance
Original file line number	Diff line number	Diff line change
Expand Up		@@ -13,6 +13,7 @@

		use Symfony\Component\Form\Exception\UnexpectedTypeException;
		use Doctrine\ORM\QueryBuilder;
		use Doctrine\ORM\EntityManagerInterface;
Copy link Member stofMay 16, 2013 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. This is wrong. There is no such interface in Doctrine stable.@fabpot please revert Copy link Member fabpotMay 16, 2013 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. done Copy link ContributorAuthor armetizMay 16, 2013 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. well done@stof. EntityManagerInterface will be available in 2.4 stable version Copy link Member stofMay 16, 2013 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. sure, but we are compatible with Doctrine ORM 2.2+
		use Doctrine\DBAL\Connection;

		/**
Expand All		@@ -33,13 +34,13 @@ class ORMQueryBuilderLoader implements EntityLoaderInterface
		/**
		* Construct an ORM Query Builder Loader
		*
		* @param QueryBuilder\|\Closure $queryBuilder
		* @paramEntityManager $manager
		* @param string $class
		* @param QueryBuilder\|\Closure$queryBuilder
		* @paramEntityManagerInterface $manager
		* @param string$class
		*
		* @throws UnexpectedTypeException
		*/
		public function __construct($queryBuilder, $manager = null, $class = null)
		public function __construct($queryBuilder,EntityManagerInterface$manager = null, $class = null)
		{
		// If a query builder was passed, it must be a closure or QueryBuilder
		// instance
Expand Down