Skip to content

Commit 0b77350

Browse files
committed
Merge branch '3.8.x' into 4.0.x
* 3.8.x: Fix documentation of supported MariaDB releases (#6407)
2 parents b36ede0 + 9cf787c commit 0b77350

File tree

4 files changed

+8
-9
lines changed

4 files changed

+8
-9
lines changed

docs/en/reference/platforms.rst

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,15 @@ can be found as follows:
3333
MySQL
3434
^^^^^
3535

36-
- ``MySQLPlatform`` for version 5.7 (5.7.9 GA) and above.
37-
- ``MySQL80Platform`` for version 8.0 (8.0 GA) and above.
36+
- ``MySQLPlatform`` for version 5.7.9 and above.
37+
- ``MySQL80Platform`` for version 8.0 and above.
3838

3939
MariaDB
4040
^^^^^
4141

42-
- ``MariaDBPlatform`` for version 10.4 (10.4.3 GA) and above.
43-
- ``MariaDB1052Platform`` for version 10.5 (10.5.2 GA) and above.
42+
- ``MariaDBPlatform`` for version 10.4.3 and above.
43+
- ``MariaDb1052Platform`` for version 10.5.2 and above.
44+
- ``MariaDb1060Platform`` for version 10.6 and above.
4445

4546
Oracle
4647
^^^^^^

src/Platforms/MariaDB1052Platform.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@
88
use Doctrine\DBAL\Schema\TableDiff;
99

1010
/**
11-
* Provides the behavior, features and SQL dialect of the MariaDB 10.5 (10.5.2 GA) database platform.
12-
*
13-
* Note: Should not be used with versions prior to 10.5.2.
11+
* Provides the behavior, features and SQL dialect of the MariaDB 10.5 database platform.
1412
*/
1513
class MariaDB1052Platform extends MariaDBPlatform
1614
{

src/Platforms/MariaDB1060Platform.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
use Doctrine\DBAL\SQL\Builder\SelectSQLBuilder;
88

99
/**
10-
* Provides the behavior, features and SQL dialect of the MariaDB 10.6 (10.6.0 GA) database platform.
10+
* Provides the behavior, features and SQL dialect of the MariaDB 10.6 database platform.
1111
*/
1212
class MariaDB1060Platform extends MariaDB1052Platform
1313
{

src/Platforms/MySQL80Platform.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
use Doctrine\DBAL\SQL\Builder\SelectSQLBuilder;
1010

1111
/**
12-
* Provides the behavior, features and SQL dialect of the MySQL 8.0 (8.0 GA) database platform.
12+
* Provides the behavior, features and SQL dialect of the MySQL 8.0 database platform.
1313
*/
1414
class MySQL80Platform extends MySQLPlatform
1515
{

0 commit comments

Comments
 (0)