RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-09 08:49:26 +03:00
Code Issues Projects Releases Wiki Activity

#6174 #5570 flattened nested conditionals

Browse Source
This commit is contained in:
Marco Pivetta 2016-12-18 14:36:39 +01:00
parent 81d44d4d6e
commit 3ce262a61a
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1887,17 +1887,21 @@ class UnitOfWork implements PropertyChangedListener
*/ */
private function ensureVersionMatch(ClassMetadata $class, $entity, $managedCopy) private function ensureVersionMatch(ClassMetadata $class, $entity, $managedCopy)
{ {
if ($class->isVersioned && $this->isLoaded($managedCopy) && $this->isLoaded($entity)) { if (! ($class->isVersioned && $this->isLoaded($managedCopy) && $this->isLoaded($entity))) {
return;
}
$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);
// Throw exception if versions don't match. // Throw exception if versions don't match.
if ($managedCopyVersion != $entityVersion) { if ($managedCopyVersion == $entityVersion) {
return;
}
throw OptimisticLockException::lockFailedVersionMismatch($entity, $entityVersion, $managedCopyVersion); throw OptimisticLockException::lockFailedVersionMismatch($entity, $entityVersion, $managedCopyVersion);
} }
}
}
/** /**
* Tests if an entity is loaded - must either be a loaded proxy or not a proxy * Tests if an entity is loaded - must either be a loaded proxy or not a proxy