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

Refactor testing Proxy not initilized

Browse Source
This commit is contained in:
bilouwan 2015-12-04 14:49:01 +01:00 committed by Marco Pivetta
parent e173c930ec
commit 4148220f9c
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1870,7 +1870,7 @@ class UnitOfWork implements PropertyChangedListener
} }
} }
if ($class->isVersioned && !($this->isNotInitializedProxy($managedCopy) || $this->isNotInitializedProxy($entity))) { if ($class->isVersioned && $this->isLoaded($managedCopy) && $this->isLoaded($entity)) {
$reflField = $class->reflFields[$class->versionField]; $reflField = $class->reflFields[$class->versionField];
$managedCopyVersion = $reflField->getValue($managedCopy); $managedCopyVersion = $reflField->getValue($managedCopy);
$entityVersion = $reflField->getValue($entity); $entityVersion = $reflField->getValue($entity);
@ -1883,7 +1883,7 @@ class UnitOfWork implements PropertyChangedListener
$visited[$oid] = $managedCopy; // mark visited $visited[$oid] = $managedCopy; // mark visited
if (!($entity instanceof Proxy && ! $entity->__isInitialized())) { if ($this->isLoaded($entity)) {
if ($managedCopy instanceof Proxy && ! $managedCopy->__isInitialized()) { if ($managedCopy instanceof Proxy && ! $managedCopy->__isInitialized()) {
$managedCopy->__load(); $managedCopy->__load();
} }
@ -1909,15 +1909,15 @@ class UnitOfWork implements PropertyChangedListener
} }
/** /**
* Tests if an entity is a non initialized proxy class * Tests if an entity is loaded (Not a proxy or a non initialized proxy)
* *
* @param $entity * @param $entity
* *
* @return bool * @return bool
*/ */
private function isNotInitializedProxy($entity) private function isLoaded($entity)
{ {
return $entity instanceof Proxy && !$entity->__isInitialized(); return !($entity instanceof Proxy) || $entity->__isInitialized();
} }
/** /**