diff --git a/extend/fast/Http.php b/extend/fast/Http.php index b3bb31f7fd769aad2dfb4a72d46ceea037287599..0af26dc4b054155c5c3bbe530fe9ab0b60924212 100644 --- a/extend/fast/Http.php +++ b/extend/fast/Http.php @@ -11,11 +11,11 @@ class Http /** * 发送一个POST请求 * @param string $url 请求URL - * @param array $params 请求参数 - * @param array $options 扩展参数 + * @param array $params 请求参数 + * @param array $options 扩展参数 * @return mixed|string */ - public static function post($url, $params = [], $options = []) + public static function post(string $url, array $params = [], array $options = []) { $req = self::sendRequest($url, $params, 'POST', $options); return $req['ret'] ? $req['msg'] : ''; @@ -24,11 +24,11 @@ class Http /** * 发送一个GET请求 * @param string $url 请求URL - * @param array $params 请求参数 - * @param array $options 扩展参数 + * @param array $params 请求参数 + * @param array $options 扩展参数 * @return mixed|string */ - public static function get($url, $params = [], $options = []) + public static function get(string $url, array $params = [], array $options = []) { $req = self::sendRequest($url, $params, 'GET', $options); return $req['ret'] ? $req['msg'] : ''; @@ -42,7 +42,7 @@ class Http * @param mixed $options CURL的参数 * @return array */ - public static function sendRequest($url, $params = [], $method = 'POST', $options = []) + public static function sendRequest(string $url, $params = [], string $method = 'POST', $options = []): array { $method = strtoupper($method); $protocol = substr($url, 0, 5); @@ -108,7 +108,7 @@ class Http * @param string $method 请求的方法 * @return boolean TRUE */ - public static function sendAsyncRequest($url, $params = [], $method = 'POST') + public static function sendAsyncRequest(string $url, $params = [], string $method = 'POST'): bool { $method = strtoupper($method); $method = $method == 'POST' ? 'POST' : 'GET'; @@ -157,10 +157,10 @@ class Http /** * 发送文件到客户端 * @param string $file - * @param bool $delaftersend - * @param bool $exitaftersend + * @param bool $deleteAfterSend + * @param bool $exitAfterSend */ - public static function sendToBrowser($file, $delaftersend = true, $exitaftersend = true) + public static function sendToBrowser(string $file, bool $deleteAfterSend = true, bool $exitAfterSend = true) { if (file_exists($file) && is_readable($file)) { header('Content-Description: File Transfer'); @@ -174,10 +174,10 @@ class Http ob_clean(); flush(); readfile($file); - if ($delaftersend) { + if ($deleteAfterSend) { unlink($file); } - if ($exitaftersend) { + if ($exitAfterSend) { exit; } } diff --git a/extend/fast/Random.php b/extend/fast/Random.php index 881091712af8f67fb3b86fd00c4fa648016c2dc3..db1f6f9a77934e24cb65f417d8097b88e29d513f 100644 --- a/extend/fast/Random.php +++ b/extend/fast/Random.php @@ -14,7 +14,7 @@ class Random * @param int $len 长度 * @return string */ - public static function alnum($len = 6) + public static function alnum(int $len = 6): string { return self::build('alnum', $len); } @@ -25,7 +25,7 @@ class Random * @param int $len 长度 * @return string */ - public static function alpha($len = 6) + public static function alpha(int $len = 6): string { return self::build('alpha', $len); } @@ -36,7 +36,7 @@ class Random * @param int $len 长度 * @return string */ - public static function numeric($len = 4) + public static function numeric(int $len = 4): string { return self::build('numeric', $len); } @@ -47,7 +47,7 @@ class Random * @param int $len 长度 * @return string */ - public static function nozero($len = 4) + public static function nozero(int $len = 4): string { return self::build('nozero', $len); } @@ -58,7 +58,7 @@ class Random * @param int $len 长度 * @return string */ - public static function build($type = 'alnum', $len = 8) + public static function build(string $type = 'alnum', int $len = 8): string { switch ($type) { case 'alpha': @@ -93,7 +93,7 @@ class Random * 获取全球唯一标识 * @return string */ - public static function uuid() + public static function uuid(): string { return sprintf( '%04x%04x-%04x-%04x-%04x-%04x%04x%04x',