Options can have scroll and scroll_id

- ResultMapper some undefined array fixes

Author: Spamercz

src/Options.php

@@ -26,21 +26,33 @@ class Options
 	 * @var bool
 	 */
 	private $includeVersion;
+	/**
+	 * @var string|null
+	 */
+	private $scroll;
+	/**
+	 * @var string|null
+	 */
+	private $scrollId;
 
 
 	public function __construct(
 		?int $size = NULL,
 		?int $from = NULL,
 		?\Spameri\ElasticQuery\Options\SortCollection $sort = NULL,
 		?float $minScore = NULL,
-		bool $includeVersion = FALSE
+		bool $includeVersion = FALSE,
+		?string $scroll = NULL,
+		?string $scrollId = NULL
 	)
 	{
 		$this->size = $size;
 		$this->from = $from;
 		$this->sort = $sort ?: new \Spameri\ElasticQuery\Options\SortCollection();
 		$this->minScore = $minScore;
 		$this->includeVersion = $includeVersion;
+		$this->scroll = $scroll;
+		$this->scrollId = $scrollId;
 	}
 
 
@@ -56,6 +68,40 @@ public function changeSize(int $size) : void
 	}
 
 
+	public function sort() : \Spameri\ElasticQuery\Options\SortCollection
+	{
+		return $this->sort;
+	}
+
+
+	public function scroll() : ?string
+	{
+		return $this->scroll;
+	}
+
+
+	public function startScroll(
+		string $scroll
+	) : void
+	{
+		$this->scroll = $scroll;
+	}
+
+
+	public function scrollId() : ?string
+	{
+		return $this->scrollId;
+	}
+
+
+	public function scrollInitialized(
+		string $scrollId
+	) : void
+	{
+		$this->scrollId = $scrollId;
+	}
+
+
 	public function toArray() : array
 	{
 		$array = [];
@@ -80,13 +126,12 @@ public function toArray() : array
 			$array['version'] = $this->includeVersion;
 		}
 
-		return $array;
-	}
-
+		if ($this->scrollId !== NULL) {
+			$array['scroll_id'] = $this->scrollId;
+			$array['scroll'] = $this->scroll;
+		}
 
-	public function sort() : \Spameri\ElasticQuery\Options\SortCollection
-	{
-		return $this->sort;
+		return $array;
 	}
 
 }

src/Response/ResultMapper.php

@@ -135,9 +135,11 @@ public function mapAggregations(
 	{
 		$aggregationArray = [];
 		$i = 0;
-		foreach ($elasticSearchResponse['aggregations'] as $aggregationName => $aggregation) {
-			$aggregationArray[] = $this->mapAggregation($aggregationName, $i, $aggregation);
-			$i++;
+		if (isset($elasticSearchResponse['aggregations'])) {
+			foreach ($elasticSearchResponse['aggregations'] as $aggregationName => $aggregation) {
+				$aggregationArray[] = $this->mapAggregation($aggregationName, $i, $aggregation);
+				$i++;
+			}
 		}
 
 		return new \Spameri\ElasticQuery\Response\Result\AggregationCollection(
@@ -222,7 +224,7 @@ public function mapShards(
 		return new Shards(
 			$elasticSearchResponse['_shards']['total'],
 			$elasticSearchResponse['_shards']['successful'],
-			$elasticSearchResponse['_shards']['skipped'],
+			$elasticSearchResponse['_shards']['skipped'] ?? 0,
 			$elasticSearchResponse['_shards']['failed']
 		);
 	}