From ca1cfc484d12e6e1944e561821793c25fc313997 Mon Sep 17 00:00:00 2001 From: jnuernberger Date: Tue, 25 Feb 2025 11:43:19 +0100 Subject: [PATCH 1/2] fix: missing boolean type for addCondition --- src/IndexService/ProductList/DefaultFindologic.php | 2 +- src/IndexService/ProductList/DefaultMysql.php | 2 +- .../ProductList/ElasticSearch/AbstractElasticSearch.php | 2 +- src/IndexService/ProductList/OpenSearch/AbstractOpenSearch.php | 2 +- src/IndexService/ProductList/ProductListInterface.php | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/IndexService/ProductList/DefaultFindologic.php b/src/IndexService/ProductList/DefaultFindologic.php index 8e1b63e2..8b67f53c 100644 --- a/src/IndexService/ProductList/DefaultFindologic.php +++ b/src/IndexService/ProductList/DefaultFindologic.php @@ -109,7 +109,7 @@ public function getProducts(): array return $this->products; } - public function addCondition(array|string $condition, string $fieldname = ''): void + public function addCondition(array|string|bool $condition, string $fieldname = ''): void { $this->products = null; $this->conditions[$fieldname][] = $condition; diff --git a/src/IndexService/ProductList/DefaultMysql.php b/src/IndexService/ProductList/DefaultMysql.php index 68f2ed0a..729262fa 100644 --- a/src/IndexService/ProductList/DefaultMysql.php +++ b/src/IndexService/ProductList/DefaultMysql.php @@ -87,7 +87,7 @@ public function getProducts(): array protected ?float $conditionPriceTo = null; - public function addCondition(array|string $condition, string $fieldname = ''): void + public function addCondition(array|string|bool $condition, string $fieldname = ''): void { $this->products = null; $this->conditions[$fieldname][] = $condition; diff --git a/src/IndexService/ProductList/ElasticSearch/AbstractElasticSearch.php b/src/IndexService/ProductList/ElasticSearch/AbstractElasticSearch.php index c2091fbc..69c83dac 100644 --- a/src/IndexService/ProductList/ElasticSearch/AbstractElasticSearch.php +++ b/src/IndexService/ProductList/ElasticSearch/AbstractElasticSearch.php @@ -169,7 +169,7 @@ public function setProductPositionMap(array $productPositionMap): static * * @param string $fieldname - must be set for elastic search */ - public function addCondition(array|string $condition, string $fieldname = ''): void + public function addCondition(array|string|bool $condition, string $fieldname = ''): void { $this->filterConditions[$fieldname][] = $condition; $this->preparedGroupByValuesLoaded = false; diff --git a/src/IndexService/ProductList/OpenSearch/AbstractOpenSearch.php b/src/IndexService/ProductList/OpenSearch/AbstractOpenSearch.php index 564abdca..b2d3d5d7 100644 --- a/src/IndexService/ProductList/OpenSearch/AbstractOpenSearch.php +++ b/src/IndexService/ProductList/OpenSearch/AbstractOpenSearch.php @@ -166,7 +166,7 @@ public function setProductPositionMap(array $productPositionMap): static * * @param string $fieldname - must be set for elastic search */ - public function addCondition(array|string $condition, string $fieldname = ''): void + public function addCondition(array|string|bool $condition, string $fieldname = ''): void { $this->filterConditions[$fieldname][] = $condition; $this->preparedGroupByValuesLoaded = false; diff --git a/src/IndexService/ProductList/ProductListInterface.php b/src/IndexService/ProductList/ProductListInterface.php index 695dc672..eed4859e 100644 --- a/src/IndexService/ProductList/ProductListInterface.php +++ b/src/IndexService/ProductList/ProductListInterface.php @@ -68,7 +68,7 @@ public function getProducts(): array; * and exclude functionality in group by results * */ - public function addCondition(array|string $condition, string $fieldname = ''): void; + public function addCondition(array|string|bool $condition, string $fieldname = ''): void; /** * Adds query condition to product list for fulltext search From 32618ae879c9665138b8f73794dba4141bef84e7 Mon Sep 17 00:00:00 2001 From: Christian Fasching Date: Fri, 18 Apr 2025 10:46:03 +0200 Subject: [PATCH 2/2] Update 01_Upgrade_Notes.md --- doc/03_Installation/01_Upgrade_Notes.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/03_Installation/01_Upgrade_Notes.md b/doc/03_Installation/01_Upgrade_Notes.md index b89c2fed..aff5ae76 100644 --- a/doc/03_Installation/01_Upgrade_Notes.md +++ b/doc/03_Installation/01_Upgrade_Notes.md @@ -1,5 +1,8 @@ # Upgrade Notes +#### v2.0.0 +Added `bool` as possible type to `$condition` parameter of `addCondition` function in `ProductListInterface` (and all implementing classes). + #### v1.2.1 - Removed the package "rybakit/twig-deferred-extension". If you extend the twig layout from the E-Commerce Framework, please check if custom CSS/JS code added by `pimcore_head_script` and `pimcore_head_link` is still working.