diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 306052a9304..a6cd38aea11 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -138,8 +138,7 @@ jobs: - "8.4" mariadb-version: # keep in sync with https://mariadb.org/about/#maintenance-policy - - "10.5" # Oldest version supported by DBAL, LTS (Jun 2025) We have code specific to 10.5.2-10.6.0 - - "10.6" # LTS (Jul 2026) We have code specific to 10.6.0-10.10.0 + - "10.6" # Oldest version supported by DBAL, LTS (Jul 2026) We have code specific to 10.6.0-10.10.0 - "10.11" # LTS (Feb 2028) We have code specific to ^10.10 - "11.4" # LTS (May 2029) - "11.8" # LTS (Jun 2028) diff --git a/UPGRADE.md b/UPGRADE.md index a99985cffcf..4cedb4323a8 100644 --- a/UPGRADE.md +++ b/UPGRADE.md @@ -340,9 +340,9 @@ The `CREATE_INDEXES` and `CREATE_FOREIGNKEYS` constants have been removed from t A new method `getColumnName()` has been added to the `Result` interface and must be implemented by all drivers and middleware. -## BC BREAK: Removed support for MariaDB 10.4, MySQL 5.7 and Postgres 10 + 11 +## BC BREAK: Removed support for MariaDB 10.4 + 10.5, MySQL 5.7 and Postgres 10 + 11 -* Upgrade to MariaDB 10.5 or later. +* Upgrade to MariaDB 10.6 or later. * Upgrade to MySQL 8.0 or later. * Upgrade to Postgres 12 or later. diff --git a/src/Driver/AbstractMySQLDriver.php b/src/Driver/AbstractMySQLDriver.php index 6931cbcaf2a..9cb04cccea6 100644 --- a/src/Driver/AbstractMySQLDriver.php +++ b/src/Driver/AbstractMySQLDriver.php @@ -10,11 +10,9 @@ use Doctrine\DBAL\Platforms\AbstractMySQLPlatform; use Doctrine\DBAL\Platforms\Exception\InvalidPlatformVersion; use Doctrine\DBAL\Platforms\MariaDB1010Platform; -use Doctrine\DBAL\Platforms\MariaDB1060Platform; use Doctrine\DBAL\Platforms\MariaDBPlatform; use Doctrine\DBAL\Platforms\MySQLPlatform; use Doctrine\DBAL\ServerVersionProvider; -use Doctrine\Deprecations\Deprecation; use function preg_match; use function stripos; @@ -39,16 +37,6 @@ public function getDatabasePlatform(ServerVersionProvider $versionProvider): Abs return new MariaDB1010Platform(); } - if (version_compare($mariaDbVersion, '10.6.0', '>=')) { - return new MariaDB1060Platform(); - } - - Deprecation::trigger( - 'doctrine/dbal', - 'https://github.com/doctrine/dbal/pull/6343', - 'Support for MariaDB < 10.6.0 is deprecated and will be removed in DBAL 5', - ); - return new MariaDBPlatform(); } diff --git a/src/Platforms/MariaDB1010Platform.php b/src/Platforms/MariaDB1010Platform.php index 22232bb32f5..b16c782cdd3 100644 --- a/src/Platforms/MariaDB1010Platform.php +++ b/src/Platforms/MariaDB1010Platform.php @@ -11,7 +11,7 @@ /** * Provides the behavior, features and SQL dialect of the MariaDB 10.10 database platform. */ -class MariaDB1010Platform extends MariaDB1060Platform +class MariaDB1010Platform extends MariaDBPlatform { public function createSelectSQLBuilder(): SelectSQLBuilder { diff --git a/src/Platforms/MariaDB1060Platform.php b/src/Platforms/MariaDB1060Platform.php deleted file mode 100644 index f00b000b592..00000000000 --- a/src/Platforms/MariaDB1060Platform.php +++ /dev/null @@ -1,20 +0,0 @@ -