Merge branch '2.12.x' into 3.0.x

UPGRADE.md

@@ -456,7 +456,7 @@ The following PDO-related classes outside of the PDO namespace have been depreca
 3. `prefersSequences()`.
 4. `supportsForeignKeyOnUpdate()`.
 
-##`ServerInfoAwareConnection::requiresQueryForServerVersion()` is deprecated.
+## `ServerInfoAwareConnection::requiresQueryForServerVersion()` is deprecated.
 
 The `ServerInfoAwareConnection::requiresQueryForServerVersion()` method has been deprecated as an implementation detail which is the same for almost all supported drivers.
 

tests/Functional/TransactionTest.php

@@ -4,6 +4,7 @@
 
 use Doctrine\DBAL\Platforms\MySQLPlatform;
 use Doctrine\DBAL\Tests\FunctionalTestCase;
+use PDOException;
 
 use function sleep;
 
@@ -35,6 +36,12 @@ public function testCommitFalse(): void
 
         sleep(2); // during the sleep mysql will close the connection
 
-        self::assertFalse(@$this->connection->commit()); // we will ignore `MySQL server has gone away` warnings
+        try {
+            self::assertFalse(@$this->connection->commit()); // we will ignore `MySQL server has gone away` warnings
+        } catch (PDOException $e) {
+            /* For PDO, we are using ERRMODE EXCEPTION, so this catch should be
+             * necessary as the equivalent of the error control operator above.
+             * This seems to be the case only since PHP 8 */
+        }
     }
 }