diff --git a/src/Elasticsearch/Endpoints/Count.php b/src/Elasticsearch/Endpoints/Count.php index b84b14910..9df724d89 100644 --- a/src/Elasticsearch/Endpoints/Count.php +++ b/src/Elasticsearch/Endpoints/Count.php @@ -52,6 +52,8 @@ protected function getURI() if (isset($index) === true && isset($type) === true) { $uri = "/$index/$type/_count"; + } elseif (isset($type) === true) { + $uri = "/_all/$type/_count"; } elseif (isset($index) === true) { $uri = "/$index/_count"; } diff --git a/src/Elasticsearch/Endpoints/Mget.php b/src/Elasticsearch/Endpoints/Mget.php index d41bf2e2c..c75e5ffc0 100644 --- a/src/Elasticsearch/Endpoints/Mget.php +++ b/src/Elasticsearch/Endpoints/Mget.php @@ -54,6 +54,8 @@ protected function getURI() $uri = "/$index/$type/_mget"; } elseif (isset($index) === true) { $uri = "/$index/_mget"; + } elseif (isset($type) === true) { + $uri = "/_all/$type/_mget"; } return $uri; diff --git a/src/Elasticsearch/Endpoints/Msearch.php b/src/Elasticsearch/Endpoints/Msearch.php index 798249360..b7dd7f423 100644 --- a/src/Elasticsearch/Endpoints/Msearch.php +++ b/src/Elasticsearch/Endpoints/Msearch.php @@ -75,6 +75,8 @@ protected function getURI() $uri = "/$index/$type/_msearch"; } elseif (isset($index) === true) { $uri = "/$index/_msearch"; + } elseif (isset($type) === true) { + $uri = "/_all/$type/_msearch"; } return $uri; diff --git a/src/Elasticsearch/Endpoints/Search.php b/src/Elasticsearch/Endpoints/Search.php index fe157b0b8..229422d64 100644 --- a/src/Elasticsearch/Endpoints/Search.php +++ b/src/Elasticsearch/Endpoints/Search.php @@ -35,14 +35,7 @@ public function setBody($body) return $this; } - if (is_string($body) === true || is_array($body) === true) { - $this->body = $body; - } else { - throw new InvalidArgumentException( - 'Query must be a string or array' - ); - } - + $this->body = $body; return $this; } @@ -61,6 +54,8 @@ protected function getURI() $uri = "/$index/$type/_search"; } elseif (isset($index) === true) { $uri = "/$index/_search"; + } elseif (isset($type) === true) { + $uri = "/_all/$type/_search"; } return $uri;