Merge branch '5.4' into 6.0

* 5.4:
  fix SQLSRV throws for method_exists()
  [HttpKernel] Add basic support for language negotiation
  [Messenger] Add a middleware to log when transaction has been left open
  [HttpClient] Add method to set response factory in mock client
  Move array_merge calls out of loops to improve performance
  Remove references to DBALException
  [VarDumper] Fix handling of "new" in initializers on PHP 8.1

Author: derrabus

CHANGELOG.md

@@ -6,6 +6,10 @@ CHANGELOG
 
  * Remove `DoctrineTestHelper` and `TestRepositoryFactory`
 
+5.4
+---
+ * Add a middleware to log when transaction has been left open `DoctrineOpenTransactionLoggerMiddleware`
+
 5.3
 ---
 

Messenger/DoctrineOpenTransactionLoggerMiddleware.php

@@ -0,0 +1,49 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * 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;
+
+/**
+ * Middleware to log when transaction has been left open.
+ *
+ * @author Grégoire Pineau <[email protected]>
+ */
+class DoctrineOpenTransactionLoggerMiddleware extends AbstractDoctrineMiddleware
+{
+    private $logger;
+
+    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(),
+                ]);
+            }
+        }
+    }
+}

Messenger/DoctrinePingConnectionMiddleware.php

@@ -11,8 +11,7 @@
 
 namespace Symfony\Bridge\Doctrine\Messenger;
 
-use Doctrine\DBAL\DBALException;
-use Doctrine\DBAL\Exception;
+use Doctrine\DBAL\Exception as DBALException;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Messenger\Envelope;
 use Symfony\Component\Messenger\Middleware\StackInterface;
@@ -40,7 +39,7 @@ private function pingConnection(EntityManagerInterface $entityManager)
 
         try {
             $connection->executeQuery($connection->getDatabasePlatform()->getDummySelectSQL());
-        } catch (DBALException | Exception $e) {
+        } catch (DBALException $e) {
             $connection->close();
             $connection->connect();
         }

Tests/Messenger/DoctrineOpenTransactionLoggerMiddlewareTest.php

@@ -0,0 +1,62 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * 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\AbstractLogger;
+use Symfony\Bridge\Doctrine\Messenger\DoctrineOpenTransactionLoggerMiddleware;
+use Symfony\Component\Messenger\Envelope;
+use Symfony\Component\Messenger\Test\Middleware\MiddlewareTestCase;
+
+class DoctrineOpenTransactionLoggerMiddlewareTest extends MiddlewareTestCase
+{
+    private $logger;
+    private $connection;
+    private $entityManager;
+    private $middleware;
+
+    protected function setUp(): void
+    {
+        $this->logger = new class() extends AbstractLogger {
+            public $logs = [];
+
+            public function log($level, $message, $context = []): void
+            {
+                $this->logs[$level][] = $message;
+            }
+        };
+
+        $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 DoctrineOpenTransactionLoggerMiddleware($managerRegistry, null, $this->logger);
+    }
+
+    public function testMiddlewareWrapsInTransactionAndFlushes()
+    {
+        $this->connection->expects($this->exactly(1))
+            ->method('isTransactionActive')
+            ->will($this->onConsecutiveCalls(true, true, false))
+        ;
+
+        $this->middleware->handle(new Envelope(new \stdClass()), $this->getStackMock());
+
+        $this->assertSame(['error' => ['A handler opened a transaction but did not close it.']], $this->logger->logs);
+    }
+}

Tests/Messenger/DoctrinePingConnectionMiddlewareTest.php

@@ -12,8 +12,7 @@
 namespace Symfony\Bridge\Doctrine\Tests\Messenger;
 
 use Doctrine\DBAL\Connection;
-use Doctrine\DBAL\DBALException;
-use Doctrine\DBAL\Exception;
+use Doctrine\DBAL\Exception as DBALException;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\Persistence\ManagerRegistry;
 use Symfony\Bridge\Doctrine\Messenger\DoctrinePingConnectionMiddleware;
@@ -50,7 +49,7 @@ public function testMiddlewarePingOk()
     {
         $this->connection->expects($this->once())
             ->method('getDatabasePlatform')
-            ->will($this->throwException(class_exists(Exception::class) ? new Exception() : new DBALException()));
+            ->will($this->throwException(new DBALException()));
 
         $this->connection->expects($this->once())
             ->method('close')
@@ -69,7 +68,7 @@ public function testMiddlewarePingResetEntityManager()
     {
         $this->connection->expects($this->once())
             ->method('getDatabasePlatform')
-            ->will($this->throwException(class_exists(Exception::class) ? new Exception() : new DBALException()));
+            ->will($this->throwException(new DBALException()));
 
         $this->entityManager->expects($this->once())
             ->method('isOpen')

composer.json

@@ -46,11 +46,12 @@
         "doctrine/annotations": "^1.10.4",
         "doctrine/collections": "~1.0",
         "doctrine/data-fixtures": "^1.1",
-        "doctrine/dbal": "^2.10|^3.0",
-        "doctrine/orm": "^2.7.3"
+        "doctrine/dbal": "^2.13|^3.0",
+        "doctrine/orm": "^2.7.3",
+        "psr/log": "^1|^2|^3"
     },
     "conflict": {
-        "doctrine/dbal": "<2.10",
+        "doctrine/dbal": "<2.13",
         "doctrine/orm": "<2.7.3",
         "phpunit/phpunit": "<5.4.3",
         "symfony/dependency-injection": "<5.4",