✈️

Author: codemasher

src/CurlClient.php

@@ -12,6 +12,8 @@
 
 namespace chillerlan\HTTP;
 
+use chillerlan\HTTP\Psr18\{ClientException, CurlHandle};
+
 trait HTTPOptionsTrait{
 
 	/**

src/HTTPOptionsTrait.php

@@ -4,13 +4,13 @@
  *
  * @filesource   ClientException.php
  * @created      10.09.2018
- * @package      chillerlan\HTTP
+ * @package      chillerlan\HTTP\Psr18
  * @author       smiley <smiley@chillerlan.net>
  * @copyright    2018 smiley
  * @license      MIT
  */
 
-namespace chillerlan\HTTP;
+namespace chillerlan\HTTP\Psr18;
 
 use Psr\Http\Client\ClientExceptionInterface;
 

src/ClientException.php renamed to src/Psr18/ClientException.php

@@ -0,0 +1,65 @@
+<?php
+/**
+ * Class HTTPClient
+ *
+ * @filesource   HTTPClient.php
+ * @created      27.08.2018
+ * @package      chillerlan\HTTP
+ * @author       smiley <smiley@chillerlan.net>
+ * @copyright    2018 smiley
+ * @license      MIT
+ */
+
+namespace chillerlan\HTTP\Psr18;
+
+use Psr\Http\Message\{RequestInterface, ResponseInterface};
+
+class CurlClient extends HTTPClientAbstract{
+
+	/**
+	 * Sends a PSR-7 request.
+	 *
+	 * @param \Psr\Http\Message\RequestInterface $request
+	 *
+	 * @return \Psr\Http\Message\ResponseInterface
+	 *
+	 * @throws \Psr\Http\Client\ClientExceptionInterface If an error happens during processing the request.
+	 * @throws \Exception                                If processing the request is impossible (eg. bad configuration).
+	 */
+	public function sendRequest(RequestInterface $request):ResponseInterface{
+		/** @var \chillerlan\HTTP\Psr18\CurlHandle $handle */
+		$handle = new $this->options->curlHandle($request, $this->responseFactory->createResponse(), $this->options);
+		$handle->init();
+
+		curl_exec($handle->curl);
+
+		$errno = curl_errno($handle->curl);
+
+		if($errno !== CURLE_OK){
+			$error = curl_error($handle->curl);
+
+			$network_errors = [
+				CURLE_COULDNT_RESOLVE_PROXY,
+				CURLE_COULDNT_RESOLVE_HOST,
+				CURLE_COULDNT_CONNECT,
+				CURLE_OPERATION_TIMEOUTED,
+				CURLE_SSL_CONNECT_ERROR,
+				CURLE_GOT_NOTHING,
+			];
+
+			$this->logger->error('cURL error #'.$errno.': '.$error);
+
+			if(in_array($errno, $network_errors, true)){
+				throw new NetworkException($error, $request);
+			}
+
+			throw new RequestException($error, $request);
+		}
+
+		$handle->close();
+		$handle->response->getBody()->rewind();
+
+		return $handle->response;
+	}
+
+}

src/Psr18/CurlClient.php

@@ -10,7 +10,7 @@
  * @license      MIT
  */
 
-namespace chillerlan\HTTP;
+namespace chillerlan\HTTP\Psr18;
 
 use chillerlan\Settings\SettingsContainerInterface;
 use Psr\Http\Message\{RequestInterface, ResponseInterface};
@@ -37,7 +37,7 @@ class CurlHandle{
 	/**
 	 * @var \chillerlan\HTTP\HTTPOptions
 	 */
-	public $options;
+	protected $options;
 
 	/**
 	 * CurlHandle constructor.

src/CurlHandle.php renamed to src/Psr18/CurlHandle.php

@@ -0,0 +1,103 @@
+<?php
+/**
+ * Class HTTPClientAbstract
+ *
+ * @filesource   HTTPClientAbstract.php
+ * @created      22.02.2019
+ * @package      chillerlan\HTTP\Psr18
+ * @author       smiley <smiley@chillerlan.net>
+ * @copyright    2019 smiley
+ * @license      MIT
+ */
+
+namespace chillerlan\HTTP\Psr18;
+
+use chillerlan\HTTP\{HTTPOptions, Psr7, Psr17};
+use chillerlan\HTTP\Psr7\Request;
+use chillerlan\HTTP\Psr17\ResponseFactory;
+use chillerlan\Settings\SettingsContainerInterface;
+use Psr\Http\Message\{ResponseFactoryInterface, ResponseInterface};
+use Psr\Log\{LoggerAwareInterface, LoggerAwareTrait, LoggerInterface, NullLogger};
+
+abstract class HTTPClientAbstract implements HTTPClientInterface, LoggerAwareInterface{
+	use LoggerAwareTrait;
+
+	/**
+	 * @var \chillerlan\HTTP\HTTPOptions
+	 */
+	protected $options;
+
+	/**
+	 * @var \Psr\Http\Message\RequestFactoryInterface
+	 */
+	protected $requestFactory;
+
+	/**
+	 * @var \Psr\Http\Message\ResponseFactoryInterface
+	 */
+	protected $responseFactory;
+
+	/**
+	 * CurlClient constructor.
+	 *
+	 * @param \chillerlan\Settings\SettingsContainerInterface|null $options
+	 * @param \Psr\Http\Message\ResponseFactoryInterface|null      $responseFactory
+	 * @param \Psr\Log\LoggerInterface|null                        $logger
+	 */
+	public function __construct(
+		SettingsContainerInterface $options = null,
+		ResponseFactoryInterface $responseFactory = null,
+		LoggerInterface $logger = null
+	){
+		$this->options         = $options ?? new HTTPOptions;
+		$this->responseFactory = $responseFactory ?? new ResponseFactory;
+		$this->logger          = $logger ?? new NullLogger;
+	}
+
+	/**
+	 * @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   = new Request($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);
+				}
+				else{
+					$body = null; // @todo
+				}
+
+			}
+
+			$request = $request->withBody(Psr17\create_stream((string)$body));
+		}
+
+		foreach($headers as $header => $value){
+			$request = $request->withAddedHeader($header, $value);
+		}
+
+		return $this->sendRequest($request);
+	}
+
+}

src/Psr18/HTTPClientAbstract.php

@@ -10,7 +10,7 @@
  * @license      MIT
  */
 
-namespace chillerlan\HTTP;
+namespace chillerlan\HTTP\Psr18;
 
 use Fig\Http\Message\RequestMethodInterface;
 use Psr\Http\Client\ClientInterface;

src/HTTPClientInterface.php renamed to src/Psr18/HTTPClientInterface.php

@@ -10,7 +10,7 @@
  * @license      MIT
  */
 
-namespace chillerlan\HTTP;
+namespace chillerlan\HTTP\Psr18;
 
 use Exception;
 use Psr\Http\Client\NetworkExceptionInterface;

src/NetworkException.php renamed to src/Psr18/NetworkException.php

@@ -10,7 +10,7 @@
  * @license      MIT
  */
 
-namespace chillerlan\HTTP;
+namespace chillerlan\HTTP\Psr18;
 
 use Exception;
 use Psr\Http\Client\RequestExceptionInterface;