diff --git a/HttpServer/Client/ClientAbstracts.php b/HttpServer/Client/ClientAbstracts.php index 36a6cc2c..d4d9f434 100644 --- a/HttpServer/Client/ClientAbstracts.php +++ b/HttpServer/Client/ClientAbstracts.php @@ -10,6 +10,8 @@ use Snowflake\Abstracts\Component; use Snowflake\Core\Help; use Swoole\Coroutine\System; +defined('SPLIT_URL') or define('SPLIT_URL', '/(http[s]?:\/\/)?(([\w\-_]+\.)+\w+(:\d+)?)((\/[a-zA-Z0-9\-]+)+[\/]?(\?[a-zA-Z]+=.*)?)?/'); + /** * Class ClientAbstracts @@ -94,7 +96,7 @@ abstract class ClientAbstracts extends Component implements IClient /** * @param string $contentType */ - public function setContentType(string $contentType) + public function setContentType(string $contentType): void { $this->header['Content-Type'] = $contentType; } @@ -233,7 +235,7 @@ abstract class ClientAbstracts extends Component implements IClient * @param $key * @param $value */ - public function addHeader($key, $value) + public function addHeader($key, $value): void { $this->header[$key] = $value; } @@ -280,9 +282,9 @@ abstract class ClientAbstracts extends Component implements IClient /** * @param string $value - * @return $this + * @return static */ - public function setMethod(string $value): self + public function setMethod(string $value): static { $this->method = $value; return $this; diff --git a/HttpServer/Client/IClient.php b/HttpServer/Client/IClient.php index 3cd0d7f1..80d4d8ed 100644 --- a/HttpServer/Client/IClient.php +++ b/HttpServer/Client/IClient.php @@ -4,6 +4,8 @@ namespace HttpServer\Client; +use Closure; + interface IClient { @@ -13,7 +15,7 @@ interface IClient * @param array $params * @return array|Result|int|string */ - public function get(string $path, array $params = []); + public function get(string $path, array $params = []): Result|int|array|string; /** @@ -21,7 +23,7 @@ interface IClient * @param array $params * @return array|Result|int|string */ - public function post(string $path, array $params = []); + public function post(string $path, array $params = []): Result|int|array|string; /** @@ -29,7 +31,7 @@ interface IClient * @param array $params * @return array|Result|int|string */ - public function delete(string $path, array $params = []); + public function delete(string $path, array $params = []): Result|int|array|string; /** @@ -37,7 +39,7 @@ interface IClient * @param array $params * @return array|Result|int|string */ - public function options(string $path, array $params = []); + public function options(string $path, array $params = []): Result|int|array|string; /** @@ -45,7 +47,7 @@ interface IClient * @param array $params * @return array|Result|int|string */ - public function upload(string $path, array $params = []); + public function upload(string $path, array $params = []): Result|int|array|string; /** @@ -53,7 +55,7 @@ interface IClient * @param array $params * @return array|Result|int|string */ - public function put(string $path, array $params = []); + public function put(string $path, array $params = []): Result|int|array|string; /** @@ -61,7 +63,7 @@ interface IClient * @param array $params * @return array|Result|int|string */ - public function head(string $path, array $params = []); + public function head(string $path, array $params = []): Result|int|array|string; /** @@ -70,28 +72,28 @@ interface IClient * @param array $params * @return array|Result|int|string */ - public function request(string $method, string $path, array $params = []); + public function request(string $method, string $path, array $params = []): Result|array|int|string; /** * @param string $host * @return mixed */ - public function setHost(string $host); + public function setHost(string $host): void; /** * @param array $header * @return mixed */ - public function setHeader(array $header); + public function setHeader(array $header): void; /** * @param array $header * @return mixed */ - public function setHeaders(array $header); + public function setHeaders(array $header): array; /** @@ -99,117 +101,117 @@ interface IClient * @param string $value * @return mixed */ - public function addHeader(string $key, string $value); + public function addHeader(string $key, string $value): void; /** * @param int $value * @return mixed */ - public function setTimeout(int $value); + public function setTimeout(int $value): void; /** - * @param \Closure|null $value + * @param Closure|null $value * @return mixed */ - public function setCallback(?\Closure $value); + public function setCallback(?Closure $value): void; /** * @param string $value - * @return mixed + * @return static */ - public function setMethod(string $value); + public function setMethod(string $value): static; /** * @param bool $isSSL * @return mixed */ - public function setIsSSL(bool $isSSL); + public function setIsSSL(bool $isSSL): void; /** * @param string $agent * @return mixed */ - public function setAgent(string $agent); + public function setAgent(string $agent): void; /** * @param string $errorCodeField * @return mixed */ - public function setErrorCodeField(string $errorCodeField); + public function setErrorCodeField(string $errorCodeField): void; /** * @param string $errorMsgField * @return mixed */ - public function setErrorMsgField(string $errorMsgField); + public function setErrorMsgField(string $errorMsgField): void; /** * @param bool $use_swoole * @return mixed */ - public function setUseSwoole(bool $use_swoole); + public function setUseSwoole(bool $use_swoole): void; /** * @param string $ssl_cert_file * @return mixed */ - public function setSslCertFile(string $ssl_cert_file); + public function setSslCertFile(string $ssl_cert_file): void; /** * @param string $ssl_key_file * @return mixed */ - public function setSslKeyFile(string $ssl_key_file); + public function setSslKeyFile(string $ssl_key_file): void; /** * @param string $ssl_key_file * @return mixed */ - public function setCa(string $ssl_key_file); + public function setCa(string $ssl_key_file): void; /** * @param int $port * @return mixed */ - public function setPort(int $port); + public function setPort(int $port): void; /** * @param string $message * @return mixed */ - public function setMessage(string $message); + public function setMessage(string $message): void; /** * @param string $data * @return mixed */ - public function setData(string $data); + public function setData(string $data): void; /** * @param int $connect_timeout * @return mixed */ - public function setConnectTimeout(int $connect_timeout); + public function setConnectTimeout(int $connect_timeout): void; /** * @param string $contentType * @return mixed */ - public function setContentType(string $contentType); + public function setContentType(string $contentType): void; }