Skip to content

Commit 1a58d72

Browse files
committed
ACPT-1665:Fix searchConfig merge in SearchCriteriaBuilder
1 parent 03b2996 commit 1a58d72

File tree

3 files changed

+22
-12
lines changed

3 files changed

+22
-12
lines changed

app/code/Magento/CatalogGraphQl/DataProvider/Product/RequestDataBuilder.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
11
<?php
2-
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
36
namespace Magento\CatalogGraphQl\DataProvider\Product;
47

58
use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
69

10+
/**
11+
* Builds request specific Product Search Query
12+
*/
713
class RequestDataBuilder implements ResetAfterRequestInterface
814
{
915
private array $data;

app/code/Magento/CatalogGraphQl/DataProvider/Product/SearchCriteriaBuilder.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -82,15 +82,15 @@ class SearchCriteriaBuilder
8282
* @param SearchConfig|null $searchConfig
8383
*/
8484
public function __construct(
85-
Builder $builder,
85+
Builder $builder,
8686
ScopeConfigInterface $scopeConfig,
87-
FilterBuilder $filterBuilder,
88-
FilterGroupBuilder $filterGroupBuilder,
89-
Visibility $visibility,
90-
SortOrderBuilder $sortOrderBuilder = null,
91-
Config $eavConfig = null,
92-
SearchConfig $searchConfig = null,
93-
RequestDataBuilder $localData = null,
87+
FilterBuilder $filterBuilder,
88+
FilterGroupBuilder $filterGroupBuilder,
89+
Visibility $visibility,
90+
SortOrderBuilder $sortOrderBuilder = null,
91+
Config $eavConfig = null,
92+
SearchConfig $searchConfig = null,
93+
RequestDataBuilder $localData = null,
9494
) {
9595
$this->scopeConfig = $scopeConfig;
9696
$this->filterBuilder = $filterBuilder;

lib/internal/Magento/Framework/Search/Request/Builder.php

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,18 @@ class Builder implements ResetAfterRequestInterface
6060
* @param Binder $binder
6161
* @param Cleaner $cleaner
6262
*/
63-
public function __construct(ObjectManagerInterface $objectManager, Config $config, Binder $binder, Cleaner $cleaner
64-
, RequestDataBuilder $localData = null)
63+
public function __construct(
64+
ObjectManagerInterface $objectManager,
65+
Config $config,
66+
Binder $binder,
67+
Cleaner $cleaner,
68+
RequestDataBuilder $localData = null)
6569
{
6670
$this->objectManager = $objectManager;
6771
$this->config = $config;
6872
$this->binder = $binder;
6973
$this->cleaner = $cleaner;
70-
$this->localData = $localData?? $this->objectManager->get(RequestDataBuilder::class);
74+
$this->localData = $localData ?? $this->objectManager->get(RequestDataBuilder::class);
7175
}
7276

7377
/**

0 commit comments

Comments
 (0)