diff --git a/CHANGELOG.md b/CHANGELOG.md index 0318240dee..6e0676c9ee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,16 +2,29 @@ All notable changes to this project will be documented in this file based on the [Keep a Changelog](http://keepachangelog.com/) Standard. This project adheres to [Semantic Versioning](http://semver.org/). -## [Unreleased](https://github.com/ruflin/Elastica/compare/3.0.0-beta1...HEAD) +## [Unreleased](https://github.com/ruflin/Elastica/compare/3.0.0...HEAD) ### Backward Compatibility Breaks +### Bugfixes + +### Added + +### Improvements + +### Deprecated + + +## [3.0.0](https://github.com/ruflin/Elastica/compare/3.0.0-beta1...3.0.0) + +### Backward Compatibility Breaks +- Revert getError changes in Response object and make it better BC compatible. See comment [here](https://github.com/ruflin/Elastica/commit/41a7a2075837320bc9bd3bca4150e05a1ec9a115#commitcomment-15136374). + ### Bugfixes - Function score query: corrected the `score_method` `average` to `avg` #975 - Set `json_decode()` assoc parameter to true in `Elastica\Response` #1005 - Add `bigintConversion` to keys passed to connection config in `Elastica\Client` #1005 - Use POST instead of PUT to send bulk requests #1010 -- Revert getError changes in Response object and make it better BC compatible. See comment [here](https://github.com/ruflin/Elastica/commit/41a7a2075837320bc9bd3bca4150e05a1ec9a115#commitcomment-15136374). ### Added - Elastica\Query\MultiMatch::setFuzziness now supports being set to `AUTO` with the const `MultiMatch::FUZZINESS_AUTO` diff --git a/composer.json b/composer.json index 6e5387295c..547276fccc 100644 --- a/composer.json +++ b/composer.json @@ -35,7 +35,7 @@ }, "extra": { "branch-alias": { - "dev-master": "2.3.x-dev" + "dev-master": "3.0.x-dev" } } } diff --git a/test/lib/Elastica/Test/ResponseTest.php b/test/lib/Elastica/Test/ResponseTest.php index 3b6b8c33c3..ec799249b1 100644 --- a/test/lib/Elastica/Test/ResponseTest.php +++ b/test/lib/Elastica/Test/ResponseTest.php @@ -152,8 +152,6 @@ public function testArrayErrorMessage() $this->assertEquals(array('a', 'b'), $response->getFullError()); } - - /** * @group unit */