Skip to content

Commit

Permalink
Version v5.5.0: Pull #295
Browse files Browse the repository at this point in the history
  • Loading branch information
thinkingserious committed May 5, 2017
1 parent 9286d6c commit b4c997f
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 5 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file.

This project adheres to [Semantic Versioning](http://semver.org/).

## [5.5.0] - 2017-05-04 ##
### Added
- Pull #393: Update [php-http-client](https://github.com/sendgrid/php-http-client) dependency
- [v3.6](https://github.com/sendgrid/php-http-client/releases/tag/v3.6.0): Pass the curlOptions to the client in buildClient
- [v3.7](https://github.com/sendgrid/php-http-client/releases/tag/v3.7.0): Added ability to get headers as associative array

## [5.4.2] - 2017-04-18 ##
### Fixes
- Fixes #292
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ Add SendGrid to your `composer.json` file. If you are not using [Composer](http:
```json
{
"require": {
"sendgrid/sendgrid": "~5.4"
"sendgrid/sendgrid": "~5.5"
}
}
```
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "sendgrid/sendgrid",
"description": "This library allows you to quickly and easily send emails through SendGrid using PHP.",
"version": "5.4.2",
"version": "5.5.0",
"homepage": "http://github.com/sendgrid/sendgrid-php",
"license": "MIT",
"keywords": ["SendGrid", "sendgrid", "email", "send", "grid"],
Expand Down
2 changes: 1 addition & 1 deletion lib/SendGrid.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
*/
class SendGrid
{
const VERSION = '5.4.2';
const VERSION = '5.5.0';

/**
*
Expand Down
4 changes: 2 additions & 2 deletions test/unit/SendGridTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public static function setUpBeforeClass()

public function testVersion()
{
$this->assertEquals(SendGrid::VERSION, '5.4.2');
$this->assertEquals(SendGrid::VERSION, '5.5.0');
$this->assertEquals(json_decode(file_get_contents(__DIR__ . '/../../composer.json'))->version, SendGrid::VERSION);
}

Expand All @@ -83,7 +83,7 @@ public function testSendGrid()

$sg3 = new SendGrid($apiKey, array('curl' => array('foo' => 'bar')));
$this->assertEquals(array('foo' => 'bar'), $sg3->client->getCurlOptions());

$sg4 = new SendGrid($apiKey, ['curl' => [CURLOPT_PROXY => '127.0.0.1:8000']]);
$this->assertEquals($sg4->client->getCurlOptions(), [10004 => '127.0.0.1:8000']);
}
Expand Down

0 comments on commit b4c997f

Please sign in to comment.