Migrate to wrapInTransaction()

composer.json

@@ -19,15 +19,16 @@
         "doctrine/persistence": "^1.3.3|^2.0|^3.0"
     },
     "conflict": {
-        "doctrine/phpcr-odm": "<1.3.0",
-        "doctrine/dbal": "<2.13"
+        "doctrine/dbal": "<2.13",
+        "doctrine/orm": "<2.10",
+        "doctrine/phpcr-odm": "<1.3.0"
     },
     "require-dev": {
         "ext-sqlite3": "*",
         "doctrine/coding-standard": "^9.0",
         "doctrine/dbal": "^2.13 || ^3.0",
         "doctrine/mongodb-odm": "^1.3.0 || ^2.0.0",
-        "doctrine/orm": "^2.7.0",
+        "doctrine/orm": "^2.10.0",
         "jangregor/phpstan-prophecy": "^1",
         "phpstan/phpstan": "^1.5",
         "phpunit/phpunit": "^8.5 || ^9.5",

lib/Doctrine/Common/DataFixtures/Executor/ORMExecutor.php

@@ -7,16 +7,21 @@
 use Doctrine\Common\DataFixtures\Event\Listener\ORMReferenceListener;
 use Doctrine\Common\DataFixtures\Purger\ORMPurgerInterface;
 use Doctrine\Common\DataFixtures\ReferenceRepository;
+use Doctrine\ORM\Decorator\EntityManagerDecorator;
+use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * Class responsible for executing data fixtures.
  */
 class ORMExecutor extends AbstractExecutor
 {
-    /** @var EntityManagerInterface */
+    /** @var EntityManager|EntityManagerDecorator */
     private $em;
 
+    /** @var EntityManagerInterface */
+    private $originalManager;
+
     /** @var ORMReferenceListener */
     private $listener;
 
@@ -27,7 +32,14 @@ class ORMExecutor extends AbstractExecutor
      */
     public function __construct(EntityManagerInterface $em, ?ORMPurgerInterface $purger = null)
     {
-        $this->em = $em;
+        $this->originalManager = $em;
+        // Make sure, wrapInTransaction() exists on the EM.
+        // To be removed when dropping support for ORM 2
+        $this->em = $em instanceof EntityManager || $em instanceof EntityManagerDecorator
+            ? $em
+            : new class ($em) extends EntityManagerDecorator {
+            };
+
         if ($purger !== null) {
             $this->purger = $purger;
             $this->purger->setEntityManager($em);
@@ -45,7 +57,7 @@ public function __construct(EntityManagerInterface $em, ?ORMPurgerInterface $pur
      */
     public function getObjectManager()
     {
-        return $this->em;
+        return $this->originalManager;
     }
 
     /** @inheritDoc */
@@ -65,7 +77,7 @@ public function setReferenceRepository(ReferenceRepository $referenceRepository)
     public function execute(array $fixtures, $append = false)
     {
         $executor = $this;
-        $this->em->transactional(static function (EntityManagerInterface $em) use ($executor, $fixtures, $append) {
+        $this->em->wrapInTransaction(static function (EntityManagerInterface $em) use ($executor, $fixtures, $append) {
             if ($append === false) {
                 $executor->purge();
             }

tests/Doctrine/Tests/Common/DataFixtures/Executor/ORMExecutorTest.php

@@ -4,9 +4,12 @@
 
 namespace Doctrine\Tests\Common\DataFixtures\Executor;
 
+use Closure;
 use Doctrine\Common\DataFixtures\Executor\ORMExecutor;
 use Doctrine\Common\DataFixtures\FixtureInterface;
 use Doctrine\Common\DataFixtures\Purger\ORMPurger;
+use Doctrine\Common\EventManager;
+use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\Tests\Common\DataFixtures\BaseTest;
 use PHPUnit\Framework\MockObject\MockObject;
 
@@ -56,6 +59,16 @@ public function testExecuteTransaction(): void
         $executor->execute([$fixture], true);
     }
 
+    public function testCustomLegacyEntityManager(): void
+    {
+        $em = $this->createMock(EntityManagerInterface::class);
+        $em->method('getEventManager')->willReturn($this->createMock(EventManager::class));
+        $em->expects($this->once())->method('transactional')->with(self::isInstanceOf(Closure::class));
+
+        $executor = new ORMExecutor($em);
+        @$executor->execute([]);
+    }
+
     /**
      * @return FixtureInterface&MockObject
      */