Support doctrine/dbal ^3.0 (#75)

* Upgrade doctrine/dbal to ^3.0

* Update composer.json

* Added test cases for PHP 7.3 and 7.4

* Use Exception instead of the removed DBALException

* Doctrine\DBAL\Exception is avaliable in v2.11

* Fixed the removed methods

* Don't support php7.1 and 7.2

* Fixed `ping()` does not works.

* Fixed PHPUnit.

* Added sort-packages

Author: limingxinleo

.travis.yml

@@ -16,51 +16,51 @@ matrix:
   include:
     - env:
         - DB=mariadb:5.5
-      php: "7.1"
+      php: "7.3"
     - env:
         - DB=mariadb:10.0
-      php: "7.1"
+      php: "7.3"
     - env:
         - DB=mariadb:10.1
-      php: "7.1"
+      php: "7.3"
     - env:
         - DB=mysql:5.5
-      php: "7.1"
+      php: "7.3"
     - env:
         - DB=mysql:5.6
-      php: "7.1"
+      php: "7.3"
     - env:
         - DB=mysql:5.7
-      php: "7.1"
+      php: "7.3"
     - env:
         - DB=mysql:8.0
         - TEST_AUTH=yes
-      php: "7.1"
+      php: "7.3"
     - env:
         - DB=mariadb:5.5
-      php: "7.2"
+      php: "7.4"
     - env:
         - DB=mariadb:10.0
-      php: "7.2"
+      php: "7.4"
     - env:
         - DB=mariadb:10.1
-      php: "7.2"
+      php: "7.4"
     - env:
         - DB=mysql:5.5
-      php: "7.2"
+      php: "7.4"
     - env:
         - DB=mysql:5.6
-      php: "7.2"
+      php: "7.4"
     - env:
         - DB=mysql:5.7
-      php: "7.2"
+      php: "7.4"
     - env:
         - DB=mysql:8.0
         - TEST_AUTH=yes
-      php: "7.2"
+      php: "7.4"
 
 before_script:
   - ./.travis/initializedb.sh
 
 install:
-  travis_retry composer install --no-interaction --prefer-source;
+  travis_retry composer install --no-interaction --prefer-source;

composer.json

@@ -12,18 +12,18 @@
   ],
   "type": "library",
   "require": {
-    "php": ">=7.1",
-    "ext-sockets": "*",
-    "ext-json": "*",
+    "php": ">=7.3",
     "ext-bcmath": "*",
-    "doctrine/dbal": "^2.5",
+    "ext-json": "*",
+    "ext-sockets": "*",
     "doctrine/collections": "^1.3",
-    "symfony/event-dispatcher": "^3.1|^4.0|^5.0",
+    "doctrine/dbal": "^3.0",
+    "psr/simple-cache": "^1.0",
     "symfony/dependency-injection": "^3.1|^4.0|^5.0",
-    "psr/simple-cache": "^1.0"
+    "symfony/event-dispatcher": "^3.1|^4.0|^5.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "^7.0"
+    "phpunit/phpunit": "^9.0"
   },
   "license": "MIT",
   "authors": [
@@ -42,5 +42,8 @@
       "MySQLReplication\\Tests\\": "tests/"
     }
   },
-  "minimum-stability": "stable"
+  "minimum-stability": "stable",
+  "config": {
+    "sort-packages": true
+  }
 }

src/MySQLReplication/Event/RowEvent/RowEvent.php

@@ -662,7 +662,7 @@ protected function getDecimal(ColumnDTO $columnDTO): string
             $res .= sprintf('%0' . $compFractional . 'd', $value);
         }
 
-        return bcmul($res, '1', $columnDTO->getPrecision());
+        return bcmul($res, '1', $columnDTO->getDecimals());
     }
 
     protected function getDatetime(): ?string

src/MySQLReplication/MySQLReplicationFactory.php

@@ -4,7 +4,7 @@
 namespace MySQLReplication;
 
 use Doctrine\DBAL\Connection;
-use Doctrine\DBAL\DBALException;
+use Doctrine\DBAL\Exception;
 use Doctrine\DBAL\DriverManager;
 use MySQLReplication\BinaryDataReader\BinaryDataReaderException;
 use MySQLReplication\BinLog\BinLogException;
@@ -37,7 +37,7 @@ class MySQLReplicationFactory
     /**
      * @throws BinLogException
      * @throws ConfigException
-     * @throws DBALException
+     * @throws Exception
      * @throws SocketException
      * @throws GtidException
      */
@@ -129,4 +129,4 @@ public function consume(): void
     {
         $this->event->consume();
     }
-}
+}

src/MySQLReplication/Repository/MySQLRepository.php

@@ -4,11 +4,11 @@
 namespace MySQLReplication\Repository;
 
 use Doctrine\DBAL\Connection;
-use Doctrine\DBAL\DBALException;
+use Doctrine\DBAL\Exception;
 use MySQLReplication\BinLog\BinLogException;
 use MySQLReplication\Exception\MySQLReplicationException;
 
-class MySQLRepository implements RepositoryInterface
+class MySQLRepository implements RepositoryInterface, PingableConnection
 {
     private $connection;
 
@@ -42,12 +42,12 @@ public function getFields(string $database, string $table): FieldDTOCollection
                 ORDINAL_POSITION        
        ';
 
-        return FieldDTOCollection::makeFromArray($this->getConnection()->fetchAll($sql, [$database, $table]));
+        return FieldDTOCollection::makeFromArray($this->getConnection()->fetchAllAssociative($sql, [$database, $table]));
     }
 
     private function getConnection(): Connection
     {
-        if (false === $this->connection->ping()) {
+        if (false === $this->ping($this->connection)) {
             $this->connection->close();
             $this->connection->connect();
         }
@@ -56,19 +56,19 @@ private function getConnection(): Connection
     }
 
     /**
-     * @throws DBALException
+     * @throws Exception
      */
     public function isCheckSum(): bool
     {
-        $res = $this->getConnection()->fetchAssoc('SHOW GLOBAL VARIABLES LIKE "BINLOG_CHECKSUM"');
+        $res = $this->getConnection()->fetchAssociative('SHOW GLOBAL VARIABLES LIKE "BINLOG_CHECKSUM"');
 
         return isset($res['Value']) && $res['Value'] !== 'NONE';
     }
 
     public function getVersion(): string
     {
         $r = '';
-        $versions = $this->getConnection()->fetchAll('SHOW VARIABLES LIKE "version%"');
+        $versions = $this->getConnection()->fetchAllAssociative('SHOW VARIABLES LIKE "version%"');
         if (is_array($versions) && 0 !== count($versions)) {
             foreach ($versions as $version) {
                 $r .= $version['Value'];
@@ -80,12 +80,12 @@ public function getVersion(): string
 
     /**
      * @inheritDoc
-     * @throws DBALException
+     * @throws Exception
      * @throws BinLogException
      */
     public function getMasterStatus(): MasterStatusDTO
     {
-        $data = $this->getConnection()->fetchAssoc('SHOW MASTER STATUS');
+        $data = $this->getConnection()->fetchAssociative('SHOW MASTER STATUS');
         if (empty($data)) {
             throw new BinLogException(
                 MySQLReplicationException::BINLOG_NOT_ENABLED,
@@ -95,4 +95,14 @@ public function getMasterStatus(): MasterStatusDTO
 
         return MasterStatusDTO::makeFromArray($data);
     }
-}
+
+    public function ping(Connection $connection): bool
+    {
+        try {
+            $connection->executeQuery($connection->getDatabasePlatform()->getDummySelectSQL());
+            return true;
+        } catch (Exception $e) {
+            return false;
+        }
+    }
+}

src/MySQLReplication/Repository/PingableConnection.php

@@ -0,0 +1,20 @@
+<?php
+declare(strict_types=1);
+
+namespace MySQLReplication\Repository;
+
+use Doctrine\DBAL\Connection;
+
+/**
+ * An interface for connections which support a "native" ping method.
+ */
+interface PingableConnection
+{
+    /**
+     * Pings the database server to determine if the connection is still
+     * available. Return true/false based on if that was successful or not.
+     *
+     * @return bool
+     */
+    public function ping(Connection $connection): bool;
+}

tests/Integration/BaseTest.php

@@ -71,11 +71,11 @@ public function connect(): void
 
         $this->connection = $this->mySQLReplicationFactory->getDbConnection();
 
-        $this->connection->exec('SET SESSION time_zone = "UTC"');
-        $this->connection->exec('DROP DATABASE IF EXISTS ' . $this->database);
-        $this->connection->exec('CREATE DATABASE ' . $this->database);
-        $this->connection->exec('USE ' . $this->database);
-        $this->connection->exec('SET SESSION sql_mode = \'\';');
+        $this->connection->executeStatement('SET SESSION time_zone = "UTC"');
+        $this->connection->executeStatement('DROP DATABASE IF EXISTS ' . $this->database);
+        $this->connection->executeStatement('CREATE DATABASE ' . $this->database);
+        $this->connection->executeStatement('USE ' . $this->database);
+        $this->connection->executeStatement('SET SESSION sql_mode = \'\';');
     }
 
     protected function getEvent(): EventDTO
@@ -101,7 +101,7 @@ protected function tearDown(): void
 
     protected function checkForVersion(float $version): bool
     {
-        return (float)$this->connection->fetchColumn('SELECT VERSION()') < $version;
+        return (float)$this->connection->fetchOne('SELECT VERSION()') < $version;
     }
 
     protected function disconnect(): void
@@ -113,13 +113,13 @@ protected function disconnect(): void
 
     protected function createAndInsertValue(string $createQuery, string $insertQuery): EventDTO
     {
-        $this->connection->exec($createQuery);
-        $this->connection->exec($insertQuery);
+        $this->connection->executeStatement($createQuery);
+        $this->connection->executeStatement($insertQuery);
 
         self::assertInstanceOf(QueryDTO::class, $this->getEvent());
         self::assertInstanceOf(QueryDTO::class, $this->getEvent());
         self::assertInstanceOf(TableMapDTO::class, $this->getEvent());
 
         return $this->getEvent();
     }
-}
+}