@@ -72,17 +72,13 @@ discard block |
||
72 | 72 | if (self::$auto_process) { |
73 | 73 | if (isset(BPT::$update->message)) { |
74 | 74 | self::processMessage(BPT::$update->message); |
75 | - } |
|
76 | - elseif (isset(BPT::$update->edited_message)) { |
|
75 | + } elseif (isset(BPT::$update->edited_message)) { |
|
77 | 76 | self::processMessage(BPT::$update->edited_message); |
78 | - } |
|
79 | - elseif (isset(BPT::$update->callback_query)) { |
|
77 | + } elseif (isset(BPT::$update->callback_query)) { |
|
80 | 78 | self::processCallbackQuery(BPT::$update->callback_query); |
81 | - } |
|
82 | - elseif (isset(BPT::$update->inline_query)) { |
|
79 | + } elseif (isset(BPT::$update->inline_query)) { |
|
83 | 80 | self::processInlineQuery(BPT::$update->inline_query); |
84 | - } |
|
85 | - elseif (isset(BPT::$update->my_chat_member)) { |
|
81 | + } elseif (isset(BPT::$update->my_chat_member)) { |
|
86 | 82 | self::processMyChatMember(BPT::$update->my_chat_member); |
87 | 83 | } |
88 | 84 | } |
@@ -139,8 +135,7 @@ discard block |
||
139 | 135 | if ($type === chatType::PRIVATE) { |
140 | 136 | if ($update->new_chat_member->status === chatMemberStatus::MEMBER) { |
141 | 137 | self::update('users', ['blocked' => false], ['id' => $update->from->id], 1); |
142 | - } |
|
143 | - else { |
|
138 | + } else { |
|
144 | 139 | self::update('users', ['blocked' => true], ['id' => $update->from->id], 1); |
145 | 140 | } |
146 | 141 | } |
@@ -280,11 +275,9 @@ discard block |
||
280 | 275 | foreach ($vars as $var) { |
281 | 276 | if (is_int($var)) { |
282 | 277 | $types .= 'i'; |
283 | - } |
|
284 | - elseif (is_double($var)) { |
|
278 | + } elseif (is_double($var)) { |
|
285 | 279 | $types .= 'd'; |
286 | - } |
|
287 | - else { |
|
280 | + } else { |
|
288 | 281 | $types .= 's'; |
289 | 282 | } |
290 | 283 | } |
@@ -308,8 +301,7 @@ discard block |
||
308 | 301 | foreach ($where as $name => $value) { |
309 | 302 | if ($first) { |
310 | 303 | $first = false; |
311 | - } |
|
312 | - else { |
|
304 | + } else { |
|
313 | 305 | $query .= ' AND'; |
314 | 306 | } |
315 | 307 | |
@@ -381,8 +373,7 @@ discard block |
||
381 | 373 | foreach ($order_by as $key => $mode) { |
382 | 374 | if ($first) { |
383 | 375 | $first = false; |
384 | - } |
|
385 | - else { |
|
376 | + } else { |
|
386 | 377 | $query .= ', '; |
387 | 378 | } |
388 | 379 | if (is_numeric($key)) { |
@@ -396,8 +387,7 @@ discard block |
||
396 | 387 | private static function countBuilder(string &$query, int $count = null, int $offset = null): void { |
397 | 388 | if (!empty($count)) { |
398 | 389 | $query .= !empty($offset) ? " LIMIT $offset,$count" : " LIMIT $count"; |
399 | - } |
|
400 | - elseif (!empty($offset)) { |
|
390 | + } elseif (!empty($offset)) { |
|
401 | 391 | $query .= " OFFSET $offset"; |
402 | 392 | } |
403 | 393 | } |
@@ -409,8 +399,7 @@ discard block |
||
409 | 399 | foreach ($modify as $name => $value) { |
410 | 400 | if ($first) { |
411 | 401 | $first = false; |
412 | - } |
|
413 | - else { |
|
402 | + } else { |
|
414 | 403 | $query .= ' ,'; |
415 | 404 | } |
416 | 405 | |
@@ -456,7 +445,9 @@ discard block |
||
456 | 445 | |
457 | 446 | private static function insertBuilder(string &$query, string|array $columns, array|string $values): array { |
458 | 447 | $query .= '(`' . (is_string($columns) ? $columns : implode('`,`', $columns)) . '`) VALUES ('; |
459 | - if (is_string($values)) $values = [$values]; |
|
448 | + if (is_string($values)) { |
|
449 | + $values = [$values]; |
|
450 | + } |
|
460 | 451 | $query .= '?' . str_repeat(',?', count($values) - 1) . ')'; |
461 | 452 | return $values; |
462 | 453 | } |
@@ -481,8 +472,7 @@ discard block |
||
481 | 472 | $column = 'all'; |
482 | 473 | } |
483 | 474 | $query .= strtoupper($function) . "($formatted) as `{$function}_$column`"; |
484 | - } |
|
485 | - else { |
|
475 | + } else { |
|
486 | 476 | $query .= "`$column`"; |
487 | 477 | } |
488 | 478 | |
@@ -636,9 +626,12 @@ discard block |
||
636 | 626 | public static function selectEach (string $table, array|string $columns = '*', array $where = null, int $count = null, int $offset = null, array|string $group_by = [], array|string $order_by = []): bool|Generator { |
637 | 627 | $res = self::select($table, $columns, $where, $count, $offset, $group_by, $order_by); |
638 | 628 | if ($res) { |
639 | - while ($row = $res->fetch_assoc()) yield $row; |
|
629 | + while ($row = $res->fetch_assoc()) { |
|
630 | + yield $row; |
|
631 | + } |
|
632 | + } else { |
|
633 | + return $res; |
|
640 | 634 | } |
641 | - else return $res; |
|
642 | 635 | } |
643 | 636 | |
644 | 637 | /** |