krowinski / php-mysql-replication

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/BinLog/BinLogSocketConnect.php

Spacing +1 added lines, -1 removed lines

@@ -96,7 +96,7 @@
     {
         if (false === ($this->socket = socket_create(AF_INET, SOCK_STREAM, SOL_TCP)))
         {
-            throw new BinLogException(BinLogException::UNABLE_TO_CREATE_SOCKET. socket_strerror(socket_last_error()), socket_last_error());
+            throw new BinLogException(BinLogException::UNABLE_TO_CREATE_SOCKET . socket_strerror(socket_last_error()), socket_last_error());
         }
         socket_set_block($this->socket);
         socket_set_option($this->socket, SOL_SOCKET, SO_KEEPALIVE, 1);

src/MySQLReplication/Event/Event.php

Braces +8 added lines, -16 removed lines

@@ -100,8 +100,7 @@ 
             {
                 $this->eventDispatcher->dispatch(ConstEventsNames::TABLE_MAP, $event);
             }
-        }
-        else
+        } else
         {
             if ([] !== $this->config->getEventsOnly() && !in_array($eventInfo->getType(), $this->config->getEventsOnly(), true))
             {
@@ -120,40 +119,33 @@ 
                 {
                     $this->eventDispatcher->dispatch(ConstEventsNames::UPDATE, $event);
                 }
-            }
-            elseif (in_array($eventInfo->getType(), [ConstEventType::WRITE_ROWS_EVENT_V1, ConstEventType::WRITE_ROWS_EVENT_V2], true))
+            } 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);
                 }
-            }
-            elseif (in_array($eventInfo->getType(), [ConstEventType::DELETE_ROWS_EVENT_V1, ConstEventType::DELETE_ROWS_EVENT_V2], true))
+            } 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);
                 }
-            }
-            elseif (ConstEventType::XID_EVENT === $eventInfo->getType())
+            } elseif (ConstEventType::XID_EVENT === $eventInfo->getType())
             {
                 $this->eventDispatcher->dispatch(ConstEventsNames::XID, (new XidEvent($eventInfo, $binaryDataReader))->makeXidDTO());
-            }
-            elseif (ConstEventType::ROTATE_EVENT === $eventInfo->getType())
+            } elseif (ConstEventType::ROTATE_EVENT === $eventInfo->getType())
             {
                 $this->eventDispatcher->dispatch(ConstEventsNames::ROTATE, (new RotateEvent($eventInfo, $binaryDataReader))->makeRotateEventDTO());
-            }
-            elseif (ConstEventType::GTID_LOG_EVENT === $eventInfo->getType())
+            } elseif (ConstEventType::GTID_LOG_EVENT === $eventInfo->getType())
             {
                 $this->eventDispatcher->dispatch(ConstEventsNames::GTID, (new GtidEvent($eventInfo, $binaryDataReader))->makeGTIDLogDTO());
-            }
-            elseif (ConstEventType::QUERY_EVENT === $eventInfo->getType())
+            } elseif (ConstEventType::QUERY_EVENT === $eventInfo->getType())
             {
                 $this->eventDispatcher->dispatch(ConstEventsNames::QUERY, (new QueryEvent($eventInfo, $binaryDataReader))->makeQueryDTO());
-            }
-            elseif (ConstEventType::MARIA_GTID_EVENT === $eventInfo->getType())
+            } elseif (ConstEventType::MARIA_GTID_EVENT === $eventInfo->getType())
             {
                 $this->eventDispatcher->dispatch(ConstEventsNames::MARIADB_GTID, (new MariaDbGtidEvent($eventInfo, $binaryDataReader))->makeMariaDbGTIDLogDTO());
             }

src/MySQLReplication/Event/RowEvent/Columns.php

Braces +15 added lines, -30 removed lines

@@ -46,53 +46,41 @@ 
         if (self::$field['type'] === ConstFieldType::VARCHAR)
         {
             self::$field['max_length'] = $binaryDataReader->readInt16();
-        }
-        elseif (self::$field['type'] === ConstFieldType::DOUBLE)
+        } elseif (self::$field['type'] === ConstFieldType::DOUBLE)
         {
             self::$field['size'] = $binaryDataReader->readUInt8();
-        }
-        elseif (self::$field['type'] === ConstFieldType::FLOAT)
+        } elseif (self::$field['type'] === ConstFieldType::FLOAT)
         {
             self::$field['size'] = $binaryDataReader->readUInt8();
-        }
-        elseif (self::$field['type'] === ConstFieldType::TIMESTAMP2)
+        } elseif (self::$field['type'] === ConstFieldType::TIMESTAMP2)
         {
             self::$field['fsp'] = $binaryDataReader->readUInt8();
-        }
-        elseif (self::$field['type'] === ConstFieldType::DATETIME2)
+        } elseif (self::$field['type'] === ConstFieldType::DATETIME2)
         {
             self::$field['fsp'] = $binaryDataReader->readUInt8();
-        }
-        elseif (self::$field['type'] === ConstFieldType::TIME2)
+        } elseif (self::$field['type'] === ConstFieldType::TIME2)
         {
             self::$field['fsp'] = $binaryDataReader->readUInt8();
-        }
-        elseif (self::$field['type'] === ConstFieldType::TINY && $columnSchema['COLUMN_TYPE'] === 'tinyint(1)')
+        } elseif (self::$field['type'] === ConstFieldType::TINY && $columnSchema['COLUMN_TYPE'] === 'tinyint(1)')
         {
             self::$field['type_is_bool'] = true;
-        }
-        elseif (self::$field['type'] === ConstFieldType::VAR_STRING || self::$field['type'] === ConstFieldType::STRING)
+        } elseif (self::$field['type'] === ConstFieldType::VAR_STRING || self::$field['type'] === ConstFieldType::STRING)
         {
             self::getFieldSpecial($binaryDataReader, $columnSchema);
-        }
-        elseif (self::$field['type'] === ConstFieldType::BLOB)
+        } elseif (self::$field['type'] === ConstFieldType::BLOB)
         {
             self::$field['length_size'] = $binaryDataReader->readUInt8();
-        }
-        elseif (self::$field['type'] === ConstFieldType::GEOMETRY)
+        } elseif (self::$field['type'] === ConstFieldType::GEOMETRY)
         {
             self::$field['length_size'] = $binaryDataReader->readUInt8();
-        }
-        elseif (self::$field['type'] === ConstFieldType::JSON)
+        } elseif (self::$field['type'] === ConstFieldType::JSON)
         {
             self::$field['length_size'] = $binaryDataReader->readUInt8();
-        }
-        elseif (self::$field['type'] === ConstFieldType::NEWDECIMAL)
+        } elseif (self::$field['type'] === ConstFieldType::NEWDECIMAL)
         {
             self::$field['precision'] = $binaryDataReader->readUInt8();
             self::$field['decimals'] = $binaryDataReader->readUInt8();
-        }
-        elseif (self::$field['type'] === ConstFieldType::BIT)
+        } elseif (self::$field['type'] === ConstFieldType::BIT)
         {
             $bits = $binaryDataReader->readUInt8();
             $bytes = $binaryDataReader->readUInt8();
@@ -117,8 +105,7 @@ 
             self::$field['type'] = $real_type;
             self::$field['size'] = $metadata & 0x00ff;
             self::getFieldSpecialValues($columnSchema);
-        }
-        else
+        } else
         {
             self::$field['max_length'] = ((($metadata >> 4) & 0x300) ^ 0x300) + ($metadata & 0x00ff);
         }
@@ -133,12 +120,10 @@ 
         if (self::$field['type'] === ConstFieldType::ENUM)
         {
             self::$field['enum_values'] = explode(',', str_replace(['enum(', ')', '\''], '', $columnSchema['COLUMN_TYPE']));
-        }
-        else if (self::$field['type'] === ConstFieldType::SET)
+        } else if (self::$field['type'] === ConstFieldType::SET)
         {
             self::$field['set_values'] = explode(',', str_replace(['set(', ')', '\''], '', $columnSchema['COLUMN_TYPE']));
-        }
-        else
+        } else
         {
             throw new ConfigException('Type not handled! - ' . self::$field['type']);
         }