Skip to content

Commit

Permalink
Fix query dsl inconsistency
Browse files Browse the repository at this point in the history
  • Loading branch information
@im-denisenko
im-denisenko committed Jun 18, 2015
1 parent 1add0ae commit 8980145
Showing 1 changed file with 41 additions and 28 deletions.
69 changes: 41 additions & 28 deletions lib/Elastica/QueryBuilder/DSL/Query.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,11 +160,13 @@ public function custom_boost_factor()
*
* @link http://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-constant-score-query.html
*
* @param null|\Elastica\Filter\AbstractFilter|array $filter
*
* @return ConstantScore
*/
public function constant_score()
public function constant_score($filter = null)
{
return new ConstantScore();
return new ConstantScore($filter);
}

/**
Expand Down Expand Up @@ -199,7 +201,7 @@ public function field()
*
* @return Filtered
*/
public function filtered(AbstractQuery $query, AbstractFilter $filter)
public function filtered(AbstractQuery $query = null, AbstractFilter $filter = null)
{
return new Filtered($query, $filter);
}
Expand Down Expand Up @@ -243,11 +245,14 @@ public function function_score()
*
* @link http://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-fuzzy-query.html
*
* @param string $fieldName Field name
* @param string $value String to search for
*
* @return Fuzzy
*/
public function fuzzy()
public function fuzzy($fieldName = null, $value = null)
{
return new Fuzzy();
return new Fuzzy($fieldName, $value);
}

/**
Expand All @@ -265,12 +270,12 @@ public function geo_shape()
*
* @link http://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-has-child-query.html
*
* @param AbstractQuery $query
* @param null|string $type
* @param string|\Elastica\Query|\Elastica\Query\AbstractQuery $query
* @param string $type Parent document type
*
* @return HasChild
*/
public function has_child(AbstractQuery $query, $type = null)
public function has_child($query, $type = null)
{
return new HasChild($query, $type);
}
Expand All @@ -280,12 +285,12 @@ public function has_child(AbstractQuery $query, $type = null)
*
* @link http://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-has-parent-query.html
*
* @param AbstractQuery $query
* @param string $type
* @param string|\Elastica\Query|\Elastica\Query\AbstractQuery $query
* @param string $type Parent document type
*
* @return HasParent
*/
public function has_parent(AbstractQuery $query, $type)
public function has_parent($query, $type)
{
return new HasParent($query, $type);
}
Expand All @@ -300,7 +305,7 @@ public function has_parent(AbstractQuery $query, $type)
*
* @return Ids
*/
public function ids($type, array $ids)
public function ids($type = null, array $ids = array())
{
return new Ids($type, $ids);
}
Expand Down Expand Up @@ -367,23 +372,27 @@ public function nested()
*
* @link http://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-prefix-query.html
*
* @param array $prefix Prefix array
*
* @return Prefix
*/
public function prefix()
public function prefix(array $prefix = array())
{
return new Prefix();
return new Prefix($prefix);
}

/**
* query string query.
*
* @link http://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html
*
* @param string $queryString OPTIONAL Query string for object
*
* @return QueryString
*/
public function query_string()
public function query_string($queryString = '')
{
return new QueryString();
return new QueryString($queryString);
}

/**
Expand Down Expand Up @@ -411,25 +420,25 @@ public function simple_query_string($query, array $fields = array())
*
* @return Range
*/
public function range($fieldName, array $args)
public function range($fieldName = null, array $args = array())
{
return new Range($fieldName, $args);
}

/**
* regexp query.
*
* @param string $fieldName
* @param string $key
* @param string $value
* @param float $boost
*
* @return Regexp
*
* @link http://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-regexp-query.html
*/
public function regexp($fieldName, $value, $boost)
public function regexp($key = '', $value = null, $boost = 1.0)
{
return new Regexp($fieldName, $value, $boost);
return new Regexp($key, $value, $boost);
}

/**
Expand Down Expand Up @@ -511,27 +520,27 @@ public function term(array $term = array())
*
* @link http://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-terms-query.html
*
* @param string $field
* @param string $key
* @param array $terms
*
* @return Terms
*/
public function terms($field, array $terms)
public function terms($key = '', array $terms = array())
{
return new Terms($field, $terms);
return new Terms($key, $terms);
}

/**
* top children query.
*
* @link http://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-top-children-query.html
*
* @param AbstractQuery $query
* @param string $type
* @param string|AbstractQuery|\Elastica\Query $query
* @param string $type
*
* @return TopChildren
*/
public function top_children(AbstractQuery $query, $type)
public function top_children($query, $type = null)
{
return new TopChildren($query, $type);
}
Expand All @@ -541,11 +550,15 @@ public function top_children(AbstractQuery $query, $type)
*
* @link http://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-wildcard-query.html
*
* @param string $key OPTIONAL Wildcard key
* @param string $value OPTIONAL Wildcard value
* @param float $boost OPTIONAL Boost value (default = 1)
*
* @return Wildcard
*/
public function wildcard()
public function wildcard($key = '', $value = null, $boost = 1.0)
{
return new Wildcard();
return new Wildcard($key, $value, $boost);
}

/**
Expand Down

0 comments on commit 8980145

Please sign in to comment.