Clean up + CS + PHPSTAN

Author: Spamercz

composer.json

@@ -11,8 +11,7 @@
 	  	"issues": "https://github.com/Spameri/ElasticQuery/issues"
 	},
 	"require": {
-	  	"php": ">=7.1",
-		"elasticsearch/elasticsearch": "^6.0"
+	  	"php": ">=7.1"
 	},
 	"require-dev": {
 		"phpstan/phpstan-shim": "v0.10.3",
@@ -24,6 +23,8 @@
 		}
 	},
   	"autoload-dev": {
-	  	"Spameri\\": "tests"
+	  "psr-4": {
+		"SpameriTests\\": "tests/SpameriTests"
+	  }
 	}
 }

composer.lock

@@ -12,14 +12,14 @@ class AggregationCollection implements LeafAggregationInterface
 	private $filter;
 
 	/**
-	 * @var \Spameri\ElasticQuery\Aggregation\LeafAggregationCollection
+	 * @var \Spameri\ElasticQuery\Aggregation\LeafAggregationCollection[]
 	 */
 	private $aggregations;
 
 
 	public function __construct(
-		?\Spameri\ElasticQuery\Filter\FilterCollection $filter,
-		\Spameri\ElasticQuery\Aggregation\LeafAggregationCollection ... $aggregations
+		?\Spameri\ElasticQuery\Filter\FilterCollection $filter = NULL
+		, \Spameri\ElasticQuery\Aggregation\LeafAggregationCollection ... $aggregations
 	)
 	{
 		if ( ! $filter) {

src/Aggregation/AggregationCollection.php

@@ -3,6 +3,9 @@
 namespace Spameri\ElasticQuery\Aggregation;
 
 
+/**
+ * @see https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-histogram-aggregation.html
+ */
 class Histogram implements LeafAggregationInterface
 {
 
@@ -18,8 +21,8 @@ class Histogram implements LeafAggregationInterface
 
 
 	public function __construct(
-		string $field,
-		int $interval
+		string $field
+		, int $interval
 	)
 	{
 		$this->field = $field;
@@ -42,4 +45,5 @@ public function toArray() : array
 			],
 		];
 	}
+
 }

src/Aggregation/Histogram.php

@@ -3,7 +3,7 @@
 namespace Spameri\ElasticQuery\Aggregation;
 
 
-class LeafAggregationCollection implements LeafAggregationInterface
+class LeafAggregationCollection implements LeafAggregationInterface, \IteratorAggregate
 {
 
 	/**
@@ -17,15 +17,15 @@ class LeafAggregationCollection implements LeafAggregationInterface
 	private $filter;
 
 	/**
-	 * @var \Spameri\ElasticQuery\Aggregation\LeafAggregationInterface
+	 * @var \Spameri\ElasticQuery\Aggregation\LeafAggregationInterface[]
 	 */
 	private $aggregations;
 
 
 	public function __construct(
-		string $name,
-		?\Spameri\ElasticQuery\Filter\FilterCollection $filter,
-		\Spameri\ElasticQuery\Aggregation\LeafAggregationInterface ... $aggregations
+		string $name
+		, ?\Spameri\ElasticQuery\Filter\FilterCollection $filter
+		, \Spameri\ElasticQuery\Aggregation\LeafAggregationInterface ... $aggregations
 	)
 	{
 		if ( ! $filter) {
@@ -50,12 +50,18 @@ public function filter() : \Spameri\ElasticQuery\Filter\FilterCollection
 	}
 
 
+	public function getIterator() : \ArrayIterator
+	{
+		return new \ArrayIterator($this->aggregations);
+	}
+
+
 	public function toArray() : array
 	{
 		$array = [];
 
 		foreach ($this->aggregations as $aggregation) {
-			if ($aggregation instanceof LeafAggregationCollection) {
+			if ($aggregation instanceof \Spameri\ElasticQuery\Aggregation\LeafAggregationCollection) {
 				$array[$this->key()]['aggs'] = $aggregation->toArray();
 
 			} else {