#110876 fix

Author: MsNatali

src/Concerns/DecoratesBoolQuery.php

@@ -3,7 +3,6 @@
 namespace Ensi\LaravelElasticQuery\Concerns;
 
 use Closure;
-use Ensi\LaravelElasticQuery\Contracts\BoolQuery;
 use Ensi\LaravelElasticQuery\Contracts\MatchOptions;
 use Ensi\LaravelElasticQuery\Contracts\MultiMatchOptions;
 use Ensi\LaravelElasticQuery\Contracts\WildcardOptions;
@@ -108,7 +107,7 @@ public function orWhereWildcard(string $field, string $query, ?WildcardOptions $
         return $this;
     }
 
-    public function addMustBool(): BoolQuery
+    public function addMustBool(callable $fn): static
     {
         return $this->forwardCallTo($this->boolQuery(), __FUNCTION__, func_get_args());
     }

src/Contracts/BoolQuery.php

@@ -33,5 +33,5 @@ public function whereWildcard(string $field, string $query, ?WildcardOptions $op
 
     public function orWhereWildcard(string $field, string $query, ?WildcardOptions $options = null): static;
 
-    public function addMustBool(): BoolQuery;
+    public function addMustBool(callable $fn): static;
 }

src/Filtering/BoolQueryBuilder.php

@@ -202,12 +202,13 @@ public function makeWildcard(string $field, string $query, ?WildcardOptions $opt
         return new Wildcard($this->absolutePath($field), $query, $options ?: new WildcardOptions());
     }
 
-    public function addMustBool(): BoolQueryBuilder
+    public function addMustBool(callable $fn): static
     {
         $boolCriteria = static::make();
+        $fn($boolCriteria);
         $this->must->add($boolCriteria);
 
-        return $boolCriteria;
+        return $this;
     }
 
     protected function addNestedCriteria(string $nested, Closure $filter, CriteriaCollection $target): static

tests/Unit/Filtering/BoolQueryTest.php

@@ -251,7 +251,7 @@ public function testAddMustBool(): void
     {
         $builder = BoolQueryBuilder::make();
         $builder->where('mustName', 'value');
-        $builder->addMustBool()->orWhereWildcard('wildcardName', 'wildcardValue')->orWhereMatch('matchName', 'matchValue');
+        $builder->addMustBool(fn (BoolQueryBuilder $builder) => $builder->orWhereWildcard('wildcardName', 'wildcardValue')->orWhereMatch('matchName', 'matchValue'));
 
         $dsl = $builder->toDSL();