RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-03-22 16:03:49 +03:00
Code Issues Projects Releases Wiki Activity

#1277 DDC-3346 - removing array-based persister context handling (better to just use private props)

Browse Source
This commit is contained in:
Marco Pivetta 2015-01-24 14:38:58 +01:00
parent dff365318d
commit 97ea6a7d85
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php
View File

@ -178,14 +178,19 @@ class BasicEntityPersister implements EntityPersister
private $identifierFlattener; private $identifierFlattener;
/** /**
* @var CachedPersisterContext[] * @var CachedPersisterContext
*/ */
protected $cachedPersisterContexts = []; protected $currentPersisterContext;
/** /**
* @var CachedPersisterContext * @var CachedPersisterContext
*/ */
protected $currentPersisterContext; private $limitsHandlingContext;
/**
* @var CachedPersisterContext
*/
private $noLimitsContext;
/** /**
* Initializes a new <tt>BasicEntityPersister</tt> that uses the given EntityManager * Initializes a new <tt>BasicEntityPersister</tt> that uses the given EntityManager
@ -196,18 +201,18 @@ class BasicEntityPersister implements EntityPersister
*/ */
public function __construct(EntityManagerInterface $em, ClassMetadata $class) public function __construct(EntityManagerInterface $em, ClassMetadata $class)
{ {
$this->em = $em; $this->em = $em;
$this->class = $class; $this->class = $class;
$this->conn = $em->getConnection(); $this->conn = $em->getConnection();
$this->platform = $this->conn->getDatabasePlatform(); $this->platform = $this->conn->getDatabasePlatform();
$this->quoteStrategy = $em->getConfiguration()->getQuoteStrategy(); $this->quoteStrategy = $em->getConfiguration()->getQuoteStrategy();
$this->identifierFlattener = new IdentifierFlattener($em->getUnitOfWork(), $em->getMetadataFactory()); $this->identifierFlattener = new IdentifierFlattener($em->getUnitOfWork(), $em->getMetadataFactory());
$this->cachedPersisterContexts['noLimits'] = $this->currentPersisterContext = new CachedPersisterContext( $this->noLimitsContext = $this->currentPersisterContext = new CachedPersisterContext(
$class, $class,
new Query\ResultSetMapping(), new Query\ResultSetMapping(),
false false
); );
$this->cachedPersisterContexts['withLimits'] = new CachedPersisterContext( $this->limitsHandlingContext = new CachedPersisterContext(
$class, $class,
new Query\ResultSetMapping(), new Query\ResultSetMapping(),
true true
@ -1966,11 +1971,11 @@ class BasicEntityPersister implements EntityPersister
protected function switchPersisterContext($offset, $limit) protected function switchPersisterContext($offset, $limit)
{ {
if (null === $offset && null === $limit) { if (null === $offset && null === $limit) {
$this->currentPersisterContext = $this->cachedPersisterContexts['noLimits']; $this->currentPersisterContext = $this->noLimitsContext;
return; return;
} }
$this->currentPersisterContext = $this->cachedPersisterContexts['withLimits']; $this->currentPersisterContext = $this->limitsHandlingContext;
} }
} }