From df536663a290e160c7df03e9b096b0a56da985d3 Mon Sep 17 00:00:00 2001 From: ruflin Date: Sat, 30 Jan 2016 21:30:15 +0100 Subject: [PATCH] Prepare CHANGELOG and composer.json for 3.1.0 release --- CHANGELOG.md | 17 +++++-- composer.json | 2 +- lib/Elastica/AbstractScript.php | 1 + lib/Elastica/Aggregation/Filter.php | 2 +- lib/Elastica/Aggregation/Filters.php | 2 +- lib/Elastica/Bulk/Action/AbstractDocument.php | 2 +- lib/Elastica/Bulk/Action/UpdateDocument.php | 2 +- lib/Elastica/Filter/AbstractFilter.php | 1 - lib/Elastica/Filter/AbstractGeoDistance.php | 1 - lib/Elastica/Filter/AbstractGeoShape.php | 1 - lib/Elastica/Filter/BoolAnd.php | 1 - lib/Elastica/Filter/BoolFilter.php | 1 - lib/Elastica/Filter/BoolNot.php | 1 - lib/Elastica/Filter/BoolOr.php | 1 - lib/Elastica/Filter/Exists.php | 1 - lib/Elastica/Filter/GeoBoundingBox.php | 1 - lib/Elastica/Filter/GeoDistance.php | 1 - lib/Elastica/Filter/GeoDistanceRange.php | 1 - lib/Elastica/Filter/GeoPolygon.php | 1 - lib/Elastica/Filter/GeoShapePreIndexed.php | 1 - lib/Elastica/Filter/GeoShapeProvided.php | 1 - lib/Elastica/Filter/GeohashCell.php | 1 - lib/Elastica/Filter/HasChild.php | 1 - lib/Elastica/Filter/HasParent.php | 1 - lib/Elastica/Filter/Ids.php | 1 - lib/Elastica/Filter/Indices.php | 1 - lib/Elastica/Filter/Limit.php | 1 - lib/Elastica/Filter/MatchAll.php | 1 - lib/Elastica/Filter/Missing.php | 1 - lib/Elastica/Filter/Nested.php | 1 - lib/Elastica/Filter/NumericRange.php | 1 - lib/Elastica/Filter/Prefix.php | 1 - lib/Elastica/Filter/Query.php | 1 - lib/Elastica/Filter/Range.php | 1 - lib/Elastica/Filter/Regexp.php | 1 - lib/Elastica/Filter/Script.php | 1 - lib/Elastica/Filter/Term.php | 1 - lib/Elastica/Filter/Terms.php | 1 - lib/Elastica/Filter/Type.php | 1 - lib/Elastica/Query.php | 1 + lib/Elastica/Query/Filtered.php | 2 +- lib/Elastica/Query/FunctionScore.php | 47 ++++++++++--------- lib/Elastica/Query/Indices.php | 4 +- lib/Elastica/Result.php | 21 ++++++--- lib/Elastica/ResultSet.php | 7 +-- lib/Elastica/Transport/Guzzle.php | 8 ++-- lib/Elastica/Type.php | 4 +- .../Elastica/Test/Aggregation/FilterTest.php | 6 +-- .../Elastica/Test/Aggregation/FiltersTest.php | 2 +- .../Test/Aggregation/SignificantTermsTest.php | 2 +- test/lib/Elastica/Test/Base.php | 2 +- .../lib/Elastica/Test/DeprecatedClassBase.php | 2 +- test/lib/Elastica/Test/ErrorsCollector.php | 3 +- .../Elastica/Test/Filter/BoolFilterTest.php | 1 + test/lib/Elastica/Test/Filter/MultiTest.php | 2 +- test/lib/Elastica/Test/Filter/TermTest.php | 1 - .../Elastica/Test/LegacyScriptFieldsTest.php | 4 +- .../Elastica/Test/LegacyScriptFileTest.php | 2 +- test/lib/Elastica/Test/LegacyScriptTest.php | 2 +- .../lib/Elastica/Test/Query/BoolQueryTest.php | 4 +- .../Elastica/Test/Query/ConstantScoreTest.php | 4 +- test/lib/Elastica/Test/Query/FilteredTest.php | 5 +- .../Elastica/Test/Query/FunctionScoreTest.php | 14 +++--- .../Test/Query/GeoDistanceRangeTest.php | 2 +- .../Elastica/Test/Query/GeoDistanceTest.php | 2 +- .../Elastica/Test/Query/GeoPolygonTest.php | 2 +- .../Test/Query/GeoShapePreIndexedTest.php | 2 +- .../Test/Query/GeoShapeProvidedTest.php | 2 +- .../Elastica/Test/Query/GeohashCellTest.php | 2 +- test/lib/Elastica/Test/Query/IndicesTest.php | 4 +- .../Elastica/Test/Query/PostFilterTest.php | 6 +-- .../Test/QueryBuilder/DSL/QueryTest.php | 4 +- test/lib/Elastica/Test/QueryTest.php | 7 ++- test/lib/Elastica/Test/ResultSetTest.php | 4 +- test/lib/Elastica/Test/SearchTest.php | 2 +- 75 files changed, 119 insertions(+), 130 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6a654be103..7e71f2c3b7 100644 --- 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 index 471e1c0ccd..464abd1646 100644 --- 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 index 2a4682da65..f1e862195a 100644 --- 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 index 801e6ffac6..2ffaf22824 100644 --- 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 index 8750104dee..d6ce62ad11 100644 --- 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 index 956472a79d..2251ab2bf0 100644 --- a/lib/Elastica/Bulk/Action/AbstractDocument.php +++ b/lib/Elastica/Bulk/Action/AbstractDocument.php @@ -1,10 +1,10 @@ * * @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 index caa0e8f8bc..88ec3e16fd 100644 --- a/lib/Elastica/Filter/AbstractGeoDistance.php +++ b/lib/Elastica/Filter/AbstractGeoDistance.php @@ -11,7 +11,6 @@ * @author Nicolas Ruflin * * @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 index 18860e9563..95ca452550 100644 --- a/lib/Elastica/Filter/AbstractGeoShape.php +++ b/lib/Elastica/Filter/AbstractGeoShape.php @@ -11,7 +11,6 @@ * @author Bennie Krijger * * @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 index e23bd5786b..cf8a68a65a 100644 --- a/lib/Elastica/Filter/BoolAnd.php +++ b/lib/Elastica/Filter/BoolAnd.php @@ -9,7 +9,6 @@ * @author Lee Parker, Nicolas Ruflin * * @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 index 71a5648272..ab6c4108d2 100644 --- a/lib/Elastica/Filter/BoolFilter.php +++ b/lib/Elastica/Filter/BoolFilter.php @@ -11,7 +11,6 @@ * @author Nicolas Ruflin * * @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 index 3b87450916..511ffa5ab6 100644 --- a/lib/Elastica/Filter/BoolNot.php +++ b/lib/Elastica/Filter/BoolNot.php @@ -9,7 +9,6 @@ * @author Lee Parker, Nicolas Ruflin * * @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 index dc38b70003..6ded20fe72 100644 --- a/lib/Elastica/Filter/BoolOr.php +++ b/lib/Elastica/Filter/BoolOr.php @@ -9,7 +9,6 @@ * @author Nicolas Ruflin * * @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 index 89fcde0961..e116a11769 100644 --- a/lib/Elastica/Filter/Exists.php +++ b/lib/Elastica/Filter/Exists.php @@ -9,7 +9,6 @@ * @author Oleg Cherniy * * @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 index 3d8bb883f6..515de7d738 100644 --- a/lib/Elastica/Filter/GeoBoundingBox.php +++ b/lib/Elastica/Filter/GeoBoundingBox.php @@ -11,7 +11,6 @@ * @author Fabian Vogler * * @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 index b36c69a6ba..975bc323ed 100644 --- a/lib/Elastica/Filter/GeoDistance.php +++ b/lib/Elastica/Filter/GeoDistance.php @@ -9,7 +9,6 @@ * @author Nicolas Ruflin * * @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 index 45852c30ea..bfd6704a70 100644 --- 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 index 2c67b00ea2..9dc915ae95 100644 --- a/lib/Elastica/Filter/GeoPolygon.php +++ b/lib/Elastica/Filter/GeoPolygon.php @@ -9,7 +9,6 @@ * @author Michael Maclean * * @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 index 714f2c0b84..f94a5ade68 100644 --- a/lib/Elastica/Filter/GeoShapePreIndexed.php +++ b/lib/Elastica/Filter/GeoShapePreIndexed.php @@ -11,7 +11,6 @@ * @author Bennie Krijger * * @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 index eb1d008acd..9cfc4ab7ac 100644 --- a/lib/Elastica/Filter/GeoShapeProvided.php +++ b/lib/Elastica/Filter/GeoShapeProvided.php @@ -11,7 +11,6 @@ * @author BennieKrijger * * @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 index 9d8a82491a..6f00ad8ca3 100644 --- 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 index 9aa7a88356..8d498441f4 100644 --- a/lib/Elastica/Filter/HasChild.php +++ b/lib/Elastica/Filter/HasChild.php @@ -9,7 +9,6 @@ * @author Fabian Vogler * * @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 index c777a6564f..b21436ecdf 100644 --- 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 index 2cd6067cd9..365ea7001c 100644 --- a/lib/Elastica/Filter/Ids.php +++ b/lib/Elastica/Filter/Ids.php @@ -11,7 +11,6 @@ * @author Lee Parker, Nicolas Ruflin * * @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 index c562512e0e..bff394bbb9 100644 --- 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 index a058786da8..2efca5d249 100644 --- a/lib/Elastica/Filter/Limit.php +++ b/lib/Elastica/Filter/Limit.php @@ -9,7 +9,6 @@ * @author Nicolas Ruflin * * @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 index ab1c527e7d..21572f8792 100644 --- a/lib/Elastica/Filter/MatchAll.php +++ b/lib/Elastica/Filter/MatchAll.php @@ -9,7 +9,6 @@ * @author Nicolas Ruflin * * @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 index 3f2c72095a..1053287894 100644 --- a/lib/Elastica/Filter/Missing.php +++ b/lib/Elastica/Filter/Missing.php @@ -9,7 +9,6 @@ * @author Maciej Wiercinski * * @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 index 6919edfd7c..c8cf87baa1 100644 --- a/lib/Elastica/Filter/Nested.php +++ b/lib/Elastica/Filter/Nested.php @@ -11,7 +11,6 @@ * @author Nicolas Ruflin * * @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 index 3738bbd356..e6033d7e37 100644 --- a/lib/Elastica/Filter/NumericRange.php +++ b/lib/Elastica/Filter/NumericRange.php @@ -9,7 +9,6 @@ * @author Nicolas Ruflin * * @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 index c18a239fe0..66ee9414d4 100644 --- a/lib/Elastica/Filter/Prefix.php +++ b/lib/Elastica/Filter/Prefix.php @@ -9,7 +9,6 @@ * @author Jasper van Wanrooy * * @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 index 9918fce56b..0a0a518b55 100644 --- a/lib/Elastica/Filter/Query.php +++ b/lib/Elastica/Filter/Query.php @@ -12,7 +12,6 @@ * @author Nicolas Ruflin * * @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 index 3aff1292c3..53a28b0846 100644 --- a/lib/Elastica/Filter/Range.php +++ b/lib/Elastica/Filter/Range.php @@ -9,7 +9,6 @@ * @author Nicolas Ruflin * * @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 index 816b2af6fe..60c8b45365 100644 --- a/lib/Elastica/Filter/Regexp.php +++ b/lib/Elastica/Filter/Regexp.php @@ -9,7 +9,6 @@ * @author Timothy Lamb * * @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 index 8618553060..d3bd38a881 100644 --- a/lib/Elastica/Filter/Script.php +++ b/lib/Elastica/Filter/Script.php @@ -11,7 +11,6 @@ * @author Nicolas Ruflin * * @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 index 99749c161d..dd8aa1b19b 100644 --- a/lib/Elastica/Filter/Term.php +++ b/lib/Elastica/Filter/Term.php @@ -9,7 +9,6 @@ * @author Nicolas Ruflin * * @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 index 081cf00445..50ac3736bd 100644 --- a/lib/Elastica/Filter/Terms.php +++ b/lib/Elastica/Filter/Terms.php @@ -11,7 +11,6 @@ * @author Nicolas Ruflin * * @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 index ed398e25b1..c29a6f3165 100644 --- a/lib/Elastica/Filter/Type.php +++ b/lib/Elastica/Filter/Type.php @@ -9,7 +9,6 @@ * @author James Wilson * * @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 index 815e556ca8..954b94b6da 100644 --- 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 index 14d5699b30..25b2ba573b 100644 --- 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) diff --git a/lib/Elastica/Query/FunctionScore.php b/lib/Elastica/Query/FunctionScore.php index c625b45c5f..38db71b428 100644 --- a/lib/Elastica/Query/FunctionScore.php +++ b/lib/Elastica/Query/FunctionScore.php @@ -2,9 +2,9 @@ namespace Elastica\Query; use Elastica\Exception\DeprecatedException; -use Elastica\Script\AbstractScript; use Elastica\Exception\InvalidException; use Elastica\Filter\AbstractFilter; +use Elastica\Script\AbstractScript; /** * Class FunctionScore. @@ -58,6 +58,7 @@ public function setQuery(AbstractQuery $query) /** * @param AbstractFilter $filter + * * @deprecated Elastica\Query\FunctionScore::setFilter is deprecated. Use setQuery instead * * @return $this @@ -70,10 +71,10 @@ public function setFilter(AbstractFilter $filter) /** * Add a function to the function_score query. * - * @param string $functionType valid values are DECAY_* constants and script_score - * @param array|float $functionParams the body of the function. See documentation for proper syntax. - * @param AbstractQuery $filter optional filter to apply to the function - * @param float $weight function weight + * @param string $functionType valid values are DECAY_* constants and script_score + * @param array|float $functionParams the body of the function. See documentation for proper syntax. + * @param AbstractQuery $filter optional filter to apply to the function + * @param float $weight function weight * * @return $this */ @@ -105,9 +106,9 @@ public function addFunction($functionType, $functionParams, $filter = null, $wei /** * Add a script_score function to the query. * - * @param \Elastica\Script\AbstractScript $script a Script object - * @param AbstractQuery $filter an optional filter to apply to the function - * @param float $weight the weight of the function + * @param \Elastica\Script\AbstractScript $script a Script object + * @param AbstractQuery $filter an optional filter to apply to the function + * @param float $weight the weight of the function * * @return $this */ @@ -127,14 +128,14 @@ public function addScriptScoreFunction(AbstractScript $script, $filter = null, $ /** * Add a decay function to the query. * - * @param string $function see DECAY_* constants for valid options - * @param string $field the document field on which to perform the decay function - * @param string $origin the origin value for this decay function - * @param string $scale a scale to define the rate of decay for this function - * @param string $offset If defined, this function will only be computed for documents with a distance from the origin greater than this value - * @param float $decay optionally defines how documents are scored at the distance given by the $scale parameter - * @param float $weight optional factor by which to multiply the score at the value provided by the $scale parameter - * @param AbstractQuery $filter a filter associated with this function + * @param string $function see DECAY_* constants for valid options + * @param string $field the document field on which to perform the decay function + * @param string $origin the origin value for this decay function + * @param string $scale a scale to define the rate of decay for this function + * @param string $offset If defined, this function will only be computed for documents with a distance from the origin greater than this value + * @param float $decay optionally defines how documents are scored at the distance given by the $scale parameter + * @param float $weight optional factor by which to multiply the score at the value provided by the $scale parameter + * @param AbstractQuery $filter a filter associated with this function * * @return $this */ @@ -210,8 +211,8 @@ public function addFieldValueFactorFunction( /** * Add a boost_factor function to the query. * - * @param float $boostFactor the boost factor value - * @param AbstractQuery $filter a filter associated with this function + * @param float $boostFactor the boost factor value + * @param AbstractQuery $filter a filter associated with this function * * @deprecated Use addWeightFunction instead. This method will be removed in further Elastica releases */ @@ -230,8 +231,8 @@ public function addBoostFactorFunction($boostFactor, $filter = null) } /** - * @param float $weight the weight of the function - * @param AbstractQuery $filter a filter associated with this function + * @param float $weight the weight of the function + * @param AbstractQuery $filter a filter associated with this function */ public function addWeightFunction($weight, $filter = null) { @@ -249,9 +250,9 @@ public function addWeightFunction($weight, $filter = null) /** * Add a random_score function to the query. * - * @param number $seed the seed value - * @param AbstractQuery $filter a filter associated with this function - * @param float $weight an optional boost value associated with this function + * @param number $seed the seed value + * @param AbstractQuery $filter a filter associated with this function + * @param float $weight an optional boost value associated with this function */ public function addRandomScoreFunction($seed, $filter = null, $weight = null) { diff --git a/lib/Elastica/Query/Indices.php b/lib/Elastica/Query/Indices.php index 77663282ea..27b46bbac0 100644 --- a/lib/Elastica/Query/Indices.php +++ b/lib/Elastica/Query/Indices.php @@ -11,8 +11,8 @@ class Indices extends AbstractQuery { /** - * @param AbstractQuery $query Query which will be applied to docs in the specified indices - * @param mixed[] $indices + * @param AbstractQuery $query Query which will be applied to docs in the specified indices + * @param mixed[] $indices */ public function __construct(AbstractQuery $query, array $indices) { diff --git a/lib/Elastica/Result.php b/lib/Elastica/Result.php index 5f774eecba..9efdfac1af 100644 --- a/lib/Elastica/Result.php +++ b/lib/Elastica/Result.php @@ -186,9 +186,9 @@ public function getExplanation() { return $this->getParam('_explanation'); } - + /** - * Returns Document + * Returns Document. * * @return \Elastica\Document */ @@ -197,11 +197,20 @@ public function getDocument() $doc = new \Elastica\Document(); $doc->setData($this->getSource()); $hit = $this->getHit(); - if($this->hasParam('_source')) unset($hit['_source']); - if($this->hasParam('_explanation')) unset($hit['_explanation']); - if($this->hasParam('highlight')) unset($hit['highlight']); - if($this->hasParam('_score')) unset($hit['_score']); + if ($this->hasParam('_source')) { + unset($hit['_source']); + } + if ($this->hasParam('_explanation')) { + unset($hit['_explanation']); + } + if ($this->hasParam('highlight')) { + unset($hit['highlight']); + } + if ($this->hasParam('_score')) { + unset($hit['_score']); + } $doc->setParams($hit); + return $doc; } diff --git a/lib/Elastica/ResultSet.php b/lib/Elastica/ResultSet.php index be34b8daff..528433f248 100644 --- a/lib/Elastica/ResultSet.php +++ b/lib/Elastica/ResultSet.php @@ -136,7 +136,7 @@ public function getResults() { return $this->_results; } - + /** * Returns all Documents. * @@ -144,10 +144,11 @@ public function getResults() */ public function getDocuments() { - $documents = []; - foreach($this->_results as $doc) { + $documents = array(); + foreach ($this->_results as $doc) { $documents[] = $doc->getDocument(); } + return $documents; } diff --git a/lib/Elastica/Transport/Guzzle.php b/lib/Elastica/Transport/Guzzle.php index 0062555bdb..73f3e50a82 100644 --- a/lib/Elastica/Transport/Guzzle.php +++ b/lib/Elastica/Transport/Guzzle.php @@ -107,7 +107,7 @@ public function exec(Request $request, array $params) } /** - * @param Request $request + * @param Request $request * @param Connection $connection * * @return Psr7\Request @@ -119,7 +119,7 @@ protected function _createPsr7Request(Request $request, Connection $connection) $this->_getActionPath($request), $connection->hasConfig('headers') && is_array($connection->getConfig('headers')) ? $connection->getConfig('headers') - : [] + : array() ); $data = $request->getData(); @@ -175,12 +175,12 @@ protected function _getBaseUrl(Connection $connection) if (!empty($url)) { $baseUri = $url; } else { - $baseUri = (string) Uri::fromParts([ + $baseUri = (string) Uri::fromParts(array( 'scheme' => $this->_scheme, 'host' => $connection->getHost(), 'port' => $connection->getPort(), 'path' => ltrim('/', $connection->getPath()), - ]); + )); } return rtrim($baseUri, '/'); diff --git a/lib/Elastica/Type.php b/lib/Elastica/Type.php index 8f63feb515..4f4ce03bff 100644 --- a/lib/Elastica/Type.php +++ b/lib/Elastica/Type.php @@ -134,8 +134,8 @@ public function addObject($object, Document $doc = null) * * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/docs-update.html * - * @param \Elastica\Document|\Elastica\Script\AbstractScript $data Document with update data - * @param array $options array of query params to use for query. For possible options check es api + * @param \Elastica\Document|\Elastica\Script\AbstractScript $data Document with update data + * @param array $options array of query params to use for query. For possible options check es api * * @throws \Elastica\Exception\InvalidException * diff --git a/test/lib/Elastica/Test/Aggregation/FilterTest.php b/test/lib/Elastica/Test/Aggregation/FilterTest.php index fc1f910ca1..262beabc17 100644 --- a/test/lib/Elastica/Test/Aggregation/FilterTest.php +++ b/test/lib/Elastica/Test/Aggregation/FilterTest.php @@ -7,9 +7,9 @@ use Elastica\Filter\Exists; use Elastica\Filter\Range; use Elastica\Filter\Term; +use Elastica\Query; use Elastica\Query\Range as RangeQuery; use Elastica\Query\Term as TermQuery; -use Elastica\Query; class FilterTest extends BaseAggregationTest { @@ -54,7 +54,7 @@ public function testConstructorWithLegacyFilterDeprecated() $errorsCollector->assertOnlyDeprecatedErrors( array( 'Deprecated: Elastica\Aggregation\Filter passing filter as AbstractFilter is deprecated. Pass instance of AbstractQuery instead.', - 'Deprecated: Elastica\Aggregation\Filter\setFilter() passing filter as AbstractFilter is deprecated. Pass instance of AbstractQuery instead.' + 'Deprecated: Elastica\Aggregation\Filter\setFilter() passing filter as AbstractFilter is deprecated. Pass instance of AbstractQuery instead.', ) ); } @@ -86,7 +86,7 @@ public function testSetFilterWithLegacyFilterDeprecated() $errorsCollector->assertOnlyDeprecatedErrors( array( - 'Deprecated: Elastica\Aggregation\Filter\setFilter() passing filter as AbstractFilter is deprecated. Pass instance of AbstractQuery instead.' + 'Deprecated: Elastica\Aggregation\Filter\setFilter() passing filter as AbstractFilter is deprecated. Pass instance of AbstractQuery instead.', ) ); } diff --git a/test/lib/Elastica/Test/Aggregation/FiltersTest.php b/test/lib/Elastica/Test/Aggregation/FiltersTest.php index 83ec16347f..f9b0c76495 100644 --- a/test/lib/Elastica/Test/Aggregation/FiltersTest.php +++ b/test/lib/Elastica/Test/Aggregation/FiltersTest.php @@ -53,7 +53,7 @@ public function testSetFilterWithLegacyFilterDeprecated() $errorsCollector->assertOnlyDeprecatedErrors( array( - 'Deprecated: Elastica\Aggregation\Filters\addFilter() passing filter as AbstractFilter is deprecated. Pass instance of AbstractQuery instead.' + 'Deprecated: Elastica\Aggregation\Filters\addFilter() passing filter as AbstractFilter is deprecated. Pass instance of AbstractQuery instead.', ) ); } diff --git a/test/lib/Elastica/Test/Aggregation/SignificantTermsTest.php b/test/lib/Elastica/Test/Aggregation/SignificantTermsTest.php index e5a1b3ea7b..dd69c45e7b 100644 --- a/test/lib/Elastica/Test/Aggregation/SignificantTermsTest.php +++ b/test/lib/Elastica/Test/Aggregation/SignificantTermsTest.php @@ -52,7 +52,7 @@ public function testSetBackgroundFilterWithLegacyFilterDeprecated() $errorsCollector->assertOnlyDeprecatedErrors( array( - 'Deprecated: Elastica\Aggregation\SignificantTerms::setBackgroundFilter passing filter as AbstractFilter is deprecated. Pass instance of AbstractQuery instead.' + 'Deprecated: Elastica\Aggregation\SignificantTerms::setBackgroundFilter passing filter as AbstractFilter is deprecated. Pass instance of AbstractQuery instead.', ) ); } diff --git a/test/lib/Elastica/Test/Base.php b/test/lib/Elastica/Test/Base.php index a9f58eb10b..2a6e95d368 100644 --- a/test/lib/Elastica/Test/Base.php +++ b/test/lib/Elastica/Test/Base.php @@ -20,7 +20,7 @@ public static function showDeprecated() protected function assertFileDeprecated($file, $deprecationMessage) { $content = file_get_contents($file); - $content = preg_replace('/^(abstract class|class) ([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]+)/m', '${1} ${2}' . uniqid(), $content); + $content = preg_replace('/^(abstract class|class) ([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]+)/m', '${1} ${2}'.uniqid(), $content); $newFile = tempnam(sys_get_temp_dir(), 'elastica-test-'); file_put_contents($newFile, $content); diff --git a/test/lib/Elastica/Test/DeprecatedClassBase.php b/test/lib/Elastica/Test/DeprecatedClassBase.php index 22c121b226..787c2c6434 100644 --- a/test/lib/Elastica/Test/DeprecatedClassBase.php +++ b/test/lib/Elastica/Test/DeprecatedClassBase.php @@ -2,7 +2,7 @@ namespace Elastica\Test; /** - * Base test for test deprecated classes. Supress deprecated error during run test case + * Base test for test deprecated classes. Supress deprecated error during run test case. * * @author Evgeniy Sokolov */ diff --git a/test/lib/Elastica/Test/ErrorsCollector.php b/test/lib/Elastica/Test/ErrorsCollector.php index 9eb2141454..cf32beaf46 100644 --- a/test/lib/Elastica/Test/ErrorsCollector.php +++ b/test/lib/Elastica/Test/ErrorsCollector.php @@ -35,7 +35,6 @@ public function assertOnlyOneDeprecatedError($deprecationMessage) $this->testCase->assertSame(1, $this->getCount()); $this->testCase->assertSame(1, $this->getDeprecatedCount()); $this->testCase->assertSame($deprecationMessage, $this->getMessage(0)); - } public function assertOnlyDeprecatedErrors(array $deprecationMessages) @@ -54,7 +53,7 @@ public function getDeprecatedCount() foreach ($this->errors as $error) { if (E_USER_DEPRECATED === $error[0]) { - $count++; + ++$count; } } diff --git a/test/lib/Elastica/Test/Filter/BoolFilterTest.php b/test/lib/Elastica/Test/Filter/BoolFilterTest.php index b06655d626..eccb014006 100644 --- a/test/lib/Elastica/Test/Filter/BoolFilterTest.php +++ b/test/lib/Elastica/Test/Filter/BoolFilterTest.php @@ -88,6 +88,7 @@ public function getTestToArrayData() $out[] = array($bool, $expected); $this->showDeprecated(); + return $out; } diff --git a/test/lib/Elastica/Test/Filter/MultiTest.php b/test/lib/Elastica/Test/Filter/MultiTest.php index df19294ad4..470fa05196 100644 --- a/test/lib/Elastica/Test/Filter/MultiTest.php +++ b/test/lib/Elastica/Test/Filter/MultiTest.php @@ -120,4 +120,4 @@ public function getBaseName() } } -Base::showDeprecated(); \ No newline at end of file +Base::showDeprecated(); diff --git a/test/lib/Elastica/Test/Filter/TermTest.php b/test/lib/Elastica/Test/Filter/TermTest.php index b81ca55c67..91397cefea 100644 --- a/test/lib/Elastica/Test/Filter/TermTest.php +++ b/test/lib/Elastica/Test/Filter/TermTest.php @@ -1,5 +1,4 @@ assertInstanceOf('Elastica\Script\ScriptFields', new LegacyScriptFields([])); + $this->assertInstanceOf('Elastica\Script\ScriptFields', new LegacyScriptFields(array())); } -} \ No newline at end of file +} diff --git a/test/lib/Elastica/Test/LegacyScriptFileTest.php b/test/lib/Elastica/Test/LegacyScriptFileTest.php index 6251bcebda..2a865ba777 100644 --- a/test/lib/Elastica/Test/LegacyScriptFileTest.php +++ b/test/lib/Elastica/Test/LegacyScriptFileTest.php @@ -13,4 +13,4 @@ public function testParent() { $this->assertInstanceOf('Elastica\Script\ScriptFile', new LegacyScriptFile('script_file')); } -} \ No newline at end of file +} diff --git a/test/lib/Elastica/Test/LegacyScriptTest.php b/test/lib/Elastica/Test/LegacyScriptTest.php index 48145c7792..307153d2cc 100644 --- a/test/lib/Elastica/Test/LegacyScriptTest.php +++ b/test/lib/Elastica/Test/LegacyScriptTest.php @@ -13,4 +13,4 @@ public function testParent() { $this->assertInstanceOf('Elastica\Script\Script', new LegacyScript('script')); } -} \ No newline at end of file +} diff --git a/test/lib/Elastica/Test/Query/BoolQueryTest.php b/test/lib/Elastica/Test/Query/BoolQueryTest.php index 31948e39b0..691fe21f1a 100644 --- a/test/lib/Elastica/Test/Query/BoolQueryTest.php +++ b/test/lib/Elastica/Test/Query/BoolQueryTest.php @@ -7,8 +7,8 @@ use Elastica\Index; use Elastica\Query\BoolQuery; use Elastica\Query\Ids; -use Elastica\Query\Term as TermQuery; use Elastica\Query\Term; +use Elastica\Query\Term as TermQuery; use Elastica\Test\Base as BaseTest; use Elastica\Type; @@ -41,7 +41,7 @@ public function testAddFilterWithLegacyFilterDeprecated() $errorsCollector->assertOnlyDeprecatedErrors( array( - 'Deprecated: Elastica\Query\BoolQuery::addFilter passing AbstractFilter is deprecated. Pass AbstractQuery instead.' + 'Deprecated: Elastica\Query\BoolQuery::addFilter passing AbstractFilter is deprecated. Pass AbstractQuery instead.', ) ); } diff --git a/test/lib/Elastica/Test/Query/ConstantScoreTest.php b/test/lib/Elastica/Test/Query/ConstantScoreTest.php index 33a121c9fe..9c47b546db 100644 --- a/test/lib/Elastica/Test/Query/ConstantScoreTest.php +++ b/test/lib/Elastica/Test/Query/ConstantScoreTest.php @@ -46,7 +46,7 @@ public function testConstructWithLegacyFilterDeprecated() $errorsCollector->assertOnlyDeprecatedErrors( array( 'Deprecated: Elastica\Query\ConstantScore passing AbstractFilter is deprecated. Pass AbstractQuery instead.', - 'Deprecated: Elastica\Query\ConstantScore::setFilter passing AbstractFilter is deprecated. Pass AbstractQuery instead.' + 'Deprecated: Elastica\Query\ConstantScore::setFilter passing AbstractFilter is deprecated. Pass AbstractQuery instead.', ) ); } @@ -78,7 +78,7 @@ public function testSetFilterWithLegacyFilterDeprecated() $errorsCollector->assertOnlyDeprecatedErrors( array( - 'Deprecated: Elastica\Query\ConstantScore::setFilter passing AbstractFilter is deprecated. Pass AbstractQuery instead.' + 'Deprecated: Elastica\Query\ConstantScore::setFilter passing AbstractFilter is deprecated. Pass AbstractQuery instead.', ) ); } diff --git a/test/lib/Elastica/Test/Query/FilteredTest.php b/test/lib/Elastica/Test/Query/FilteredTest.php index e3477e6648..caf24272c3 100644 --- a/test/lib/Elastica/Test/Query/FilteredTest.php +++ b/test/lib/Elastica/Test/Query/FilteredTest.php @@ -1,5 +1,4 @@ assertOnlyDeprecatedErrors( array( 'Deprecated: Elastica\Query\Filtered passing AbstractFilter is deprecated. Pass AbstractQuery instead.', - 'Deprecated: Elastica\Query\Filtered::setFilter passing AbstractFilter is deprecated. Pass AbstractQuery instead.' + 'Deprecated: Elastica\Query\Filtered::setFilter passing AbstractFilter is deprecated. Pass AbstractQuery instead.', ) ); } @@ -81,7 +80,7 @@ public function testSetFilterWithLegacyFilterDeprecated() $errorsCollector->assertOnlyDeprecatedErrors( array( - 'Deprecated: Elastica\Query\Filtered::setFilter passing AbstractFilter is deprecated. Pass AbstractQuery instead.' + 'Deprecated: Elastica\Query\Filtered::setFilter passing AbstractFilter is deprecated. Pass AbstractQuery instead.', ) ); } diff --git a/test/lib/Elastica/Test/Query/FunctionScoreTest.php b/test/lib/Elastica/Test/Query/FunctionScoreTest.php index 1b3ac3c1eb..9c1822fc78 100644 --- a/test/lib/Elastica/Test/Query/FunctionScoreTest.php +++ b/test/lib/Elastica/Test/Query/FunctionScoreTest.php @@ -87,7 +87,7 @@ public function testAddFunctionWithLegacyFilterDeprecated() $errorsCollector->assertOnlyDeprecatedErrors( array( - 'Deprecated: Elastica\Query\FunctionScore::addFunction passing AbstractFilter is deprecated. Pass AbstractQuery instead.' + 'Deprecated: Elastica\Query\FunctionScore::addFunction passing AbstractFilter is deprecated. Pass AbstractQuery instead.', ) ); } @@ -120,7 +120,7 @@ public function testAddDecayFunctionWithLegacyFilterDeprecated() $errorsCollector->assertOnlyDeprecatedErrors( array( 'Deprecated: Elastica\Query\FunctionScore::addDecayFunction passing AbstractFilter is deprecated. Pass AbstractQuery instead.', - 'Deprecated: Elastica\Query\FunctionScore::addFunction passing AbstractFilter is deprecated. Pass AbstractQuery instead.' + 'Deprecated: Elastica\Query\FunctionScore::addFunction passing AbstractFilter is deprecated. Pass AbstractQuery instead.', ) ); } @@ -153,7 +153,7 @@ public function testScriptScoreFunctionWithLegacyFilterDeprecated() $errorsCollector->assertOnlyDeprecatedErrors( array( 'Deprecated: Elastica\Query\FunctionScore::addScriptScoreFunction passing AbstractFilter is deprecated. Pass AbstractQuery instead.', - 'Deprecated: Elastica\Query\FunctionScore::addFunction passing AbstractFilter is deprecated. Pass AbstractQuery instead.' + 'Deprecated: Elastica\Query\FunctionScore::addFunction passing AbstractFilter is deprecated. Pass AbstractQuery instead.', ) ); } @@ -186,7 +186,7 @@ public function testAddFieldValueFactorFunctionWithLegacyFilterDeprecated() $errorsCollector->assertOnlyDeprecatedErrors( array( 'Deprecated: Elastica\Query\FunctionScore::addFieldValueFactorFunction passing AbstractFilter is deprecated. Pass AbstractQuery instead.', - 'Deprecated: Elastica\Query\FunctionScore::addFunction passing AbstractFilter is deprecated. Pass AbstractQuery instead.' + 'Deprecated: Elastica\Query\FunctionScore::addFunction passing AbstractFilter is deprecated. Pass AbstractQuery instead.', ) ); } @@ -221,7 +221,7 @@ public function testAddBoostFactorFunctionWithLegacyFilterDeprecated() 'Deprecated: Elastica\Query\FunctionScore::addBoostFactorFunction passing AbstractFilter is deprecated. Pass AbstractQuery instead.', 'Query\FunctionScore::addBoostFactorFunction is deprecated. Use addWeightFunction instead. This method will be removed in further Elastica releases', 'Deprecated: Elastica\Query\FunctionScore::addWeightFunction passing AbstractFilter is deprecated. Pass AbstractQuery instead.', - 'Deprecated: Elastica\Query\FunctionScore::addFunction passing AbstractFilter is deprecated. Pass AbstractQuery instead.' + 'Deprecated: Elastica\Query\FunctionScore::addFunction passing AbstractFilter is deprecated. Pass AbstractQuery instead.', ) ); } @@ -254,7 +254,7 @@ public function testAddWeightFunctionWithLegacyFilterDeprecated() $errorsCollector->assertOnlyDeprecatedErrors( array( 'Deprecated: Elastica\Query\FunctionScore::addWeightFunction passing AbstractFilter is deprecated. Pass AbstractQuery instead.', - 'Deprecated: Elastica\Query\FunctionScore::addFunction passing AbstractFilter is deprecated. Pass AbstractQuery instead.' + 'Deprecated: Elastica\Query\FunctionScore::addFunction passing AbstractFilter is deprecated. Pass AbstractQuery instead.', ) ); } @@ -287,7 +287,7 @@ public function testAddRandomScoreFunctionWithLegacyFilterDeprecated() $errorsCollector->assertOnlyDeprecatedErrors( array( 'Deprecated: Elastica\Query\FunctionScore::addRandomScoreFunction passing AbstractFilter is deprecated. Pass AbstractQuery instead.', - 'Deprecated: Elastica\Query\FunctionScore::addFunction passing AbstractFilter is deprecated. Pass AbstractQuery instead.' + 'Deprecated: Elastica\Query\FunctionScore::addFunction passing AbstractFilter is deprecated. Pass AbstractQuery instead.', ) ); } diff --git a/test/lib/Elastica/Test/Query/GeoDistanceRangeTest.php b/test/lib/Elastica/Test/Query/GeoDistanceRangeTest.php index 716ceb88b2..f801cf6d6d 100644 --- a/test/lib/Elastica/Test/Query/GeoDistanceRangeTest.php +++ b/test/lib/Elastica/Test/Query/GeoDistanceRangeTest.php @@ -2,8 +2,8 @@ namespace Elastica\Test\Query; use Elastica\Document; -use Elastica\Query\GeoDistanceRange; use Elastica\Query; +use Elastica\Query\GeoDistanceRange; use Elastica\Query\MatchAll; use Elastica\Test\Base as BaseTest; diff --git a/test/lib/Elastica/Test/Query/GeoDistanceTest.php b/test/lib/Elastica/Test/Query/GeoDistanceTest.php index 76accff4cf..9824624c45 100644 --- a/test/lib/Elastica/Test/Query/GeoDistanceTest.php +++ b/test/lib/Elastica/Test/Query/GeoDistanceTest.php @@ -2,8 +2,8 @@ namespace Elastica\Test\Query; use Elastica\Document; -use Elastica\Query\GeoDistance; use Elastica\Query; +use Elastica\Query\GeoDistance; use Elastica\Query\MatchAll; use Elastica\Test\Base as BaseTest; diff --git a/test/lib/Elastica/Test/Query/GeoPolygonTest.php b/test/lib/Elastica/Test/Query/GeoPolygonTest.php index ced594c2bb..f0ac200ae4 100644 --- a/test/lib/Elastica/Test/Query/GeoPolygonTest.php +++ b/test/lib/Elastica/Test/Query/GeoPolygonTest.php @@ -2,8 +2,8 @@ namespace Elastica\Test\Query; use Elastica\Document; -use Elastica\Query\GeoPolygon; use Elastica\Query; +use Elastica\Query\GeoPolygon; use Elastica\Query\MatchAll; use Elastica\Test\Base as BaseTest; diff --git a/test/lib/Elastica/Test/Query/GeoShapePreIndexedTest.php b/test/lib/Elastica/Test/Query/GeoShapePreIndexedTest.php index 87a4baa86a..236a85a04d 100644 --- a/test/lib/Elastica/Test/Query/GeoShapePreIndexedTest.php +++ b/test/lib/Elastica/Test/Query/GeoShapePreIndexedTest.php @@ -2,8 +2,8 @@ namespace Elastica\Test\Query; use Elastica\Query\AbstractGeoShape; -use Elastica\Query\GeoShapePreIndexed; use Elastica\Query\BoolQuery; +use Elastica\Query\GeoShapePreIndexed; use Elastica\Test\Base as BaseTest; class GeoShapePreIndexedTest extends BaseTest diff --git a/test/lib/Elastica/Test/Query/GeoShapeProvidedTest.php b/test/lib/Elastica/Test/Query/GeoShapeProvidedTest.php index ba95a79547..8a5b504bad 100644 --- a/test/lib/Elastica/Test/Query/GeoShapeProvidedTest.php +++ b/test/lib/Elastica/Test/Query/GeoShapeProvidedTest.php @@ -3,8 +3,8 @@ use Elastica\Document; use Elastica\Query\AbstractGeoShape; -use Elastica\Query\GeoShapeProvided; use Elastica\Query\BoolQuery; +use Elastica\Query\GeoShapeProvided; use Elastica\Test\Base as BaseTest; use Elastica\Type\Mapping; diff --git a/test/lib/Elastica/Test/Query/GeohashCellTest.php b/test/lib/Elastica/Test/Query/GeohashCellTest.php index c28a26797a..f8822d79d5 100644 --- a/test/lib/Elastica/Test/Query/GeohashCellTest.php +++ b/test/lib/Elastica/Test/Query/GeohashCellTest.php @@ -2,8 +2,8 @@ namespace Elastica\Test\Query; use Elastica\Document; -use Elastica\Query\GeohashCell; use Elastica\Query; +use Elastica\Query\GeohashCell; use Elastica\Test\Base as BaseTest; use Elastica\Type\Mapping; diff --git a/test/lib/Elastica/Test/Query/IndicesTest.php b/test/lib/Elastica/Test/Query/IndicesTest.php index 28f85d13ba..d09a736cfe 100644 --- a/test/lib/Elastica/Test/Query/IndicesTest.php +++ b/test/lib/Elastica/Test/Query/IndicesTest.php @@ -2,10 +2,10 @@ namespace Elastica\Test\Query; use Elastica\Document; -use Elastica\Query\Indices; -use Elastica\Query\Term; use Elastica\Index; use Elastica\Query; +use Elastica\Query\Indices; +use Elastica\Query\Term; use Elastica\Test\Base as BaseTest; class IndicesTest extends BaseTest diff --git a/test/lib/Elastica/Test/Query/PostFilterTest.php b/test/lib/Elastica/Test/Query/PostFilterTest.php index 4db2e9748e..07597c605c 100644 --- a/test/lib/Elastica/Test/Query/PostFilterTest.php +++ b/test/lib/Elastica/Test/Query/PostFilterTest.php @@ -32,13 +32,13 @@ public function testArrayDeprecated() $errorsCollector = $this->startCollectErrors(); $query = new Query(); - $query->setPostFilter(array("a")); + $query->setPostFilter(array('a')); $this->finishCollectErrors(); $errorsCollector->assertOnlyDeprecatedErrors( array( - 'Deprecated: Elastica\Query::setPostFilter() passing filter as array is deprecated. Pass instance of AbstractQuery instead.' + 'Deprecated: Elastica\Query::setPostFilter() passing filter as array is deprecated. Pass instance of AbstractQuery instead.', ) ); } @@ -57,7 +57,7 @@ public function testFilterDeprecated() $errorsCollector->assertOnlyDeprecatedErrors( array( - 'Deprecated: Elastica\Query::setPostFilter() passing filter as AbstractFilter is deprecated. Pass instance of AbstractQuery instead.' + 'Deprecated: Elastica\Query::setPostFilter() passing filter as AbstractFilter is deprecated. Pass instance of AbstractQuery instead.', ) ); } diff --git a/test/lib/Elastica/Test/QueryBuilder/DSL/QueryTest.php b/test/lib/Elastica/Test/QueryBuilder/DSL/QueryTest.php index f5ffa31525..0f851bd386 100644 --- a/test/lib/Elastica/Test/QueryBuilder/DSL/QueryTest.php +++ b/test/lib/Elastica/Test/QueryBuilder/DSL/QueryTest.php @@ -59,7 +59,7 @@ public function testConstantScoreWithLegacyFilterDeprecated() $errorsCollector->assertOnlyDeprecatedErrors( array( 'Deprecated: Elastica\Query\ConstantScore passing AbstractFilter is deprecated. Pass AbstractQuery instead.', - 'Deprecated: Elastica\Query\ConstantScore::setFilter passing AbstractFilter is deprecated. Pass AbstractQuery instead.' + 'Deprecated: Elastica\Query\ConstantScore::setFilter passing AbstractFilter is deprecated. Pass AbstractQuery instead.', ) ); } @@ -79,7 +79,7 @@ public function testFilteredDeprecated() array( 'Use bool() instead. Filtered query is deprecated since ES 2.0.0-beta1 and this method will be removed in further Elastica releases.', 'Deprecated: Elastica\Query\Filtered passing AbstractFilter is deprecated. Pass AbstractQuery instead.', - 'Deprecated: Elastica\Query\Filtered::setFilter passing AbstractFilter is deprecated. Pass AbstractQuery instead.' + 'Deprecated: Elastica\Query\Filtered::setFilter passing AbstractFilter is deprecated. Pass AbstractQuery instead.', ) ); } diff --git a/test/lib/Elastica/Test/QueryTest.php b/test/lib/Elastica/Test/QueryTest.php index bd2b94b062..40de8042ef 100644 --- a/test/lib/Elastica/Test/QueryTest.php +++ b/test/lib/Elastica/Test/QueryTest.php @@ -25,7 +25,6 @@ public function testCreateWithLegacyFilterDeprecated() $existsFilter = new Exists('test'); $this->showDeprecated(); - $errorsCollector = $this->startCollectErrors(); Query::create($existsFilter); $this->finishCollectErrors(); @@ -33,7 +32,7 @@ public function testCreateWithLegacyFilterDeprecated() $errorsCollector->assertOnlyDeprecatedErrors( array( 'Deprecated: Elastica\Query::create() passing filter is deprecated. Create query and use setPostFilter with AbstractQuery instead.', - 'Deprecated: Elastica\Query::setPostFilter() passing filter as AbstractFilter is deprecated. Pass instance of AbstractQuery instead.' + 'Deprecated: Elastica\Query::setPostFilter() passing filter as AbstractFilter is deprecated. Pass instance of AbstractQuery instead.', ) ); } @@ -67,7 +66,7 @@ public function testSetFilterWithLegacyFilterDeprecated() array( 'Deprecated: Elastica\Query::setFilter() passing filter as AbstractFilter is deprecated. Pass instance of AbstractQuery instead.', 'Deprecated: Elastica\Query::setFilter() is deprecated and will be removed in further Elastica releases. Use Elastica\Query::setPostFilter() instead.', - 'Deprecated: Elastica\Query::setPostFilter() passing filter as AbstractFilter is deprecated. Pass instance of AbstractQuery instead.' + 'Deprecated: Elastica\Query::setPostFilter() passing filter as AbstractFilter is deprecated. Pass instance of AbstractQuery instead.', ) ); } @@ -99,7 +98,7 @@ public function testSetPostFilterWithLegacyFilterDeprecated() $errorsCollector->assertOnlyDeprecatedErrors( array( - 'Deprecated: Elastica\Query::setPostFilter() passing filter as AbstractFilter is deprecated. Pass instance of AbstractQuery instead.' + 'Deprecated: Elastica\Query::setPostFilter() passing filter as AbstractFilter is deprecated. Pass instance of AbstractQuery instead.', ) ); } diff --git a/test/lib/Elastica/Test/ResultSetTest.php b/test/lib/Elastica/Test/ResultSetTest.php index c8613bec5c..2c0119a448 100644 --- a/test/lib/Elastica/Test/ResultSetTest.php +++ b/test/lib/Elastica/Test/ResultSetTest.php @@ -74,11 +74,11 @@ public function testDocumentsAccess() $resultSet = $type->search('elastica search'); $this->assertInstanceOf('Elastica\ResultSet', $resultSet); - + $documents = $resultSet->getDocuments(); $this->assertInternalType('array', $documents); - $this->assertEquals(3, count($documents)); + $this->assertEquals(3, count($documents)); $this->assertInstanceOf('Elastica\Document', $documents[0]); $this->assertInstanceOf('Elastica\Document', $documents[1]); $this->assertInstanceOf('Elastica\Document', $documents[2]); diff --git a/test/lib/Elastica/Test/SearchTest.php b/test/lib/Elastica/Test/SearchTest.php index c921757a69..792211e202 100644 --- a/test/lib/Elastica/Test/SearchTest.php +++ b/test/lib/Elastica/Test/SearchTest.php @@ -36,7 +36,7 @@ public function testSetQueryWithLegacyFilterDeprecated() array( 'Deprecated: Elastica\Search::setQuery() passing AbstractFilter is deprecated. Create query and use setPostFilter with AbstractQuery instead.', 'Deprecated: Elastica\Query::create() passing filter is deprecated. Create query and use setPostFilter with AbstractQuery instead.', - 'Deprecated: Elastica\Query::setPostFilter() passing filter as AbstractFilter is deprecated. Pass instance of AbstractQuery instead.' + 'Deprecated: Elastica\Query::setPostFilter() passing filter as AbstractFilter is deprecated. Pass instance of AbstractQuery instead.', ) ); }