1
0
mirror of synced 2025-01-06 00:57:10 +03:00

Merge branch 'DDC-1093'

This commit is contained in:
Benjamin Eberlei 2011-04-03 20:29:15 +02:00
commit 88dc18f88a

View File

@ -97,12 +97,16 @@ class EntityManager implements ObjectManager
private $proxyFactory; private $proxyFactory;
/** /**
* @var ExpressionBuilder The expression builder instance used to generate query expressions. * The expression builder instance used to generate query expressions.
*
* @var Doctrine\ORM\Query\Expr
*/ */
private $expressionBuilder; private $expressionBuilder;
/** /**
* Whether the EntityManager is closed or not. * Whether the EntityManager is closed or not.
*
* @var bool
*/ */
private $closed = false; private $closed = false;
@ -164,7 +168,7 @@ class EntityManager implements ObjectManager
* ->where($expr->orX($expr->eq('u.id', 1), $expr->eq('u.id', 2))); * ->where($expr->orX($expr->eq('u.id', 1), $expr->eq('u.id', 2)));
* </code> * </code>
* *
* @return ExpressionBuilder * @return Doctrine\ORM\Query\Expr
*/ */
public function getExpressionBuilder() public function getExpressionBuilder()
{ {