Remove support for MariaDB 10.5 (#7008)

|      Q       |   A
|------------- | -----------
| Type         | improvement
| Fixed issues | Follows #7000

#### Summary

MariaDB 10.5 will be EOL before we release DBAL 5.

Author: derrabus

.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)

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.
 

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();
         }
 

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
     {

src/Platforms/MariaDB1060Platform.php

@@ -6,8 +6,6 @@
 
 use Doctrine\DBAL\Schema\ForeignKeyConstraint;
 use Doctrine\DBAL\Schema\Index;
-use Doctrine\DBAL\SQL\Builder\DefaultSelectSQLBuilder;
-use Doctrine\DBAL\SQL\Builder\SelectSQLBuilder;
 use Doctrine\DBAL\Types\JsonType;
 
 use function sprintf;
@@ -94,9 +92,4 @@ protected function getColumnDeclarationSQL(array $column): string
 
         return parent::getColumnDeclarationSQL($column);
     }
-
-    public function createSelectSQLBuilder(): SelectSQLBuilder
-    {
-        return new DefaultSelectSQLBuilder($this, 'FOR UPDATE', null);
-    }
 }

src/Platforms/MariaDBPlatform.php

@@ -8,7 +8,6 @@
 use Doctrine\DBAL\Driver;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Platforms\MariaDB1010Platform;
-use Doctrine\DBAL\Platforms\MariaDB1060Platform;
 use Doctrine\DBAL\Platforms\MariaDBPlatform;
 use Doctrine\DBAL\Platforms\MySQLPlatform;
 use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
@@ -37,9 +36,8 @@ public static function mySQLVersionProvider(): array
             ['5.5.40-MariaDB-1~wheezy', MariaDBPlatform::class],
             ['5.5.5-MariaDB-10.2.8+maria~xenial-log', MariaDBPlatform::class],
             ['10.2.8-MariaDB-10.2.8+maria~xenial-log', MariaDBPlatform::class],
-            ['10.5.2-MariaDB-1~lenny-log', MariaDBPlatform::class],
-            ['10.6.0-MariaDB-1~lenny-log', MariaDB1060Platform::class],
-            ['10.9.3-MariaDB-1~lenny-log', MariaDB1060Platform::class],
+            ['10.6.0-MariaDB-1~lenny-log', MariaDBPlatform::class],
+            ['10.9.3-MariaDB-1~lenny-log', MariaDBPlatform::class],
             ['11.0.2-MariaDB-1:11.0.2+maria~ubu2204', MariaDB1010Platform::class],
         ];
     }

tests/Driver/VersionAwarePlatformDriverTest.php

@@ -9,7 +9,6 @@
 use Doctrine\DBAL\Exception;
 use Doctrine\DBAL\ParameterType;
 use Doctrine\DBAL\Platforms\DB2Platform;
-use Doctrine\DBAL\Platforms\MariaDB1060Platform;
 use Doctrine\DBAL\Platforms\MariaDBPlatform;
 use Doctrine\DBAL\Platforms\MySQLPlatform;
 use Doctrine\DBAL\Platforms\OraclePlatform;
@@ -549,7 +548,7 @@ private function platformSupportsSkipLocked(): bool
         }
 
         if ($platform instanceof MariaDBPlatform) {
-            return $platform instanceof MariaDB1060Platform;
+            return true;
         }
 
         return ! $platform instanceof SQLitePlatform;