Completed
Push — master ( 15c40a...010522 )
by kacper
01:57
created
src/MySQLReplication/Event/RowEvent/RowEvent.php 1 patch
Braces   +37 added lines, -74 removed lines patch added patch discarded remove patch
@@ -162,8 +162,7 @@  discard block
 block discarded – undo
162 162
                         'COLUMN_KEY' => '',
163 163
                     ];
164 164
                     $type = ConstFieldType::IGNORE;
165
-                }
166
-                else
165
+                } else
167 166
                 {
168 167
                     $type = ord($data['column_types'][$i]);
169 168
                 }
@@ -302,123 +301,98 @@  discard block
 block discarded – undo
302 301
             if ($this->checkNull($null_bitmap, $nullBitmapIndex))
303 302
             {
304 303
                 $values[$name] = null;
305
-            }
306
-            elseif ($column['type'] === ConstFieldType::IGNORE)
304
+            } elseif ($column['type'] === ConstFieldType::IGNORE)
307 305
             {
308 306
                 $values[$name] = null;
309
-            }
310
-            elseif ($column['type'] === ConstFieldType::TINY)
307
+            } elseif ($column['type'] === ConstFieldType::TINY)
311 308
             {
312 309
                 if (true === $column['unsigned'])
313 310
                 {
314 311
                     $values[$name] = $this->binaryDataReader->readUInt8();
315
-                }
316
-                else
312
+                } else
317 313
                 {
318 314
                     $values[$name] = $this->binaryDataReader->readInt8();
319 315
                 }
320
-            }
321
-            elseif ($column['type'] === ConstFieldType::SHORT)
316
+            } elseif ($column['type'] === ConstFieldType::SHORT)
322 317
             {
323 318
                 if (true === $column['unsigned'])
324 319
                 {
325 320
                     $values[$name] = $this->binaryDataReader->readUInt16();
326
-                }
327
-                else
321
+                } else
328 322
                 {
329 323
                     $values[$name] = $this->binaryDataReader->readInt16();
330 324
                 }
331
-            }
332
-            elseif ($column['type'] === ConstFieldType::LONG)
325
+            } elseif ($column['type'] === ConstFieldType::LONG)
333 326
             {
334 327
                 if (true === $column['unsigned'])
335 328
                 {
336 329
                     $values[$name] = $this->binaryDataReader->readUInt32();
337
-                }
338
-                else
330
+                } else
339 331
                 {
340 332
                     $values[$name] = $this->binaryDataReader->readInt32();
341 333
                 }
342
-            }
343
-            elseif ($column['type'] === ConstFieldType::LONGLONG)
334
+            } elseif ($column['type'] === ConstFieldType::LONGLONG)
344 335
             {
345 336
                 if (true === $column['unsigned'])
346 337
                 {
347 338
                     $values[$name] = $this->binaryDataReader->readUInt64();
348
-                }
349
-                else
339
+                } else
350 340
                 {
351 341
                     $values[$name] = $this->binaryDataReader->readInt64();
352 342
                 }
353
-            }
354
-            elseif ($column['type'] === ConstFieldType::INT24)
343
+            } elseif ($column['type'] === ConstFieldType::INT24)
355 344
             {
356 345
                 if (true === $column['unsigned'])
357 346
                 {
358 347
                     $values[$name] = $this->binaryDataReader->readUInt24();
359
-                }
360
-                else
348
+                } else
361 349
                 {
362 350
                     $values[$name] = $this->binaryDataReader->readInt24();
363 351
                 }
364
-            }
365
-            elseif ($column['type'] === ConstFieldType::FLOAT)
352
+            } elseif ($column['type'] === ConstFieldType::FLOAT)
366 353
             {
367 354
                 // http://dev.mysql.com/doc/refman/5.7/en/floating-point-types.html FLOAT(7,4)
368 355
                 $values[$name] = round($this->binaryDataReader->readFloat(), 4);
369
-            }
370
-            elseif ($column['type'] === ConstFieldType::DOUBLE)
356
+            } elseif ($column['type'] === ConstFieldType::DOUBLE)
371 357
             {
372 358
                 $values[$name] = $this->binaryDataReader->readDouble();
373
-            }
374
-            elseif ($column['type'] === ConstFieldType::VARCHAR || $column['type'] === ConstFieldType::STRING)
359
+            } elseif ($column['type'] === ConstFieldType::VARCHAR || $column['type'] === ConstFieldType::STRING)
375 360
             {
376 361
                 if ($column['max_length'] > 255)
377 362
                 {
378 363
                     $values[$name] = $this->getString(2, $column);
379
-                }
380
-                else
364
+                } else
381 365
                 {
382 366
                     $values[$name] = $this->getString(1, $column);
383 367
                 }
384
-            }
385
-            elseif ($column['type'] === ConstFieldType::NEWDECIMAL)
368
+            } elseif ($column['type'] === ConstFieldType::NEWDECIMAL)
386 369
             {
387 370
                 $values[$name] = $this->getDecimal($column);
388
-            }
389
-            elseif ($column['type'] === ConstFieldType::BLOB)
371
+            } elseif ($column['type'] === ConstFieldType::BLOB)
390 372
             {
391 373
                 $values[$name] = $this->getString($column['length_size'], $column);
392
-            }
393
-            elseif ($column['type'] === ConstFieldType::DATETIME)
374
+            } elseif ($column['type'] === ConstFieldType::DATETIME)
394 375
             {
395 376
                 $values[$name] = $this->getDatetime();
396
-            }
397
-            elseif ($column['type'] === ConstFieldType::DATETIME2)
377
+            } elseif ($column['type'] === ConstFieldType::DATETIME2)
398 378
             {
399 379
                 $values[$name] = $this->getDatetime2($column);
400
-            }
401
-            elseif ($column['type'] === ConstFieldType::TIMESTAMP)
380
+            } elseif ($column['type'] === ConstFieldType::TIMESTAMP)
402 381
 			{
403 382
 				$values[$name] = date('c', $this->binaryDataReader->readUInt32());
404
-			}
405
-            elseif ($column['type'] === ConstFieldType::TIME2)
383
+			} elseif ($column['type'] === ConstFieldType::TIME2)
406 384
             {
407 385
                 $values[$name] = $this->getTime2($column);
408
-            }
409
-            elseif ($column['type'] === ConstFieldType::TIMESTAMP2)
386
+            } elseif ($column['type'] === ConstFieldType::TIMESTAMP2)
410 387
             {
411 388
                 $values[$name] = $this->getTimestamp2($column);
412
-            }
413
-            elseif ($column['type'] === ConstFieldType::DATE)
389
+            } elseif ($column['type'] === ConstFieldType::DATE)
414 390
             {
415 391
                 $values[$name] = $this->getDate();
416
-            }
417
-            elseif ($column['type'] === ConstFieldType::YEAR)
392
+            } elseif ($column['type'] === ConstFieldType::YEAR)
418 393
             {
419 394
                 $values[$name] = $this->binaryDataReader->readUInt8() + 1900;
420
-            }
421
-            elseif ($column['type'] === ConstFieldType::ENUM)
395
+            } elseif ($column['type'] === ConstFieldType::ENUM)
422 396
             {
423 397
                 $value = $this->binaryDataReader->readUIntBySize($column['size']) - 1;
424 398
 
@@ -428,24 +402,19 @@  discard block
 block discarded – undo
428 402
                 {
429 403
                     $values[$name] = $column['enum_values'][$value];
430 404
                 }
431
-            }
432
-            elseif ($column['type'] === ConstFieldType::SET)
405
+            } elseif ($column['type'] === ConstFieldType::SET)
433 406
             {
434 407
                 $values[$name] = $this->getSet($column);
435
-            }
436
-            elseif ($column['type'] === ConstFieldType::BIT)
408
+            } elseif ($column['type'] === ConstFieldType::BIT)
437 409
             {
438 410
                 $values[$name] = $this->getBit($column);
439
-            }
440
-            elseif ($column['type'] === ConstFieldType::GEOMETRY)
411
+            } elseif ($column['type'] === ConstFieldType::GEOMETRY)
441 412
             {
442 413
                 $values[$name] = $this->binaryDataReader->readLengthCodedPascalString($column['length_size']);
443
-            }
444
-            elseif ($column['type'] === ConstFieldType::JSON)
414
+            } elseif ($column['type'] === ConstFieldType::JSON)
445 415
             {
446 416
                 $values[$name] = $this->jsonBinaryDecoderFactory->makeJsonBinaryDecoder($this->getString(BinaryDataReader::UNSIGNED_INT32_LENGTH, $column))->parseToString();
447
-            }
448
-            else
417
+            } else
449 418
             {
450 419
                 throw new MySQLReplicationException('Unknown row type: ' . $column['type']);
451 420
             }
@@ -547,8 +516,7 @@  discard block
 block discarded – undo
547 516
         {
548 517
             $mask = 0;
549 518
             $res = '';
550
-        }
551
-        else
519
+        } else
552 520
         {
553 521
             $mask = -1;
554 522
             $res = '-';
@@ -683,12 +651,10 @@  discard block
 block discarded – undo
683 651
         if ($column['fsp'] === 1 || $column['fsp'] === 2)
684 652
         {
685 653
             $read = 1;
686
-        }
687
-        elseif ($column['fsp'] === 3 || $column['fsp'] === 4)
654
+        } elseif ($column['fsp'] === 3 || $column['fsp'] === 4)
688 655
         {
689 656
             $read = 2;
690
-        }
691
-        elseif ($column ['fsp'] === 5 || $column['fsp'] === 6)
657
+        } elseif ($column ['fsp'] === 5 || $column['fsp'] === 6)
692 658
         {
693 659
             $read = 3;
694 660
         }
@@ -809,8 +775,7 @@  discard block
 block discarded – undo
809 775
                 if (1 === $column['bytes'])
810 776
                 {
811 777
                     $end = $column['bits'];
812
-                }
813
-                else
778
+                } else
814 779
                 {
815 780
                     $end = $column['bits'] % 8;
816 781
                     if (0 === $end)
@@ -818,8 +783,7 @@  discard block
 block discarded – undo
818 783
                         $end = 8;
819 784
                     }
820 785
                 }
821
-            }
822
-            else
786
+            } else
823 787
             {
824 788
                 $end = 8;
825 789
             }
@@ -829,8 +793,7 @@  discard block
 block discarded – undo
829 793
                 if ($data & (1 << $bit))
830 794
                 {
831 795
                     $current_byte .= '1';
832
-                }
833
-                else
796
+                } else
834 797
                 {
835 798
                     $current_byte .= '0';
836 799
                 }
Please login to merge, or discard this patch.
src/MySQLReplication/JsonBinaryDecoder/JsonBinaryDecoderService.php 1 patch
Braces   +22 added lines, -44 removed lines patch added patch discarded remove patch
@@ -94,20 +94,16 @@  discard block
 block discarded – undo
94 94
         if (self::SMALL_OBJECT === $type)
95 95
         {
96 96
             $this->parseObject();
97
-        }
98
-        else if (self::LARGE_OBJECT === $type)
97
+        } else if (self::LARGE_OBJECT === $type)
99 98
         {
100 99
             //TODO
101
-        }
102
-        else if (self::SMALL_ARRAY === $type)
100
+        } else if (self::SMALL_ARRAY === $type)
103 101
         {
104 102
             $this->parseArray();
105
-        }
106
-        else if (self::LARGE_ARRAY === $type)
103
+        } else if (self::LARGE_ARRAY === $type)
107 104
         {
108 105
             //TODO
109
-        }
110
-        else
106
+        } else
111 107
         {
112 108
             $this->parseScalar($type);
113 109
         }
@@ -174,40 +170,35 @@  discard block
 block discarded – undo
174 170
                 $this->readLiteral(),
175 171
                 $type
176 172
             );
177
-        }
178
-        else if (self::INT16 === $type)
173
+        } else if (self::INT16 === $type)
179 174
         {
180 175
             return new JsonBinaryDecoderValue(
181 176
                 true,
182 177
                 $this->binaryDataReader->readInt16(),
183 178
                 $type
184 179
             );
185
-        }
186
-        else if (self::UINT16 === $type)
180
+        } else if (self::UINT16 === $type)
187 181
         {
188 182
             return new JsonBinaryDecoderValue(
189 183
                 true,
190 184
                 $this->binaryDataReader->readUInt16(),
191 185
                 $type
192 186
             );
193
-        }
194
-        else if (self::INT32 === $type)
187
+        } else if (self::INT32 === $type)
195 188
         {
196 189
             return new JsonBinaryDecoderValue(
197 190
                 true,
198 191
                 $this->binaryDataReader->readInt32(),
199 192
                 $type
200 193
             );
201
-        }
202
-        else if (self::UINT32 === $type)
194
+        } else if (self::UINT32 === $type)
203 195
         {
204 196
             return new JsonBinaryDecoderValue(
205 197
                 true,
206 198
                 $this->binaryDataReader->readUInt32(),
207 199
                 $type
208 200
             );
209
-        }
210
-        else
201
+        } else
211 202
         {
212 203
             $offset = $this->binaryDataReader->readUInt16();
213 204
             if ($offset > $numBytes)
@@ -238,12 +229,10 @@  discard block
 block discarded – undo
238 229
         if (0 === $literal)
239 230
         {
240 231
             return null;
241
-        }
242
-        else if (1 === $literal)
232
+        } else if (1 === $literal)
243 233
         {
244 234
             return true;
245
-        }
246
-        else if (2 === $literal)
235
+        } else if (2 === $literal)
247 236
         {
248 237
             return false;
249 238
         }
@@ -259,18 +248,15 @@  discard block
 block discarded – undo
259 248
         if (false === $jsonBinaryDecoderValue->isIsResolved())
260 249
         {
261 250
             $this->parseJson($jsonBinaryDecoderValue->getType());
262
-        }
263
-        else
251
+        } else
264 252
         {
265 253
             if (null === $jsonBinaryDecoderValue->getValue())
266 254
             {
267 255
                 $this->jsonBinaryDecoderFormatter->formatValueNull();
268
-            }
269
-            elseif (is_bool($jsonBinaryDecoderValue->getValue()))
256
+            } elseif (is_bool($jsonBinaryDecoderValue->getValue()))
270 257
             {
271 258
                 $this->jsonBinaryDecoderFormatter->formatValueBool($jsonBinaryDecoderValue->getValue());
272
-            }
273
-            elseif (is_numeric($jsonBinaryDecoderValue->getValue()))
259
+            } elseif (is_numeric($jsonBinaryDecoderValue->getValue()))
274 260
             {
275 261
                 $this->jsonBinaryDecoderFormatter->formatValueNumeric($jsonBinaryDecoderValue->getValue());
276 262
             }
@@ -310,8 +296,7 @@  discard block
 block discarded – undo
310 296
         if (null === $r)
311 297
         {
312 298
             $this->jsonBinaryDecoderFormatter->formatValueNull();
313
-        }
314
-        else
299
+        } else
315 300
         {
316 301
             $this->jsonBinaryDecoderFormatter->formatValueBool($r);
317 302
         }
@@ -322,32 +307,25 @@  discard block
 block discarded – undo
322 307
         if (self::LITERAL === $type)
323 308
         {
324 309
             $this->parseBoolean();
325
-        }
326
-        else if (self::INT16 === $type)
310
+        } else if (self::INT16 === $type)
327 311
         {
328 312
             $this->jsonBinaryDecoderFormatter->formatValue($this->binaryDataReader->readInt16());
329
-        }
330
-        else if (self::INT32 === $type)
313
+        } else if (self::INT32 === $type)
331 314
         {
332 315
             $this->jsonBinaryDecoderFormatter->formatValue($this->binaryDataReader->readInt32());
333
-        }
334
-        else if (self::INT64 === $type)
316
+        } else if (self::INT64 === $type)
335 317
         {
336 318
             $this->jsonBinaryDecoderFormatter->formatValue($this->binaryDataReader->readInt64());
337
-        }
338
-        else if (self::UINT16 === $type)
319
+        } else if (self::UINT16 === $type)
339 320
         {
340 321
             $this->jsonBinaryDecoderFormatter->formatValue($this->binaryDataReader->readUInt16());
341
-        }
342
-        else if (self::UINT64 === $type)
322
+        } else if (self::UINT64 === $type)
343 323
         {
344 324
             $this->jsonBinaryDecoderFormatter->formatValue($this->binaryDataReader->readUInt64());
345
-        }
346
-        else if (self::DOUBLE === $type)
325
+        } else if (self::DOUBLE === $type)
347 326
         {
348 327
             $this->jsonBinaryDecoderFormatter->formatValue($this->binaryDataReader->readDouble());
349
-        }
350
-        else if (self::STRING === $type)
328
+        } else if (self::STRING === $type)
351 329
         {
352 330
             $this->jsonBinaryDecoderFormatter->formatValue(
353 331
                 $this->binaryDataReader->read($this->readVariableInt())
Please login to merge, or discard this patch.