Refactored the Request, Response and Statistics class.

Author: Martin Brecht-Precht

src/Request/Base/RequestInterface.php

@@ -4,8 +4,9 @@
 
 use BasicHttpClient\Request\Authentication\Base\AuthenticationInterface;
 use BasicHttpClient\Request\Message\Base\MessageInterface;
+use BasicHttpClient\Request\Message\Header\Header;
 use BasicHttpClient\Request\Transport\Base\TransportInterface;
-use BasicHttpClient\Response\Response;
+use BasicHttpClient\Response\Base\ResponseInterface;
 
 /**
  * Class Request
@@ -15,6 +16,17 @@
 interface RequestInterface extends CurlConfiguratorInterface
 {
 
+	/**
+	 * @return string
+	 */
+	public function getUserAgent();
+
+	/**
+	 * @param string $userAgent
+	 * @return $this
+	 */
+	public function setUserAgent($userAgent);
+
 	/**
 	 * @return string
 	 */
@@ -31,6 +43,11 @@ public function setEndpoint($endpoint);
 	 */
 	public function getPort();
 
+	/**
+	 * @return bool
+	 */
+	public function hasPort();
+
 	/**
 	 * @param int $port
 	 * @return $this
@@ -115,8 +132,23 @@ public function countAuthentications();
 	public function perform();
 
 	/**
-	 * @return Response
+	 * @return ResponseInterface
 	 */
 	public function getResponse();
 
+	/**
+	 * @return string
+	 */
+	public function getEffectiveStatus();
+
+	/**
+	 * @return string
+	 */
+	public function getEffectiveEndpoint();
+
+	/**
+	 * @return Header[]
+	 */
+	public function getEffectiveHeaders();
+
 }

src/Request/Request.php

@@ -9,6 +9,7 @@
 use BasicHttpClient\Request\Transport\Base\TransportInterface;
 use BasicHttpClient\Request\Transport\HttpsTransport;
 use BasicHttpClient\Request\Transport\HttpTransport;
+use BasicHttpClient\Response\Base\ResponseInterface;
 use BasicHttpClient\Response\Response;
 use BasicHttpClient\Util\UrlUtil;
 use CommonException\NetworkException\Base\NetworkException;
@@ -65,7 +66,7 @@ class Request implements RequestInterface
 	private $message;
 
 	/**
-	 * @var Response
+	 * @var ResponseInterface
 	 */
 	private $response;
 
@@ -287,30 +288,6 @@ public function countAuthentications()
 		return count($this->authentications);
 	}
 
-	/**
-	 * @return string
-	 */
-	public function getEffectiveStatus()
-	{
-		return $this->effectiveStatus;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getEffectiveEndpoint()
-	{
-		return $this->effectiveEndpoint;
-	}
-
-	/**
-	 * @return Header[]
-	 */
-	public function getEffectiveHeaders()
-	{
-		return $this->effectiveHeaders;
-	}
-
 	/**
 	 * @param resource $curl
 	 * @return $this
@@ -389,13 +366,37 @@ public function perform()
 	}
 
 	/**
-	 * @return Response
+	 * @return ResponseInterface
 	 */
 	public function getResponse()
 	{
 		return $this->response;
 	}
 
+	/**
+	 * @return string
+	 */
+	public function getEffectiveStatus()
+	{
+		return $this->effectiveStatus;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getEffectiveEndpoint()
+	{
+		return $this->effectiveEndpoint;
+	}
+
+	/**
+	 * @return Header[]
+	 */
+	public function getEffectiveHeaders()
+	{
+		return $this->effectiveHeaders;
+	}
+
 	/**
 	 * @throws \Exception
 	 * @return void

src/Response/Base/ResponseInterface.php

@@ -0,0 +1,61 @@
+<?php
+
+namespace BasicHttpClient\Response\Base;
+
+use BasicHttpClient\Request\Base\RequestInterface;
+use BasicHttpClient\Response\Header\Header;
+use BasicHttpClient\Response\Statistics\Statistics;
+
+/**
+ * Interface ResponseInterface
+ *
+ * @package BasicHttpClient\Response\Base
+ */
+interface ResponseInterface
+{
+
+	/**
+	 * Response constructor.
+	 *
+	 * @param RequestInterface $request
+	 */
+	public function __construct(RequestInterface $request);
+
+	/**
+	 * @param resource $curl
+	 * @param string $responseBody
+	 * @return $this
+	 */
+	public function populateFromCurlResult($curl, $responseBody);
+
+	/**
+	 * @return RequestInterface
+	 */
+	public function getRequest();
+
+	/**
+	 * @return int
+	 */
+	public function getStatusCode();
+
+	/**
+	 * @return string
+	 */
+	public function getStatusText();
+
+	/**
+	 * @return Header[]
+	 */
+	public function getHeaders();
+
+	/**
+	 * @return string
+	 */
+	public function getBody();
+
+	/**
+	 * @return Statistics
+	 */
+	public function getStatistics();
+
+}

src/Response/Response.php

@@ -3,6 +3,7 @@
 namespace BasicHttpClient\Response;
 
 use BasicHttpClient\Request\Base\RequestInterface;
+use BasicHttpClient\Response\Base\ResponseInterface;
 use BasicHttpClient\Response\Header\Header;
 use BasicHttpClient\Response\Statistics\Statistics;
 
@@ -11,7 +12,7 @@
  *
  * @package BasicHttpClient\Response
  */
-class Response
+class Response implements ResponseInterface
 {
 
 	/**
@@ -39,21 +40,6 @@ class Response
 	 */
 	private $body;
 
-	/**
-	 * @var int
-	 */
-	private $redirectCount;
-
-	/**
-	 * @var float
-	 */
-	private $redirectTime;
-
-	/**
-	 * @var string
-	 */
-	private $redirectEndpoint;
-
 	/**
 	 * @var Statistics
 	 */
@@ -77,14 +63,59 @@ public function __construct(RequestInterface $request)
 	public function populateFromCurlResult($curl, $responseBody)
 	{
 		$this->statusCode = intval(curl_getinfo($curl, CURLINFO_HTTP_CODE));
-		$this->redirectCount = curl_getinfo($curl, CURLINFO_REDIRECT_COUNT);
-		$this->redirectTime = curl_getinfo($curl, CURLINFO_REDIRECT_TIME);
-		$this->redirectEndpoint = curl_getinfo($curl, CURLINFO_REDIRECT_URL);
 		$this->setStatistics($curl);
 		$this->setResponseData($responseBody);
 		return $this;
 	}
 
+	/**
+	 * @return RequestInterface
+	 */
+	public function getRequest()
+	{
+		return $this->request;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getStatusCode()
+	{
+		return $this->statusCode;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getStatusText()
+	{
+		return $this->statusText;
+	}
+
+	/**
+	 * @return Header[]
+	 */
+	public function getHeaders()
+	{
+		return $this->headers;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getBody()
+	{
+		return $this->body;
+	}
+
+	/**
+	 * @return Statistics
+	 */
+	public function getStatistics()
+	{
+		return $this->statistics;
+	}
+
 	/**
 	 * @param resource $curl
 	 * @return $this

src/Response/Statistics/Statistics.php

@@ -35,6 +35,21 @@ class Statistics
 	 */
 	private $startTransferTime;
 
+	/**
+	 * @var int
+	 */
+	private $redirectCount;
+
+	/**
+	 * @var float
+	 */
+	private $redirectTime;
+
+	/**
+	 * @var string
+	 */
+	private $redirectEndpoint;
+
 	/**
 	 * @param resource $curl
 	 * @return $this
@@ -46,6 +61,9 @@ public function populateFromCurlResult($curl)
 		$this->connectionEstablishTime = curl_getinfo($curl, CURLINFO_CONNECT_TIME);
 		$this->preTransferTime = curl_getinfo($curl, CURLINFO_PRETRANSFER_TIME);
 		$this->startTransferTime = curl_getinfo($curl, CURLINFO_STARTTRANSFER_TIME);
+		$this->redirectCount = curl_getinfo($curl, CURLINFO_REDIRECT_COUNT);
+		$this->redirectTime = curl_getinfo($curl, CURLINFO_REDIRECT_TIME);
+		$this->redirectEndpoint = curl_getinfo($curl, CURLINFO_REDIRECT_URL);
 		return $this;
 	}
 
@@ -89,4 +107,28 @@ public function getStartTransferTime()
 		return $this->startTransferTime;
 	}
 
+	/**
+	 * @return int
+	 */
+	public function getRedirectCount()
+	{
+		return $this->redirectCount;
+	}
+
+	/**
+	 * @return float
+	 */
+	public function getRedirectTime()
+	{
+		return $this->redirectTime;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getRedirectEndpoint()
+	{
+		return $this->redirectEndpoint;
+	}
+
 }