🚿

Author: codemasher

src/CurlClient.php

@@ -21,31 +21,35 @@
  */
 class CurlClient extends HTTPClientAbstract{
 
-	protected CurlHandle $handle;
-
 	/**
 	 * @inheritDoc
 	 */
 	public function sendRequest(RequestInterface $request):ResponseInterface{
-		$stream       = $this->streamFactory?->createStream();
-		$this->handle = new CurlHandle($request, $this->responseFactory->createResponse(), $this->options, $stream);
-		$errno        = $this->handle->exec();
+
+		$handle = new CurlHandle(
+			$request,
+			$this->responseFactory->createResponse(),
+			$this->options,
+			$this->streamFactory?->createStream(),
+		);
+
+		$errno = $handle->exec();
 
 		if($errno !== CURLE_OK){
-			$error = $this->handle->getError();
+			$error = $handle->getError();
 
 			$this->logger->error(sprintf('cURL error #%s: %s', $errno, $error));
 
-			if(in_array($errno, $this->handle::CURL_NETWORK_ERRORS, true)){
+			if(in_array($errno, $handle::CURL_NETWORK_ERRORS, true)){
 				throw new NetworkException($error, $request);
 			}
 
 			throw new RequestException($error, $request);
 		}
 
-		$this->handle->close();
+		$handle->close();
 
-		return $this->handle->getResponse();
+		return $handle->getResponse();
 	}
 
 }

src/StreamClient.php

@@ -14,34 +14,52 @@
 
 use chillerlan\HTTP\Utils\HeaderUtil;
 use Psr\Http\Message\{RequestInterface, ResponseInterface};
-use function explode, file_get_contents, get_headers, in_array, intval, restore_error_handler,
-	set_error_handler, stream_context_create, strtolower, str_starts_with, trim;
+use Exception, Throwable;
+use function explode, file_get_contents, get_headers, in_array, intval, is_file, restore_error_handler,
+	set_error_handler, sprintf, stream_context_create, strtolower, str_starts_with, trim;
 
 /**
+ * A http client via PHP streams
  *
+ * (I'm not exactly sure why I'm keeping this - use CurlClient in production)
+ *
+ * @see \file_get_contents()
+ * @see \stream_context_create()
  */
 class StreamClient extends HTTPClientAbstract{
 
 	/**
 	 * @inheritDoc
+	 * @throws \Exception|\chillerlan\HTTP\ClientException
 	 */
 	public function sendRequest(RequestInterface $request):ResponseInterface{
 
 		$errorHandler = function(int $errno, string $errstr):bool{
-			$this->logger->error('StreamClient error #'.$errno.': '.$errstr);
+			$this->logger->error(sprintf('StreamClient error #%s: %s', $errno, $errstr));
 
-			throw new ClientException($errstr, $errno);
+			throw new Exception($errstr, $errno);
 		};
 
 		set_error_handler($errorHandler);
 
-		$context      = stream_context_create($this->getContextOptions($request));
-		$requestUri   = (string)$request->getUri()->withFragment('');
-		$responseBody = file_get_contents($requestUri, false, $context);
-		$response     = $this->createResponse(get_headers($requestUri, true, $context));
+		$exception = null;
+
+		try{
+			$context      = stream_context_create($this->getContextOptions($request));
+			$requestUri   = (string)$request->getUri()->withFragment('');
+			$responseBody = file_get_contents($requestUri, false, $context);
+			$response     = $this->createResponse(get_headers($requestUri, true, $context));
+		}
+		catch(Throwable $e){
+			$exception = $e;
+		}
 
 		restore_error_handler();
 
+		if($exception !== null){
+			throw new ClientException($exception->getMessage());
+		}
+
 		$body = $this->streamFactory !== null
 			? $this->streamFactory->createStream()
 			: $response->getBody()
@@ -58,9 +76,11 @@ public function sendRequest(RequestInterface $request):ResponseInterface{
 	 */
 	protected function getContextOptions(RequestInterface $request):array{
 		$method = $request->getMethod();
-		$body   = in_array($method, ['DELETE', 'PATCH', 'POST', 'PUT'], true)
-			? $request->getBody()->getContents()
-			: null;
+		$body   = null;
+
+		if(in_array($method, ['DELETE', 'PATCH', 'POST', 'PUT'], true)){
+			$body = $request->getBody()->getContents();
+		}
 
 		$options = [
 			'http' => [
@@ -81,8 +101,10 @@ protected function getContextOptions(RequestInterface $request):array{
 			],
 		];
 
-		$ca                  = ($this->options->ca_info_is_path) ? 'capath' : 'cafile';
-		$options['ssl'][$ca] = $this->options->ca_info;
+		if($this->options->ca_info){
+			$ca                  = (is_file($this->options->ca_info)) ? 'capath' : 'cafile';
+			$options['ssl'][$ca] = $this->options->ca_info;
+		}
 
 		return $options;
 	}