Merge remote-tracking branch 'remotes/upstream/master' into issue94-patch

# Conflicts:
#	lib/Client.php

Author: misantron

CHANGELOG.md

@@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file.
 
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [3.9.4] - 2018-03-22
+### Fixed
+- Fixes [#586](https://github.com/sendgrid/sendgrid-php/issues/586), PR [#96](https://github.com/sendgrid/php-http-client/pull/96): Fix constructor function signature regression.
+
 ## [3.9.3] - 2018-03-11
 ### Fixed
 - Fixes [#584](https://github.com/sendgrid/sendgrid-php/issues/584), PR [#93](https://github.com/sendgrid/php-http-client/pull/93): Don't overwrite headers set from upstream dependencies.

README.md

@@ -39,7 +39,7 @@ Add php-http-client to your `composer.json` file. If you are not using [Composer
 ```json
 {
   "require": {
-    "sendgrid/php-http-client": "~3.9.3"
+    "sendgrid/php-http-client": "~3.9.4"
   }
 }
 ```

composer.json

@@ -2,7 +2,7 @@
     "name": "sendgrid/php-http-client",
     "description": "HTTP REST client, simplified for PHP",
     "type": "library",
-    "version": "3.9.3",
+    "version": "3.9.4",
     "homepage": "http://github.com/sendgrid/php-http-client",
     "keywords": ["SendGrid", "HTTP", "REST", "API", "Fluent"],
     "license": "MIT",

lib/Client.php

@@ -77,22 +77,23 @@ class Client
     private $methods = ['get', 'post', 'patch', 'put', 'delete'];
 
     /**
-     * Initialize the client
-     *
-     * @param string $host    the base url (e.g. https://api.sendgrid.com)
-     * @param array  $headers global request headers
-     * @param string $version api version (configurable)
-     * @param array  $path    holds the segments of the url path
-     */
-    public function __construct($host, array $headers = [], $version = '/v3', array $path = [])
+      * Initialize the client
+      *
+      * @param string  $host          the base url (e.g. https://api.sendgrid.com)
+      * @param array   $headers       global request headers
+      * @param string  $version       api version (configurable) - this is specific to the SendGrid API
+      * @param array   $path          holds the segments of the url path
+      * @param array   $curlOptions   extra options to set during curl initialization
+      * @param bool    $retryOnLimit  set default retry on limit flag
+      */
+    public function __construct($host, $headers = null, $version = null, $path = null, $curlOptions = null, $retryOnLimit = false)
     {
         $this->host = $host;
-        $this->headers = $headers;
+        $this->headers = $headers ?: [];
         $this->version = $version;
-        $this->path = $path;
-
-        $this->curlOptions = [];
-        $this->retryOnLimit = false;
+        $this->path = $path ?: [];
+        $this->curlOptions = $curlOptions ?: [];
+        $this->retryOnLimit = $retryOnLimit;
         $this->isConcurrentRequest = false;
         $this->savedRequests = [];
     }

test/unit/ClientTest.php

@@ -20,7 +20,7 @@ protected function setUp()
             'Content-Type: application/json',
             'Authorization: Bearer SG.XXXX'
         ];
-        $this->client = new MockClient($this->host, $this->headers);
+        $this->client = new MockClient($this->host, $this->headers, '/v3');
     }
 
     public function testConstructor()
@@ -91,7 +91,7 @@ public function testGetVersion()
         $this->assertSame('/v3', $client->getVersion());
 
         $client = new Client('https://localhost:4010');
-        $this->assertSame('/v3', $client->getVersion());
+        $this->assertSame(null, $client->getVersion());
     }
 
     public function testGetPath()