RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-04-03 13:23:37 +03:00
Code Issues Projects Releases Wiki Activity

Removed todo by implementing it.

Browse source
This commit is contained in:
Guilherme Blanco 2015-01-18 22:21:18 -05:00
parent d8d4ec6eb2
commit 2418f8f5e6
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lib/Doctrine/ORM/UnitOfWork.php
View file

@ -146,9 +146,8 @@ class UnitOfWork implements PropertyChangedListener
* Keys are object ids (spl_object_hash). * Keys are object ids (spl_object_hash).
* *
* @var array * @var array
* @todo rename: scheduledForSynchronization
*/ */
private $scheduledForDirtyCheck = array(); private $scheduledForSynchronization = array();
/** /**
* A list of all pending entity insertions. * A list of all pending entity insertions.
@ -425,7 +424,7 @@ class UnitOfWork implements PropertyChangedListener
$this->collectionUpdates = $this->collectionUpdates =
$this->collectionDeletions = $this->collectionDeletions =
$this->visitedCollections = $this->visitedCollections =
$this->scheduledForDirtyCheck = $this->scheduledForSynchronization =
$this->orphanRemovals = array(); $this->orphanRemovals = array();
} }
@ -771,8 +770,8 @@ class UnitOfWork implements PropertyChangedListener
$entitiesToProcess = $entities; $entitiesToProcess = $entities;
break; break;
case (isset($this->scheduledForDirtyCheck[$className])): case (isset($this->scheduledForSynchronization[$className])):
$entitiesToProcess = $this->scheduledForDirtyCheck[$className]; $entitiesToProcess = $this->scheduledForSynchronization[$className];
break; break;
default: default:
@ -1310,7 +1309,7 @@ class UnitOfWork implements PropertyChangedListener
{ {
$rootEntityName = $this->em->getClassMetadata(get_class($entity))->rootEntityName; $rootEntityName = $this->em->getClassMetadata(get_class($entity))->rootEntityName;
return isset($this->scheduledForDirtyCheck[$rootEntityName][spl_object_hash($entity)]); return isset($this->scheduledForSynchronization[$rootEntityName][spl_object_hash($entity)]);
} }
/** /**
@ -2361,7 +2360,7 @@ class UnitOfWork implements PropertyChangedListener
$this->originalEntityData = $this->originalEntityData =
$this->entityChangeSets = $this->entityChangeSets =
$this->entityStates = $this->entityStates =
$this->scheduledForDirtyCheck = $this->scheduledForSynchronization =
$this->entityInsertions = $this->entityInsertions =
$this->entityUpdates = $this->entityUpdates =
$this->entityDeletions = $this->entityDeletions =
@ -2953,7 +2952,7 @@ class UnitOfWork implements PropertyChangedListener
{ {
$rootClassName = $this->em->getClassMetadata(get_class($entity))->rootEntityName; $rootClassName = $this->em->getClassMetadata(get_class($entity))->rootEntityName;
$this->scheduledForDirtyCheck[$rootClassName][spl_object_hash($entity)] = $entity; $this->scheduledForSynchronization[$rootClassName][spl_object_hash($entity)] = $entity;
} }
/** /**
@ -3120,7 +3119,7 @@ class UnitOfWork implements PropertyChangedListener
// Update changeset and mark entity for synchronization // Update changeset and mark entity for synchronization
$this->entityChangeSets[$oid][$propertyName] = array($oldValue, $newValue); $this->entityChangeSets[$oid][$propertyName] = array($oldValue, $newValue);
if ( ! isset($this->scheduledForDirtyCheck[$class->rootEntityName][$oid])) { if ( ! isset($this->scheduledForSynchronization[$class->rootEntityName][$oid])) {
$this->scheduleForDirtyCheck($entity); $this->scheduleForDirtyCheck($entity);
} }
} }