Added Options object

- created empty if not supplied
- ability to set from and size for query
- ability to specify min score for result
- includes sorting

Author: Spamercz

src/ElasticQuery.php

@@ -27,23 +27,17 @@ class ElasticQuery implements \Spameri\ElasticQuery\Entity\ArrayInterface
 	private $aggregation;
 
 	/**
-	 * @var ?int
+	 * @var \Spameri\ElasticQuery\Options
 	 */
-	private $from;
-
-	/**
-	 * @var ?int
-	 */
-	private $size;
+	private $options;
 
 
 	public function __construct(
 		?\Spameri\ElasticQuery\Query\QueryCollection $query = NULL
 		, ?\Spameri\ElasticQuery\Filter\FilterCollection $filter = NULL
 		, ?\Spameri\ElasticQuery\Options\SortCollection $sort = NULL
 		, ?\Spameri\ElasticQuery\Aggregation\AggregationCollection $aggregation = NULL
-		, ?int $from = NULL
-		, ?int $size = NULL
+		, ?Options $options = NULL
 	)
 	{
 		if ( ! $query) {
@@ -58,12 +52,14 @@ public function __construct(
 		if ( ! $aggregation) {
 			$aggregation = new \Spameri\ElasticQuery\Aggregation\AggregationCollection();
 		}
+		if ( ! $options) {
+			$options = new Options();
+		}
 		$this->query = $query;
 		$this->filter = $filter;
 		$this->sort = $sort;
 		$this->aggregation = $aggregation;
-		$this->from = $from;
-		$this->size = $size;
+		$this->options = $options;
 	}
 
 
@@ -79,9 +75,21 @@ public function filter() : \Spameri\ElasticQuery\Filter\FilterCollection
 	}
 
 
+	public function aggregation() : \Spameri\ElasticQuery\Aggregation\AggregationCollection
+	{
+		return $this->aggregation;
+	}
+
+
+	public function options() : \Spameri\ElasticQuery\Options
+	{
+		return $this->options;
+	}
+
+
 	public function toArray() : array
 	{
-		$array = [];
+		$array = $this->options->toArray();
 
 		$queryArray = $this->query->toArray();
 		if ($queryArray) {
@@ -103,14 +111,6 @@ public function toArray() : array
 			$array['aggs'] = $aggregation;
 		}
 
-		if ($this->size !== NULL) {
-			$array['size'] = $this->size;
-		}
-
-		if ($this->from !== NULL) {
-			$array['from'] = $this->from;
-		}
-
 		return $array;
 	}
 

src/Options.php

@@ -0,0 +1,82 @@
+<?php declare(strict_types = 1);
+
+namespace Spameri\ElasticQuery;
+
+
+class Options
+{
+
+	/**
+	 * @var int
+	 */
+	private $size;
+	/**
+	 * @var int
+	 */
+	private $from;
+	/**
+	 * @var \Spameri\ElasticQuery\Options\SortCollection
+	 */
+	private $sort;
+	/**
+	 * @var int
+	 */
+	private $minScore;
+
+
+	public function __construct(
+		?int $size = NULL,
+		?int $from = NULL,
+		?\Spameri\ElasticQuery\Options\SortCollection $sort = NULL,
+		float $minScore = NULL
+	)
+	{
+		$this->size = $size;
+		$this->from = $from;
+		$this->sort = $sort ?: new \Spameri\ElasticQuery\Options\SortCollection();
+		$this->minScore = $minScore;
+	}
+
+
+	public function changeFrom(int $from) : void
+	{
+		$this->from = $from;
+	}
+
+
+	public function changeSize(int $size) : void
+	{
+		$this->size = $size;
+	}
+
+
+	public function toArray() : array
+	{
+		$array = [];
+
+		if ($this->from !== NULL) {
+			$array['from'] = $this->from;
+		}
+
+		if ($this->size !== NULL) {
+			$array['size'] = $this->size;
+		}
+
+		foreach ($this->sort as $item) {
+			$array['sort'][] = $item->toArray();
+		}
+
+		if ($this->minScore) {
+			$array['min_score'] = $this->minScore;
+		}
+
+		return $array;
+	}
+
+
+	public function sort() : \Spameri\ElasticQuery\Options\SortCollection
+	{
+		return $this->sort;
+	}
+
+}