Merge pull request #1 from phpclassic/master

resync

Author: fabio-sassi-spotview

README.md

@@ -14,6 +14,20 @@ composer require phpclassic/php-shopify
 PHPShopify uses curl extension for handling http calls. So you need to have the curl extension installed and enabled with PHP.
 >However if you prefer to use any other available package library for handling HTTP calls, you can easily do so by modifying 1 line in each of the `get()`, `post()`, `put()`, `delete()` methods in `PHPShopify\HttpRequestJson` class.
 
+You can pass additional curl configuration to `ShopifySDK`
+```php
+$config = array(
+    'ShopUrl' => 'yourshop.myshopify.com',
+    'ApiKey' => '***YOUR-PRIVATE-API-KEY***',
+    'Password' => '***YOUR-PRIVATE-API-PASSWORD***',   
+    'Curl' => array(
+        CURLOPT_TIMEOUT => 10,
+        CURLOPT_FOLLOWLOCATION => true
+    )
+);
+
+PHPShopify\ShopifySDK::config($config);
+```
 ## Usage
 
 You can use PHPShopify in a pretty simple object oriented way. 

lib/CurlRequest.php

@@ -35,6 +35,13 @@ class CurlRequest
      */
     public static $lastHttpResponseHeaders = array();
 
+    /**
+     * Curl additional configuration
+     *
+     * @var array
+     */
+    protected static $config = array();
+
     /**
      * Initialize the curl resource
      *
@@ -57,6 +64,10 @@ protected static function init($url, $httpHeaders = array())
         curl_setopt($ch, CURLOPT_HEADER, true);
         curl_setopt($ch, CURLOPT_USERAGENT, 'PHPClassic/PHPShopify');
 
+        foreach (self::$config as $option => $value) {
+            curl_setopt($ch, $option, $value);
+        }
+
         $headers = array();
         foreach ($httpHeaders as $key => $value) {
             $headers[] = "$key: $value";
@@ -139,6 +150,16 @@ public static function delete($url, $httpHeaders = array())
         return self::processRequest($ch);
     }
 
+    /**
+     * Set curl additional configuration
+     *
+     * @param array $config
+     */
+    public static function config($config = array())
+    {
+        self::$config = $config;
+    }
+
     /**
      * Execute a request, release the resource and return output
      *

lib/ShopifySDK.php

@@ -351,6 +351,10 @@ public static function config($config)
             static::$timeAllowedForEachApiCall = $config['AllowedTimePerCall'];
         }
 
+        if (isset($config['Curl']) && is_array($config['Curl'])) {
+            CurlRequest::config($config['Curl']);
+        }
+
         return new ShopifySDK;
     }