RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-02 21:41:45 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'DDC-2578' into 2.4

Browse Source
This commit is contained in:
Benjamin Eberlei 2013-08-10 18:14:24 +02:00
commit c095b88804
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Doctrine/ORM/AbstractQuery.php
View File

@ -799,7 +799,7 @@ abstract class AbstractQuery
return $stmt; return $stmt;
} }
$data = $this->_em->getHydrator($this->_hydrationMode)->hydrateAll( $data = $this->_em->newHydrator($this->_hydrationMode)->hydrateAll(
$stmt, $this->_resultSetMapping, $this->_hints $stmt, $this->_resultSetMapping, $this->_hints
); );

15
lib/Doctrine/ORM/EntityManager.php
View File

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