Move user agent to connector

Author: ilijastuden

Diff for: src/Client.php

@@ -48,14 +48,6 @@ public function __construct(TokenInterface $token, $api_version = null)
         }
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getUserAgent()
-    {
-        return 'Active Collab API Wrapper; v' . self::VERSION;
-    }
-
     // ---------------------------------------------------
     //  Info
     // ---------------------------------------------------

Diff for: src/ClientInterface.php

@@ -15,13 +15,6 @@ interface ClientInterface
 {
     const VERSION = '3.0.0';
 
-    /**
-     * Return user agent string.
-     *
-     * @return string
-     */
-    public function getUserAgent();
-
     /**
      * Return info.
      *

Diff for: src/Connector.php

@@ -16,6 +16,14 @@
  */
 class Connector implements ConnectorInterface
 {
+    /**
+     * {@inheritdoc}
+     */
+    public function getUserAgent()
+    {
+        return 'Active Collab API Wrapper; v' . Client::VERSION;
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -137,7 +145,7 @@ private function &getHandle($url, $headers)
     {
         $http = curl_init();
 
-        curl_setopt($http, CURLOPT_USERAGENT, Client::getUserAgent());
+        curl_setopt($http, CURLOPT_USERAGENT, $this->getUserAgent());
         curl_setopt($http, CURLOPT_RETURNTRANSFER, true);
         curl_setopt($http, CURLINFO_HEADER_OUT, true);
         curl_setopt($http, CURLOPT_URL, $url);

Diff for: src/ConnectorInterface.php

@@ -13,6 +13,13 @@
  */
 interface ConnectorInterface
 {
+    /**
+     * Return user agent string.
+     *
+     * @return string
+     */
+    public function getUserAgent();
+
     /**
      * GET data.
      *

Diff for: src/Response.php

@@ -8,6 +8,8 @@
 
 namespace ActiveCollab\SDK;
 
+use RuntimeException;
+
 /**
  * Abstract result.
  */
@@ -75,11 +77,25 @@ public function getBody()
     }
 
     /**
-     * Cached JSON data.
+     * Flag whether we have a JSON response or not.
      *
      * @var mixed
      */
-    private $is_json = null, $json_loaded = false, $json = null;
+    private $is_json = null;
+
+    /**
+     * Flag whether JSON was parsed or not.
+     *
+     * @var bool
+     */
+    private $json_loaded = false;
+
+    /**
+     * Parsed JSON data.
+     *
+     * @var array|null
+     */
+    private $json = null;
 
     /**
      * Return true if response is JSON.
@@ -105,6 +121,10 @@ public function getJson()
         if (empty($this->json_loaded)) {
             if ($this->getBody() && $this->isJson()) {
                 $this->json = json_decode($this->getBody(), true);
+
+                if (json_last_error()) {
+                    throw new RuntimeException('Failed to parse JSON. Reason: ' . json_last_error_msg());
+                }
             }
 
             $this->json_loaded = true;

Diff for: src/ResponseInterface.php

@@ -13,6 +13,20 @@
  */
 interface ResponseInterface
 {
+    /**
+     * Return HTTP code.
+     *
+     * @return int
+     */
+    public function getHttpCode();
+
+    /**
+     * Return content type.
+     *
+     * @return string
+     */
+    public function getContentType();
+
     /**
      * Return raw response body.
      *
@@ -33,18 +47,4 @@ public function isJson();
      * @return mixed
      */
     public function getJson();
-
-    /**
-     * Return content type.
-     *
-     * @return string
-     */
-    public function getContentType();
-
-    /**
-     * Return HTTP code.
-     *
-     * @return int
-     */
-    public function getHttpCode();
 }