Merge branch 'master' of github.com:Spameri/ElasticQuery into v2

Author: Spamercz

src/Document.php

@@ -30,7 +30,10 @@ public function toArray(): array
 			$array['body'] = $this->body->toArray();
 		}
 
-		if ($this->id) {
+		if (
+			\is_string($this->id)
+			&& $this->id !== ''
+		) {
 			$array['id'] = $this->id;
 		}
 

src/ElasticQuery.php

@@ -12,6 +12,8 @@ class ElasticQuery implements \Spameri\ElasticQuery\Entity\ArrayInterface
 
 	private \Spameri\ElasticQuery\Filter\FilterCollection $filter;
 
+	private \Spameri\ElasticQuery\Query\QueryCollection $postFilter;
+
 	private \Spameri\ElasticQuery\Options\SortCollection $sort;
 
 	private \Spameri\ElasticQuery\Aggregation\AggregationCollection $aggregation;
@@ -21,6 +23,7 @@ class ElasticQuery implements \Spameri\ElasticQuery\Entity\ArrayInterface
 	public function __construct(
 		\Spameri\ElasticQuery\Query\QueryCollection|null $query = null,
 		\Spameri\ElasticQuery\Filter\FilterCollection|null $filter = null,
+		\Spameri\ElasticQuery\Query\QueryCollection|null $postFilter = null,
 		\Spameri\ElasticQuery\Options\SortCollection|null $sort = null,
 		\Spameri\ElasticQuery\Aggregation\AggregationCollection|null $aggregation = null,
 		private \Spameri\ElasticQuery\Highlight|null $highlight = null,
@@ -34,6 +37,9 @@ public function __construct(
 		if ($filter === null) {
 			$filter = new \Spameri\ElasticQuery\Filter\FilterCollection();
 		}
+		if ($postFilter === null) {
+			$postFilter = new \Spameri\ElasticQuery\Query\QueryCollection();
+		}
 		if ($sort === null) {
 			$sort = new \Spameri\ElasticQuery\Options\SortCollection();
 		}
@@ -46,6 +52,7 @@ public function __construct(
 
 		$this->query = $query;
 		$this->filter = $filter;
+		$this->postFilter = $postFilter;
 		$this->sort = $sort;
 		$this->aggregation = $aggregation;
 		$this->options = $options;
@@ -106,6 +113,18 @@ public function addShouldQuery(\Spameri\ElasticQuery\Query\LeafQueryInterface $l
 	}
 
 
+	public function postFilter(): \Spameri\ElasticQuery\Query\QueryCollection
+	{
+		return $this->postFilter;
+	}
+
+
+	public function addPostFilterMustQuery(\Spameri\ElasticQuery\Query\LeafQueryInterface $leafQuery): void
+	{
+		$this->postFilter->must()->add($leafQuery);
+	}
+
+
 	public function addFilter(\Spameri\ElasticQuery\Query\LeafQueryInterface $leafQuery): void
 	{
 		$this->filter->must()->add($leafQuery);
@@ -136,6 +155,11 @@ public function toArray(): array
 			$array['query']['bool']['filter'] = $filterArray;
 		}
 
+		$postFilterArray = $this->postFilter->toArray();
+		if ($postFilterArray) {
+			$array['post_filter'] = $postFilterArray;
+		}
+
 		$sortArray = $this->sort->toArray();
 		if ($sortArray) {
 			$array['sort'] = $sortArray;

src/Options.php

@@ -84,6 +84,11 @@ public function toArray(): array
 		}
 
 		foreach ($this->sort as $item) {
+			if ($item->field === '_score') {
+				$array['sort'][] = $item->field;
+				continue;
+			}
+
 			$array['sort'][] = $item->toArray();
 		}
 

src/Options/Sort.php

@@ -17,9 +17,9 @@ class Sort implements \Spameri\ElasticQuery\Entity\EntityInterface
 	public const MISSING_FIRST = '_first';
 
 	public function __construct(
-		private string $field,
-		private string $type = self::DESC,
-		private string $missing = self::MISSING_LAST,
+		public string $field,
+		public string $type = self::DESC,
+		public string $missing = self::MISSING_LAST,
 	)
 	{
 		if ( ! \in_array($type, [self::ASC, self::DESC], true)) {

src/Options/SortCollection.php

@@ -12,7 +12,13 @@ public function toArray(): array
 	{
 		$array = [];
 
+		/** @var \Spameri\ElasticQuery\Options\Sort $sort */
 		foreach ($this->collection as $sort) {
+			if ($sort->field === '_score') {
+				$array[] = $sort->field;
+				continue;
+			}
+
 			$array[] = $sort->toArray();
 		}
 

src/Query/Nested.php

@@ -32,11 +32,19 @@ public function key(): string
 
 	public function toArray(): array
 	{
+		$queryArray = $this->query->toArray();
+
+		if (count($queryArray) === 0) {
+			$queryArray = [
+				'bool' => [],
+			];
+		}
+
 		return [
 			'nested' => [
 				'path' => $this->path,
 				'query' => [
-					'bool' => $this->query->toArray(),
+					$queryArray,
 				],
 			],
 		];

src/Response/ResultMapper.php

@@ -261,9 +261,11 @@ private function mapBucket(
 		array $bucketArray,
 	): \Spameri\ElasticQuery\Response\Result\Aggregation\Bucket
 	{
+		$bucketKey = $bucketArray['key'] ?? $bucketPosition;
+
 		return new \Spameri\ElasticQuery\Response\Result\Aggregation\Bucket(
-			$bucketArray['key'] ?? (string) $bucketPosition,
-			$bucketArray['doc_count'],
+			(string) $bucketKey,
+			(int) $bucketArray['doc_count'],
 			\is_int($bucketPosition) ? $bucketPosition : null,
 			$bucketArray['from'] ?? null,
 			$bucketArray['to'] ?? null,