Merge branch 'DDC-1093'

lib/Doctrine/ORM/EntityManager.php

@@ -97,12 +97,16 @@ class EntityManager implements ObjectManager
     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;
 
     /**
      * Whether the EntityManager is closed or not.
+     *
+     * @var bool
      */
     private $closed = false;
 
@@ -164,7 +168,7 @@ class EntityManager implements ObjectManager
      *         ->where($expr->orX($expr->eq('u.id', 1), $expr->eq('u.id', 2)));
      * </code>
      *
-     * @return ExpressionBuilder
+     * @return Doctrine\ORM\Query\Expr
      */
     public function getExpressionBuilder()
     {