Merge pull request #46 from chihiro-adachi/doctrine-dbal

Doctrine\DBAL
EC-CUBE · Jun 26, 2023 · 60179f7 · 60179f7
2 parents 69b2eb0 + 6dc601b
commit 60179f7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/src/application/Eccube/Service/PurchaseFlow/Processor/StockReduceProcessor.php b/src/application/Eccube/Service/PurchaseFlow/Processor/StockReduceProcessor.php
@@ -13,7 +13,7 @@
 
 namespace Eccube\Service\PurchaseFlow\Processor;
 
-use Doctrine\DBAL\LockMode;
+
 use Eccube\Entity\ItemHolderInterface;
 use Eccube\Entity\Order;
 use Eccube\Entity\ProductStock;
@@ -83,7 +83,7 @@ private function eachProductOrderItems(ItemHolderInterface $itemHolder, callable
                 $productStock = $item->getProductClass()->getProductStock();
                 if ($productStock->getProductClassId() === null) {
                     // 在庫に対してロックを実行
-                    $this->entityManager->lock($productStock, LockMode::PESSIMISTIC_WRITE);
+                    $this->entityManager->pessimisticWriteLock($productStock);
                     $this->entityManager->refresh($productStock);
                     $productStock->setProductClassId($item->getProductClass()->getId());
                 }

diff --git a/src/framework/Eccube/ORM/EntityManager.php b/src/framework/Eccube/ORM/EntityManager.php
@@ -14,6 +14,7 @@
 namespace Eccube\ORM;
 
 use Doctrine\DBAL\Exception\ForeignKeyConstraintViolationException as DoctrineForeignKeyConstraintViolationException;
+use Doctrine\DBAL\LockMode;
 use Doctrine\ORM\EntityManagerInterface;
 use Eccube\ORM\Exception\ForeignKeyConstraintViolationException;
 use Eccube\ORM\Exception\ORMException;
@@ -83,18 +84,18 @@ public function clear($entityName = null)
     /**
      * @throws ORMException
      */
-    public function lock($entity, $lockMode, $lockVersion = null)
+    public function pessimisticWriteLock($entity)
     {
         try {
-            $this->entityManager->lock($entity, $lockMode, $lockVersion);
+            $this->entityManager->lock($entity, LockMode::PESSIMISTIC_WRITE);
         } catch (\Exception $e) {
             throw new ORMException($e);
         }
     }
 
-    public function refresh($entity, ?int $lockMode = null)
+    public function refresh($entity)
     {
-        $this->entityManager->refresh($entity, $lockMode);
+        $this->entityManager->refresh($entity);
     }
 
     /**
@@ -136,9 +137,9 @@ public function isRollbackOnly(): bool
         return $this->entityManager->getConnection()->getNativeConnection()->isRollbackOnly();
     }
 
-    public function find($className, $id, $lockMode = null, $lockVersion = null)
+    public function find($className, $id)
     {
-        return $this->entityManager->find($className, $id, $lockMode, $lockVersion);
+        return $this->entityManager->find($className, $id);
     }
 
     public function isStateManaged($entity, $assume = null): bool