krowinski / php-mysql-replication

src/MySQLReplication/BinLog/BinLogConnect.php

Doc Comments +3 added lines, -3 removed lines

@@ -140,7 +140,7 @@ 
 
     /**
      * @param $length
-     * @return mixed
+     * @return string
      * @throws BinLogException
      */
     private function readFromSocket($length)
@@ -161,7 +161,7 @@ 
     }
 
     /**
-     * @param $packet
+     * @param string $packet
      * @return array
      * @throws BinLogException
      */
@@ -203,7 +203,7 @@ 
     }
 
     /**
-     * @param $data
+     * @param string $data
      * @throws BinLogException
      */
     private function writeToSocket($data)

Braces +2 added lines, -4 removed lines

@@ -171,8 +171,7 @@ 
         if (in_array($head, $this->packageOkHeader, true))
         {
             return ['status' => true, 'code' => 0, 'msg' => ''];
-        }
-        else
+        } else
         {
             $error_code = unpack('v', $packet[1] . $packet[2])[1];
             $error_msg = '';
@@ -230,8 +229,7 @@ 
         if ('' !== $this->config->getGtid())
         {
             $this->setBinLogDumpGtid();
-        }
-        else
+        } else
         {
             $this->setBinLogDump();
         }

src/MySQLReplication/BinLog/BinLogServerInfo.php

Braces +2 added lines, -4 removed lines

@@ -35,8 +35,7 @@ 
             {
                 $i++;
                 break;
-            }
-            else
+            } else
             {
                 self::$serverInfo['server_version'] .= $pack[$i];
             }
@@ -116,8 +115,7 @@ 
             if (false !== strpos($version, self::MYSQL_VERSION_MARIADB))
             {
                 self::$serverInfo['version_name'] = self::MYSQL_VERSION_MARIADB;
-            }
-            else if (false !== strpos($version, self::MYSQL_VERSION_PERCONA))
+            } else if (false !== strpos($version, self::MYSQL_VERSION_PERCONA))
             {
                 self::$serverInfo['version_name'] = self::MYSQL_VERSION_PERCONA;
             }

src/MySQLReplication/Gtid/Gtid.php

Braces +1 added lines, -2 removed lines

@@ -53,8 +53,7 @@
             {
                 $buffer .= BinaryDataReader::pack64bit($interval[0]);
                 $buffer .= BinaryDataReader::pack64bit($interval[1]);
-            }
-            else
+            } else
             {
                 $buffer .= BinaryDataReader::pack64bit($interval[0]);
                 $buffer .= BinaryDataReader::pack64bit($interval[0] + 1);

src/MySQLReplication/BinaryDataReader/BinaryDataReader.php

Braces +14 added lines, -28 removed lines

@@ -109,17 +109,14 @@ 
         if ($c < self::UNSIGNED_CHAR_COLUMN)
         {
             return $c;
-        }
-        elseif ($c == self::UNSIGNED_SHORT_COLUMN)
+        } elseif ($c == self::UNSIGNED_SHORT_COLUMN)
         {
             return $this->readUInt16();
 
-        }
-        elseif ($c == self::UNSIGNED_INT24_COLUMN)
+        } elseif ($c == self::UNSIGNED_INT24_COLUMN)
         {
             return $this->readUInt24();
-        }
-        elseif ($c == self::UNSIGNED_INT64_COLUMN)
+        } elseif ($c == self::UNSIGNED_INT64_COLUMN)
         {
             return $this->readUInt64();
         }
@@ -208,32 +205,25 @@ 
         if ($size == self::UNSIGNED_CHAR_LENGTH)
         {
             return $this->readUInt8();
-        }
-        elseif ($size == self::UNSIGNED_SHORT_LENGTH)
+        } elseif ($size == self::UNSIGNED_SHORT_LENGTH)
         {
             return $this->readUInt16();
-        }
-        elseif ($size == self::UNSIGNED_INT24_LENGTH)
+        } elseif ($size == self::UNSIGNED_INT24_LENGTH)
         {
             return $this->readUInt24();
-        }
-        elseif ($size == self::UNSIGNED_INT32_LENGTH)
+        } elseif ($size == self::UNSIGNED_INT32_LENGTH)
         {
             return $this->readUInt32();
-        }
-        elseif ($size == self::UNSIGNED_INT40_LENGTH)
+        } elseif ($size == self::UNSIGNED_INT40_LENGTH)
         {
             return $this->readUInt40();
-        }
-        elseif ($size == self::UNSIGNED_INT48_LENGTH)
+        } elseif ($size == self::UNSIGNED_INT48_LENGTH)
         {
             return $this->readUInt48();
-        }
-        elseif ($size == self::UNSIGNED_INT56_LENGTH)
+        } elseif ($size == self::UNSIGNED_INT56_LENGTH)
         {
             return $this->readUInt56();
-        }
-        elseif ($size == self::UNSIGNED_INT64_LENGTH)
+        } elseif ($size == self::UNSIGNED_INT64_LENGTH)
         {
             return $this->readUInt64();
         }
@@ -302,20 +292,16 @@ 
         if ($size == self::UNSIGNED_CHAR_LENGTH)
         {
             return $this->readInt8();
-        }
-        elseif ($size == self::UNSIGNED_SHORT_LENGTH)
+        } elseif ($size == self::UNSIGNED_SHORT_LENGTH)
         {
             return $this->readInt16Be();
-        }
-        elseif ($size == self::UNSIGNED_INT24_LENGTH)
+        } elseif ($size == self::UNSIGNED_INT24_LENGTH)
         {
             return $this->readInt24Be();
-        }
-        elseif ($size == self::UNSIGNED_INT32_LENGTH)
+        } elseif ($size == self::UNSIGNED_INT32_LENGTH)
         {
             return $this->readInt32Be();
-        }
-        elseif ($size == self::UNSIGNED_INT40_LENGTH)
+        } elseif ($size == self::UNSIGNED_INT40_LENGTH)
         {
             return $this->readInt40Be();
         }

src/MySQLReplication/Event/Event.php

Indentation +16 added lines, -16 removed lines

@@ -86,10 +86,10 @@ 
         );
 
         if (ConstEventType::TABLE_MAP_EVENT === $eventInfo->getType()) {
-			$event = $this->rowEventService->makeRowEvent($binaryDataReader, $eventInfo)->makeTableMapDTO();
-			if ($event !== null) {
-				$this->eventDispatcher->dispatch(ConstEventsNames::TABLE_MAP, $event);
-			}
+            $event = $this->rowEventService->makeRowEvent($binaryDataReader, $eventInfo)->makeTableMapDTO();
+            if ($event !== null) {
+                $this->eventDispatcher->dispatch(ConstEventsNames::TABLE_MAP, $event);
+            }
         } else {
             if ([] !== $this->config->getEventsOnly() && !in_array($eventInfo->getType(), $this->config->getEventsOnly(), true)) {
                 return;
@@ -100,20 +100,20 @@ 
             }
 
             if (in_array($eventInfo->getType(), [ConstEventType::UPDATE_ROWS_EVENT_V1, ConstEventType::UPDATE_ROWS_EVENT_V2], true)) {
-				$event = $this->rowEventService->makeRowEvent($binaryDataReader, $eventInfo)->makeUpdateRowsDTO();
-				if ($event !== null) {
-					$this->eventDispatcher->dispatch(ConstEventsNames::UPDATE, $event);
-				}
+                $event = $this->rowEventService->makeRowEvent($binaryDataReader, $eventInfo)->makeUpdateRowsDTO();
+                if ($event !== null) {
+                    $this->eventDispatcher->dispatch(ConstEventsNames::UPDATE, $event);
+                }
             } elseif (in_array($eventInfo->getType(), [ConstEventType::WRITE_ROWS_EVENT_V1, ConstEventType::WRITE_ROWS_EVENT_V2], true)) {
-				$event = $this->rowEventService->makeRowEvent($binaryDataReader, $eventInfo)->makeWriteRowsDTO();
-				if ($event !== null) {
-					$this->eventDispatcher->dispatch(ConstEventsNames::WRITE, $event);
-				}
+                $event = $this->rowEventService->makeRowEvent($binaryDataReader, $eventInfo)->makeWriteRowsDTO();
+                if ($event !== null) {
+                    $this->eventDispatcher->dispatch(ConstEventsNames::WRITE, $event);
+                }
             } elseif (in_array($eventInfo->getType(), [ConstEventType::DELETE_ROWS_EVENT_V1, ConstEventType::DELETE_ROWS_EVENT_V2], true)) {
-            	$event = $this->rowEventService->makeRowEvent($binaryDataReader, $eventInfo)->makeDeleteRowsDTO();
-            	if ($event !== null) {
-					$this->eventDispatcher->dispatch(ConstEventsNames::DELETE, $event);
-				}
+                $event = $this->rowEventService->makeRowEvent($binaryDataReader, $eventInfo)->makeDeleteRowsDTO();
+                if ($event !== null) {
+                    $this->eventDispatcher->dispatch(ConstEventsNames::DELETE, $event);
+                }
             } elseif (ConstEventType::XID_EVENT === $eventInfo->getType()) {
                 $this->eventDispatcher->dispatch(ConstEventsNames::XID, (new XidEvent($eventInfo, $binaryDataReader))->makeXidDTO());
             } elseif (ConstEventType::ROTATE_EVENT === $eventInfo->getType()) {

src/MySQLReplication/Event/RowEvent/RowEvent.php

Indentation +3 added lines, -3 removed lines

@@ -352,9 +352,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

@@ -162,8 +162,7 @@ 
                         'COLUMN_KEY' => '',
                     ];
                     $type = ConstFieldType::IGNORE;
-                }
-                else
+                } else
                 {
                     $type = ord($data['column_types'][$i]);
                 }
@@ -302,123 +301,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;
 
@@ -428,24 +402,19 @@ 
                 {
                     $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->getString(BinaryDataReader::UNSIGNED_INT32_LENGTH, $column))->parseToString();
-            }
-            else
+            } else
             {
                 throw new MySQLReplicationException('Unknown row type: ' . $column['type']);
             }
@@ -547,8 +516,7 @@ 
         {
             $mask = 0;
             $res = '';
-        }
-        else
+        } else
         {
             $mask = -1;
             $res = '-';
@@ -683,12 +651,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;
         }
@@ -809,8 +775,7 @@ 
                 if (1 === $column['bytes'])
                 {
                     $end = $column['bits'];
-                }
-                else
+                } else
                 {
                     $end = $column['bits'] % 8;
                     if (0 === $end)
@@ -818,8 +783,7 @@ 
                         $end = 8;
                     }
                 }
-            }
-            else
+            } else
             {
                 $end = 8;
             }
@@ -829,8 +793,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();
-        }
-        else if (self::LARGE_OBJECT === $type)
+        } else if (self::LARGE_OBJECT === $type)
         {
             //TODO
-        }
-        else if (self::SMALL_ARRAY === $type)
+        } else if (self::SMALL_ARRAY === $type)
         {
             $this->parseArray();
-        }
-        else if (self::LARGE_ARRAY === $type)
+        } else if (self::LARGE_ARRAY === $type)
         {
             //TODO
-        }
-        else
+        } else
         {
             $this->parseScalar($type);
         }
@@ -174,40 +170,35 @@ 
                 $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 (self::INT32 === $type)
+        } else if (self::INT32 === $type)
         {
             return new JsonBinaryDecoderValue(
                 true,
                 $this->binaryDataReader->readInt32(),
                 $type
             );
-        }
-        else if (self::UINT32 === $type)
+        } else if (self::UINT32 === $type)
         {
             return new JsonBinaryDecoderValue(
                 true,
                 $this->binaryDataReader->readUInt32(),
                 $type
             );
-        }
-        else
+        } else
         {
             $offset = $this->binaryDataReader->readUInt16();
             if ($offset > $numBytes)
@@ -238,12 +229,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;
         }
@@ -259,18 +248,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());
             }
@@ -310,8 +296,7 @@ 
         if (null === $r)
         {
             $this->jsonBinaryDecoderFormatter->formatValueNull();
-        }
-        else
+        } else
         {
             $this->jsonBinaryDecoderFormatter->formatValueBool($r);
         }
@@ -322,32 +307,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())