Merge branch 'DDC-2578' into 2.4

doctrine · Aug 10, 2013 · c095b88 · c095b88
2 parents ec36e2c + efe4208
commit c095b88
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 13 deletions.
diff --git a/lib/Doctrine/ORM/AbstractQuery.php b/lib/Doctrine/ORM/AbstractQuery.php
@@ -799,7 +799,7 @@ public function execute($parameters = null, $hydrationMode = null)
             return $stmt;
         }
 
-        $data = $this->_em->getHydrator($this->_hydrationMode)->hydrateAll(
+        $data = $this->_em->newHydrator($this->_hydrationMode)->hydrateAll(
             $stmt, $this->_resultSetMapping, $this->_hints
         );
 

diff --git a/lib/Doctrine/ORM/EntityManager.php b/lib/Doctrine/ORM/EntityManager.php
@@ -99,13 +99,6 @@
      */
     private $eventManager;
 
-    /**
-     * The maintained (cached) hydrators. One instance per type.
-     *
-     * @var array
-     */
-    private $hydrators = array();
-
     /**
      * The proxy factory used to create dynamic proxies.
      *
@@ -840,17 +833,15 @@ public function getUnitOfWork()
      * This method caches the hydrator instances which is used for all queries that don't
      * selectively iterate over the result.
      *
+     * @deprecated
+     *
      * @param int $hydrationMode
      *
      * @return \Doctrine\ORM\Internal\Hydration\AbstractHydrator
      */
     public function getHydrator($hydrationMode)
     {
-        if ( ! isset($this->hydrators[$hydrationMode])) {
-            $this->hydrators[$hydrationMode] = $this->newHydrator($hydrationMode);
-        }
-
-        return $this->hydrators[$hydrationMode];
+        return $this->newHydrator($hydrationMode);
     }
 
     /**