@@ -69,17 +69,13 @@ discard block |
||
| 69 | 69 | if (self::$auto_process) { |
| 70 | 70 | if (isset(BPT::$update->message)) { |
| 71 | 71 | self::processMessage(BPT::$update->message); |
| 72 | - } |
|
| 73 | - elseif (isset(BPT::$update->edited_message)) { |
|
| 72 | + } elseif (isset(BPT::$update->edited_message)) { |
|
| 74 | 73 | self::processMessage(BPT::$update->edited_message); |
| 75 | - } |
|
| 76 | - elseif (isset(BPT::$update->callback_query)) { |
|
| 74 | + } elseif (isset(BPT::$update->callback_query)) { |
|
| 77 | 75 | self::processCallbackQuery(BPT::$update->callback_query); |
| 78 | - } |
|
| 79 | - elseif (isset(BPT::$update->inline_query)) { |
|
| 76 | + } elseif (isset(BPT::$update->inline_query)) { |
|
| 80 | 77 | self::processInlineQuery(BPT::$update->inline_query); |
| 81 | - } |
|
| 82 | - elseif (isset(BPT::$update->my_chat_member)) { |
|
| 78 | + } elseif (isset(BPT::$update->my_chat_member)) { |
|
| 83 | 79 | self::processMyChatMember(BPT::$update->my_chat_member); |
| 84 | 80 | } |
| 85 | 81 | } |
@@ -136,8 +132,7 @@ discard block |
||
| 136 | 132 | if ($type === chatType::PRIVATE) { |
| 137 | 133 | if ($update->new_chat_member->status === chatMemberStatus::MEMBER) { |
| 138 | 134 | self::update('users', ['blocked' => false], ['id' => $update->from->id], 1); |
| 139 | - } |
|
| 140 | - else { |
|
| 135 | + } else { |
|
| 141 | 136 | self::update('users', ['blocked' => true], ['id' => $update->from->id], 1); |
| 142 | 137 | } |
| 143 | 138 | } |
@@ -251,11 +246,9 @@ discard block |
||
| 251 | 246 | foreach ($vars as $var) { |
| 252 | 247 | if (is_int($var)) { |
| 253 | 248 | $types .= 'i'; |
| 254 | - } |
|
| 255 | - elseif (is_double($var)) { |
|
| 249 | + } elseif (is_double($var)) { |
|
| 256 | 250 | $types .= 'd'; |
| 257 | - } |
|
| 258 | - else { |
|
| 251 | + } else { |
|
| 259 | 252 | $types .= 's'; |
| 260 | 253 | } |
| 261 | 254 | } |
@@ -273,15 +266,13 @@ discard block |
||
| 273 | 266 | foreach ($array as $name => $value) { |
| 274 | 267 | if ($first) { |
| 275 | 268 | $first = false; |
| 276 | - } |
|
| 277 | - else { |
|
| 269 | + } else { |
|
| 278 | 270 | $query .= $operator; |
| 279 | 271 | } |
| 280 | 272 | if ($is_update && str_starts_with($value, '.=') && is_numeric(substr($value,2))) { |
| 281 | 273 | $query .= " `$name` = `$name` + ?"; |
| 282 | 274 | $values[] = substr($value,2); |
| 283 | - } |
|
| 284 | - else { |
|
| 275 | + } else { |
|
| 285 | 276 | $query .= " `$name` = ?"; |
| 286 | 277 | $values[] = $value; |
| 287 | 278 | } |
@@ -298,8 +289,7 @@ discard block |
||
| 298 | 289 | } |
| 299 | 290 | if (!empty($count)) { |
| 300 | 291 | $query .= !empty($offset) ? " LIMIT $offset,$count" : " LIMIT $count"; |
| 301 | - } |
|
| 302 | - elseif (!empty($offset)) { |
|
| 292 | + } elseif (!empty($offset)) { |
|
| 303 | 293 | $query .= " OFFSET $offset"; |
| 304 | 294 | } |
| 305 | 295 | return $values; |
@@ -317,8 +307,7 @@ discard block |
||
| 317 | 307 | foreach ($where as $name => $value) { |
| 318 | 308 | if ($first) { |
| 319 | 309 | $first = false; |
| 320 | - } |
|
| 321 | - else { |
|
| 310 | + } else { |
|
| 322 | 311 | $query .= ' AND'; |
| 323 | 312 | } |
| 324 | 313 | |
@@ -384,8 +373,7 @@ discard block |
||
| 384 | 373 | foreach ($order_by as $key => $mode) { |
| 385 | 374 | if ($first) { |
| 386 | 375 | $first = false; |
| 387 | - } |
|
| 388 | - else { |
|
| 376 | + } else { |
|
| 389 | 377 | $query .= ', '; |
| 390 | 378 | } |
| 391 | 379 | if (is_numeric($key)) { |
@@ -399,8 +387,7 @@ discard block |
||
| 399 | 387 | private static function countBuilder(string &$query, int $count = null, int $offset = null): void { |
| 400 | 388 | if (!empty($count)) { |
| 401 | 389 | $query .= !empty($offset) ? " LIMIT $offset,$count" : " LIMIT $count"; |
| 402 | - } |
|
| 403 | - elseif (!empty($offset)) { |
|
| 390 | + } elseif (!empty($offset)) { |
|
| 404 | 391 | $query .= " OFFSET $offset"; |
| 405 | 392 | } |
| 406 | 393 | } |
@@ -412,8 +399,7 @@ discard block |
||
| 412 | 399 | foreach ($modify as $name => $value) { |
| 413 | 400 | if ($first) { |
| 414 | 401 | $first = false; |
| 415 | - } |
|
| 416 | - else { |
|
| 402 | + } else { |
|
| 417 | 403 | $query .= ' ,'; |
| 418 | 404 | } |
| 419 | 405 | |
@@ -453,7 +439,9 @@ discard block |
||
| 453 | 439 | |
| 454 | 440 | private static function insertBuilder(string &$query, string|array $columns, array|string $values): array { |
| 455 | 441 | $query .= '(`' . (is_string($columns) ? $columns : implode('`,`', $columns)) . '`) VALUES ('; |
| 456 | - if (is_string($values)) $values = [$values]; |
|
| 442 | + if (is_string($values)) { |
|
| 443 | + $values = [$values]; |
|
| 444 | + } |
|
| 457 | 445 | $query .= '?' . str_repeat(',?', count($values) - 1) . ')'; |
| 458 | 446 | return $values; |
| 459 | 447 | } |
@@ -461,8 +449,7 @@ discard block |
||
| 461 | 449 | private static function selectBuilder(string &$query, string|array $columns): void { |
| 462 | 450 | if ($columns == '*') { |
| 463 | 451 | $query .= " * "; |
| 464 | - } |
|
| 465 | - else { |
|
| 452 | + } else { |
|
| 466 | 453 | $query .= ' `' . (is_string($columns) ? $columns : implode('`,`', $columns)) . '` '; |
| 467 | 454 | } |
| 468 | 455 | } |
@@ -604,9 +591,12 @@ discard block |
||
| 604 | 591 | public static function selectEach (string $table, array|string $columns = '*', array $where = null, int $count = null, int $offset = null): bool|Generator { |
| 605 | 592 | $res = self::select($table, $columns, $where, $count, $offset); |
| 606 | 593 | if ($res) { |
| 607 | - while ($row = $res->fetch_assoc()) yield $row; |
|
| 594 | + while ($row = $res->fetch_assoc()) { |
|
| 595 | + yield $row; |
|
| 596 | + } |
|
| 597 | + } else { |
|
| 598 | + return $res; |
|
| 608 | 599 | } |
| 609 | - else return $res; |
|
| 610 | 600 | } |
| 611 | 601 | |
| 612 | 602 | /** |