add url into response

Author: hhxsv5

src/Curl.php

@@ -89,10 +89,10 @@ public function exec()
             $responseStr = curl_exec($this->handle);
         }
 
-        $id = spl_object_hash($this);
         $errno = curl_errno($this->handle);
         $errstr = curl_error($this->handle);//Fix: curl_errno() always return 0 when fail
-        $this->response = $this->toResponse($id, $responseStr, $errno, $errstr);
+        $url = curl_getinfo($this->handle, CURLINFO_EFFECTIVE_URL);
+        $this->response = $this->toResponse($url, $responseStr, $errno, $errstr);
         return $this->response;
     }
 

src/Response.php

@@ -4,7 +4,7 @@
 
 class Response
 {
-    protected $id;
+    protected $url;
     protected $httpCode;
     protected $headers = [];
     protected $body    = '';
@@ -15,15 +15,20 @@ class Response
      */
     protected $error = [];
 
-    public function __construct($id = null, $httpCode = 0, $body = '', array $headers = [], array $error = [])
+    public function __construct($url = null, $httpCode = 0, $body = '', array $headers = [], array $error = [])
     {
-        $this->id = $id ?: uniqid('', true);
+        $this->url = $url;
         $this->httpCode = $httpCode;
         $this->headers = array_change_key_case($headers, CASE_LOWER);
         $this->body = $body;
         $this->error = $error;
     }
 
+    public function getUrl()
+    {
+        return $this->url;
+    }
+
     public function getHttpCode()
     {
         return $this->httpCode;

src/ResponseParser.php

@@ -17,7 +17,7 @@ public function parse($str)
         return [$headers, $body];
     }
 
-    public function toResponse($id, $responseStr, $errno, $errstr)
+    public function toResponse($url, $responseStr, $errno, $errstr)
     {
         $httpCode = 0;
         $error = [];
@@ -29,6 +29,6 @@ public function toResponse($id, $responseStr, $errno, $errstr)
             $httpCode = curl_getinfo($this->handle, CURLINFO_HTTP_CODE);
             list($headers, $body) = $this->parse($responseStr);
         }
-        return new Response($id, $httpCode, $body, $headers, $error);
+        return new Response($url, $httpCode, $body, $headers, $error);
     }
 }