Cleancode (#16)

* change ip to host * tests * tests, support for JSON column type in mysql 5.7 (wip), some clean up * wip json binary decoding * wip json * clean up * clean up * Scrutinizer * Scrutinizer 2
krowinski · Nov 19, 2016 · 0105225 · 0105225
1 parent 15c40a7
commit 0105225
Show file tree

Hide file tree

Showing 28 changed files with 1,181 additions and 145 deletions.
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@ php-mysql-replication
 [![Build Status](https://travis-ci.org/krowinski/php-mysql-replication.svg?branch=master)](https://travis-ci.org/krowinski/php-mysql-replication)
 [![Latest Stable Version](https://poser.pugx.org/krowinski/php-mysql-replication/v/stable)](https://packagist.org/packages/krowinski/php-mysql-replication) [![Total Downloads](https://poser.pugx.org/krowinski/php-mysql-replication/downloads)](https://packagist.org/packages/krowinski/php-mysql-replication) [![Latest Unstable Version](https://poser.pugx.org/krowinski/php-mysql-replication/v/unstable)](https://packagist.org/packages/krowinski/php-mysql-replication) 
 [![SensioLabsInsight](https://insight.sensiolabs.com/projects/4a0e49d4-3802-41d3-bb32-0a8194d0fd4d/mini.png)](https://insight.sensiolabs.com/projects/4a0e49d4-3802-41d3-bb32-0a8194d0fd4d) [![License](https://poser.pugx.org/krowinski/php-mysql-replication/license)](https://packagist.org/packages/krowinski/php-mysql-replication)
-
+[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/krowinski/php-mysql-replication/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/krowinski/php-mysql-replication/?branch=master)
 
 Pure PHP Implementation of MySQL replication protocol. This allow you to receive event like insert, update, delete with their data and raw SQL queries.
 

diff --git a/composer.json b/composer.json
@@ -13,11 +13,11 @@
     "doctrine/dbal": "^2.5",
     "doctrine/collections": "^1.3",
     "ext-sockets": "*",
-    "symfony/event-dispatcher": "^3.1",
-    "symfony/dependency-injection": "^3.1"
+    "symfony/event-dispatcher": ">=2.8 <=3.1",
+    "symfony/dependency-injection": ">=2.8 <=3.1"
   },
   "require-dev": {
-    "phpunit/phpunit": "*"
+    "phpunit/phpunit": ">=4.8 <=5.6"
   },
   "license": "MIT",
   "authors": [

diff --git a/example/dump_events.php b/example/dump_events.php
@@ -48,4 +48,5 @@ public function allEvents(EventDTO $event)
 // start consuming events
 while (1) {
     $binLogStream->binLogEvent();
-}
+}
+
diff --git a/src/MySQLReplication/BinLog/BinLogConnect.php b/src/MySQLReplication/BinLog/BinLogConnect.php
@@ -35,6 +35,10 @@ class BinLogConnect
      * @var BinLogAuth
      */
     private $packAuth;
+    /**
+     * @var GtidService
+     */
+    private $gtidService;
     /**
      * http://dev.mysql.com/doc/internals/en/auth-phase-fast-path.html 00 FE
      * @var array
@@ -96,7 +100,7 @@ public function connectToStream()
         socket_set_block($this->socket);
         socket_set_option($this->socket, SOL_SOCKET, SO_KEEPALIVE, 1);
 
-        if (false === socket_connect($this->socket, $this->config->getIp(), $this->config->getPort()))
+        if (false === socket_connect($this->socket, $this->config->getHost(), $this->config->getPort()))
         {
             throw new BinLogException(socket_strerror(socket_last_error()), socket_last_error());
         }
@@ -125,7 +129,7 @@ public function getPacket($checkForOkByte = true)
         $header = $this->readFromSocket(4);
         if (false === $header)
         {
-            return false;
+            return '';
         }
         $dataLength = unpack('L', $header[0] . $header[1] . $header[2] . chr(0))[1];
 
@@ -310,7 +314,7 @@ private function setBinLogDump()
             $this->execute('SET @slave_gtid_ignore_duplicates = 0');
         }
 
-        if ('' === $binFilePos || '' === $binFileName)
+        if (0 === $binFilePos || '' === $binFileName)
         {
             $master = $this->mySQLRepository->getMasterStatus();
             $binFilePos = $master['Position'];

diff --git a/src/MySQLReplication/BinLog/BinLogServerInfo.php b/src/MySQLReplication/BinLog/BinLogServerInfo.php
@@ -43,7 +43,7 @@ public static function parsePackage($pack)
         }
 
         //connection_id 4 bytes
-        self::$serverInfo['connection_id'] = $pack[$i] . $pack[++$i] . $pack[++$i] . $pack[++$i];
+        self::$serverInfo['connection_id'] = unpack('I', $pack[$i] . $pack[++$i] . $pack[++$i] . $pack[++$i])[1];
         $i++;
 
         //auth_plugin_data_part_1

diff --git a/src/MySQLReplication/BinaryDataReader/BinaryDataReader.php b/src/MySQLReplication/BinaryDataReader/BinaryDataReader.php
@@ -183,7 +183,7 @@ public function readInt24()
     public function readInt64()
     {
         $data = unpack('V*', $this->read(self::UNSIGNED_INT64_LENGTH));
-        return bcadd($data[1], ($data[2] << 32));
+        return bcadd($data[1], $data[2] << 32);
     }
 
     /**
@@ -424,15 +424,22 @@ public function isComplete($size)
      */
     public static function pack64bit($value)
     {
-        return pack('C8',
-            ($value >>  0) & 0xFF,
-            ($value >>  8) & 0xFF,
-            ($value >> 16) & 0xFF,
-            ($value >> 24) & 0xFF,
-            ($value >> 32) & 0xFF,
-            ($value >> 40) & 0xFF,
-            ($value >> 48) & 0xFF,
-            ($value >> 56) & 0xFF
-        );
+        return pack('C8', ($value >> 0) & 0xFF, ($value >> 8) & 0xFF, ($value >> 16) & 0xFF, ($value >> 24) & 0xFF, ($value >> 32) & 0xFF, ($value >> 40) & 0xFF, ($value >> 48) & 0xFF, ($value >> 56) & 0xFF);
+    }
+
+    /**
+     * @return int
+     */
+    public function getBinaryDataLength()
+    {
+        return strlen($this->binaryData);
+    }
+
+    /**
+     * @return string
+     */
+    public function getBinaryData()
+    {
+        return $this->binaryData;
     }
 }
diff --git a/src/MySQLReplication/BinaryDataReader/BinaryDataReaderBuilder.php b/src/MySQLReplication/BinaryDataReader/BinaryDataReaderBuilder.php
@@ -8,6 +8,9 @@
  */
 class BinaryDataReaderBuilder
 {
+    /**
+     * @var string
+     */
     private $binaryData = '';
 
     /**
@@ -18,6 +21,9 @@ public function withBinaryData($binaryData)
         $this->binaryData = $binaryData;
     }
 
+    /**
+     * @return BinaryDataReader
+     */
     public function build()
     {
         return new BinaryDataReader(

diff --git a/src/MySQLReplication/BinaryDataReader/BinaryDataReaderService.php b/src/MySQLReplication/BinaryDataReader/BinaryDataReaderService.php
@@ -9,7 +9,7 @@
 class BinaryDataReaderService
 {
     /**
-     * @param $binaryData
+     * @param string $binaryData
      * @return BinaryDataReader
      */
     public function makePackageFromBinaryData($binaryData)

diff --git a/src/MySQLReplication/Config/Config.php b/src/MySQLReplication/Config/Config.php
@@ -17,7 +17,7 @@ class Config
     /**
      * @var string
      */
-    private $ip;
+    private $host;
     /**
      * @var int
      */
@@ -74,7 +74,7 @@ class Config
     /**
      * Config constructor.
      * @param string $user
-     * @param string $ip
+     * @param string $host
      * @param int $port
      * @param string $password
      * @param string $dbName
@@ -91,7 +91,7 @@ class Config
      */
     public function __construct(
         $user,
-        $ip,
+        $host,
         $port,
         $password,
         $dbName,
@@ -107,7 +107,7 @@ public function __construct(
         array $databasesOnly
     ) {
         $this->user = $user;
-        $this->ip = $ip;
+        $this->host = $host;
         $this->port = $port;
         $this->password = $password;
         $this->dbName = $dbName;
@@ -132,9 +132,13 @@ public function validate()
         {
             throw new ConfigException(ConfigException::USER_ERROR_MESSAGE, ConfigException::USER_ERROR_CODE);
         }
-        if (!empty($this->ip) && false === filter_var($this->ip, FILTER_VALIDATE_IP))
+        if (!empty($this->host))
         {
-            throw new ConfigException(ConfigException::IP_ERROR_MESSAGE, ConfigException::IP_ERROR_CODE);
+            $ip = gethostbyname($this->host);
+            if (false === filter_var($ip, FILTER_VALIDATE_IP))
+            {
+                throw new ConfigException(ConfigException::IP_ERROR_MESSAGE, ConfigException::IP_ERROR_CODE);
+            }
         }
         if (!empty($this->port) && false === filter_var($this->port, FILTER_VALIDATE_INT, ['options' => ['min_range' => 0]]))
         {
@@ -191,9 +195,9 @@ public function getUser()
     /**
      * @return string
      */
-    public function getIp()
+    public function getHost()
     {
-        return $this->ip;
+        return $this->host;
     }
 
     /**
@@ -299,5 +303,4 @@ public function getDatabasesOnly()
     {
         return $this->databasesOnly;
     }
-
 }