ruflin#1184 Remove Filtered query:

- Remove Elastica/Query/Filtered.php - Remove test/Elastica/Query/FilteredTest.php - Remove all references for filtered query from code - Changelog update
Zyqsempai · Oct 24, 2016 · dcaa8ce · dcaa8ce
1 parent 11af175
commit dcaa8ce
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 255 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@ All notable changes to this project will be documented in this file based on the
 - Removing all deprecated filters including tests. Use queries instead.
 - Remove deprecated Elastica\Script*.php classes. Use Elastica\Script\* instead.
 - Remove Elastica/Query/Image.php and test/Elastica/Query/ImageTest.php, no more support for image-plugin.
+- Remove Elastica/Query/Filtered.php and test/Elastica/Query/FilteredTest.php and all uses from code.
 
 ### Bugfixes
 

diff --git a/lib/Elastica/Query/Builder.php b/lib/Elastica/Query/Builder.php
@@ -384,28 +384,6 @@ public function filterClose()
         return $this->close();
     }
 
-    /**
-     *  Query.
-     *
-     * @return $this
-     */
-    public function filteredQuery()
-    {
-        return $this->fieldOpen('filtered');
-    }
-
-    /**
-     * Close a 'filtered_query' block.
-     *
-     * Alias of close() for ease of reading in source.
-     *
-     * @return $this
-     */
-    public function filteredQueryClose()
-    {
-        return $this->fieldClose();
-    }
-
     /**
      * Set the from parameter (offset).
      *

diff --git a/lib/Elastica/Query/Filtered.php b/lib/Elastica/Query/Filtered.php
diff --git a/test/lib/Elastica/Test/Exception/PartialShardFailureExceptionTest.php b/test/lib/Elastica/Test/Exception/PartialShardFailureExceptionTest.php
@@ -34,7 +34,7 @@ public function testPartialFailure()
 
         $query = Query::create([
             'query' => [
-                'filtered' => [
+                'bool' => [
                     'filter' => [
                         'script' => [
                             'script' => 'doc["undefined"] > 8', // compiles, but doesn't work

diff --git a/test/lib/Elastica/Test/Query/BuilderTest.php b/test/lib/Elastica/Test/Query/BuilderTest.php
@@ -109,7 +109,6 @@ public function getQueryTypes()
             ['constantScore', 'constant_score'],
             ['disMax', 'dis_max'],
             ['filter', 'filter'],
-            ['filteredQuery', 'filtered'],
             ['must', 'must'],
             ['mustNot', 'must_not'],
             ['prefix', 'prefix'],
@@ -137,8 +136,6 @@ public function getQueryTypes()
      * @covers \Elastica\Query\Builder::disMaxClose
      * @covers \Elastica\Query\Builder::filter
      * @covers \Elastica\Query\Builder::filterClose
-     * @covers \Elastica\Query\Builder::filteredQuery
-     * @covers \Elastica\Query\Builder::filteredQueryClose
      * @covers \Elastica\Query\Builder::must
      * @covers \Elastica\Query\Builder::mustClose
      * @covers \Elastica\Query\Builder::mustNot

diff --git a/test/lib/Elastica/Test/Query/FilteredTest.php b/test/lib/Elastica/Test/Query/FilteredTest.php