diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "merged branch armetiz/master (PR #8045)"

Browse Source 
This reverts commit a6dd5db60d, reversing
changes made to da6f190a6b.
This commit is contained in:
Fabien Potencier 2013-05-16 10:06:37 +02:00
parent ffccc1af29
commit 1231d47acf
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Symfony/Bridge/Doctrine/Form/ChoiceList/ORMQueryBuilderLoader.php
View File

@ -13,7 +13,6 @@ namespace Symfony\Bridge\Doctrine\Form\ChoiceList;
use Symfony\Component\Form\Exception\UnexpectedTypeException; use Symfony\Component\Form\Exception\UnexpectedTypeException;
use Doctrine\ORM\QueryBuilder; use Doctrine\ORM\QueryBuilder;
use Doctrine\ORM\EntityManagerInterface;
use Doctrine\DBAL\Connection; use Doctrine\DBAL\Connection;
/** /**
@ -34,13 +33,13 @@ class ORMQueryBuilderLoader implements EntityLoaderInterface
/** /**
* Construct an ORM Query Builder Loader * Construct an ORM Query Builder Loader
* *
* @param QueryBuilder|\Closure $queryBuilder * @param QueryBuilder|\Closure $queryBuilder
* @param EntityManagerInterface $manager * @param EntityManager $manager
* @param string $class * @param string $class
* *
* @throws UnexpectedTypeException * @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 // If a query builder was passed, it must be a closure or QueryBuilder
// instance // instance