Author: codemasher

src/CurlClient.php

@@ -18,7 +18,6 @@
 use Http\Client\Exception\{NetworkException, RequestException};
 
 class CurlClient implements HTTPClientInterface{
-	use HTTPRequestTrait;
 
 	/**
 	 * @var \chillerlan\HTTP\HTTPOptions
@@ -104,4 +103,47 @@ public function sendRequest(RequestInterface $request):ResponseInterface{
 
 	}
 
+	/**
+	 * @todo: files, content-type
+	 *
+	 * @param string      $uri
+	 * @param string|null $method
+	 * @param array|null  $query
+	 * @param mixed|null  $body
+	 * @param array|null  $headers
+	 *
+	 * @return \Psr\Http\Message\ResponseInterface
+	 */
+	public function request(string $uri, string $method = null, array $query = null, $body = null, array $headers = null):ResponseInterface{
+		$method    = strtoupper($method ?? 'GET');
+		$headers   = Psr7\normalize_request_headers($headers);
+		$request   = $this->requestFactory->createRequest($method, Psr7\merge_query($uri, $query ?? []));
+
+		if(in_array($method, ['DELETE', 'PATCH', 'POST', 'PUT'], true) && $body !== null){
+
+			if(is_array($body) || is_object($body)){
+
+				if(!isset($headers['Content-type'])){
+					$headers['Content-type'] = 'application/x-www-form-urlencoded';
+				}
+
+				if($headers['Content-type'] === 'application/x-www-form-urlencoded'){
+					$body = http_build_query($body, '', '&', PHP_QUERY_RFC1738);
+				}
+				elseif($headers['Content-type'] === 'application/json'){
+					$body = json_encode($body);
+				}
+
+			}
+
+			$request = $request->withBody($this->streamFactory->createStream((string)$body));
+		}
+
+		foreach($headers as $header => $value){
+			$request = $request->withAddedHeader($header, $value);
+		}
+
+		return $this->sendRequest($request);
+	}
+
 }

src/HTTPRequestTrait.php

@@ -16,14 +16,6 @@
 
 interface ApiClientInterface{
 
-	/**
-	 * @param string $endpointMap
-	 *
-	 * @return \chillerlan\HTTP\MagicAPI\ApiClientInterface
-	 * @throws \chillerlan\HTTP\MagicAPI\ApiClientException
-	 */
-	public function loadEndpoints(string $endpointMap):ApiClientInterface;
-
 	/**
 	 * @param string $name
 	 * @param array  $arguments