Merge pull request #1041 from ruflin/release-3.1.0

Prepare CHANGELOG and composer.json for 3.1.0 release
ruflin · Jan 30, 2016 · 2c881b1 · 2c881b1
2 parents a8b0b6b + df53666
commit 2c881b1
Show file tree

Hide file tree

Showing 75 changed files with 119 additions and 130 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,14 +2,25 @@
 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.1...HEAD)
+## [Unreleased](https://github.com/ruflin/Elastica/compare/3.1.0...HEAD)
 
 ### Backward Compatibility Breaks
-- Update Guzzle transport to use Guzzle 6
-- Elastica\Query\FunctionScore::setFilter - deprecated and will throw DeprecatedException since not supported by Elasticsearch. Use setQuery instead.
 
 ### Bugfixes
 
+### Added
+
+### Improvements
+
+### Deprecated
+
+
+## [3.1.0](https://github.com/ruflin/Elastica/compare/3.0.1...3.1.0)
+
+### Backward Compatibility Breaks
+- Update Guzzle transport to use Guzzle 6
+- Elastica\Query\FunctionScore::setFilter - deprecated and will throw DeprecatedException since not supported by Elasticsearch. Use setQuery instead.
+
 ### Added
 - `Elastica\Result->getDocument` and `Elastica\ResultSet->getDocuments` for return `\Elastica\Document`. https://github.com/ruflin/Elastica/issues/960
 

diff --git a/composer.json b/composer.json
@@ -35,7 +35,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "3.0.x-dev"
+            "dev-master": "3.1.x-dev"
         }
     }
 }
diff --git a/lib/Elastica/AbstractScript.php b/lib/Elastica/AbstractScript.php
@@ -2,6 +2,7 @@
 namespace Elastica;
 
 use Elastica\Script\AbstractScript as BaseAbstractScript;
+
 /**
  * Kept for BC reasons.
  *

diff --git a/lib/Elastica/Aggregation/Filter.php b/lib/Elastica/Aggregation/Filter.php
@@ -13,7 +13,7 @@
 class Filter extends AbstractAggregation
 {
     /**
-     * @param string         $name
+     * @param string        $name
      * @param AbstractQuery $filter
      */
     public function __construct($name, $filter = null)

diff --git a/lib/Elastica/Aggregation/Filters.php b/lib/Elastica/Aggregation/Filters.php
@@ -26,7 +26,7 @@ class Filters extends AbstractAggregation
      * If a name is given, it will be added as a key, otherwise considered as an anonymous filter
      *
      * @param AbstractQuery $filter
-     * @param string         $name
+     * @param string        $name
      *
      * @return $this
      */

diff --git a/lib/Elastica/Bulk/Action/AbstractDocument.php b/lib/Elastica/Bulk/Action/AbstractDocument.php
@@ -1,10 +1,10 @@
 <?php
 namespace Elastica\Bulk\Action;
 
-use Elastica\Script\AbstractScript;
 use Elastica\AbstractUpdateAction;
 use Elastica\Bulk\Action;
 use Elastica\Document;
+use Elastica\Script\AbstractScript;
 
 abstract class AbstractDocument extends Action
 {

diff --git a/lib/Elastica/Bulk/Action/UpdateDocument.php b/lib/Elastica/Bulk/Action/UpdateDocument.php
@@ -1,8 +1,8 @@
 <?php
 namespace Elastica\Bulk\Action;
 
-use Elastica\Script\AbstractScript;
 use Elastica\Document;
+use Elastica\Script\AbstractScript;
 
 class UpdateDocument extends IndexDocument
 {

diff --git a/lib/Elastica/Filter/AbstractFilter.php b/lib/Elastica/Filter/AbstractFilter.php
@@ -12,7 +12,6 @@
  * @author Nicolas Ruflin <spam@ruflin.com>
  *
  * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-filters.html
- *
  * @deprecated Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html
  */
 abstract class AbstractFilter extends Param

diff --git a/lib/Elastica/Filter/AbstractGeoDistance.php b/lib/Elastica/Filter/AbstractGeoDistance.php
@@ -11,7 +11,6 @@
  * @author Nicolas Ruflin <spam@ruflin.com>
  *
  * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-geo-distance-filter.html
- *
  * @deprecated Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html
  */
 abstract class AbstractGeoDistance extends AbstractFilter

diff --git a/lib/Elastica/Filter/AbstractGeoShape.php b/lib/Elastica/Filter/AbstractGeoShape.php
@@ -11,7 +11,6 @@
  * @author Bennie Krijger <benniekrijger@gmail.com>
  *
  * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-geo-shape-filter.html
- *
  * @deprecated Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html
  */
 abstract class AbstractGeoShape extends AbstractFilter

diff --git a/lib/Elastica/Filter/BoolAnd.php b/lib/Elastica/Filter/BoolAnd.php
@@ -9,7 +9,6 @@
  * @author Lee Parker, Nicolas Ruflin <spam@ruflin.com>
  *
  * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-and-filter.html
- *
  * @deprecated Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html
  */
 class BoolAnd extends AbstractMulti

diff --git a/lib/Elastica/Filter/BoolFilter.php b/lib/Elastica/Filter/BoolFilter.php
@@ -11,7 +11,6 @@
  * @author Nicolas Ruflin <spam@ruflin.com>
  *
  * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-bool-filter.html
- *
  * @deprecated Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html
  */
 class BoolFilter extends AbstractFilter

diff --git a/lib/Elastica/Filter/BoolNot.php b/lib/Elastica/Filter/BoolNot.php
@@ -9,7 +9,6 @@
  * @author Lee Parker, Nicolas Ruflin <spam@ruflin.com>
  *
  * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-not-filter.html
- *
  * @deprecated Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html
  */
 class BoolNot extends AbstractFilter

diff --git a/lib/Elastica/Filter/BoolOr.php b/lib/Elastica/Filter/BoolOr.php
@@ -9,7 +9,6 @@
  * @author Nicolas Ruflin <spam@ruflin.com>
  *
  * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-or-filter.html
- *
  * @deprecated Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html
  */
 class BoolOr extends AbstractMulti

diff --git a/lib/Elastica/Filter/Exists.php b/lib/Elastica/Filter/Exists.php
@@ -9,7 +9,6 @@
  * @author Oleg Cherniy <oleg.cherniy@gmail.com>
  *
  * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-exists-filter.html
- *
  * @deprecated Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html
  */
 class Exists extends AbstractFilter

diff --git a/lib/Elastica/Filter/GeoBoundingBox.php b/lib/Elastica/Filter/GeoBoundingBox.php
@@ -11,7 +11,6 @@
  * @author Fabian Vogler <fabian@equivalence.ch>
  *
  * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-geo-bounding-box-filter.html
- *
  * @deprecated Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html
  */
 class GeoBoundingBox extends AbstractFilter

diff --git a/lib/Elastica/Filter/GeoDistance.php b/lib/Elastica/Filter/GeoDistance.php
@@ -9,7 +9,6 @@
  * @author Nicolas Ruflin <spam@ruflin.com>
  *
  * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-geo-distance-filter.html
- *
  * @deprecated Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html
  */
 class GeoDistance extends AbstractGeoDistance

diff --git a/lib/Elastica/Filter/GeoDistanceRange.php b/lib/Elastica/Filter/GeoDistanceRange.php
@@ -11,7 +11,6 @@
  * @author munkie
  *
  * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-geo-distance-range-filter.html
- *
  * @deprecated Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html
  */
 class GeoDistanceRange extends AbstractGeoDistance

diff --git a/lib/Elastica/Filter/GeoPolygon.php b/lib/Elastica/Filter/GeoPolygon.php
@@ -9,7 +9,6 @@
  * @author Michael Maclean <mgdm@php.net>
  *
  * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-geo-polygon-filter.html
- *
  * @deprecated Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html
  */
 class GeoPolygon extends AbstractFilter

diff --git a/lib/Elastica/Filter/GeoShapePreIndexed.php b/lib/Elastica/Filter/GeoShapePreIndexed.php
@@ -11,7 +11,6 @@
  * @author Bennie Krijger <benniekrijger@gmail.com>
  *
  * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-geo-shape-filter.html
- *
  * @deprecated Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html
  */
 class GeoShapePreIndexed extends AbstractGeoShape

diff --git a/lib/Elastica/Filter/GeoShapeProvided.php b/lib/Elastica/Filter/GeoShapeProvided.php
@@ -11,7 +11,6 @@
  * @author BennieKrijger <benniekrijger@gmail.com>
  *
  * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-geo-shape-filter.html
- *
  * @deprecated Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html
  */
 class GeoShapeProvided extends AbstractGeoShape

diff --git a/lib/Elastica/Filter/GeohashCell.php b/lib/Elastica/Filter/GeohashCell.php
@@ -7,7 +7,6 @@
  * Class GeohashCell.
  *
  * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-geohash-cell-filter.html
- *
  * @deprecated Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html
  */
 class GeohashCell extends AbstractGeoDistance

diff --git a/lib/Elastica/Filter/HasChild.php b/lib/Elastica/Filter/HasChild.php
@@ -9,7 +9,6 @@
  * @author Fabian Vogler <fabian@equivalence.ch>
  *
  * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-has-child-filter.html
- *
  * @deprecated Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html
  */
 class HasChild extends AbstractFilter

diff --git a/lib/Elastica/Filter/HasParent.php b/lib/Elastica/Filter/HasParent.php
@@ -7,7 +7,6 @@
  * Returns child documents having parent docs matching the query.
  *
  * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-has-parent-filter.html
- *
  * @deprecated Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html
  */
 class HasParent extends AbstractFilter

diff --git a/lib/Elastica/Filter/Ids.php b/lib/Elastica/Filter/Ids.php
@@ -11,7 +11,6 @@
  * @author Lee Parker, Nicolas Ruflin <spam@ruflin.com>
  *
  * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-ids-filter.html
- *
  * @deprecated Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html
  */
 class Ids extends AbstractFilter

diff --git a/lib/Elastica/Filter/Indices.php b/lib/Elastica/Filter/Indices.php
@@ -9,7 +9,6 @@
  * Class Indices.
  *
  * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-indices-filter.html
- *
  * @deprecated Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html
  */
 class Indices extends AbstractFilter

diff --git a/lib/Elastica/Filter/Limit.php b/lib/Elastica/Filter/Limit.php
@@ -9,7 +9,6 @@
  * @author Nicolas Ruflin <spam@ruflin.com>
  *
  * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-limit-filter.html
- *
  * @deprecated Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html
  */
 class Limit extends AbstractFilter

diff --git a/lib/Elastica/Filter/MatchAll.php b/lib/Elastica/Filter/MatchAll.php
@@ -9,7 +9,6 @@
  * @author Nicolas Ruflin <spam@ruflin.com>
  *
  * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-match-all-filter.html
- *
  * @deprecated Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html
  */
 class MatchAll extends AbstractFilter

diff --git a/lib/Elastica/Filter/Missing.php b/lib/Elastica/Filter/Missing.php
@@ -9,7 +9,6 @@
  * @author Maciej Wiercinski <maciej@wiercinski.net>
  *
  * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-missing-filter.html
- *
  * @deprecated Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html
  */
 class Missing extends AbstractFilter

diff --git a/lib/Elastica/Filter/Nested.php b/lib/Elastica/Filter/Nested.php
@@ -11,7 +11,6 @@
  * @author Nicolas Ruflin <spam@ruflin.com>
  *
  * @link http://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-nested-filter.html
- *
  * @deprecated Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html
  */
 class Nested extends AbstractFilter

diff --git a/lib/Elastica/Filter/NumericRange.php b/lib/Elastica/Filter/NumericRange.php
@@ -9,7 +9,6 @@
  * @author Nicolas Ruflin <spam@ruflin.com>
  *
  * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-range-filter.html
- *
  * @deprecated Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html
  */
 class NumericRange extends Range

diff --git a/lib/Elastica/Filter/Prefix.php b/lib/Elastica/Filter/Prefix.php
@@ -9,7 +9,6 @@
  * @author Jasper van Wanrooy <jasper@vanwanrooy.net>
  *
  * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-prefix-filter.html
- *
  * @deprecated Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html
  */
 class Prefix extends AbstractFilter

diff --git a/lib/Elastica/Filter/Query.php b/lib/Elastica/Filter/Query.php
@@ -12,7 +12,6 @@
  * @author Nicolas Ruflin <spam@ruflin.com>
  *
  * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-filter.html
- *
  * @deprecated Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html
  */
 class Query extends AbstractFilter

diff --git a/lib/Elastica/Filter/Range.php b/lib/Elastica/Filter/Range.php
@@ -9,7 +9,6 @@
  * @author Nicolas Ruflin <spam@ruflin.com>
  *
  * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-range-filter.html
- *
  * @deprecated Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html
  */
 class Range extends AbstractFilter

diff --git a/lib/Elastica/Filter/Regexp.php b/lib/Elastica/Filter/Regexp.php
@@ -9,7 +9,6 @@
  * @author Timothy Lamb <trash80@gmail.com>
  *
  * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-regexp-filter.html
- *
  * @deprecated Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html
  */
 class Regexp extends AbstractFilter

diff --git a/lib/Elastica/Filter/Script.php b/lib/Elastica/Filter/Script.php
@@ -11,7 +11,6 @@
  * @author Nicolas Ruflin <spam@ruflin.com>
  *
  * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-script-filter.html
- *
  * @deprecated Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html
  */
 class Script extends AbstractFilter

diff --git a/lib/Elastica/Filter/Term.php b/lib/Elastica/Filter/Term.php
@@ -9,7 +9,6 @@
  * @author Nicolas Ruflin <spam@ruflin.com>
  *
  * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-term-filter.html
- *
  * @deprecated Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html
  */
 class Term extends AbstractFilter

diff --git a/lib/Elastica/Filter/Terms.php b/lib/Elastica/Filter/Terms.php
@@ -11,7 +11,6 @@
  * @author Nicolas Ruflin <spam@ruflin.com>
  *
  * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-terms-filter.html
- *
  * @deprecated Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html
  */
 class Terms extends AbstractFilter

diff --git a/lib/Elastica/Filter/Type.php b/lib/Elastica/Filter/Type.php
@@ -9,7 +9,6 @@
  * @author James Wilson <jwilson556@gmail.com>
  *
  * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-type-filter.html
- *
  * @deprecated Filters are deprecated. Use queries in filter context. See https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html
  */
 class Type extends AbstractFilter

diff --git a/lib/Elastica/Query.php b/lib/Elastica/Query.php
@@ -75,6 +75,7 @@ public static function create($query)
                 trigger_error('Deprecated: Elastica\Query::create() passing filter is deprecated. Create query and use setPostFilter with AbstractQuery instead.', E_USER_DEPRECATED);
                 $newQuery = new self();
                 $newQuery->setPostFilter($query);
+
                 return $newQuery;
             case empty($query):
                 return new self(new MatchAll());

diff --git a/lib/Elastica/Query/Filtered.php b/lib/Elastica/Query/Filtered.php
@@ -20,7 +20,7 @@ class Filtered extends AbstractQuery
     /**
      * Constructs a filtered query.
      *
-     * @param \Elastica\Query\AbstractQuery   $query  OPTIONAL Query object
+     * @param \Elastica\Query\AbstractQuery $query  OPTIONAL Query object
      * @param \Elastica\Query\AbstractQuery $filter OPTIONAL Filter object
      */
     public function __construct(AbstractQuery $query = null, $filter = null)
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,7 @@ @@
     namespace Elastica;
     use Elastica\Script\AbstractScript as BaseAbstractScript;
     /**
      * Kept for BC reasons.
      *
@@ Expand Down @@