From fa363493b9e7cb04dfab51db43d02b3400cd28fe Mon Sep 17 00:00:00 2001 From: Igor Denisenko Date: Thu, 17 Sep 2015 03:43:15 +0300 Subject: [PATCH] Numeric range filter was removed https://github.com/elastic/elasticsearch/pull/7242 --- lib/Elastica/Filter/NumericRange.php | 13 ------- lib/Elastica/QueryBuilder/DSL/Filter.php | 16 -------- .../Elastica/Test/Filter/NumericRangeTest.php | 37 ------------------- .../Test/QueryBuilder/DSL/FilterTest.php | 1 - 4 files changed, 67 deletions(-) delete mode 100644 lib/Elastica/Filter/NumericRange.php delete mode 100644 test/lib/Elastica/Test/Filter/NumericRangeTest.php diff --git a/lib/Elastica/Filter/NumericRange.php b/lib/Elastica/Filter/NumericRange.php deleted file mode 100644 index 0834261685..0000000000 --- a/lib/Elastica/Filter/NumericRange.php +++ /dev/null @@ -1,13 +0,0 @@ - - * - * @link http://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-range-filter.html - */ -class NumericRange extends Range -{ -} diff --git a/lib/Elastica/QueryBuilder/DSL/Filter.php b/lib/Elastica/QueryBuilder/DSL/Filter.php index 1c41239ffe..7c5dafc7cf 100644 --- a/lib/Elastica/QueryBuilder/DSL/Filter.php +++ b/lib/Elastica/QueryBuilder/DSL/Filter.php @@ -22,7 +22,6 @@ use Elastica\Filter\MatchAll; use Elastica\Filter\Missing; use Elastica\Filter\Nested; -use Elastica\Filter\NumericRange; use Elastica\Filter\Prefix; use Elastica\Filter\Query as QueryFilter; use Elastica\Filter\Range; @@ -332,21 +331,6 @@ public function bool_not(AbstractFilter $filter) return new BoolNot($filter); } - /** - * numeric range filter. - * - * @link http://www.elastic.co/guide/en/elasticsearch/reference/0.90/query-dsl-numeric-range-filter.html - * - * @param string $fieldName Field name - * @param array $args Field arguments - * - * @return NumericRange - */ - public function numeric_range($fieldName = '', array $args = array()) - { - return new NumericRange($fieldName, $args); - } - /** * or filter. * diff --git a/test/lib/Elastica/Test/Filter/NumericRangeTest.php b/test/lib/Elastica/Test/Filter/NumericRangeTest.php deleted file mode 100644 index 590b51370b..0000000000 --- a/test/lib/Elastica/Test/Filter/NumericRangeTest.php +++ /dev/null @@ -1,37 +0,0 @@ -addField('fieldName', array('to' => 'value')); - $this->assertInstanceOf('Elastica\Filter\NumericRange', $returnValue); - } - - /** - * @group unit - */ - public function testToArray() - { - $filter = new NumericRange(); - - $fromTo = array('from' => 'ra', 'to' => 'ru'); - $filter->addField('name', $fromTo); - - $expectedArray = array( - 'numeric_range' => array( - 'name' => $fromTo, - ), - ); - - $this->assertEquals($expectedArray, $filter->toArray()); - } -} diff --git a/test/lib/Elastica/Test/QueryBuilder/DSL/FilterTest.php b/test/lib/Elastica/Test/QueryBuilder/DSL/FilterTest.php index 755bd18acc..9797c2a883 100644 --- a/test/lib/Elastica/Test/QueryBuilder/DSL/FilterTest.php +++ b/test/lib/Elastica/Test/QueryBuilder/DSL/FilterTest.php @@ -45,7 +45,6 @@ public function testInterface() $this->_assertImplemented($filterDSL, 'match_all', 'Elastica\Filter\MatchAll', array()); $this->_assertImplemented($filterDSL, 'missing', 'Elastica\Filter\Missing', array('field')); $this->_assertImplemented($filterDSL, 'nested', 'Elastica\Filter\Nested', array()); - $this->_assertImplemented($filterDSL, 'numeric_range', 'Elastica\Filter\NumericRange', array()); $this->_assertImplemented($filterDSL, 'prefix', 'Elastica\Filter\Prefix', array('field', 'prefix')); $this->_assertImplemented($filterDSL, 'query', 'Elastica\Filter\Query', array(new Match())); $this->_assertImplemented($filterDSL, 'range', 'Elastica\Filter\Range', array('field', array()));