Merge branch '4.4.x' into 5.0.x

* 4.4.x:
  Make options check strict again
  Make options check strict again (doctrine#7141)
  Remove obsolete upgrade note (doctrine#7138)
  Document the PDO subclasses backport (doctrine#7137)
  Downgrade PHP for the DB2 workflow (doctrine#7134)
  Workaround for MySQL 8.4 and unknown users (doctrine#7136)
  Leverage PHP 8.4 PDO classes, fix PHP 8.5 deprecation (doctrine#7132)
  Run tests on MySQL 8.4 LTS and 9.4 (doctrine#7133)

Author: derrabus

.github/workflows/continuous-integration.yml

@@ -156,18 +156,19 @@ jobs:
           - "8.4"
         mysql-version:
           - "8.0"
-          - "9.3"
+          - "8.4" # LTS
+          - "9.4"
         extension:
           - "mysqli"
           - "pdo_mysql"
         include:
           - config-file-suffix: "-tls"
             php-version: "8.4"
-            mysql-version: "9.1"
+            mysql-version: "9.4"
             extension: "mysqli"
           - config-file-suffix: "-stringify_fetches"
             php-version: "8.4"
-            mysql-version: "9.1"
+            mysql-version: "9.4"
             extension: "pdo_mysql"
 
   phpunit-mssql:
@@ -190,17 +191,18 @@ jobs:
           - "Latin1_General_100_CI_AS_SC_UTF8"
           - "Latin1_General_100_CS_AS_SC_UTF8"
 
-  phpunit-ibm-db2:
-    name: "PHPUnit with IBM DB2"
-    needs: "phpunit-smoke-check"
-    uses: ./.github/workflows/phpunit-db2.yml
-    with:
-      php-version: ${{ matrix.php-version }}
-
-    strategy:
-      matrix:
-        php-version:
-          - "8.4"
+# The DB2 workflow currently segfaults with PHP 8.4
+#  phpunit-ibm-db2:
+#    name: "PHPUnit with IBM DB2"
+#    needs: "phpunit-smoke-check"
+#    uses: ./.github/workflows/phpunit-db2.yml
+#    with:
+#      php-version: ${{ matrix.php-version }}
+#
+#    strategy:
+#      matrix:
+#        php-version:
+#          - "8.4"
 
   development-deps:
     name: "PHPUnit with PDO_SQLite and development dependencies"

UPGRADE.md

@@ -843,10 +843,7 @@ and `::dropUniqueConstraint()` respectively instead.
 ## Support for new PDO subclasses on PHP 8.4
 
 On PHP 8.4, if you call `getNativeConnection()` on a connection established through one of the PDO drivers,
-you will get an instance of the new PDO subclasses, e.g. `Pdo\Mysql` or `Pdo\Ppgsql` instead of just `PDO`.
-
-However, this currently does not apply to persistent connections.
-See https://github.com/php/php-src/issues/16314 for details.
+you will get an instance of the new PDO subclasses, e.g. `Pdo\Mysql` or `Pdo\Pgsql` instead of just `PDO`.
 
 ## Minor BC break: incompatible query cache format
 
@@ -1799,6 +1796,16 @@ The following methods have been removed.
 
 # Upgrade to 3.10
 
+## Support for new PDO subclasses on PHP 8.4
+
+In 3.10.2, we've backported support for new PDO subclasses introduced in PHP 8.4 because not using them
+could trigger deprecation warnings under certain circumstances in PHP 8.5.
+
+On PHP 8.4, if you call `getNativeConnection()` on a connection established through one of the PDO drivers,
+you will get an instance of the new PDO subclasses, e.g. `Pdo\Mysql` or `Pdo\Pgsql` instead of just `PDO`.
+
+## Optional `doctrine/cache` dependency
+
 The `doctrine/cache` package is now an optional dependency. If you are using the
 `Doctrine\DBAL\Cache` classes, you need to require the `doctrine/cache` package
 explicitly.

src/Driver/API/MySQL/ExceptionConverter.php

@@ -22,6 +22,8 @@
 use Doctrine\DBAL\Exception\UniqueConstraintViolationException;
 use Doctrine\DBAL\Query;
 
+use function str_contains;
+
 /** @internal */
 final class ExceptionConverter implements ExceptionConverterInterface
 {
@@ -31,6 +33,15 @@ final class ExceptionConverter implements ExceptionConverterInterface
      */
     public function convert(Exception $exception, ?Query $query): DriverException
     {
+        if (
+            $exception->getCode() === 1524
+            && str_contains($exception->getMessage(), 'Plugin \'mysql_native_password\' is not loaded')
+        ) {
+            // Workaround for MySQL 8.4 if we request an unknown user.
+            // https://bugs.mysql.com/bug.php?id=114876
+            return new ConnectionException($exception, $query);
+        }
+
         return match ($exception->getCode()) {
             1008 => new DatabaseDoesNotExist($exception, $query),
             1213 => new DeadlockException($exception, $query),

src/Driver/PDO/PgSQL/Driver.php

@@ -9,6 +9,7 @@
 use Doctrine\DBAL\Driver\PDO\Exception;
 use Doctrine\DBAL\Driver\PDO\Exception\InvalidConfiguration;
 use PDO;
+use Pdo\Pgsql;
 use PDOException;
 use SensitiveParameter;
 
@@ -50,10 +51,10 @@ public function connect(
         }
 
         if (
-            ! isset($driverOptions[PDO::PGSQL_ATTR_DISABLE_PREPARES])
-            || $driverOptions[PDO::PGSQL_ATTR_DISABLE_PREPARES] === true
+            ! isset($driverOptions[Pgsql::ATTR_DISABLE_PREPARES])
+            || $driverOptions[Pgsql::ATTR_DISABLE_PREPARES] === true
         ) {
-            $pdo->setAttribute(PDO::PGSQL_ATTR_DISABLE_PREPARES, true);
+            $pdo->setAttribute(Pgsql::ATTR_DISABLE_PREPARES, true);
         }
 
         $connection = new Connection($pdo);