Use construction parameter instead of trait

Author: igoooor

src/Features/HasDefaultOptions.php

@@ -14,7 +14,8 @@ abstract class AbstractMatchQuery implements QueryInterface
     public function __construct(
         string $field,
         protected string $query,
-        protected ?string $analyzer = null
+        protected ?string $analyzer = null,
+        protected array $params = [],
     ) {
         $this->field = $field;
     }
@@ -37,11 +38,10 @@ public function build(): array
     {
         $queryName = $this->getQueryName();
 
-        $query = [
-            $queryName => [
-                $this->field => [
-                    'query' => $this->query,
-                ],
+        $query = $this->params;
+        $query[$queryName] = [
+            $this->field => [
+                'query' => $this->query,
             ],
         ];
 

src/Query/AbstractMatchQuery.php

@@ -20,6 +20,7 @@ public function __construct(
         private array $mustNot = [],
         private array $should = [],
         private array $filter = [],
+        private array $params = [],
     ) {
     }
 
@@ -77,7 +78,7 @@ public function isEmpty(): bool
 
     public function build(): array
     {
-        $query = [];
+        $query = $this->params;
 
         $this
             ->buildQueries($query, 'should', $this->should)

src/Query/BoolQuery.php

@@ -17,7 +17,8 @@ class GeoDistanceQuery implements QueryInterface
     public function __construct(
         private string $distance,
         string $field,
-        private array $position
+        private array $position,
+        private array $params = [],
     ) {
         $this->field = $field;
     }
@@ -38,14 +39,15 @@ public function setPosition(array $position): self
 
     public function build(): array
     {
-        return [
-            'geo_distance' => [
-                'distance' => $this->distance,
-                $this->field => [
-                    'lat' => $this->position[0],
-                    'lon' => $this->position[1],
-                ],
+        $build = $this->params;
+        $build['geo_distance'] = [
+            'distance' => $this->distance,
+            $this->field => [
+                'lat' => $this->position[0],
+                'lon' => $this->position[1],
             ],
         ];
+
+        return $build;
     }
 }

src/Query/GeoDistanceQuery.php

@@ -16,7 +16,8 @@ class GeoShapeQuery implements QueryInterface
     public function __construct(
         private string $field,
         private string $type,
-        private array $coordinates
+        private array $coordinates,
+        private array $params = [],
     ) {
     }
 
@@ -50,16 +51,17 @@ public function setRelation(string $relation): self
 
     public function build(): array
     {
-        return [
-            'geo_shape' => [
-                $this->field => [
-                    'shape' => [
-                        'type' => $this->type,
-                        'coordinates' => $this->coordinates,
-                    ],
-                    'relation' => $this->relation,
+        $build = $this->params;
+        $build['geo_shape'] = [
+            $this->field => [
+                'shape' => [
+                    'type' => $this->type,
+                    'coordinates' => $this->coordinates,
                 ],
+                'relation' => $this->relation,
             ],
         ];
+
+        return $build;
     }
 }

src/Query/GeoShapeQuery.php

@@ -17,9 +17,10 @@ public function __construct(
         string $query,
         ?string $analyzer = null,
         ?string $operator = null,
-        ?string $minimumShouldMatch = null
+        ?string $minimumShouldMatch = null,
+        array $params = [],
     ) {
-        parent::__construct($field, $query, $analyzer);
+        parent::__construct($field, $query, $analyzer, $params);
 
         $this->operator = $operator;
         $this->minimumShouldMatch = $minimumShouldMatch;

src/Query/MatchQuery.php

@@ -25,7 +25,8 @@ public function __construct(
         protected ?string $fuzziness = null,
         ?string $operator = null,
         ?float $boost = null,
-        ?string $minimumShouldMatch = null
+        ?string $minimumShouldMatch = null,
+        protected array $params = [],
     ) {
         $this->operator = $operator;
         $this->boost = $boost;
@@ -79,8 +80,9 @@ public function build(): array
         $this->buildBoostTo($data);
         $this->buildMinimumShouldMatchTo($data);
 
-        return [
-            'multi_match' => $data,
-        ];
+        $build = $this->params;
+        $build['multi_match'] = $data;
+
+        return $build;
     }
 }

src/Query/MultiMatchQuery.php

@@ -10,7 +10,8 @@ class NestedQuery implements QueryInterface
 {
     public function __construct(
         protected ?string $path,
-        protected QueryInterface $query
+        protected QueryInterface $query,
+        protected array $params = [],
     ) {
     }
 
@@ -30,11 +31,12 @@ public function setQuery(QueryInterface $query): self
 
     public function build(): array
     {
-        return [
-            'nested' => [
-                'path' => $this->path,
-                'query' => $this->query->build(),
-            ],
+        $build = $this->params;
+        $build['nested'] = [
+            'path' => $this->path,
+            'query' => $this->query->build(),
         ];
+
+        return $build;
     }
 }

src/Query/NestedQuery.php

@@ -22,7 +22,8 @@ public function __construct(
         string $field,
         protected string $value,
         ?string $rewrite = null,
-        ?bool $caseInsensitive = null
+        ?bool $caseInsensitive = null,
+        protected array $params = [],
     ) {
         $this->field = $field;
         $this->rewrite = $rewrite;
@@ -38,9 +39,8 @@ public function setValue(string $value): self
 
     public function build(): array
     {
-        $build = [
-            'value' => $this->value,
-        ];
+        $build = $this->params;
+        $build['value'] = $this->value;
 
         $this->buildRewriteTo($build);
         $this->buildCaseInsensitiveTo($build);