diff --git a/HttpServer/Client/ClientAbstracts.php b/HttpServer/Client/ClientAbstracts.php index ecf97e80..ae9c39eb 100644 --- a/HttpServer/Client/ClientAbstracts.php +++ b/HttpServer/Client/ClientAbstracts.php @@ -530,9 +530,9 @@ abstract class ClientAbstracts extends Component implements IClient /** * @param $newData - * @return mixed + * @return string */ - protected function mergeParams($newData): mixed + protected function mergeParams($newData): string { if (empty($this->getData())) { return $this->toRequest($newData); diff --git a/HttpServer/Client/Curl.php b/HttpServer/Client/Curl.php index c4bdd5a1..c47d1f0c 100644 --- a/HttpServer/Client/Curl.php +++ b/HttpServer/Client/Curl.php @@ -54,12 +54,11 @@ class Curl extends ClientAbstracts return $resource; } - if ($method === self::GET && !empty($this->getData())) { + if (!empty($this->getData())) { curl_setopt($resource, CURLOPT_POSTFIELDS, $this->getData()); } else if ($method === self::POST) { curl_setopt($resource, CURLOPT_POSTFIELDS, $this->mergeParams($params)); - } - if ($method === self::UPLOAD) { + } else if ($method === self::UPLOAD) { curl_setopt($resource, CURLOPT_POSTFIELDS, $params); } return $resource;