Allow to configure a subkey when adding a param (#2030)

* Allow to configure a subkey when adding a param * Add changelog
ruflin · Dec 3, 2021 · 256b1ba · 256b1ba
1 parent 2e9b223
commit 256b1ba
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 67 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Added `bytes` processor [#2008](https://github.com/ruflin/Elastica/pull/2008)
 * Added `indices_boost` option to `Elastica\Query` [#2018](https://github.com/ruflin/Elastica/pull/2018)
 * Added `Elastica\Query\Terms::setBoost()` method to configure boost [#2035](https://github.com/ruflin/Elastica/pull/2035)
+* Allowed to configure a sub key when adding a param with `Elastica\Param::addParam()` [#2030](https://github.com/ruflin/Elastica/pull/2030)
 ### Changed
 * Triggered deprecation in `Elastica\Result::getType()` method [#2016](https://github.com/ruflin/Elastica/pull/2016)
 * Updated `php-cs-fixer` to `3.3.2` [#2022](https://github.com/ruflin/Elastica/pull/2022)

diff --git a/src/Aggregation/AdjacencyMatrix.php b/src/Aggregation/AdjacencyMatrix.php
@@ -13,10 +13,7 @@ class AdjacencyMatrix extends AbstractAggregation
      */
     public function addFilter(AbstractQuery $filter, string $name): self
     {
-        $filterArray = [];
-        $filterArray[$name] = $filter;
-
-        return $this->addParam('filters', $filterArray);
+        return $this->addParam('filters', $filter, $name);
     }
 
     /**
@@ -26,25 +23,4 @@ public function setSeparator(string $separator = '&'): self
     {
         return $this->setParam('separator', $separator);
     }
-
-    public function toArray(): array
-    {
-        $array = [];
-        $filters = $this->getParam('filters');
-
-        foreach ($filters as $filter) {
-            $key = \key($filter);
-            $array['adjacency_matrix']['filters'][$key] = \current($filter)->toArray();
-        }
-
-        if ($this->hasParam('separator')) {
-            $array['adjacency_matrix']['separator'] = $this->getParam('separator');
-        }
-
-        if ($this->_aggs) {
-            $array['aggs'] = $this->_convertArrayable($this->_aggs);
-        }
-
-        return $array;
-    }
 }
diff --git a/src/Aggregation/Filters.php b/src/Aggregation/Filters.php
@@ -29,16 +29,7 @@ class Filters extends AbstractAggregation
      */
     public function addFilter(AbstractQuery $filter, ?string $name = null): self
     {
-        $filterArray = [];
-
-        $type = self::NAMED_TYPE;
-
-        if (null === $name) {
-            $filterArray[] = $filter;
-            $type = self::ANONYMOUS_TYPE;
-        } else {
-            $filterArray[$name] = $filter;
-        }
+        $type = null !== $name ? self::NAMED_TYPE : self::ANONYMOUS_TYPE;
 
         if ($this->hasParam('filters')
             && \count($this->getParam('filters'))
@@ -49,7 +40,7 @@ public function addFilter(AbstractQuery $filter, ?string $name = null): self
 
         $this->_type = $type;
 
-        return $this->addParam('filters', $filterArray);
+        return $this->addParam('filters', $filter, $name);
     }
 
     /**
@@ -67,33 +58,4 @@ public function setOtherBucketKey(string $otherBucketKey): self
     {
         return $this->setParam('other_bucket_key', $otherBucketKey);
     }
-
-    public function toArray(): array
-    {
-        $array = [];
-        $filters = $this->getParam('filters');
-
-        foreach ($filters as $filter) {
-            if (self::NAMED_TYPE === $this->_type) {
-                $key = \key($filter);
-                $array['filters']['filters'][$key] = \current($filter)->toArray();
-            } else {
-                $array['filters']['filters'][] = \current($filter)->toArray();
-            }
-        }
-
-        if ($this->hasParam('other_bucket')) {
-            $array['filters']['other_bucket'] = $this->getParam('other_bucket');
-        }
-
-        if ($this->hasParam('other_bucket_key')) {
-            $array['filters']['other_bucket_key'] = $this->getParam('other_bucket_key');
-        }
-
-        if ($this->_aggs) {
-            $array['aggs'] = $this->_convertArrayable($this->_aggs);
-        }
-
-        return $array;
-    }
 }
diff --git a/src/Param.php b/src/Param.php
@@ -84,9 +84,13 @@ public function setParams(array $params)
      *
      * @return $this
      */
-    public function addParam($key, $value)
+    public function addParam($key, $value, ?string $subKey = null)
     {
-        $this->_params[$key][] = $value;
+        if (null !== $subKey) {
+            $this->_params[$key][$subKey] = $value;
+        } else {
+            $this->_params[$key][] = $value;
+        }
 
         return $this;
     }