symfony
diff --git a/‎src/Symfony/Bridge/Doctrine/CHANGELOG.md
Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/CHANGELOG.md
+4Lines changed: 4 additions & 0 deletions b/‎src/Symfony/Bridge/Doctrine/CHANGELOG.md
Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/CHANGELOG.md
+4Lines changed: 4 additions & 0 deletions
diff --git a/‎src/Symfony/Bridge/Doctrine/Messenger/DoctrineTransactionWatchdogMiddleware.php
Copy file name to clipboard
+52Lines changed: 52 additions & 0 deletions b/‎src/Symfony/Bridge/Doctrine/Messenger/DoctrineTransactionWatchdogMiddleware.php
Copy file name to clipboard
+52Lines changed: 52 additions & 0 deletions
diff --git a/‎src/Symfony/Bridge/Doctrine/Tests/Messenger/DoctrineTransactionWatchdogMiddlewareTest.php
Copy file name to clipboard
+57Lines changed: 57 additions & 0 deletions b/‎src/Symfony/Bridge/Doctrine/Tests/Messenger/DoctrineTransactionWatchdogMiddlewareTest.php
Copy file name to clipboard
+57Lines changed: 57 additions & 0 deletions
@@ -1,6 +1,10 @@
 CHANGELOG
 =========
 
+5.4
+---
+ * Add a middleware to ensure all transaction has been closed `DoctrineTransactionWatchdogMiddleware`
+
 5.3
 ---
 
 
@@ -0,0 +1,52 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\Doctrine\Messenger;
+
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\Persistence\ManagerRegistry;
+use Psr\Log\LoggerInterface;
+use Psr\Log\NullLogger;
+use Symfony\Component\Messenger\Envelope;
+use Symfony\Component\Messenger\Middleware\StackInterface;
+
+/**
+ * Search for open transactions, then log and close them.
+ *
+ * @author Grégoire Pineau <lyrixx@lyrixx.info>
+ */
+class DoctrineTransactionWatchdogMiddleware extends AbstractDoctrineMiddleware
+{
+    public function __construct(ManagerRegistry $managerRegistry, string $entityManagerName = null, LoggerInterface $logger = null)
+    {
+        parent::__construct($managerRegistry, $entityManagerName);
+
+        $this->logger = $logger ?? new NullLogger();
+    }
+
+    protected function handleForManager(EntityManagerInterface $entityManager, Envelope $envelope, StackInterface $stack): Envelope
+    {
+        try {
+            return $stack->next()->handle($envelope, $stack);
+        } finally {
+            if ($entityManager->getConnection()->isTransactionActive()) {
+                $this->logger->error('A handler opened a transaction but did not close it.', [
+                    'message' => $envelope->getMessage(),
+                ]);
+
+                $connection = $entityManager->getConnection();
+                while ($connection->isTransactionActive()) {
+                    $connection->rollBack();
+                }
+            }
+        }
+    }
+}
@@ -0,0 +1,57 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\Doctrine\Tests\Messenger;
+
+use Doctrine\DBAL\Connection;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\Persistence\ManagerRegistry;
+use Psr\Log\Test\TestLogger;
+use Symfony\Bridge\Doctrine\Messenger\DoctrineTransactionWatchdogMiddleware;
+use Symfony\Component\Messenger\Envelope;
+use Symfony\Component\Messenger\Test\Middleware\MiddlewareTestCase;
+
+class DoctrineTransactionWatchdogMiddlewareTest extends MiddlewareTestCase
+{
+    private $logger;
+    private $connection;
+    private $entityManager;
+    private $middleware;
+
+    protected function setUp(): void
+    {
+        $this->logger = new TestLogger();
+        $this->connection = $this->createMock(Connection::class);
+
+        $this->entityManager = $this->createMock(EntityManagerInterface::class);
+        $this->entityManager->method('getConnection')->willReturn($this->connection);
+
+        $managerRegistry = $this->createMock(ManagerRegistry::class);
+        $managerRegistry->method('getManager')->willReturn($this->entityManager);
+
+        $this->middleware = new DoctrineTransactionWatchdogMiddleware($managerRegistry, null, $this->logger);
+    }
+
+    public function testMiddlewareWrapsInTransactionAndFlushes()
+    {
+        $this->connection->expects($this->exactly(3))
+            ->method('isTransactionActive')
+            ->will($this->onConsecutiveCalls(true, true, false))
+        ;
+        $this->connection->expects($this->exactly(1))
+            ->method('rollBack')
+        ;
+
+        $this->middleware->handle(new Envelope(new \stdClass()), $this->getStackMock());
+
+        $this->logger->hasErrorThatContains('A handler opened a transaction but did not close it.');
+    }
+}