[DoctrineBridge] fix messenger bus dispatch inside an active transaction

symfony · nicolas-grekas · Jul 26, 2024 · Jul 24, 2024 · Jul 26, 2024 · f164370dcf1109dbf8d90459a333ef3622a22977
commit f164370dcf1109dbf8d90459a333ef3622a22977
diff --git a/src/Symfony/Bridge/Doctrine/Messenger/DoctrineOpenTransactionLoggerMiddleware.php b/src/Symfony/Bridge/Doctrine/Messenger/DoctrineOpenTransactionLoggerMiddleware.php
@@ -43,11 +43,12 @@ protected function handleForManager(EntityManagerInterface $entityManager, Envel
        }

        $this->isHandling = true;
+        $initialTransactionLevel = $entityManager->getConnection()->getTransactionNestingLevel();

        try {
            return $stack->next()->handle($envelope, $stack);
        } finally {
-            if ($entityManager->getConnection()->isTransactionActive()) {
+            if ($entityManager->getConnection()->getTransactionNestingLevel() > $initialTransactionLevel) {
                $this->logger->error('A handler opened a transaction but did not close it.', [
                    'message' => $envelope->getMessage(),
                ]);

diff --git a/src/Symfony/Bridge/Doctrine/Tests/Messenger/DoctrineOpenTransactionLoggerMiddlewareTest.php b/src/Symfony/Bridge/Doctrine/Tests/Messenger/DoctrineOpenTransactionLoggerMiddlewareTest.php
@@ -50,9 +50,9 @@ public function log($level, $message, $context = []): void

    public function testMiddlewareWrapsInTransactionAndFlushes()
    {
-        $this->connection->expects($this->exactly(1))
-            ->method('isTransactionActive')
-            ->willReturn(true, true, false)
+        $this->connection->expects($this->exactly(2))
+            ->method('getTransactionNestingLevel')
+            ->willReturn(0, 1)
        ;

        $this->middleware->handle(new Envelope(new \stdClass()), $this->getStackMock());