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

Store/PdoStore.php

@@ -12,9 +12,8 @@
 namespace Symfony\Component\Lock\Store;
 
 use Doctrine\DBAL\Connection;
-use Doctrine\DBAL\DBALException;
 use Doctrine\DBAL\DriverManager;
-use Doctrine\DBAL\Exception;
+use Doctrine\DBAL\Exception as DBALException;
 use Doctrine\DBAL\Exception\TableNotFoundException;
 use Doctrine\DBAL\Schema\Schema;
 use Symfony\Component\Lock\Exception\InvalidArgumentException;
@@ -141,7 +140,7 @@ public function save(Key $key)
                 $this->createTable();
             }
             $stmt->execute();
-        } catch (DBALException | Exception $e) {
+        } catch (DBALException $e) {
             // the lock is already acquired. It could be us. Let's try to put off.
             $this->putOffExpiration($key, $this->initialTtl);
         } catch (\PDOException $e) {
@@ -252,7 +251,6 @@ private function getConnection(): \PDO|Connection
      *
      * @throws \PDOException    When the table already exists
      * @throws DBALException    When the table already exists
-     * @throws Exception        When the table already exists
      * @throws \DomainException When an unsupported PDO driver is used
      */
     public function createTable(): void
@@ -266,7 +264,7 @@ public function createTable(): void
             $this->addTableToSchema($schema);
 
             foreach ($schema->toSql($conn->getDatabasePlatform()) as $sql) {
-                if (method_exists($conn, 'executeStatement')) {
+                if ($conn instanceof Connection && method_exists($conn, 'executeStatement')) {
                     $conn->executeStatement($sql);
                 } else {
                     $conn->exec($sql);
@@ -296,7 +294,7 @@ public function createTable(): void
                 throw new \DomainException(sprintf('Creating the lock table is currently not implemented for platform "%s".', $driver));
         }
 
-        if (method_exists($conn, 'executeStatement')) {
+        if ($conn instanceof Connection && method_exists($conn, 'executeStatement')) {
             $conn->executeStatement($sql);
         } else {
             $conn->exec($sql);
@@ -327,7 +325,7 @@ private function prune(): void
         $sql = "DELETE FROM $this->table WHERE $this->expirationCol <= {$this->getCurrentTimestampStatement()}";
 
         $conn = $this->getConnection();
-        if (method_exists($conn, 'executeStatement')) {
+        if ($conn instanceof Connection && method_exists($conn, 'executeStatement')) {
             $conn->executeStatement($sql);
         } else {
             $conn->exec($sql);

composer.json

@@ -20,12 +20,12 @@
         "psr/log": "^1|^2|^3"
     },
     "require-dev": {
-        "doctrine/dbal": "^2.10|^3.0",
+        "doctrine/dbal": "^2.13|^3.0",
         "mongodb/mongodb": "~1.1",
         "predis/predis": "~1.0"
     },
     "conflict": {
-        "doctrine/dbal": "<2.10"
+        "doctrine/dbal": "<2.13"
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Lock\\": "" },