Removed deprecated methods Query\QueryString::setTieBraker() and Quer…

…y\QueryString::setQueryString()
ruflin · Jan 22, 2013 · b2195eb · b2195eb
1 parent 6e22861
commit b2195eb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 32 deletions.
diff --git a/changes.txt b/changes.txt
@@ -2,8 +2,9 @@ CHANGES
 
 2013-01-22
 - Removed deprecated method Type::getType()
-- Removed deprecated old constructor call in Filter/GeoDistance::__construct()
-- Removed deprecated method Filter/Script::setQuery()
+- Removed deprecated old constructor call in Filter\GeoDistance::__construct()
+- Removed deprecated method Filter\Script::setQuery()
+- Removed deprecated methods Query\QueryString::setTieBraker() and Query\QueryString::setQueryString()
 
 2013-01-21
 - Added Thrift transport. Ir requires installing munkie/elasticsearch-thrift-php package and elasticsearch-tranport-thrift plugin should be installed in elastcisearch

diff --git a/lib/Elastica/Query/QueryString.php b/lib/Elastica/Query/QueryString.php
@@ -46,20 +46,6 @@ public function setQuery($query = '')
         return $this->setParam('query', $query);
     }
 
-    /**
-     * Sets the default operator AND or OR
-     *
-     * If no operator is set, OR is chosen
-     *
-     * @param  string                          $queryString Query string
-     * @return \Elastica\Query\QueryString Current object
-     * @deprecated Please use setQuery instead
-     */
-    public function setQueryString($queryString)
-    {
-        return $this->setQuery($queryString);
-    }
-
     /**
      * Sets the default field
      *
@@ -244,20 +230,6 @@ public function setUseDisMax($value = true)
         return $this->setParam('use_dis_max', (bool) $value);
     }
 
-    /**
-     * When using dis_max, the disjunction max tie breaker.
-     *
-     * If not set, defaults to 0.
-     *
-     * @param  int                             $tieBreaker
-     * @return \Elastica\Query\QueryString Current object
-     * @deprecated
-     */
-    public function setTieBraker($tieBreaker = 0)
-    {
-        return $this->setTieBreaker($tieBreaker);
-    }
-
     /**
      * When using dis_max, the disjunction max tie breaker.
      *

diff --git a/test/lib/Elastica/Test/Query/QueryStringTest.php b/test/lib/Elastica/Test/Query/QueryStringTest.php
@@ -118,9 +118,9 @@ public function testSetRewrite()
     /**
      * @expectedException \Elastica\Exception\InvalidException
      */
-    public function testSetQueryStringInvalid()
+    public function testSetQueryInvalid()
     {
         $query = new QueryString();
-        $query->setQueryString(array());
+        $query->setQuery(array());
     }
 }