From 741da7806c5d01796e243de9a122590151cb0c90 Mon Sep 17 00:00:00 2001 From: Peter Gribanov Date: Wed, 8 Jun 2016 10:29:39 +0300 Subject: [PATCH] change switch/case to if/else --- lib/Doctrine/ORM/EntityManager.php | 44 ++++++++++++++---------------- 1 file changed, 20 insertions(+), 24 deletions(-) diff --git a/lib/Doctrine/ORM/EntityManager.php b/lib/Doctrine/ORM/EntityManager.php index d66f454e7..a38ebecbf 100644 --- a/lib/Doctrine/ORM/EntityManager.php +++ b/lib/Doctrine/ORM/EntityManager.php @@ -22,6 +22,7 @@ namespace Doctrine\ORM; use Exception; use Doctrine\Common\EventManager; use Doctrine\DBAL\Connection; +use Doctrine\DBAL\DriverManager; use Doctrine\DBAL\LockMode; use Doctrine\ORM\Query\ResultSetMapping; use Doctrine\ORM\Proxy\ProxyFactory; @@ -420,14 +421,14 @@ use Doctrine\Common\Util\ClassUtils; return null; } - switch (true) { - case LockMode::OPTIMISTIC === $lockMode: + switch ($lockMode) { + case LockMode::OPTIMISTIC: $this->lock($entity, $lockMode, $lockVersion); break; - case LockMode::NONE === $lockMode: - case LockMode::PESSIMISTIC_READ === $lockMode: - case LockMode::PESSIMISTIC_WRITE === $lockMode: + case LockMode::NONE: + case LockMode::PESSIMISTIC_READ: + case LockMode::PESSIMISTIC_WRITE: $persister = $unitOfWork->getEntityPersister($class->name); $persister->refresh($sortedId, $entity, $lockMode); break; @@ -438,8 +439,8 @@ use Doctrine\Common\Util\ClassUtils; $persister = $unitOfWork->getEntityPersister($class->name); - switch (true) { - case LockMode::OPTIMISTIC === $lockMode: + switch ($lockMode) { + case LockMode::OPTIMISTIC: if ( ! $class->isVersioned) { throw OptimisticLockException::notVersioned($class->name); } @@ -450,8 +451,8 @@ use Doctrine\Common\Util\ClassUtils; return $entity; - case LockMode::PESSIMISTIC_READ === $lockMode: - case LockMode::PESSIMISTIC_WRITE === $lockMode: + case LockMode::PESSIMISTIC_READ: + case LockMode::PESSIMISTIC_WRITE: if ( ! $this->getConnection()->isTransactionActive()) { throw TransactionRequiredException::transactionRequired(); } @@ -835,21 +836,16 @@ use Doctrine\Common\Util\ClassUtils; throw ORMException::missingMappingDriverImpl(); } - switch (true) { - case (is_array($conn)): - $conn = \Doctrine\DBAL\DriverManager::getConnection( - $conn, $config, ($eventManager ?: new EventManager()) - ); - break; - - case ($conn instanceof Connection): - if ($eventManager !== null && $conn->getEventManager() !== $eventManager) { - throw ORMException::mismatchedEventManager(); - } - break; - - default: - throw new \InvalidArgumentException("Invalid argument: " . $conn); + if (is_array($conn)) { + $conn = DriverManager::getConnection( + $conn, $config, ($eventManager ?: new EventManager()) + ); + } elseif ($conn instanceof Connection) { + if ($eventManager !== null && $conn->getEventManager() !== $eventManager) { + throw ORMException::mismatchedEventManager(); + } + } else { + throw new \InvalidArgumentException("Invalid argument: " . $conn); } return new EntityManager($conn, $config, $conn->getEventManager());