diff --git a/.travis.yml b/.travis.yml index 7bf23c9c0b3..9ca1ebe5509 100644 --- a/.travis.yml +++ b/.travis.yml @@ -179,6 +179,18 @@ jobs: addons: mariadb: 10.2 + - stage: Test + php: 7.2 + env: DB=mariadb MARIADB_VERSION=10.3 + addons: + mariadb: 10.3 + + - stage: Test + php: 7.2 + env: DB=mariadb.mysqli MARIADB_VERSION=10.3 + addons: + mariadb: 10.3 + - stage: Test php: 7.1 env: DB=pgsql POSTGRESQL_VERSION=9.2 COVERAGE=yes diff --git a/docs/en/reference/platforms.rst b/docs/en/reference/platforms.rst index 5f57fec9226..32ef74304ea 100644 --- a/docs/en/reference/platforms.rst +++ b/docs/en/reference/platforms.rst @@ -37,6 +37,11 @@ MySQL - ``MySQL57Platform`` for version 5.7 (5.7.9 GA) and above. - ``MySQL80Platform`` for version 8.0 (8.0 GA) and above. +MariaDB +^^^^^ + +- ``MariaDb1027Platform`` for version 10.2 (10.2.7 GA) and above. + Oracle ^^^^^^ diff --git a/lib/Doctrine/DBAL/Platforms/MariaDb1027Platform.php b/lib/Doctrine/DBAL/Platforms/MariaDb1027Platform.php index 1955fb05912..4c1f6b3f8b0 100644 --- a/lib/Doctrine/DBAL/Platforms/MariaDb1027Platform.php +++ b/lib/Doctrine/DBAL/Platforms/MariaDb1027Platform.php @@ -24,21 +24,13 @@ /** * Provides the behavior, features and SQL dialect of the MariaDB 10.2 (10.2.7 GA) database platform. * - * Note: Should not be used with versions prior ro 10.2.7. + * Note: Should not be used with versions prior to 10.2.7. * * @author Vanvelthem Sébastien * @link www.doctrine-project.org */ final class MariaDb1027Platform extends MySqlPlatform { - /** - * {@inheritdoc} - */ - public function hasNativeJsonType() : bool - { - return false; - } - /** * {@inheritdoc} * diff --git a/tests/Doctrine/Tests/DBAL/Platforms/MariaDb1027PlatformTest.php b/tests/Doctrine/Tests/DBAL/Platforms/MariaDb1027PlatformTest.php index 79d08d1a07d..138a55ef714 100644 --- a/tests/Doctrine/Tests/DBAL/Platforms/MariaDb1027PlatformTest.php +++ b/tests/Doctrine/Tests/DBAL/Platforms/MariaDb1027PlatformTest.php @@ -3,8 +3,6 @@ namespace Doctrine\Tests\DBAL\Platforms; use Doctrine\DBAL\Platforms\MariaDb1027Platform; -use Doctrine\DBAL\Schema\Comparator; -use Doctrine\DBAL\Schema\Table; use Doctrine\DBAL\Types\Type; class MariaDb1027PlatformTest extends AbstractMySQLPlatformTestCase