Merge pull request #15 from xsuchy09/feature/parameters

New parameters, some fixes.

Author: erichard

.gitignore

@@ -1,3 +1,4 @@
 vendor
 composer.lock
-.phpunit.result.cache
+.phpunit.result.cache
+.editorconfig

phpstan.neon

@@ -12,8 +12,8 @@ parameters:
         - src
         - tests
 
-    # The level 8 is the highest level
-    level: 8
+    # The level 9 is the highest level
+    level: 9
 
     # it is impossible to map build()
     checkMissingIterableValueType: false

src/Features/HasBoost.php

@@ -0,0 +1,33 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Erichard\ElasticQueryBuilder\Features;
+
+trait HasBoost
+{
+    protected ?float $boost = null;
+
+    public function setBoost(?float $boost): self
+    {
+        $this->boost = $boost;
+
+        return $this;
+    }
+
+    public function buildBoostTo(array &$array): self
+    {
+        if (null === $this->boost) {
+            return $this;
+        }
+
+        $array['boost'] = $this->boost;
+
+        return $this;
+    }
+
+    public function getBoost(): ?float
+    {
+        return $this->boost;
+    }
+}

src/Features/HasCaseInsensitive.php

@@ -0,0 +1,33 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Erichard\ElasticQueryBuilder\Features;
+
+trait HasCaseInsensitive
+{
+    protected ?bool $caseInsensitive = null;
+
+    public function setCaseInsensitive(?bool $caseInsensitive): self
+    {
+        $this->caseInsensitive = $caseInsensitive;
+
+        return $this;
+    }
+
+    public function buildCaseInsensitiveTo(array &$array): self
+    {
+        if (null === $this->caseInsensitive) {
+            return $this;
+        }
+
+        $array['case_insensitive'] = $this->caseInsensitive;
+
+        return $this;
+    }
+
+    public function getCaseInsensitive(): ?bool
+    {
+        return $this->caseInsensitive;
+    }
+}

src/Features/HasFormat.php

@@ -0,0 +1,33 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Erichard\ElasticQueryBuilder\Features;
+
+trait HasFormat
+{
+    protected ?string $format = null;
+
+    public function setFormat(?string $format): self
+    {
+        $this->format = $format;
+
+        return $this;
+    }
+
+    public function buildFormatTo(array &$array): self
+    {
+        if (null === $this->format) {
+            return $this;
+        }
+
+        $array['format'] = $this->format;
+
+        return $this;
+    }
+
+    public function getFormat(): ?string
+    {
+        return $this->format;
+    }
+}

src/Features/HasMinimumShouldMatch.php

@@ -0,0 +1,33 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Erichard\ElasticQueryBuilder\Features;
+
+trait HasMinimumShouldMatch
+{
+    protected ?string $minimumShouldMatch = null;
+
+    public function setMinimumShouldMatch(?string $minimumShouldMatch): self
+    {
+        $this->minimumShouldMatch = $minimumShouldMatch;
+
+        return $this;
+    }
+
+    public function buildMinimumShouldMatchTo(array &$array): self
+    {
+        if (null === $this->minimumShouldMatch) {
+            return $this;
+        }
+
+        $array['minimum_should_match'] = $this->minimumShouldMatch;
+
+        return $this;
+    }
+
+    public function getMinimumShouldMatch(): ?string
+    {
+        return $this->minimumShouldMatch;
+    }
+}

src/Features/HasRewrite.php

@@ -0,0 +1,33 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Erichard\ElasticQueryBuilder\Features;
+
+trait HasRewrite
+{
+    protected ?string $rewrite = null;
+
+    public function setRewrite(?string $rewrite): self
+    {
+        $this->rewrite = $rewrite;
+
+        return $this;
+    }
+
+    public function buildRewriteTo(array &$array): self
+    {
+        if (null === $this->rewrite) {
+            return $this;
+        }
+
+        $array['rewrite'] = $this->rewrite;
+
+        return $this;
+    }
+
+    public function getRewrite(): ?string
+    {
+        return $this->rewrite;
+    }
+}

src/Features/HasSorting.php

@@ -32,7 +32,7 @@ public function addSort(string $field, string|array $config = SortDirections::AS
      */
     protected function buildSortTo(array &$toArray): self
     {
-        if (false === empty($this->sort)) {
+        if (empty($this->sort) === false) {
             foreach ($this->sort as $sort => $config) {
                 $toArray['sort'][$sort] = $config;
             }

src/Options/Collapse.php

@@ -48,7 +48,7 @@ public function build(): array
             $result['max_concurrent_group_searches'] = $this->maxConcurrentSearchers;
         }
 
-        if (false === empty($this->innerHits)) {
+        if (empty($this->innerHits) === false) {
             $result['inner_hits'] = array_map(fn (InnerHit $hit) => $hit->build(), $this->innerHits);
         }
 

src/Query/MatchQuery.php

@@ -4,10 +4,39 @@
 
 namespace Erichard\ElasticQueryBuilder\Query;
 
+use Erichard\ElasticQueryBuilder\Features\HasMinimumShouldMatch;
+use Erichard\ElasticQueryBuilder\Features\HasOperator;
+
 class MatchQuery extends AbstractMatchQuery
 {
+    use HasOperator;
+    use HasMinimumShouldMatch;
+
+    public function __construct(
+        string $field,
+        string $query,
+        ?string $analyzer = null,
+        ?string $operator = null,
+        ?string $minimumShouldMatch = null
+    ) {
+        parent::__construct($field, $query, $analyzer);
+
+        $this->operator = $operator;
+        $this->minimumShouldMatch = $minimumShouldMatch;
+    }
+
     public function getQueryName(): string
     {
         return 'match';
     }
+
+    public function build(): array
+    {
+        $build = parent::build();
+
+        $this->buildOperatorTo($build[$this->getQueryName()][$this->field]);
+        $this->buildMinimumShouldMatchTo($build[$this->getQueryName()][$this->field]);
+
+        return $build;
+    }
 }