Merge branch '1.0' into 1.x

pimcore · Aug 3, 2023 · fe6189d · fe6189d
2 parents 349de4c + 28dcb14
commit fe6189d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/src/IndexService/Config/AbstractConfig.php b/src/IndexService/Config/AbstractConfig.php
@@ -26,23 +26,23 @@ abstract class AbstractConfig implements ConfigInterface
 {
     protected string $tenantName;
 
-    protected array $attributeConfig;
+    protected array $attributeConfig = [];
 
-    protected array $searchAttributeConfig;
+    protected array $searchAttributeConfig = [];
 
     protected ?AttributeFactory $attributeFactory = null;
 
     protected array $attributes = [];
 
-    protected array $searchAttributes;
+    protected array $searchAttributes = [];
 
-    protected array $filterTypes;
+    protected array $filterTypes = [];
 
     protected ?WorkerInterface $tenantWorker = null;
 
     protected ?array $filterTypeConfig = null;
 
-    protected array $options;
+    protected array $options = [];
 
     /**
      * @param array[]|Attribute[] $attributes

diff --git a/src/IndexService/Config/ElasticSearch.php b/src/IndexService/Config/ElasticSearch.php
@@ -75,9 +75,9 @@ class ElasticSearch extends AbstractConfig implements MockupConfigInterface, Ela
     public function __construct(
         AttributeFactory $attributeFactory,
         string $tenantName,
-        array $attributes,
-        array $searchAttributes,
-        array $filterTypes,
+        array $attributes = [],
+        array $searchAttributes = [],
+        array $filterTypes = [],
         array $options = [],
         iterable $synonymProviders = []
     ) {

diff --git a/src/IndexService/ProductList/ElasticSearch/AbstractElasticSearch.php b/src/IndexService/ProductList/ElasticSearch/AbstractElasticSearch.php
@@ -1145,7 +1145,7 @@ protected function convertBucketValues(array $bucket): array
                 $data['key_as_string'] = $bucket['key_as_string'];
             } elseif (is_array($reverseAggregationBucket) && array_key_exists('doc_count', $reverseAggregationBucket)) { // reverse aggregation
                 $data['reverse_count'] = $reverseAggregationBucket['doc_count'];
-            } elseif (is_array($subAggregationBuckets['buckets'])) {        // sub aggregations
+            } elseif(is_array($subAggregationBuckets) && isset($subAggregationBuckets['buckets'])) {        // sub aggregations
                 foreach ($subAggregationBuckets['buckets'] as $bucket) {
                     $data[$subAggregationField][] = $this->convertBucketValues($bucket);
                 }