Fix TransactionRequiredException for pessimistic lock

doctrine · Sep 11, 2022 · 3da2eef · 3da2eef
1 parent e836f50
commit 3da2eef
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/lib/Doctrine/ORM/EntityManager.php b/lib/Doctrine/ORM/EntityManager.php
@@ -700,6 +700,7 @@ public function remove($entity)
  *
  * @throws ORMInvalidArgumentException
  * @throws ORMException
+ * @throws TransactionRequiredException
  */
  public function refresh($entity, $lockMode = null)
  {

diff --git a/lib/Doctrine/ORM/UnitOfWork.php b/lib/Doctrine/ORM/UnitOfWork.php
@@ -2188,6 +2188,7 @@ private function doDetach(
  * @return void
  *
  * @throws InvalidArgumentException If the entity is not MANAGED.
+ * @throws TransactionRequiredException
  */
  public function refresh($entity, $lockMode = null)
  {
@@ -2204,9 +2205,18 @@ public function refresh($entity, $lockMode = null)
  * @psalm-param LockMode::*|null $lockMode
  *
  * @throws ORMInvalidArgumentException If the entity is not MANAGED.
+ * @throws TransactionRequiredException
  */
  private function doRefresh($entity, array &$visited, $lockMode = null): void
  {
+ switch(true) {
+ case $lockMode === LockMode::PESSIMISTIC_READ:
+ case $lockMode === LockMode::PESSIMISTIC_WRITE:
+ if (! $this->em->getConnection()->isTransactionActive()) {
+ throw TransactionRequiredException::transactionRequired();
+ }
+ }
+
  $oid = spl_object_id($entity);
 
  if (isset($visited[$oid])) {