@@ -257,15 +257,15 @@ discard block |
||
257 | 257 | curl_exec($ch); |
258 | 258 | $size = curl_getinfo($ch, CURLINFO_CONTENT_LENGTH_DOWNLOAD); |
259 | 259 | curl_close($ch); |
260 | - } |
|
261 | - else { |
|
260 | + } else { |
|
262 | 261 | $size = file_exists($path) ? filesize($path) : false; |
263 | 262 | } |
264 | 263 | |
265 | 264 | if (isset($size) && is_numeric($size)) { |
266 | 265 | return $format ? tools::byteFormat($size) : $size; |
267 | - } |
|
268 | - else return false; |
|
266 | + } else { |
|
267 | + return false; |
|
268 | + } |
|
269 | 269 | } |
270 | 270 | |
271 | 271 | //fix methods after here comments |
@@ -293,15 +293,16 @@ discard block |
||
293 | 293 | $file->isDir() ? rmdir($file->getRealPath()) : unlink($file->getRealPath()); |
294 | 294 | } |
295 | 295 | rmdir($path); |
296 | - } |
|
297 | - else { |
|
296 | + } else { |
|
298 | 297 | logger::write("BPT delete function used\ndelete function cannot delete folder because its have subFiles and sub parameter haven't true value",loggerTypes::WARNING); |
299 | 298 | return false; |
300 | 299 | } |
301 | - } |
|
302 | - else rmdir($path); |
|
303 | - } |
|
304 | - else unlink($path); |
|
300 | + } else { |
|
301 | + rmdir($path); |
|
302 | + } |
|
303 | + } else { |
|
304 | + unlink($path); |
|
305 | + } |
|
305 | 306 | |
306 | 307 | return true; |
307 | 308 | } |
@@ -328,8 +329,9 @@ discard block |
||
328 | 329 | foreach ($string as $k => &$v) { |
329 | 330 | if ($diff->$v) { |
330 | 331 | $v = $diff->$v; |
331 | - } |
|
332 | - else unset($string[$k]); |
|
332 | + } else { |
|
333 | + unset($string[$k]); |
|
334 | + } |
|
333 | 335 | } |
334 | 336 | $string['status'] = $status; |
335 | 337 | return count($string) > 1 ? $string : ['status' => 'now']; |
@@ -35,8 +35,7 @@ discard block |
||
35 | 35 | if(settings::$receiver === receiver::GETUPDATES) { |
36 | 36 | logger::write('Answer mode only work when receiver is webhook',loggerTypes::ERROR); |
37 | 37 | throw new bptException('ANSWER_MODE_GETUPDATES'); |
38 | - } |
|
39 | - elseif(settings::$multi) { |
|
38 | + } elseif(settings::$multi) { |
|
40 | 39 | logger::write('You can not use answer mode when multi setting is on',loggerTypes::ERROR); |
41 | 40 | throw new bptException('ANSWER_MODE_MULTI'); |
42 | 41 | } |
@@ -55,8 +54,7 @@ discard block |
||
55 | 54 | foreach ($data as $key=>&$value){ |
56 | 55 | if (!isset($value)){ |
57 | 56 | unset($data[$key]); |
58 | - } |
|
59 | - elseif (is_array($value) || (is_object($value) && !is_a($value,'CURLFile'))){ |
|
57 | + } elseif (is_array($value) || (is_object($value) && !is_a($value,'CURLFile'))){ |
|
60 | 58 | $value = json_encode($value); |
61 | 59 | } |
62 | 60 | } |
@@ -233,8 +233,7 @@ |
||
233 | 233 | public function __call (string $name, array $arguments) { |
234 | 234 | if (!isset($arguments[1]) && isset($arguments[0]) && is_array($arguments[0])) { |
235 | 235 | return request::$name(...$arguments[0]); |
236 | - } |
|
237 | - else { |
|
236 | + } else { |
|
238 | 237 | return request::$name(...$arguments); |
239 | 238 | } |
240 | 239 | } |
@@ -703,12 +703,10 @@ discard block |
||
703 | 703 | self::setDefaults($action,$arguments); |
704 | 704 | if (isset($arguments['answer'])) { |
705 | 705 | return answer::init($action,$arguments); |
706 | - } |
|
707 | - else { |
|
706 | + } else { |
|
708 | 707 | return self::processResponse($action,curl::init($action,$arguments)); |
709 | 708 | } |
710 | - } |
|
711 | - else { |
|
709 | + } else { |
|
712 | 710 | logger::write("$name method is not supported",loggerTypes::ERROR); |
713 | 711 | throw new bptException('METHOD_NOT_FOUND'); |
714 | 712 | } |
@@ -734,8 +732,7 @@ discard block |
||
734 | 732 | $arguments['media'][$key]['media'] = new CURLFile($media['media']); |
735 | 733 | } |
736 | 734 | } |
737 | - } |
|
738 | - elseif ($file_params = self::methodFile($name)) { |
|
735 | + } elseif ($file_params = self::methodFile($name)) { |
|
739 | 736 | foreach ($file_params as $param) { |
740 | 737 | if (isset($arguments[$param]) && file_exists($arguments[$param])) { |
741 | 738 | $arguments[$param] = new CURLFile($arguments[$param]); |
@@ -757,12 +754,10 @@ discard block |
||
757 | 754 | $value = new ($return[0]) ($value); |
758 | 755 | } |
759 | 756 | return $response; |
760 | - } |
|
761 | - else { |
|
757 | + } else { |
|
762 | 758 | return new ($return) ($response->result); |
763 | 759 | } |
764 | - } |
|
765 | - else { |
|
760 | + } else { |
|
766 | 761 | return $response->result; |
767 | 762 | } |
768 | 763 | } |
@@ -774,8 +769,7 @@ discard block |
||
774 | 769 | if (!isset($arguments[$default])){ |
775 | 770 | $arguments[$default] = self::catchFields($default); |
776 | 771 | } |
777 | - } |
|
778 | - elseif (isset(BPT::$update->$key) || $key === 'other') { |
|
772 | + } elseif (isset(BPT::$update->$key) || $key === 'other') { |
|
779 | 773 | foreach ($default as $def) { |
780 | 774 | if (!isset($arguments[$def])){ |
781 | 775 | $arguments[$def] = self::catchFields($def); |
@@ -790,8 +784,7 @@ discard block |
||
790 | 784 | if ($response->ok) { |
791 | 785 | self::$status = true; |
792 | 786 | return self::methodReturn($name,$response); |
793 | - } |
|
794 | - else { |
|
787 | + } else { |
|
795 | 788 | self::$status = false; |
796 | 789 | return new responseError($response); |
797 | 790 | } |
@@ -826,9 +819,13 @@ discard block |
||
826 | 819 | default => false |
827 | 820 | }; |
828 | 821 | case 'file_id' : |
829 | - if (isset(BPT::$update->message)) $type = 'message'; |
|
830 | - elseif (isset(BPT::$update->edited_message)) $type = 'edited_message'; |
|
831 | - else return false; |
|
822 | + if (isset(BPT::$update->message)) { |
|
823 | + $type = 'message'; |
|
824 | + } elseif (isset(BPT::$update->edited_message)) { |
|
825 | + $type = 'edited_message'; |
|
826 | + } else { |
|
827 | + return false; |
|
828 | + } |
|
832 | 829 | |
833 | 830 | return match(true) { |
834 | 831 | isset(BPT::$update->$type->animation) => BPT::$update->$type->animation->file_id, |
@@ -66,11 +66,9 @@ discard block |
||
66 | 66 | foreach ($settings as $setting => $value) { |
67 | 67 | try{ |
68 | 68 | self::$$setting = $value; |
69 | - } |
|
70 | - catch (TypeError){ |
|
69 | + } catch (TypeError){ |
|
71 | 70 | logger::write("$setting setting has wrong type , its set to default value",loggerTypes::WARNING); |
72 | - } |
|
73 | - catch (Error){ |
|
71 | + } catch (Error){ |
|
74 | 72 | logger::write("$setting setting is not one of library settings",loggerTypes::WARNING); |
75 | 73 | } |
76 | 74 | } |
@@ -81,13 +79,11 @@ discard block |
||
81 | 79 | self::secureFolder(); |
82 | 80 | self::db(); |
83 | 81 | self::$receiver !== receiver::GETUPDATES ? self::webhook() : self::getUpdates(); |
84 | - } |
|
85 | - else { |
|
82 | + } else { |
|
86 | 83 | logger::write('token format is not right, check it and try again',loggerTypes::ERROR); |
87 | 84 | throw new bptException('TOKEN_NOT_TRUE'); |
88 | 85 | } |
89 | - } |
|
90 | - else { |
|
86 | + } else { |
|
91 | 87 | logger::write('You must specify token parameter in settings',loggerTypes::ERROR); |
92 | 88 | throw new bptException('TOKEN_NOT_FOUND'); |
93 | 89 | } |
@@ -129,8 +125,7 @@ discard block |
||
129 | 125 | private static function getUpdates() { |
130 | 126 | if (self::$handler) { |
131 | 127 | getUpdates::init(); |
132 | - } |
|
133 | - else { |
|
128 | + } else { |
|
134 | 129 | logger::write('You can\'t use getUpdates receiver when handler is off , use webhook or use handler',loggerTypes::ERROR); |
135 | 130 | throw new bptException('GETUPDATE_NEED_HANDLER'); |
136 | 131 | } |