feat(filter): expand FilterCollection to full bool body

The filter container previously only exposed must(), so filter
contexts could not express must_not / should / filter clauses
without dropping into raw arrays.

FilterCollection now mirrors QueryCollection: must(), should(),
mustNot(), filter() — each returns the appropriate typed
collection. The bool body emits all four arms when populated.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Author: Spamercz

src/Filter/FilterCollection.php

@@ -8,13 +8,26 @@
 class FilterCollection implements FilterInterface
 {
 
+	private \Spameri\ElasticQuery\Query\MustCollection $mustCollection;
+
+	private \Spameri\ElasticQuery\Query\ShouldCollection $shouldCollection;
+
+	private \Spameri\ElasticQuery\Query\MustNotCollection $mustNotCollection;
+
+	private \Spameri\ElasticQuery\Query\MustCollection $filterCollection;
+
+
 	public function __construct(
-		private \Spameri\ElasticQuery\Query\MustCollection|null $mustCollection = null,
+		\Spameri\ElasticQuery\Query\MustCollection|null $mustCollection = null,
+		\Spameri\ElasticQuery\Query\ShouldCollection|null $shouldCollection = null,
+		\Spameri\ElasticQuery\Query\MustNotCollection|null $mustNotCollection = null,
+		\Spameri\ElasticQuery\Query\MustCollection|null $filterCollection = null,
 	)
 	{
-		if ($this->mustCollection === null) {
-			$this->mustCollection = new \Spameri\ElasticQuery\Query\MustCollection();
-		}
+		$this->mustCollection = $mustCollection ?? new \Spameri\ElasticQuery\Query\MustCollection();
+		$this->shouldCollection = $shouldCollection ?? new \Spameri\ElasticQuery\Query\ShouldCollection();
+		$this->mustNotCollection = $mustNotCollection ?? new \Spameri\ElasticQuery\Query\MustNotCollection();
+		$this->filterCollection = $filterCollection ?? new \Spameri\ElasticQuery\Query\MustCollection();
 	}
 
 
@@ -24,21 +37,58 @@ public function must(): \Spameri\ElasticQuery\Query\MustCollection
 	}
 
 
+	public function should(): \Spameri\ElasticQuery\Query\ShouldCollection
+	{
+		return $this->shouldCollection;
+	}
+
+
+	public function mustNot(): \Spameri\ElasticQuery\Query\MustNotCollection
+	{
+		return $this->mustNotCollection;
+	}
+
+
+	public function filter(): \Spameri\ElasticQuery\Query\MustCollection
+	{
+		return $this->filterCollection;
+	}
+
+
 	public function key(): string
 	{
 		return '';
 	}
 
 
+	/**
+	 * @return array<string, array<string, mixed>>
+	 */
 	public function toArray(): array
 	{
-		$array = [];
-		/** @var \Spameri\ElasticQuery\Query\LeafQueryInterface $item */
+		$bool = [];
+
 		foreach ($this->mustCollection as $item) {
-			$array['bool']['must'][] = $item->toArray();
+			$bool['must'][] = $item->toArray();
+		}
+
+		foreach ($this->shouldCollection as $item) {
+			$bool['should'][] = $item->toArray();
+		}
+
+		foreach ($this->mustNotCollection as $item) {
+			$bool['must_not'][] = $item->toArray();
+		}
+
+		foreach ($this->filterCollection as $item) {
+			$bool['filter'][] = $item->toArray();
+		}
+
+		if ($bool === []) {
+			return [];
 		}
 
-		return $array;
+		return ['bool' => $bool];
 	}
 
 }

tests/SpameriTests/ElasticQuery/Filter/FilterCollection.phpt

@@ -195,6 +195,57 @@ class FilterCollection extends \Tester\TestCase
 	}
 
 
+	public function testShouldArm(): void
+	{
+		$filter = new \Spameri\ElasticQuery\Filter\FilterCollection();
+		$filter->should()->add(new \Spameri\ElasticQuery\Query\Term('status', 'a'));
+		$filter->should()->add(new \Spameri\ElasticQuery\Query\Term('status', 'b'));
+
+		$array = $filter->toArray();
+
+		\Tester\Assert::count(2, $array['bool']['should']);
+	}
+
+
+	public function testMustNotArm(): void
+	{
+		$filter = new \Spameri\ElasticQuery\Filter\FilterCollection();
+		$filter->mustNot()->add(new \Spameri\ElasticQuery\Query\Term('deleted', true));
+
+		$array = $filter->toArray();
+
+		\Tester\Assert::count(1, $array['bool']['must_not']);
+	}
+
+
+	public function testFilterArm(): void
+	{
+		$filter = new \Spameri\ElasticQuery\Filter\FilterCollection();
+		$filter->filter()->add(new \Spameri\ElasticQuery\Query\Term('region', 'eu'));
+
+		$array = $filter->toArray();
+
+		\Tester\Assert::count(1, $array['bool']['filter']);
+	}
+
+
+	public function testAllArmsCombined(): void
+	{
+		$filter = new \Spameri\ElasticQuery\Filter\FilterCollection();
+		$filter->must()->add(new \Spameri\ElasticQuery\Query\Term('m', 'x'));
+		$filter->should()->add(new \Spameri\ElasticQuery\Query\Term('s', 'y'));
+		$filter->mustNot()->add(new \Spameri\ElasticQuery\Query\Term('mn', 'z'));
+		$filter->filter()->add(new \Spameri\ElasticQuery\Query\Term('f', 'w'));
+
+		$array = $filter->toArray();
+
+		\Tester\Assert::count(1, $array['bool']['must']);
+		\Tester\Assert::count(1, $array['bool']['should']);
+		\Tester\Assert::count(1, $array['bool']['must_not']);
+		\Tester\Assert::count(1, $array['bool']['filter']);
+	}
+
+
 	public function testComplexFilterScenario(): void
 	{
 		$filter = new \Spameri\ElasticQuery\Filter\FilterCollection();