@@ -709,16 +709,14 @@ discard block |
||
| 709 | 709 | self::setDefaults($action,$arguments); |
| 710 | 710 | if (isset($arguments['answer'])) { |
| 711 | 711 | return answer::init($action,$arguments); |
| 712 | - } |
|
| 713 | - else { |
|
| 712 | + } else { |
|
| 714 | 713 | $result = curl::init($action,$arguments); |
| 715 | 714 | if (is_object($result)) { |
| 716 | 715 | return self::processResponse($action,$result); |
| 717 | 716 | } |
| 718 | 717 | return false; |
| 719 | 718 | } |
| 720 | - } |
|
| 721 | - else { |
|
| 719 | + } else { |
|
| 722 | 720 | logger::write("$name method is not supported",loggerTypes::ERROR); |
| 723 | 721 | throw new bptException('METHOD_NOT_FOUND'); |
| 724 | 722 | } |
@@ -744,8 +742,7 @@ discard block |
||
| 744 | 742 | $arguments['media'][$key]['media'] = new CURLFile($media['media']); |
| 745 | 743 | } |
| 746 | 744 | } |
| 747 | - } |
|
| 748 | - elseif ($file_params = self::methodFile($name)) { |
|
| 745 | + } elseif ($file_params = self::methodFile($name)) { |
|
| 749 | 746 | foreach ($file_params as $param) { |
| 750 | 747 | if (isset($arguments[$param]) && file_exists($arguments[$param])) { |
| 751 | 748 | $arguments[$param] = new CURLFile($arguments[$param]); |
@@ -767,12 +764,10 @@ discard block |
||
| 767 | 764 | $value = new ($return[0]) ($value); |
| 768 | 765 | } |
| 769 | 766 | return $response; |
| 770 | - } |
|
| 771 | - else { |
|
| 767 | + } else { |
|
| 772 | 768 | return new ($return) ($response->result); |
| 773 | 769 | } |
| 774 | - } |
|
| 775 | - else { |
|
| 770 | + } else { |
|
| 776 | 771 | return $response->result; |
| 777 | 772 | } |
| 778 | 773 | } |
@@ -784,8 +779,7 @@ discard block |
||
| 784 | 779 | if (!isset($arguments[$default])){ |
| 785 | 780 | $arguments[$default] = self::catchFields($default); |
| 786 | 781 | } |
| 787 | - } |
|
| 788 | - elseif (isset(BPT::$update->$key) || $key === 'other') { |
|
| 782 | + } elseif (isset(BPT::$update->$key) || $key === 'other') { |
|
| 789 | 783 | foreach ($default as $def) { |
| 790 | 784 | if (!isset($arguments[$def])){ |
| 791 | 785 | $arguments[$def] = self::catchFields($def); |
@@ -801,8 +795,7 @@ discard block |
||
| 801 | 795 | self::$status = true; |
| 802 | 796 | self::$pure_response = $response; |
| 803 | 797 | return self::methodReturn($name,$response); |
| 804 | - } |
|
| 805 | - else { |
|
| 798 | + } else { |
|
| 806 | 799 | self::$status = false; |
| 807 | 800 | self::$pure_response = $response; |
| 808 | 801 | return new responseError($response); |
@@ -845,9 +838,13 @@ discard block |
||
| 845 | 838 | default => false |
| 846 | 839 | }; |
| 847 | 840 | case fields::FILE_ID : |
| 848 | - if (isset(BPT::$update->message)) $type = 'message'; |
|
| 849 | - elseif (isset(BPT::$update->edited_message)) $type = 'edited_message'; |
|
| 850 | - else return false; |
|
| 841 | + if (isset(BPT::$update->message)) { |
|
| 842 | + $type = 'message'; |
|
| 843 | + } elseif (isset(BPT::$update->edited_message)) { |
|
| 844 | + $type = 'edited_message'; |
|
| 845 | + } else { |
|
| 846 | + return false; |
|
| 847 | + } |
|
| 851 | 848 | |
| 852 | 849 | return match(true) { |
| 853 | 850 | isset(BPT::$update->$type->animation) => BPT::$update->$type->animation->file_id, |
@@ -65,17 +65,13 @@ discard block |
||
| 65 | 65 | public static function process (): void { |
| 66 | 66 | if (isset(BPT::$update->message)) { |
| 67 | 67 | self::processMessage(BPT::$update->message); |
| 68 | - } |
|
| 69 | - elseif (isset(BPT::$update->edited_message)) { |
|
| 68 | + } elseif (isset(BPT::$update->edited_message)) { |
|
| 70 | 69 | self::processMessage(BPT::$update->edited_message); |
| 71 | - } |
|
| 72 | - elseif (isset(BPT::$update->callback_query)) { |
|
| 70 | + } elseif (isset(BPT::$update->callback_query)) { |
|
| 73 | 71 | self::processCallbackQuery(BPT::$update->callback_query); |
| 74 | - } |
|
| 75 | - elseif (isset(BPT::$update->inline_query)) { |
|
| 72 | + } elseif (isset(BPT::$update->inline_query)) { |
|
| 76 | 73 | self::processInlineQuery(BPT::$update->inline_query); |
| 77 | - } |
|
| 78 | - elseif (isset(BPT::$update->my_chat_member)) { |
|
| 74 | + } elseif (isset(BPT::$update->my_chat_member)) { |
|
| 79 | 75 | self::processMyChatMember(BPT::$update->my_chat_member); |
| 80 | 76 | } |
| 81 | 77 | } |
@@ -131,8 +127,7 @@ discard block |
||
| 131 | 127 | if ($type === chatType::PRIVATE) { |
| 132 | 128 | if ($update->new_chat_member->status === chatMemberStatus::MEMBER) { |
| 133 | 129 | self::update('users', ['blocked' => false], ['id' => $update->from->id], 1); |
| 134 | - } |
|
| 135 | - else { |
|
| 130 | + } else { |
|
| 136 | 131 | self::update('users', ['blocked' => true], ['id' => $update->from->id], 1); |
| 137 | 132 | } |
| 138 | 133 | } |
@@ -208,8 +203,7 @@ discard block |
||
| 208 | 203 | $prepare = self::$connection->prepare($query); |
| 209 | 204 | if ($prepare->execute($vars)) { |
| 210 | 205 | return $need_result ? $prepare->get_result() : true; |
| 211 | - } |
|
| 212 | - else { |
|
| 206 | + } else { |
|
| 213 | 207 | logger::write(loggerTypes::WARNING, $prepare->error); |
| 214 | 208 | return false; |
| 215 | 209 | } |
@@ -221,8 +215,7 @@ discard block |
||
| 221 | 215 | foreach ($array as $name => $value) { |
| 222 | 216 | if ($first) { |
| 223 | 217 | $first = false; |
| 224 | - } |
|
| 225 | - else { |
|
| 218 | + } else { |
|
| 226 | 219 | $query .= $operator; |
| 227 | 220 | } |
| 228 | 221 | $query .= " `$name` = ?"; |
@@ -239,8 +232,7 @@ discard block |
||
| 239 | 232 | } |
| 240 | 233 | if (!empty($count)) { |
| 241 | 234 | $query .= !empty($offset) ? " LIMIT $offset,$count" : " LIMIT $count"; |
| 242 | - } |
|
| 243 | - elseif (!empty($offset)) { |
|
| 235 | + } elseif (!empty($offset)) { |
|
| 244 | 236 | $query .= " OFFSET $offset"; |
| 245 | 237 | } |
| 246 | 238 | return $values; |
@@ -298,7 +290,9 @@ discard block |
||
| 298 | 290 | public static function insert (string $table, string|array $columns, array|string $values): mysqli_result|bool { |
| 299 | 291 | $query = "INSERT INTO `$table`("; |
| 300 | 292 | $query .= '`' . (is_string($columns) ? $columns : implode('`,`', $columns)) . '`) VALUES ('; |
| 301 | - if (is_string($values)) $values = [$values]; |
|
| 293 | + if (is_string($values)) { |
|
| 294 | + $values = [$values]; |
|
| 295 | + } |
|
| 302 | 296 | $query .= '?' . str_repeat(',?', count($values) - 1) . ')'; |
| 303 | 297 | return self::query($query, $values, false); |
| 304 | 298 | } |
@@ -321,8 +315,7 @@ discard block |
||
| 321 | 315 | $query = "SELECT "; |
| 322 | 316 | if ($columns == '*') { |
| 323 | 317 | $query .= "* "; |
| 324 | - } |
|
| 325 | - else { |
|
| 318 | + } else { |
|
| 326 | 319 | $query .= '`' . (is_string($columns) ? $columns : implode('`,`', $columns)) . '` '; |
| 327 | 320 | } |
| 328 | 321 | $query .= "FROM `$table`"; |
@@ -383,8 +376,11 @@ discard block |
||
| 383 | 376 | public static function selectEach (string $table, array|string $columns = '*', array $where = null, int $count = null, int $offset = null): bool|Generator { |
| 384 | 377 | $res = self::select($table, $columns, $where, $count, $offset); |
| 385 | 378 | if ($res) { |
| 386 | - while ($row = $res->fetch_assoc()) yield $row; |
|
| 379 | + while ($row = $res->fetch_assoc()) { |
|
| 380 | + yield $row; |
|
| 381 | + } |
|
| 382 | + } else { |
|
| 383 | + return $res; |
|
| 387 | 384 | } |
| 388 | - else return $res; |
|
| 389 | 385 | } |
| 390 | 386 | } |
| 391 | 387 | \ No newline at end of file |