symfony
diff --git a/‎src/Symfony/Bridge/Doctrine/Messenger/DoctrineOpenTransactionLoggerMiddleware.php
Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/Messenger/DoctrineOpenTransactionLoggerMiddleware.php
+2-1Lines changed: 2 additions & 1 deletion b/‎src/Symfony/Bridge/Doctrine/Messenger/DoctrineOpenTransactionLoggerMiddleware.php
Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/Messenger/DoctrineOpenTransactionLoggerMiddleware.php
+2-1Lines changed: 2 additions & 1 deletion
diff --git a/‎src/Symfony/Bridge/Doctrine/Tests/Messenger/DoctrineOpenTransactionLoggerMiddlewareTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/Tests/Messenger/DoctrineOpenTransactionLoggerMiddlewareTest.php
+3-3Lines changed: 3 additions & 3 deletions b/‎src/Symfony/Bridge/Doctrine/Tests/Messenger/DoctrineOpenTransactionLoggerMiddlewareTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/Tests/Messenger/DoctrineOpenTransactionLoggerMiddlewareTest.php
+3-3Lines changed: 3 additions & 3 deletions
@@ -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(),
                 ]);
 
@@ -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());
Original file line number	Diff line number	Diff line change
`@@ -50,9 +50,9 @@ public function log($level, $message, $context = []): void`
`50`	`50`
`51`	`51`	`public function testMiddlewareWrapsInTransactionAndFlushes()`
`52`	`52`	`{`
`53`		`- $this->connection->expects($this->exactly(1))`
`54`		`- ->method('isTransactionActive')`
`55`		`- ->willReturn(true, true, false)`
	`53`	`+ $this->connection->expects($this->exactly(2))`
	`54`	`+ ->method('getTransactionNestingLevel')`
	`55`	`+ ->willReturn(0, 1)`
`56`	`56`	`;`
`57`	`57`
`58`	`58`	`$this->middleware->handle(new Envelope(new \stdClass()), $this->getStackMock());`