🚿

Author: codemasher

src/CurlClient.php

@@ -38,6 +38,12 @@ public function __construct(ContainerInterface $options){
 			throw new HTTPClientException('invalid CA file');
 		}
 
+	}
+
+	/**
+	 * @return void
+	 */
+	protected function initCurl(){
 		$this->http = curl_init();
 
 		curl_setopt_array($this->http, [
@@ -86,14 +92,15 @@ protected function getResponse():HTTPResponseInterface{
 		parse_str($this->parsedURL['query'] ?? '', $parsedquery);
 		$params = array_merge($parsedquery, $this->requestParams);
 
-		$url = $this->requestURL.(!empty($params) ? '?'.http_build_query($params) : '');
+		$url = $this->requestURL.(!empty($params) ? '?'.$this->buildQuery($params) : '');
 
 		$options += [
 			CURLOPT_URL => $url,
 			CURLOPT_HTTPHEADER => $headers,
 			CURLOPT_HEADERFUNCTION => [$this, 'headerLine'],
 		];
 
+		$this->initCurl();
 		curl_setopt_array($this->http, $options);
 
 		$response  = curl_exec($this->http);
@@ -115,7 +122,7 @@ protected function getResponse():HTTPResponseInterface{
 	 *
 	 * @link http://php.net/manual/function.curl-setopt.php CURLOPT_HEADERFUNCTION
 	 */
-	protected function headerLine(/** @noinspection PhpUnusedParameterInspection */$curl, $header_line){
+	protected function headerLine($curl, $header_line){
 		$header = explode(':', $header_line, 2);
 
 		if(count($header) === 2){

src/HTTPResponse.php

@@ -47,10 +47,10 @@ class HTTPResponse implements HTTPResponseInterface, ContainerInterface{
 	public function __get(string $property){
 
 		switch($property){
-			case 'json': return json_decode($this->body);
+			case 'json':       return json_decode($this->body);
 			case 'json_array': return json_decode($this->body, true);
-			case 'xml': return simplexml_load_string($this->body);
-			case 'xml_array': return json_decode(json_encode(simplexml_load_string($this->body)), true); // cruel, but works.
+			case 'xml':        return simplexml_load_string($this->body);
+			case 'xml_array':  return json_decode(json_encode(simplexml_load_string($this->body)), true); // cruel, but works.
 		}
 
 		return $this->containerGet($property);