krowinski / php-mysql-replication

src/MySQLReplication/Event/RowEvent/RowEvent.php

Unused Use Statements +16 added lines, -16 removed lines

@@ -2,22 +2,22 @@
 

 namespace MySQLReplication\Event\RowEvent;

 

-use MySQLReplication\BinaryDataReader\BinaryDataReader;

-use MySQLReplication\BinaryDataReader\Exception\BinaryDataReaderException;

-use MySQLReplication\Config\Config;

-use MySQLReplication\Config\Exception\ConfigException;

-use MySQLReplication\Definitions\ConstEventType;

-use MySQLReplication\Definitions\ConstFieldType;

-use MySQLReplication\Event\DTO\DeleteRowsDTO;

-use MySQLReplication\Event\DTO\TableMapDTO;

-use MySQLReplication\Event\DTO\UpdateRowsDTO;

-use MySQLReplication\Event\DTO\WriteRowsDTO;

-use MySQLReplication\Event\EventCommon;

-use MySQLReplication\Event\EventInfo;

-use MySQLReplication\Event\Exception\EventException;

-use MySQLReplication\Exception\MySQLReplicationException;

-use MySQLReplication\JsonBinaryDecoder\JsonBinaryDecoderException;

-use MySQLReplication\JsonBinaryDecoder\JsonBinaryDecoderFactory;

+use MySQLReplication\BinaryDataReader\BinaryDataReader;
+use MySQLReplication\BinaryDataReader\Exception\BinaryDataReaderException;
+use MySQLReplication\Config\Config;
+use MySQLReplication\Config\Exception\ConfigException;
+use MySQLReplication\Definitions\ConstEventType;
+use MySQLReplication\Definitions\ConstFieldType;
+use MySQLReplication\Event\DTO\DeleteRowsDTO;
+use MySQLReplication\Event\DTO\TableMapDTO;
+use MySQLReplication\Event\DTO\UpdateRowsDTO;
+use MySQLReplication\Event\DTO\WriteRowsDTO;
+use MySQLReplication\Event\EventCommon;
+use MySQLReplication\Event\EventInfo;
+use MySQLReplication\Event\Exception\EventException;
+use MySQLReplication\Exception\MySQLReplicationException;
+use MySQLReplication\JsonBinaryDecoder\JsonBinaryDecoderException;
+use MySQLReplication\JsonBinaryDecoder\JsonBinaryDecoderFactory;
 use MySQLReplication\Repository\MySQLRepository;

 

 /**

Indentation +3 added lines, -3 removed lines

@@ -401,9 +401,9 @@
                 $values[$name] = $this->getDatetime2($column);

             }

             elseif ($column['type'] === ConstFieldType::TIMESTAMP)

-			{

-				$values[$name] = date('c', $this->binaryDataReader->readUInt32());

-			}

+            {

+                $values[$name] = date('c', $this->binaryDataReader->readUInt32());

+            }

             elseif ($column['type'] === ConstFieldType::TIME2)

             {

                 $values[$name] = $this->getTime2($column);

Braces +37 added lines, -74 removed lines

@@ -164,8 +164,7 @@ 
                         'COLUMN_KEY' => '',

                     ];

                     $type = ConstFieldType::IGNORE;

-                }

-                else

+                } else

                 {

                     $type = ord($data['column_types'][$i]);

                 }

@@ -304,123 +303,98 @@ 
             if ($this->checkNull($null_bitmap, $nullBitmapIndex))

             {

                 $values[$name] = null;

-            }

-            elseif ($column['type'] === ConstFieldType::IGNORE)

+            } elseif ($column['type'] === ConstFieldType::IGNORE)

             {

                 $values[$name] = null;

-            }

-            elseif ($column['type'] === ConstFieldType::TINY)

+            } elseif ($column['type'] === ConstFieldType::TINY)

             {

                 if (true === $column['unsigned'])

                 {

                     $values[$name] = $this->binaryDataReader->readUInt8();

-                }

-                else

+                } else

                 {

                     $values[$name] = $this->binaryDataReader->readInt8();

                 }

-            }

-            elseif ($column['type'] === ConstFieldType::SHORT)

+            } elseif ($column['type'] === ConstFieldType::SHORT)

             {

                 if (true === $column['unsigned'])

                 {

                     $values[$name] = $this->binaryDataReader->readUInt16();

-                }

-                else

+                } else

                 {

                     $values[$name] = $this->binaryDataReader->readInt16();

                 }

-            }

-            elseif ($column['type'] === ConstFieldType::LONG)

+            } elseif ($column['type'] === ConstFieldType::LONG)

             {

                 if (true === $column['unsigned'])

                 {

                     $values[$name] = $this->binaryDataReader->readUInt32();

-                }

-                else

+                } else

                 {

                     $values[$name] = $this->binaryDataReader->readInt32();

                 }

-            }

-            elseif ($column['type'] === ConstFieldType::LONGLONG)

+            } elseif ($column['type'] === ConstFieldType::LONGLONG)

             {

                 if (true === $column['unsigned'])

                 {

                     $values[$name] = $this->binaryDataReader->readUInt64();

-                }

-                else

+                } else

                 {

                     $values[$name] = $this->binaryDataReader->readInt64();

                 }

-            }

-            elseif ($column['type'] === ConstFieldType::INT24)

+            } elseif ($column['type'] === ConstFieldType::INT24)

             {

                 if (true === $column['unsigned'])

                 {

                     $values[$name] = $this->binaryDataReader->readUInt24();

-                }

-                else

+                } else

                 {

                     $values[$name] = $this->binaryDataReader->readInt24();

                 }

-            }

-            elseif ($column['type'] === ConstFieldType::FLOAT)

+            } elseif ($column['type'] === ConstFieldType::FLOAT)

             {

                 // http://dev.mysql.com/doc/refman/5.7/en/floating-point-types.html FLOAT(7,4)

                 $values[$name] = round($this->binaryDataReader->readFloat(), 4);

-            }

-            elseif ($column['type'] === ConstFieldType::DOUBLE)

+            } elseif ($column['type'] === ConstFieldType::DOUBLE)

             {

                 $values[$name] = $this->binaryDataReader->readDouble();

-            }

-            elseif ($column['type'] === ConstFieldType::VARCHAR || $column['type'] === ConstFieldType::STRING)

+            } elseif ($column['type'] === ConstFieldType::VARCHAR || $column['type'] === ConstFieldType::STRING)

             {

                 if ($column['max_length'] > 255)

                 {

                     $values[$name] = $this->getString(2, $column);

-                }

-                else

+                } else

                 {

                     $values[$name] = $this->getString(1, $column);

                 }

-            }

-            elseif ($column['type'] === ConstFieldType::NEWDECIMAL)

+            } elseif ($column['type'] === ConstFieldType::NEWDECIMAL)

             {

                 $values[$name] = $this->getDecimal($column);

-            }

-            elseif ($column['type'] === ConstFieldType::BLOB)

+            } elseif ($column['type'] === ConstFieldType::BLOB)

             {

                 $values[$name] = $this->getString($column['length_size'], $column);

-            }

-            elseif ($column['type'] === ConstFieldType::DATETIME)

+            } elseif ($column['type'] === ConstFieldType::DATETIME)

             {

                 $values[$name] = $this->getDatetime();

-            }

-            elseif ($column['type'] === ConstFieldType::DATETIME2)

+            } elseif ($column['type'] === ConstFieldType::DATETIME2)

             {

                 $values[$name] = $this->getDatetime2($column);

-            }

-            elseif ($column['type'] === ConstFieldType::TIMESTAMP)

+            } elseif ($column['type'] === ConstFieldType::TIMESTAMP)

 			{

 				$values[$name] = date('c', $this->binaryDataReader->readUInt32());

-			}

-            elseif ($column['type'] === ConstFieldType::TIME2)

+			} elseif ($column['type'] === ConstFieldType::TIME2)

             {

                 $values[$name] = $this->getTime2($column);

-            }

-            elseif ($column['type'] === ConstFieldType::TIMESTAMP2)

+            } elseif ($column['type'] === ConstFieldType::TIMESTAMP2)

             {

                 $values[$name] = $this->getTimestamp2($column);

-            }

-            elseif ($column['type'] === ConstFieldType::DATE)

+            } elseif ($column['type'] === ConstFieldType::DATE)

             {

                 $values[$name] = $this->getDate();

-            }

-            elseif ($column['type'] === ConstFieldType::YEAR)

+            } elseif ($column['type'] === ConstFieldType::YEAR)

             {

                 $values[$name] = $this->binaryDataReader->readUInt8() + 1900;

-            }

-            elseif ($column['type'] === ConstFieldType::ENUM)

+            } elseif ($column['type'] === ConstFieldType::ENUM)

             {

                 $value = $this->binaryDataReader->readUIntBySize($column['size']) - 1;

 

@@ -430,26 +404,21 @@ 
                 {

                     $values[$name] = $column['enum_values'][$value];

                 }

-            }

-            elseif ($column['type'] === ConstFieldType::SET)

+            } elseif ($column['type'] === ConstFieldType::SET)

             {

                 $values[$name] = $this->getSet($column);

-            }

-            elseif ($column['type'] === ConstFieldType::BIT)

+            } elseif ($column['type'] === ConstFieldType::BIT)

             {

                 $values[$name] = $this->getBit($column);

-            }

-            elseif ($column['type'] === ConstFieldType::GEOMETRY)

+            } elseif ($column['type'] === ConstFieldType::GEOMETRY)

             {

                 $values[$name] = $this->binaryDataReader->readLengthCodedPascalString($column['length_size']);

-            }

-            elseif ($column['type'] === ConstFieldType::JSON)

+            } elseif ($column['type'] === ConstFieldType::JSON)

             {

                 $values[$name] = $this->jsonBinaryDecoderFactory->makeJsonBinaryDecoder(

                     $this->binaryDataReader->readLengthCodedPascalString($column['length_size'])

                 )->parseToString();

-            }

-            else

+            } else

             {

                 throw new MySQLReplicationException('Unknown row type: ' . $column['type']);

             }

@@ -551,8 +520,7 @@ 
         {

             $mask = 0;

             $res = '';

-        }

-        else

+        } else

         {

             $mask = -1;

             $res = '-';

@@ -687,12 +655,10 @@ 
         if ($column['fsp'] === 1 || $column['fsp'] === 2)

         {

             $read = 1;

-        }

-        elseif ($column['fsp'] === 3 || $column['fsp'] === 4)

+        } elseif ($column['fsp'] === 3 || $column['fsp'] === 4)

         {

             $read = 2;

-        }

-        elseif ($column ['fsp'] === 5 || $column['fsp'] === 6)

+        } elseif ($column ['fsp'] === 5 || $column['fsp'] === 6)

         {

             $read = 3;

         }

@@ -813,8 +779,7 @@ 
                 if (1 === $column['bytes'])

                 {

                     $end = $column['bits'];

-                }

-                else

+                } else

                 {

                     $end = $column['bits'] % 8;

                     if (0 === $end)

@@ -822,8 +787,7 @@ 
                         $end = 8;

                     }

                 }

-            }

-            else

+            } else

             {

                 $end = 8;

             }

@@ -833,8 +797,7 @@ 
                 if ($data & (1 << $bit))

                 {

                     $current_byte .= '1';

-                }

-                else

+                } else

                 {

                     $current_byte .= '0';

                 }

src/MySQLReplication/JsonBinaryDecoder/JsonBinaryDecoderService.php

Braces +22 added lines, -44 removed lines

@@ -94,20 +94,16 @@ 
         if (self::SMALL_OBJECT === $type)
         {
             $this->parseObject(BinaryDataReader::UNSIGNED_SHORT_LENGTH);
-        }
-        else if (self::LARGE_OBJECT === $type)
+        } else if (self::LARGE_OBJECT === $type)
         {
             $this->parseObject(BinaryDataReader::UNSIGNED_INT32_LENGTH);
-        }
-        else if (self::SMALL_ARRAY === $type)
+        } else if (self::SMALL_ARRAY === $type)
         {
             $this->parseArray(BinaryDataReader::UNSIGNED_SHORT_LENGTH);
-        }
-        else if (self::LARGE_ARRAY === $type)
+        } else if (self::LARGE_ARRAY === $type)
         {
             $this->parseObject(BinaryDataReader::UNSIGNED_INT32_LENGTH);
-        }
-        else
+        } else
         {
             $this->parseScalar($type);
         }
@@ -175,24 +171,21 @@ 
                 $this->readLiteral(),
                 $type
             );
-        }
-        else if (self::INT16 === $type)
+        } else if (self::INT16 === $type)
         {
             return new JsonBinaryDecoderValue(
                 true,
                 $this->binaryDataReader->readInt16(),
                 $type
             );
-        }
-        else if (self::UINT16 === $type)
+        } else if (self::UINT16 === $type)
         {
             return new JsonBinaryDecoderValue(
                 true,
                 $this->binaryDataReader->readUInt16(),
                 $type
             );
-        }
-        else if (BinaryDataReader::UNSIGNED_INT32_LENGTH === $intSize)
+        } else if (BinaryDataReader::UNSIGNED_INT32_LENGTH === $intSize)
         {
             if (self::INT32 === $type)
             {
@@ -201,8 +194,7 @@ 
                     $this->binaryDataReader->readInt32(),
                     $type
                 );
-            }
-            else if (self::UINT32 === $type)
+            } else if (self::UINT32 === $type)
             {
                 return new JsonBinaryDecoderValue(
                     true,
@@ -210,8 +202,7 @@ 
                     $type
                 );
             }
-        }
-        else
+        } else
         {
             $offset = $this->binaryDataReader->readUIntBySize($intSize);
             if ($offset > $numBytes)
@@ -242,12 +233,10 @@ 
         if (0 === $literal)
         {
             return null;
-        }
-        else if (1 === $literal)
+        } else if (1 === $literal)
         {
             return true;
-        }
-        else if (2 === $literal)
+        } else if (2 === $literal)
         {
             return false;
         }
@@ -263,18 +252,15 @@ 
         if (false === $jsonBinaryDecoderValue->isIsResolved())
         {
             $this->parseJson($jsonBinaryDecoderValue->getType());
-        }
-        else
+        } else
         {
             if (null === $jsonBinaryDecoderValue->getValue())
             {
                 $this->jsonBinaryDecoderFormatter->formatValueNull();
-            }
-            elseif (is_bool($jsonBinaryDecoderValue->getValue()))
+            } elseif (is_bool($jsonBinaryDecoderValue->getValue()))
             {
                 $this->jsonBinaryDecoderFormatter->formatValueBool($jsonBinaryDecoderValue->getValue());
-            }
-            elseif (is_numeric($jsonBinaryDecoderValue->getValue()))
+            } elseif (is_numeric($jsonBinaryDecoderValue->getValue()))
             {
                 $this->jsonBinaryDecoderFormatter->formatValueNumeric($jsonBinaryDecoderValue->getValue());
             }
@@ -314,8 +300,7 @@ 
         if (null === $r)
         {
             $this->jsonBinaryDecoderFormatter->formatValueNull();
-        }
-        else
+        } else
         {
             $this->jsonBinaryDecoderFormatter->formatValueBool($r);
         }
@@ -326,32 +311,25 @@ 
         if (self::LITERAL === $type)
         {
             $this->parseBoolean();
-        }
-        else if (self::INT16 === $type)
+        } else if (self::INT16 === $type)
         {
             $this->jsonBinaryDecoderFormatter->formatValue($this->binaryDataReader->readInt16());
-        }
-        else if (self::INT32 === $type)
+        } else if (self::INT32 === $type)
         {
             $this->jsonBinaryDecoderFormatter->formatValue($this->binaryDataReader->readInt32());
-        }
-        else if (self::INT64 === $type)
+        } else if (self::INT64 === $type)
         {
             $this->jsonBinaryDecoderFormatter->formatValue($this->binaryDataReader->readInt64());
-        }
-        else if (self::UINT16 === $type)
+        } else if (self::UINT16 === $type)
         {
             $this->jsonBinaryDecoderFormatter->formatValue($this->binaryDataReader->readUInt16());
-        }
-        else if (self::UINT64 === $type)
+        } else if (self::UINT64 === $type)
         {
             $this->jsonBinaryDecoderFormatter->formatValue($this->binaryDataReader->readUInt64());
-        }
-        else if (self::DOUBLE === $type)
+        } else if (self::DOUBLE === $type)
         {
             $this->jsonBinaryDecoderFormatter->formatValue($this->binaryDataReader->readDouble());
-        }
-        else if (self::STRING === $type)
+        } else if (self::STRING === $type)
         {
             $this->jsonBinaryDecoderFormatter->formatValue(
                 $this->binaryDataReader->read($this->readVariableInt())