Refactored the Response class.

Author: Martin Brecht-Precht

src/Request/Request.php

@@ -5,6 +5,7 @@
 use BasicHttpClient\Request\Authentication\Base\AuthenticationInterface;
 use BasicHttpClient\Request\Base\RequestInterface;
 use BasicHttpClient\Request\Message\Base\MessageInterface;
+use BasicHttpClient\Request\Message\Header\Header;
 use BasicHttpClient\Request\Transport\Base\TransportInterface;
 use BasicHttpClient\Request\Transport\HttpsTransport;
 use BasicHttpClient\Request\Transport\HttpTransport;
@@ -68,6 +69,21 @@ class Request implements RequestInterface
 	 */
 	private $response;
 
+	/**
+	 * @var string
+	 */
+	private $effectiveStatus;
+
+	/**
+	 * @var string
+	 */
+	private $effectiveEndpoint;
+
+	/**
+	 * @var Header[]
+	 */
+	private $effectiveHeaders = array();
+
 	/**
 	 * Request constructor.
 	 */
@@ -332,8 +348,9 @@ public function perform()
 		$curlErrorCode = curl_errno($curl);
 		$curlErrorMessage = curl_error($curl);
 		if ($curlErrorCode === CURLE_OK) {
-			$this->response = new Response();
+			$this->response = new Response($this);
 			$this->response->populateFromCurlResult($curl, $responseBody);
+			$this->setEffectiveProperties($curl);
 			return $this;
 		}
 		curl_close($curl);
@@ -367,4 +384,31 @@ protected function prePerform()
 		}
 	}
 
+	/**
+	 * @param resource $curl
+	 * @return $this
+	 */
+	private function setEffectiveProperties($curl)
+	{
+		$this->effectiveEndpoint = curl_getinfo($curl, CURLINFO_EFFECTIVE_URL);
+		// Build effective request headers
+		$requestHeaders = preg_split(
+			'/\r\n/',
+			curl_getinfo($curl, CURLINFO_HEADER_OUT),
+			null,
+			PREG_SPLIT_NO_EMPTY
+		);
+		foreach ($requestHeaders as $requestHeader) {
+			if (strpos($requestHeader, ':') !== false) {
+				$headerName = mb_substr($requestHeader, 0, strpos($requestHeader, ':'));
+				$headerValue = mb_substr($requestHeader, strpos($requestHeader, ':') + 1);
+				$headerValues = explode(',', $headerValue);
+				$this->effectiveHeaders[] = new Header($headerName, $headerValues);
+			} else {
+				$this->effectiveStatus = $requestHeader;
+			}
+		}
+		return $this;
+	}
+
 }

src/Response/Response.php

@@ -2,10 +2,9 @@
 
 namespace BasicHttpClient\Response;
 
-use BasicHttpClient\Request\Message\Header\Header as RequestHeader;
+use BasicHttpClient\Request\Base\RequestInterface;
 use BasicHttpClient\Response\Header\Header;
 use BasicHttpClient\Response\Statistics\Statistics;
-use BasicHttpClient\Response\Statistics\StatisticsBuilder;
 
 /**
  * Class Response
@@ -15,6 +14,11 @@
 class Response
 {
 
+	/**
+	 * @var RequestInterface
+	 */
+	private $request;
+
 	/**
 	 * @var int
 	 */
@@ -56,19 +60,14 @@ class Response
 	private $statistics;
 
 	/**
-	 * @var string
-	 */
-	private $effectiveRequestStatus;
-
-	/**
-	 * @var string
-	 */
-	private $effectiveRequestEndpoint;
-
-	/**
-	 * @var RequestHeader[]
+	 * Response constructor.
+	 *
+	 * @param RequestInterface $request
 	 */
-	private $effectiveRequestHeaders = array();
+	public function __construct(RequestInterface $request)
+	{
+		$this->request = $request;
+	}
 
 	/**
 	 * @param resource $curl
@@ -78,12 +77,10 @@ class Response
 	public function populateFromCurlResult($curl, $responseBody)
 	{
 		$this->statusCode = intval(curl_getinfo($curl, CURLINFO_HTTP_CODE));
-		$this->effectiveRequestEndpoint = curl_getinfo($curl, CURLINFO_EFFECTIVE_URL);
 		$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->setEffectiveRequestHeaders($curl);
 		$this->setResponseData($responseBody);
 		return $this;
 	}
@@ -94,40 +91,8 @@ public function populateFromCurlResult($curl, $responseBody)
 	 */
 	private function setStatistics($curl)
 	{
-		$statisticsBuilder = new StatisticsBuilder();
-		$this->statistics = $statisticsBuilder
-			->setTotalTime(curl_getinfo($curl, CURLINFO_TOTAL_TIME))
-			->setHostLookupTime(curl_getinfo($curl, CURLINFO_NAMELOOKUP_TIME))
-			->setConnectionEstablishTime(curl_getinfo($curl, CURLINFO_CONNECT_TIME))
-			->setPreTransferTime(curl_getinfo($curl, CURLINFO_PRETRANSFER_TIME))
-			->setStartTransferTime(curl_getinfo($curl, CURLINFO_STARTTRANSFER_TIME))
-			->buildStatistics();
-		return $this;
-	}
-
-	/**
-	 * @param resource $curl
-	 * @return $this
-	 */
-	private function setEffectiveRequestHeaders($curl)
-	{
-		// Build effective request headers
-		$requestHeaders = preg_split(
-			'/\r\n/',
-			curl_getinfo($curl, CURLINFO_HEADER_OUT),
-			null,
-			PREG_SPLIT_NO_EMPTY
-		);
-		foreach ($requestHeaders as $requestHeader) {
-			if (strpos($requestHeader, ':') !== false) {
-				$headerName = mb_substr($requestHeader, 0, strpos($requestHeader, ':'));
-				$headerValue = mb_substr($requestHeader, strpos($requestHeader, ':') + 1);
-				$headerValues = explode(',', $headerValue);
-				$this->effectiveRequestHeaders[] = new RequestHeader($headerName, $headerValues);
-			} else {
-				$this->effectiveRequestStatus = $requestHeader;
-			}
-		}
+		$this->statistics = new Statistics();
+		$this->statistics->populateFromCurlResult($curl);
 		return $this;
 	}
 

src/Response/Statistics/Statistics.php

@@ -36,26 +36,17 @@ class Statistics
 	private $startTransferTime;
 
 	/**
-	 * Statistics constructor.
-	 *
-	 * @param float $totalTime
-	 * @param float $hostLookupTime
-	 * @param float $connectionEstablishTime
-	 * @param float $preTransferTime
-	 * @param float $startTransferTime
+	 * @param resource $curl
+	 * @return $this
 	 */
-	public function __construct(
-		$totalTime,
-		$hostLookupTime,
-		$connectionEstablishTime,
-		$preTransferTime,
-		$startTransferTime
-	) {
-		$this->totalTime = $totalTime;
-		$this->hostLookupTime = $hostLookupTime;
-		$this->connectionEstablishTime = $connectionEstablishTime;
-		$this->preTransferTime = $preTransferTime;
-		$this->startTransferTime = $startTransferTime;
+	public function populateFromCurlResult($curl)
+	{
+		$this->totalTime = curl_getinfo($curl, CURLINFO_TOTAL_TIME);
+		$this->hostLookupTime = curl_getinfo($curl, CURLINFO_NAMELOOKUP_TIME);
+		$this->connectionEstablishTime = curl_getinfo($curl, CURLINFO_CONNECT_TIME);
+		$this->preTransferTime = curl_getinfo($curl, CURLINFO_PRETRANSFER_TIME);
+		$this->startTransferTime = curl_getinfo($curl, CURLINFO_STARTTRANSFER_TIME);
+		return $this;
 	}
 
 	/**