Version Bump v3.6.0: Pull #16 Pass the curlOptions to the client in b…

…uildClient
sendgrid · Mar 2, 2017 · f886cd3 · f886cd3
1 parent 909de00
commit f886cd3
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@
 vendor/
 *.old
 .idea/
+*.phar
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,11 @@ All notable changes to this project will be documented in this file.
 
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [3.6.0] - 2017-03-01
+### Added
+- Pull request #16: [Pass the curlOptions to the client in buildClient](https://github.com/sendgrid/php-http-client/pull/16)
+- Thanks to [Baptiste Clavié](https://github.com/Taluu) for the pull request!
+
 ## [3.5.1] - 2016-11-17
 ### Fixed
 - Pull request #13, fixed issue #12: [Change from to php union operator to combine curl options](https://github.com/sendgrid/php-http-client/pull/13)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -122,7 +122,9 @@ All test files are in the [`/test/unit`](https://github.com/sendgrid/php-http-cl
 For the purposes of contributing to this repo, please update the [`ClientTest.php`](https://github.com/sendgrid/php-http-client/blob/master/test/unit/ClientTest.php) file with unit tests as you modify the code.
 
 ```bash
-phpunit --bootstrap test/unit/bootstrap.php --filter test* test/unit
+composer install
+cd test/unit
+../../vendor/bin/phpunit . --bootstrap bootstrap.php --filter test*
 ```
 
 <a name="style_guidelines_and_naming_conventions"></a>

diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@ Add php-http-client to your `composer.json` file. If you are not using [Composer
 ```json
 {
   "require": {
-    "sendgrid/php-http-client": "3.5.1"
+    "sendgrid/php-http-client": "~3.6"
   }
 }
 ```

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "sendgrid/php-http-client",
     "description": "HTTP REST client, simplified for PHP",
     "type": "library",
-    "version": "3.5.1",
+    "version": "3.6.0",
     "require-dev": {
         "phpunit/phpunit": "~4.4",
         "squizlabs/php_codesniffer": "~2.0"
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,3 +3,4 @@ @@
     vendor/
     *.old
     .idea/
+    *.phar