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

Merge pull request #5885 from doctrine/fix/proxy-failure-fixes

Browse Source 
Partially reverting #5860 due to type juggling horrors
This commit is contained in:
Marco Pivetta 2016-06-19 09:37:25 +02:00 committed by GitHub
commit a9bca86d4d
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/Doctrine/ORM/EntityManager.php
View File

@ -421,14 +421,14 @@ use Doctrine\Common\Util\ClassUtils;
return null;
}
switch ($lockMode) {
case LockMode::OPTIMISTIC:
switch (true) {
case LockMode::OPTIMISTIC === $lockMode:
$this->lock($entity, $lockMode, $lockVersion);
break;
case LockMode::NONE:
case LockMode::PESSIMISTIC_READ:
case LockMode::PESSIMISTIC_WRITE:
case LockMode::NONE === $lockMode:
case LockMode::PESSIMISTIC_READ === $lockMode:
case LockMode::PESSIMISTIC_WRITE === $lockMode:
$persister = $unitOfWork->getEntityPersister($class->name);
$persister->refresh($sortedId, $entity, $lockMode);
break;
@ -439,8 +439,8 @@ use Doctrine\Common\Util\ClassUtils;
$persister = $unitOfWork->getEntityPersister($class->name);
switch ($lockMode) {
case LockMode::OPTIMISTIC:
switch (true) {
case LockMode::OPTIMISTIC === $lockMode:
if ( ! $class->isVersioned) {
throw OptimisticLockException::notVersioned($class->name);
}
@ -451,8 +451,8 @@ use Doctrine\Common\Util\ClassUtils;
return $entity;
case LockMode::PESSIMISTIC_READ:
case LockMode::PESSIMISTIC_WRITE:
case LockMode::PESSIMISTIC_READ === $lockMode:
case LockMode::PESSIMISTIC_WRITE === $lockMode:
if ( ! $this->getConnection()->isTransactionActive()) {
throw TransactionRequiredException::transactionRequired();
}