Revert "merged branch armetiz/master (PR #8045)"
This reverts commita6dd5db60d
, reversing changes made toda6f190a6b
.
This commit is contained in:
parent
ffccc1af29
commit
1231d47acf
@ -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
|
||||||
|
Reference in New Issue
Block a user