Merge pull request #6 from KOBASSoftware/curl-info-fix

Update to enable extracting curl info for debugging

Author: seanmcn

README.md

@@ -33,19 +33,25 @@ echo json_encode($response, JSON_PRETTY_PRINT);
 ## Client Functions
 
 ## get($route, $params = array(), $headers = array())
-cURL Get Request
+Sends a HTTP GET Request to the route provided.
 
 ## post($route, $params = array(), $headers = array())
-cURL Post Request
+Sends a HTTP POST Request to the route provided.
 
 ## put($route, $params = array(), $headers = array())
-cURL Put Request
+Sends a HTTP PUT Request to the route provided.
 
 ## delete($route, $params = array(), $headers = array())
-cURL Delete Request
+Sends a HTTP DELETE Request to the route provided.
+
+## getRequestInfo()
+Returns the result of `curl_getinfo()`on the last request made as an array.
 
 ## setAPIBaseURL($url)
 Allows over-riding the base URL (only really needed for development)
 
 ## setAPIVersion($version)
 Allows over-riding of the API version. Might be useful in future?
+
+
+

src/Kobas/APIClient/Auth/Provider.php

@@ -7,6 +7,7 @@
 use Kobas\APIClient\Exception\CurlException;
 use League\OAuth2\Client\Provider\Exception\IdentityProviderException;
 use League\OAuth2\Client\Token\AccessToken;
+use Kobas\OAuth2\Client\Provider\Kobas as OAuthProvider;
 
 /**
  * Class OAuthSigner
@@ -110,11 +111,11 @@ public function getAccessToken()
     }
 
     /**
-     * @return \Kobas\OAuth2\Client\Provider\Kobas
+     * @return OAuthProvider
      */
     public function getProvider()
     {
-        $provider = new \Kobas\OAuth2\Client\Provider\Kobas([
+        $provider = new OAuthProvider([
             'clientId' => $this->clientId,
             'clientSecret' => $this->clientSecret,
             'companyId' => $this->companyId,

src/Kobas/APIClient/Client.php

@@ -46,6 +46,9 @@ class Client
     protected $curl_options;
 
 
+    protected $request_info;
+
+
     /**
      * Client constructor.
      *
@@ -185,6 +188,7 @@ protected function call($http_method, $route, array $params = array(), array $he
             throw new CurlException($this->request->getErrorMessage(), $this->request->getErrorNumber());
         }
 
+        $this->request_info = $this->request->getAllInfo();
         $last_response = $this->request->getInfo(CURLINFO_HTTP_CODE);
 
         $this->request->close();
@@ -240,4 +244,12 @@ public function delete($route, array $params = array(), array $headers = array()
     {
         return $this->call('DELETE', $route, $params, $headers);
     }
+
+    /**
+     * @return array|false
+     */
+    public function getRequestInfo()
+    {
+        return $this->request_info;
+    }
 }

src/Kobas/APIClient/Request/Curl.php

@@ -10,7 +10,7 @@
 class Curl implements HttpRequest
 {
     /**
-     * @var null
+     * @var null|resource
      */
     private $handle = null;
 
@@ -28,7 +28,7 @@ public function init()
 
     /**
      * @param $url
-     * @return $this|Curl
+     * @return Curl
      */
     public function setUrl($url)
     {
@@ -38,7 +38,7 @@ public function setUrl($url)
     /**
      * @param $name
      * @param $value
-     * @return $this
+     * @return Curl
      */
     public function setOption($name, $value)
     {
@@ -48,15 +48,15 @@ public function setOption($name, $value)
 
 
     /**
-     * @return null
+     * @return null|resource
      */
     public function getHandle()
     {
         return $this->handle;
     }
 
     /**
-     * @return mixed
+     * @return bool|string
      */
     public function execute()
     {
@@ -73,23 +73,31 @@ public function getInfo($name)
     }
 
     /**
-     * @return int|mixed
+     * @return array|false
+     */
+    public function getAllInfo()
+    {
+        return curl_getinfo($this->handle);
+    }
+
+    /**
+     * @return int
      */
     public function getErrorNumber()
     {
         return curl_errno($this->handle);
     }
 
     /**
-     * @return mixed|string
+     * @return string
      */
     public function getErrorMessage()
     {
         return curl_error($this->handle);
     }
 
     /**
-     * @return $this
+     * @return Curl
      */
     public function close()
     {

src/Kobas/APIClient/Request/HttpRequest.php

@@ -38,6 +38,12 @@ public function execute();
     public function getInfo($name);
 
 
+    /**
+     * @return array|false
+     */
+    public function getAllInfo();
+
+
     /**
      * @return mixed
      */