From 3fd3f2653efc86e63e4a86f05ff05d7713d11ffc Mon Sep 17 00:00:00 2001 From: AntonKhabiuk Date: Wed, 12 Jul 2023 16:09:28 +0300 Subject: [PATCH] CC-16486 Integrate fixes --- composer.json | 12 +-- composer.lock | 87 ++++++++++--------- .../ProductReviewDependencyProvider.php | 12 +++ 3 files changed, 64 insertions(+), 47 deletions(-) diff --git a/composer.json b/composer.json index 047799940d..53a7f7b033 100644 --- a/composer.json +++ b/composer.json @@ -640,7 +640,7 @@ "spryker/company-mail-connector": "1.1.0", "spryker/company-role": "1.7.2", "spryker/company-role-data-import": "0.1.3", - "spryker/company-role-gui": "1.8.0", + "spryker/company-role-gui": "1.8.1", "spryker/company-role-gui-extension": "1.0.0", "spryker/company-roles-rest-api": "1.1.3", "spryker/company-sales-connector": "1.1.1", @@ -657,7 +657,7 @@ "spryker/company-user-auth-rest-api": "2.1.0", "spryker/company-user-data-import": "0.2.1", "spryker/company-user-extension": "1.2.0", - "spryker/company-user-gui": "1.10.1", + "spryker/company-user-gui": "1.10.2", "spryker/company-user-gui-extension": "1.1.0", "spryker/company-user-invitation": "1.3.2", "spryker/company-user-storage": "1.5.1", @@ -707,7 +707,7 @@ "spryker/currency-data-import": "0.1.0", "spryker/currency-extension": "1.0.0", "spryker/currency-gui": "1.0.0", - "spryker/customer": "7.51.3", + "spryker/customer": "7.51.4", "spryker/customer-access": "1.3.0", "spryker/customer-access-gui": "1.1.3", "spryker/customer-access-permission": "1.2.2", @@ -796,7 +796,7 @@ "spryker/kernel": "3.73.0", "spryker/key-builder": "1.1.0", "spryker/laminas": "1.1.0", - "spryker/locale": "4.0.1", + "spryker/locale": "4.1.0", "spryker/locale-data-import": "0.1.0", "spryker/locale-extension": "1.0.0", "spryker/locale-gui": "1.0.0", @@ -1016,9 +1016,9 @@ "spryker/product-resource-alias-storage": "1.2.0", "spryker/product-review": "2.11.2", "spryker/product-review-gui": "1.6.0", - "spryker/product-review-search": "1.8.0", + "spryker/product-review-search": "1.9.0", "spryker/product-review-storage": "1.5.1", - "spryker/product-reviews-rest-api": "1.0.1", + "spryker/product-reviews-rest-api": "1.1.0", "spryker/product-search": "5.19.0", "spryker/product-search-config-storage": "1.4.0", "spryker/product-set": "1.7.0", diff --git a/composer.lock b/composer.lock index dc52085565..da5ea085fb 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "91f99269750ff9ff9d71b2fb8635c5d6", + "content-hash": "46d0e77f1ea2856cac382944e549b21f", "packages": [ { "name": "async-aws/core", @@ -23323,20 +23323,20 @@ }, { "name": "spryker/company-role-gui", - "version": "1.8.0", + "version": "1.8.1", "source": { "type": "git", "url": "https://github.com/spryker/company-role-gui.git", - "reference": "3ea8ab51c6d8b25e15cb6803ee2d758812535bd5" + "reference": "55d7c30a26341f196f15d0b941f3d8c13d2b1f60" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/company-role-gui/zipball/3ea8ab51c6d8b25e15cb6803ee2d758812535bd5", - "reference": "3ea8ab51c6d8b25e15cb6803ee2d758812535bd5", + "url": "https://api.github.com/repos/spryker/company-role-gui/zipball/55d7c30a26341f196f15d0b941f3d8c13d2b1f60", + "reference": "55d7c30a26341f196f15d0b941f3d8c13d2b1f60", "shasum": "" }, "require": { - "php": ">=7.4", + "php": ">=8.0", "spryker/business-on-behalf-gui-extension": "^1.0.0", "spryker/company": "^1.1.0", "spryker/company-role": "^1.4.0", @@ -23369,9 +23369,9 @@ ], "description": "CompanyRoleGui module", "support": { - "source": "https://github.com/spryker/company-role-gui/tree/1.8.0" + "source": "https://github.com/spryker/company-role-gui/tree/1.8.1" }, - "time": "2022-09-19T06:48:51+00:00" + "time": "2023-07-12T07:56:12+00:00" }, { "name": "spryker/company-role-gui-extension", @@ -24174,16 +24174,16 @@ }, { "name": "spryker/company-user-gui", - "version": "1.10.1", + "version": "1.10.2", "source": { "type": "git", "url": "https://github.com/spryker/company-user-gui.git", - "reference": "17beeafa4d5b23f71095a5f2b63d92fb13a322f8" + "reference": "f23b147e0b78bc5492cdc748b105c15937a738ee" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/company-user-gui/zipball/17beeafa4d5b23f71095a5f2b63d92fb13a322f8", - "reference": "17beeafa4d5b23f71095a5f2b63d92fb13a322f8", + "url": "https://api.github.com/repos/spryker/company-user-gui/zipball/f23b147e0b78bc5492cdc748b105c15937a738ee", + "reference": "f23b147e0b78bc5492cdc748b105c15937a738ee", "shasum": "" }, "require": { @@ -24219,9 +24219,9 @@ ], "description": "CompanyUserGui module", "support": { - "source": "https://github.com/spryker/company-user-gui/tree/1.10.1" + "source": "https://github.com/spryker/company-user-gui/tree/1.10.2" }, - "time": "2022-10-27T12:32:50+00:00" + "time": "2023-07-12T07:56:12+00:00" }, { "name": "spryker/company-user-gui-extension", @@ -26744,16 +26744,16 @@ }, { "name": "spryker/customer", - "version": "7.51.3", + "version": "7.51.4", "source": { "type": "git", "url": "https://github.com/spryker/customer.git", - "reference": "5e449f5e0b2a24d3dd528d91f6915e6a679dd790" + "reference": "5986c56d94e35fa3b332a4dbb700efb4ef1f54f4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/customer/zipball/5e449f5e0b2a24d3dd528d91f6915e6a679dd790", - "reference": "5e449f5e0b2a24d3dd528d91f6915e6a679dd790", + "url": "https://api.github.com/repos/spryker/customer/zipball/5986c56d94e35fa3b332a4dbb700efb4ef1f54f4", + "reference": "5986c56d94e35fa3b332a4dbb700efb4ef1f54f4", "shasum": "" }, "require": { @@ -26820,9 +26820,9 @@ ], "description": "Customer module", "support": { - "source": "https://github.com/spryker/customer/tree/7.51.3" + "source": "https://github.com/spryker/customer/tree/7.51.4" }, - "time": "2023-06-16T12:23:09+00:00" + "time": "2023-07-12T07:56:12+00:00" }, { "name": "spryker/customer-access", @@ -31131,16 +31131,16 @@ }, { "name": "spryker/locale", - "version": "4.0.1", + "version": "4.1.0", "source": { "type": "git", "url": "https://github.com/spryker/locale.git", - "reference": "15f14d48330cd3e90ebb84089352f25514d329d2" + "reference": "71be6de97df74807c0eeb2e848ec752366b246b5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/locale/zipball/15f14d48330cd3e90ebb84089352f25514d329d2", - "reference": "15f14d48330cd3e90ebb84089352f25514d329d2", + "url": "https://api.github.com/repos/spryker/locale/zipball/71be6de97df74807c0eeb2e848ec752366b246b5", + "reference": "71be6de97df74807c0eeb2e848ec752366b246b5", "shasum": "" }, "require": { @@ -31194,9 +31194,9 @@ ], "description": "Locale module", "support": { - "source": "https://github.com/spryker/locale/tree/4.0.1" + "source": "https://github.com/spryker/locale/tree/4.1.0" }, - "time": "2023-05-05T18:20:59+00:00" + "time": "2023-07-11T10:55:36+00:00" }, { "name": "spryker/locale-data-import", @@ -42634,16 +42634,16 @@ }, { "name": "spryker/product-review-search", - "version": "1.8.0", + "version": "1.9.0", "source": { "type": "git", "url": "https://github.com/spryker/product-review-search.git", - "reference": "9a5dd3aaf2c0c37be378215df3eda99c3c9cbcbe" + "reference": "e81df15f8e2bb5131c2b252c9c08b5ae641a8ec1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/product-review-search/zipball/9a5dd3aaf2c0c37be378215df3eda99c3c9cbcbe", - "reference": "9a5dd3aaf2c0c37be378215df3eda99c3c9cbcbe", + "url": "https://api.github.com/repos/spryker/product-review-search/zipball/e81df15f8e2bb5131c2b252c9c08b5ae641a8ec1", + "reference": "e81df15f8e2bb5131c2b252c9c08b5ae641a8ec1", "shasum": "" }, "require": { @@ -42653,6 +42653,7 @@ "spryker/product-page-search": "^0.1.0 || ^1.0.0 || ^2.2.0 || ^3.0.0", "spryker/product-page-search-extension": "^1.0.0", "spryker/product-review": "^1.1.0 || ^2.0.0", + "spryker/search-extension": "^1.0.0", "spryker/store": "^1.19.0", "spryker/synchronization-behavior": "^1.0.0", "spryker/synchronization-extension": "^1.0.0", @@ -42664,6 +42665,7 @@ "spryker/container": "*", "spryker/customer": "*", "spryker/decimal-object": "*", + "spryker/elastica": "*", "spryker/event": "*", "spryker/locale": "*", "spryker/product": "*", @@ -42673,6 +42675,7 @@ "spryker/testify": "*" }, "suggest": { + "spryker/elastica": "If you want to use Elasticsearch as the search engine.", "spryker/event": "If you want to use Event plugins, minimum required version: 2.1.0", "spryker/propel-orm": "If you want to use transaction functionality, minimum required version: 1.3.0", "spryker/search": "If you want to use Search plugins, minimum required version: 7.0.0" @@ -42694,9 +42697,9 @@ ], "description": "ProductReviewSearch module", "support": { - "source": "https://github.com/spryker/product-review-search/tree/1.8.0" + "source": "https://github.com/spryker/product-review-search/tree/1.9.0" }, - "time": "2023-03-31T19:36:11+00:00" + "time": "2023-07-11T11:01:29+00:00" }, { "name": "spryker/product-review-storage", @@ -42762,29 +42765,31 @@ }, { "name": "spryker/product-reviews-rest-api", - "version": "1.0.1", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/spryker/product-reviews-rest-api.git", - "reference": "961f5fe9ee1391ceffc42254bfd9ee80ebc6ff49" + "reference": "f99528048057148b99efa53d7c6e3a6aa4fd687b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/product-reviews-rest-api/zipball/961f5fe9ee1391ceffc42254bfd9ee80ebc6ff49", - "reference": "961f5fe9ee1391ceffc42254bfd9ee80ebc6ff49", + "url": "https://api.github.com/repos/spryker/product-reviews-rest-api/zipball/f99528048057148b99efa53d7c6e3a6aa4fd687b", + "reference": "f99528048057148b99efa53d7c6e3a6aa4fd687b", "shasum": "" }, "require": { - "php": ">=7.2", + "php": ">=8.0", "spryker/glue-application": "^1.15.0", "spryker/glue-application-extension": "^1.0.0", "spryker/kernel": "^3.30.0", "spryker/product-review": "^2.1.0", "spryker/product-review-storage": "^1.0.0", - "spryker/product-storage": "^1.16.0", + "spryker/product-storage": "^1.22.0", "spryker/products-rest-api-extension": "^1.1.0", + "spryker/store": "^1.19.0", "spryker/symfony": "^3.0.0", - "spryker/synchronization-behavior": "^1.0.0" + "spryker/synchronization-behavior": "^1.0.0", + "spryker/transfer": "^3.25.0" }, "require-dev": { "spryker/code-sniffer": "*" @@ -42806,9 +42811,9 @@ ], "description": "ProductReviewsRestApi module", "support": { - "source": "https://github.com/spryker/product-reviews-rest-api/tree/1.0.1" + "source": "https://github.com/spryker/product-reviews-rest-api/tree/1.1.0" }, - "time": "2020-04-06T13:47:09+00:00" + "time": "2023-07-11T11:01:29+00:00" }, { "name": "spryker/product-search", diff --git a/src/Pyz/Client/ProductReview/ProductReviewDependencyProvider.php b/src/Pyz/Client/ProductReview/ProductReviewDependencyProvider.php index 12e8486148..1c79d2d979 100644 --- a/src/Pyz/Client/ProductReview/ProductReviewDependencyProvider.php +++ b/src/Pyz/Client/ProductReview/ProductReviewDependencyProvider.php @@ -14,6 +14,7 @@ use Spryker\Client\ProductReview\Plugin\Elasticsearch\ResultFormatter\ProductRatingAggregationBulkResultFormatterPlugin; use Spryker\Client\ProductReview\Plugin\Elasticsearch\ResultFormatter\ProductReviewsResultFormatterPlugin; use Spryker\Client\ProductReview\ProductReviewDependencyProvider as SprykerProductReviewDependencyProvider; +use Spryker\Client\ProductReviewSearch\Plugin\Search\FilterByIdProductReviewQueryExpanderPlugin; class ProductReviewDependencyProvider extends SprykerProductReviewDependencyProvider { @@ -42,4 +43,15 @@ public function getProductReviewsBulkSearchResultFormatterPlugins(): array new ProductRatingAggregationBulkResultFormatterPlugin(), ]; } + + /** + * @return list<\Spryker\Client\Search\Dependency\Plugin\QueryExpanderPluginInterface|\Spryker\Client\SearchExtension\Dependency\Plugin\QueryExpanderPluginInterface> + */ + protected function getProductReviewsQueryExpanderPlugins(): array + { + $productReviewQueryExpanderPlugins = parent::getProductReviewsQueryExpanderPlugins(); + $productReviewQueryExpanderPlugins[] = new FilterByIdProductReviewQueryExpanderPlugin(); + + return $productReviewQueryExpanderPlugins; + } }