summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRich Leland <rich.leland@messagesystems.com>2016-05-04 09:37:09 -0400
committerRich Leland <rich.leland@messagesystems.com>2016-05-04 09:37:09 -0400
commit9754ffb24cc8dd7417c95a08b2967c5411e25944 (patch)
tree1b2d691f2ee10fc7e04b7f072e71657b545a5711
parent247baae6ed522b68d4d0dacdc5de5c46d8e7388a (diff)
downloadphp-sparkpost-9754ffb24cc8dd7417c95a08b2967c5411e25944.zip
php-sparkpost-9754ffb24cc8dd7417c95a08b2967c5411e25944.tar.gz
php-sparkpost-9754ffb24cc8dd7417c95a08b2967c5411e25944.tar.bz2
Bump version, update changelog1.2.0
-rw-r--r--CHANGELOG.md15
-rw-r--r--lib/SparkPost/SparkPost.php2
2 files changed, 14 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 31f5878..cec2a92 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,17 @@ All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).
## [Unreleased][unreleased]
-- There is no unreleased code at this time.
+
+## [1.2.0] - 2016-05-04
+### Added
+- [EditorConfig](http://editorconfig.org/) file to maintain consistent coding style
+- `composer run-script fix-style` can now be run to enforce PSR-2 style
+
+### Changed
+- Responses from the SparkPost API with HTTP status code 403 now properly raise with message, code, and description
+
+### Fixed
+- Removed reliance on composer for version of library
## [1.1.0] - 2016-05-02
### Added
@@ -42,7 +52,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
### Fixed
- README now has proper code blocks denoting PHP language
-[unreleased]: https://github.com/sparkpost/php-sparkpost/compare/v1.1.0...HEAD
+[unreleased]: https://github.com/sparkpost/php-sparkpost/compare/v1.2.0...HEAD
+[1.2.0]: https://github.com/sparkpost/php-sparkpost/compare/v1.1.0...v1.2.0
[1.1.0]: https://github.com/sparkpost/php-sparkpost/compare/v1.0.3...v1.1.0
[1.0.3]: https://github.com/sparkpost/php-sparkpost/compare/v1.0.2...v1.0.3
[1.0.2]: https://github.com/sparkpost/php-sparkpost/compare/v1.0.1...v1.0.2
diff --git a/lib/SparkPost/SparkPost.php b/lib/SparkPost/SparkPost.php
index 92ad867..8a53d5b 100644
--- a/lib/SparkPost/SparkPost.php
+++ b/lib/SparkPost/SparkPost.php
@@ -13,7 +13,7 @@ class SparkPost
/**
* Library version, used for setting User-Agent.
*/
- private $version = '1.1.0';
+ private $version = '1.2.0';
/**
* Connection config for making requests.