RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-19 23:11:41 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1026 from flack/patch-5

Browse Source 
Remove some redundant clauses
This commit is contained in:
Marco Pivetta 2014-05-03 01:43:38 +02:00
commit 94837a0105
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/Doctrine/ORM/UnitOfWork.php
View File

@ -2553,12 +2553,6 @@ class UnitOfWork implements PropertyChangedListener
if ($entity instanceof NotifyPropertyChanged) { if ($entity instanceof NotifyPropertyChanged) {
$entity->addPropertyChangedListener($this); $entity->addPropertyChangedListener($this);
} }
// inject ObjectManager into just loaded proxies.
if ($overrideLocalValues && $entity instanceof ObjectManagerAware) {
$entity->injectObjectManager($this->em, $class);
}
} else { } else {
$overrideLocalValues = isset($hints[Query::HINT_REFRESH]); $overrideLocalValues = isset($hints[Query::HINT_REFRESH]);
@ -2566,14 +2560,14 @@ class UnitOfWork implements PropertyChangedListener
if (isset($hints[Query::HINT_REFRESH_ENTITY])) { if (isset($hints[Query::HINT_REFRESH_ENTITY])) {
$overrideLocalValues = $hints[Query::HINT_REFRESH_ENTITY] === $entity; $overrideLocalValues = $hints[Query::HINT_REFRESH_ENTITY] === $entity;
} }
// inject ObjectManager upon refresh.
if ($overrideLocalValues && $entity instanceof ObjectManagerAware) {
$entity->injectObjectManager($this->em, $class);
}
} }
if ($overrideLocalValues) { if ($overrideLocalValues) {
// inject ObjectManager upon refresh.
if ($entity instanceof ObjectManagerAware) {
$entity->injectObjectManager($this->em, $class);
}
$this->originalEntityData[$oid] = $data; $this->originalEntityData[$oid] = $data;
} }
} else { } else {