Remove Search and DSL changes (#1369)

- The deprecated minimum_number_should_match parameter in the bool query has been removed, use minimum_should_match instead. - For geo_distance queries, sorting, and aggregations the sloppy_arc option has been removed from the distance_type parameter. - The geo_distance_range query, which was deprecated in 5.0, has been removed. - The optimize_bbox parameter has been removed from geo_distance queries. - The disable_coord parameter of the bool and common_terms queries has been removed. If provided, it will be ignored and issue a deprecation warning. - The percolate query’s document_type has been deprecated. From 6.0 and later it is no longer required to specify the document_type parameter.
ruflin · Sep 4, 2017 · 9efdbe5 · 9efdbe5
1 parent 80c3912
commit 9efdbe5
Show file tree

Hide file tree

Showing 11 changed files with 7 additions and 405 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -21,7 +21,11 @@ All notable changes to this project will be documented in this file based on the
 - Removed old / removed script language support : javascript, python, mvel [#1364](https://github.com/ruflin/Elastica/pull/1364)
 - Disable [_all](https://github.com/elastic/elasticsearch/pull/22144) by default, disallow configuring _all on 6.0+ indices [#1365](https://github.com/ruflin/Elastica/pull/1365)
 - [Unfiltered nested source](https://github.com/elastic/elasticsearch/pull/26102) should keep its full path [#1366](https://github.com/ruflin/Elastica/pull/1366)
-
+- The deprecated minimum_number_should_match parameter in the bool query has been removed, use minimum_should_match instead. [#1369](https://github.com/ruflin/Elastica/pull/1369)
+- For geo_distance queries, sorting, and aggregations the sloppy_arc option has been removed from the distance_type parameter. [#1369](https://github.com/ruflin/Elastica/pull/1369)
+- The geo_distance_range query, which was deprecated in 5.0, has been removed. [#1369](https://github.com/ruflin/Elastica/pull/1369)
+- The optimize_bbox parameter has been removed from geo_distance queries. [#1369](https://github.com/ruflin/Elastica/pull/1369)
+- The disable_coord parameter of the bool and common_terms queries has been removed. If provided, it will be ignored and issue a deprecation warning. [#1369](https://github.com/ruflin/Elastica/pull/1369)
 ### Bugfixes
 - Enforce [Content-Type requirement on the layer Rest](https://github.com/elastic/elasticsearch/pull/23146), a [PR on Elastica #1301](https://github.com/ruflin/Elastica/issues/1301) solved it (it has been implemented only in the HTTP Transport), but it was not implemented in the Guzzle Transport. [#1349](https://github.com/ruflin/Elastica/pull/1349)
 - Scroll no longer does an extra iteration both on an empty result and on searches where the last page has a significantly smaller number of results than the pages before it.

diff --git a/lib/Elastica/Aggregation/GeoDistance.php b/lib/Elastica/Aggregation/GeoDistance.php
@@ -10,7 +10,6 @@
  */
 class GeoDistance extends AbstractAggregation
 {
-    const DISTANCE_TYPE_SLOPPY_ARC = 'sloppy_arc';
     const DISTANCE_TYPE_ARC = 'arc';
     const DISTANCE_TYPE_PLANE = 'plane';
 
@@ -93,7 +92,7 @@ public function setUnit($unit)
     /**
      * Set the method by which distances will be calculated.
      *
-     * @param string $distanceType see DISTANCE_TYPE_* constants for options. Defaults to sloppy_arc.
+     * @param string $distanceType see DISTANCE_TYPE_* constants for options. Defaults to arc.
      *
      * @return $this
      */

diff --git a/lib/Elastica/Query/BoolQuery.php b/lib/Elastica/Query/BoolQuery.php
@@ -91,22 +91,6 @@ public function setBoost($boost)
         return $this->setParam('boost', $boost);
     }
 
-    /**
-     * Set the minimum number of of should match.
-     *
-     * @param int $minimumNumberShouldMatch Should match minimum
-     *
-     * @return $this
-     *
-     * @deprecated Replaced by setMinimumShouldMatch
-     */
-    public function setMinimumNumberShouldMatch($minimumNumberShouldMatch)
-    {
-        trigger_error('Deprecated: Elastica\Query::setMinimumNumberShouldMatch() is deprecated and will be removed in further Elastica releases. Use Elastica\Query::setMinimumShouldMatch() instead.', E_USER_DEPRECATED);
-
-        return $this->setParam('minimum_number_should_match', $minimumNumberShouldMatch);
-    }
-
     /**
      * Sets the minimum number of should clauses to match.
      *

diff --git a/lib/Elastica/Query/Common.php b/lib/Elastica/Query/Common.php
@@ -133,18 +133,6 @@ public function setAnalyzer($analyzer)
         return $this->setQueryParam('analyzer', $analyzer);
     }
 
-    /**
-     * Enable / disable computation of score factor based on the fraction of all query terms contained in the document.
-     *
-     * @param bool $disable disable_coord is false by default
-     *
-     * @return $this
-     */
-    public function setDisableCoord($disable = true)
-    {
-        return $this->setQueryParam('disable_coord', (bool) $disable);
-    }
-
     /**
      * Set a parameter in the body of this query.
      *

diff --git a/lib/Elastica/Query/GeoDistance.php b/lib/Elastica/Query/GeoDistance.php
@@ -12,11 +12,6 @@ class GeoDistance extends AbstractGeoDistance
 {
     const DISTANCE_TYPE_ARC = 'arc';
     const DISTANCE_TYPE_PLANE = 'plane';
-    const DISTANCE_TYPE_SLOPPY_ARC = 'sloppy_arc';
-
-    const OPTIMIZE_BBOX_MEMORY = 'memory';
-    const OPTIMIZE_BBOX_INDEXED = 'indexed';
-    const OPTIMIZE_BBOX_NONE = 'none';
 
     /**
      * Create GeoDistance object.
@@ -49,7 +44,7 @@ public function setDistance($distance)
     /**
      * See DISTANCE_TYPE_* constants.
      *
-     * @param string $distanceType
+     * @param string $distanceType, default arc
      *
      * @return $this
      */
@@ -59,18 +54,4 @@ public function setDistanceType($distanceType)
 
         return $this;
     }
-
-    /**
-     * See OPTIMIZE_BBOX_* constants.
-     *
-     * @param string $optimizeBbox
-     *
-     * @return $this
-     */
-    public function setOptimizeBbox($optimizeBbox)
-    {
-        $this->setParam('optimize_bbox', $optimizeBbox);
-
-        return $this;
-    }
 }
diff --git a/lib/Elastica/Query/GeoDistanceRange.php b/lib/Elastica/Query/GeoDistanceRange.php
diff --git a/lib/Elastica/Query/Percolate.php b/lib/Elastica/Query/Percolate.php
@@ -37,18 +37,6 @@ public function setDocument($document)
         return $this->setParam('document', $document);
     }
 
-    /**
-     * The type / mapping of the document being percolated. This is a required parameter.
-     *
-     * @param $documentType
-     *
-     * @return $this
-     */
-    public function setDocumentType($documentType)
-    {
-        return $this->setParam('document_type', $documentType);
-    }
-
     /**
      * The index the document resides in.
      *

diff --git a/test/Elastica/Query/BoolQueryTest.php b/test/Elastica/Query/BoolQueryTest.php
@@ -58,58 +58,6 @@ public function testToArray()
         $this->assertEquals($expectedArray, $query->toArray());
     }
 
-    /**
-     * @group unit
-     */
-    public function testToArrayWithLegacyMinimumNumberShouldMatch()
-    {
-        $query = new BoolQuery();
-
-        $idsQuery1 = new Ids();
-        $idsQuery1->setIds(1);
-
-        $idsQuery2 = new Ids();
-        $idsQuery2->setIds(2);
-
-        $idsQuery3 = new Ids();
-        $idsQuery3->setIds(3);
-
-        $this->hideDeprecated();
-        $filter1 = new Term();
-        $filter1->setTerm('test', '1');
-
-        $filter2 = new Term();
-        $filter2->setTerm('username', 'ruth');
-        $this->showDeprecated();
-
-        $boost = 1.2;
-        $minMatch = 2;
-
-        $query->setBoost($boost);
-
-        $query->addMust($idsQuery1);
-        $query->addMustNot($idsQuery2);
-        $query->addShould($idsQuery3->toArray());
-        $query->addFilter($filter1);
-        $query->addFilter($filter2);
-        $this->hideDeprecated();
-        $query->setMinimumNumberShouldMatch($minMatch);
-        $this->showDeprecated();
-
-        $expectedArray = [
-            'bool' => [
-                'must' => [$idsQuery1->toArray()],
-                'should' => [$idsQuery3->toArray()],
-                'filter' => [$filter1->toArray(), $filter2->toArray()],
-                'minimum_number_should_match' => $minMatch,
-                'must_not' => [$idsQuery2->toArray()],
-                'boost' => $boost,
-            ],
-        ];
-
-        $this->assertEquals($expectedArray, $query->toArray());
-    }
-
     /**
      * Test to resolve the following issue.
      *