Added ability to sort terms aggregation

Author: Spamercz

src/Aggregation/Term.php

@@ -9,38 +9,38 @@
 class Term implements LeafAggregationInterface
 {
 
-	/**
-	 * @var string
-	 */
-	private $field;
-	
-	/**
-	 * @var int
-	 */
-	private $size;
-	
-	/**
-	 * @var ?int
-	 */
-	private $missing;
-
-	/**
-	 * @var ?string
-	 */
-	private $key;
+	private string $field;
+
+	private int $size;
+
+	private ?int $missing;
+
+	private ?string $key;
+
+	private \Spameri\ElasticQuery\Aggregation\Terms\OrderCollection $order;
+
+	private ?string $include;
+
+	private ?string $exclude;
 
 
 	public function __construct(
-		string $field
-		, int $size = 5
-		, int $missing = NULL
-		, string $key = NULL
+		string $field,
+		int $size = 0,
+		int $missing = NULL,
+		?\Spameri\ElasticQuery\Aggregation\Terms\OrderCollection $order = NULL,
+		?string $include = NULL,
+		?string $exclude = NULL,
+		?string $key = NULL
 	)
 	{
 		$this->field = $field;
 		$this->size = $size;
 		$this->missing = $missing;
 		$this->key = $key;
+		$this->order = $order ?? new \Spameri\ElasticQuery\Aggregation\Terms\OrderCollection();
+		$this->include = $include;
+		$this->exclude = $exclude;
 	}
 
 
@@ -61,6 +61,18 @@ public function toArray(): array
 			$array['missing'] = $this->missing;
 		}
 
+		if (\count($this->order)) {
+			$array['order'] = $this->order->toArray();
+		}
+
+		if ($this->include !== NULL) {
+			$array['include'] = $this->include;
+		}
+
+		if ($this->exclude !== NULL) {
+			$array['exclude'] = $this->exclude;
+		}
+
 		return [
 			'terms' => $array,
 		];

src/Aggregation/Terms/Order.php

@@ -0,0 +1,35 @@
+<?php declare(strict_types = 1);
+
+namespace Spameri\ElasticQuery\Aggregation\Terms;
+
+class Order implements \Spameri\ElasticQuery\Collection\Item
+{
+
+	private string $field;
+
+	private string $type;
+
+
+	public function __construct(
+		string $field,
+		string $type
+	) {
+		$this->field = $field;
+		$this->type = $type;
+	}
+
+
+	public function key(): string
+	{
+		return 'order_' . $this->field . '_' . $this->type;
+	}
+
+
+	public function toArray(): array
+	{
+		return [
+			$this->field => $this->type,
+		];
+	}
+
+}

src/Aggregation/Terms/OrderCollection.php

@@ -0,0 +1,96 @@
+<?php declare(strict_types = 1);
+
+namespace Spameri\ElasticQuery\Aggregation\Terms;
+
+class OrderCollection implements
+	\Spameri\ElasticQuery\Collection\SimpleCollectionInterface,
+	\Countable
+{
+
+	/**
+	 * @var array<\Spameri\ElasticQuery\Aggregation\Terms\Order>
+	 */
+	private array $collection;
+
+
+	public function __construct(
+		\Spameri\ElasticQuery\Aggregation\Terms\Order ... $collection
+	) {
+		foreach ($collection as $order) {
+			$this->add($order);
+		}
+	}
+
+
+	public function remove(string $key): bool
+	{
+		if (isset($this->collection[$key])) {
+			unset($this->collection[$key]);
+
+			return TRUE;
+		}
+
+		return FALSE;
+	}
+
+
+	public function get(string $key): ?\Spameri\ElasticQuery\Aggregation\Terms\Order
+	{
+		return $this->collection[$key] ?? NULL;
+	}
+
+
+	public function isValue(string $key): bool
+	{
+		return isset($this->collection[$key]);
+	}
+
+
+	public function keys(): array
+	{
+		return \array_keys($this->collection);
+	}
+
+
+	public function clear(): void
+	{
+		$this->collection = [];
+	}
+
+
+	/**
+	 * @param \Spameri\ElasticQuery\Aggregation\Terms\Order $item
+	 */
+	public function add($item): void
+	{
+		$this->collection[$item->key()] = $item;
+	}
+
+
+	public function getIterator(): \ArrayIterator
+	{
+		return new \ArrayIterator($this->collection);
+	}
+
+
+	public function count(): int
+	{
+		return \count($this->collection);
+	}
+
+
+	public function toArray(): array
+	{
+		if (\count($this->collection) === 1) {
+			return \reset($this->collection)->toArray();
+		}
+
+		$array = [];
+		foreach ($this->collection as $order) {
+			$array[] = $order->toArray();
+		}
+
+		return $array;
+	}
+
+}