Author: codemasher

src/CurlClient.php

@@ -24,7 +24,13 @@ class CurlClient extends HTTPClientAbstract{
 	 */
 	protected $responseHeaders;
 
-	/** @inheritdoc */
+	/**
+	 * CurlClient constructor.
+	 *
+	 * @param \chillerlan\Traits\ContainerInterface $options
+	 *
+	 * @throws \chillerlan\HTTP\HTTPClientException
+	 */
 	public function __construct(ContainerInterface $options){
 		parent::__construct($options);
 
@@ -34,8 +40,6 @@ public function __construct(ContainerInterface $options){
 
 		$this->http = curl_init();
 
-		curl_setopt_array($this->http, $this->options->curl_options);
-
 		curl_setopt_array($this->http, [
 			CURLOPT_HEADER         => false,
 			CURLOPT_RETURNTRANSFER => true,
@@ -47,6 +51,7 @@ public function __construct(ContainerInterface $options){
 			CURLOPT_USERAGENT      => $this->options->user_agent,
 		]);
 
+		curl_setopt_array($this->http, $this->options->curl_options);
 	}
 
 	/** @inheritdoc */

src/HTTPClientAbstract.php

@@ -13,8 +13,12 @@
 namespace chillerlan\HTTP;
 
 use chillerlan\Traits\ContainerInterface;
+use Psr\Log\{
+	LoggerAwareInterface, LoggerAwareTrait, LoggerInterface, NullLogger
+};
 
-abstract class HTTPClientAbstract implements HTTPClientInterface{
+abstract class HTTPClientAbstract implements HTTPClientInterface, LoggerAwareInterface{
+	use LoggerAwareTrait;
 
 	/**
 	 * @var mixed
@@ -27,8 +31,9 @@ abstract class HTTPClientAbstract implements HTTPClientInterface{
 	protected $options;
 
 	/** @inheritdoc */
-	public function __construct(ContainerInterface $options){
+	public function __construct(ContainerInterface $options, LoggerInterface $logger = null){
 		$this->options = $options;
+		$this->logger  = $logger ?? new NullLogger;
 	}
 
 	/** @inheritdoc */
@@ -66,7 +71,7 @@ public function rawurlencode($data){
 			return rawurlencode($data);
 		}
 
-		return $data;
+		return $data; // @codeCoverageIgnore
 	}
 
 	/**

src/HTTPClientInterface.php

@@ -12,17 +12,8 @@
 
 namespace chillerlan\HTTP;
 
-use chillerlan\Traits\ContainerInterface;
-
 interface HTTPClientInterface{
 
-	/**
-	 * HTTPClientInterface constructor.
-	 *
-	 * @param \chillerlan\Traits\ContainerInterface $options
-	 */
-	public function __construct(ContainerInterface $options);
-
 	/**
 	 * @param string      $url
 	 * @param array|null  $params