Remove the request ID from response interface & implementation, #39

hollodotme · Jun 24, 2019 · 1f89ba9 · 1f89ba9
1 parent a53c2a8
commit 1f89ba9
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 13 deletions.
diff --git a/src/Interfaces/ProvidesResponseData.php b/src/Interfaces/ProvidesResponseData.php
@@ -29,8 +29,6 @@
  */
 interface ProvidesResponseData
 {
-	public function getRequestId() : int;
-
 	public function getHeaders() : array;
 
 	public function getHeader( string $headerKey ) : array;

diff --git a/src/Responses/Response.php b/src/Responses/Response.php
@@ -37,9 +37,6 @@ class Response implements ProvidesResponseData
 {
 	private const HEADER_PATTERN = '#^([^\:]+):(.*)$#';
 
-	/** @var int */
-	private $requestId;
-
 	/** @var array */
 	private $normalizedHeaders;
 
@@ -58,9 +55,8 @@ class Response implements ProvidesResponseData
 	/** @var float */
 	private $duration;
 
-	public function __construct( int $requestId, string $output, string $error, float $duration )
+	public function __construct( string $output, string $error, float $duration )
 	{
-		$this->requestId         = $requestId;
 		$this->output            = $output;
 		$this->error             = $error;
 		$this->duration          = $duration;
@@ -121,11 +117,6 @@ private function addNormalizedHeader( string $headerKey, string $headerValue ) :
 		$this->normalizedHeaders[ $key ][] = $headerValue;
 	}
 
-	public function getRequestId() : int
-	{
-		return $this->requestId;
-	}
-
 	public function getHeader( string $headerKey ) : array
 	{
 		return $this->normalizedHeaders[ strtolower( $headerKey ) ] ?? [];

diff --git a/src/Sockets/Socket.php b/src/Sockets/Socket.php
@@ -441,7 +441,6 @@ public function fetchResponse( ?int $timeoutMs = null ) : ProvidesResponseData
 		$this->guardRequestCompleted( ord( $character ) );
 
 		$this->response = new Response(
-			$this->id,
 			$output,
 			$error,
 			microtime( true ) - $this->startTime