RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-10 17:29:27 +03:00
Code Issues Projects Releases Wiki Activity

#6174 #5570 documenting thrown exception types

Browse Source
This commit is contained in:
Marco Pivetta 2016-12-18 14:32:31 +01:00
parent 754f36ef65
commit 81d44d4d6e
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1784,7 +1784,7 @@ class UnitOfWork implements PropertyChangedListener
* @throws OptimisticLockException If the entity uses optimistic locking through a version * @throws OptimisticLockException If the entity uses optimistic locking through a version
* attribute and the version check against the managed copy fails. * attribute and the version check against the managed copy fails.
* @throws ORMInvalidArgumentException If the entity instance is NEW. * @throws ORMInvalidArgumentException If the entity instance is NEW.
* @throws EntityNotFoundException * @throws EntityNotFoundException if an assigned identifier is used in the entity, but none is provided
*/ */
private function doMerge($entity, array &$visited, $prevManagedCopy = null, array $assoc = []) private function doMerge($entity, array &$visited, $prevManagedCopy = null, array $assoc = [])
{ {
@ -1876,6 +1876,15 @@ class UnitOfWork implements PropertyChangedListener
return $managedCopy; return $managedCopy;
} }
/**
* @param ClassMetadata $class
* @param object $entity
* @param object $managedCopy
*
* @return void
*
* @throws OptimisticLockException
*/
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)) {