Merge pull request #5128 from chihiro-adachi/fix-delete-login-member

ログインしたメンバーを削除できるように修正
EC-CUBE · Sep 1, 2021 · 4186b99 · 4186b99
2 parents 45e239e + f6f887b
commit 4186b99
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/src/Eccube/Repository/MemberRepository.php b/src/Eccube/Repository/MemberRepository.php
@@ -121,6 +121,12 @@ public function delete($Member)
             ->execute();
 
         $em = $this->getEntityManager();
+
+        // ログインしたメンバーの外部参照制約を解除する
+        // https://github.com/EC-CUBE/ec-cube/issues/5119
+        $Member->setCreator(null);
+        $em->flush();
+
         $em->remove($Member);
         $em->flush();
     }

diff --git a/tests/Eccube/Tests/Repository/MemberRepositoryTest.php b/tests/Eccube/Tests/Repository/MemberRepositoryTest.php
@@ -172,4 +172,18 @@ public function testDeleteWithException()
         $this->memberRepo->delete($Member1);
         $this->fail();
     }
+
+    /**
+     * https://github.com/EC-CUBE/ec-cube/issues/5119
+     */
+    public function testDeleteWithException_SelfForeignKey()
+    {
+        $Member1 = $this->createMember();
+        $Member1->setCreator($Member1);
+        $this->entityManager->flush();
+
+        // 削除できることを確認
+        $this->memberRepo->delete($Member1);
+        self::assertNull($Member1->getId());
+    }
 }