Skip to content

Commit 056cb38

Browse files
author
dnyomo
committed
Code style fixes
1 parent 7e5d864 commit 056cb38

File tree

3 files changed

+14
-6
lines changed

3 files changed

+14
-6
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,9 @@ private function addDefaultSortOrder(SearchCriteriaInterface $searchCriteria, ar
213213
} else {
214214
$categoryIdFilter = isset($args['filter']['category_id']) ? $args['filter']['category_id'] : false;
215215
if ($categoryIdFilter) {
216-
if (!is_array($categoryIdFilter[array_key_first($categoryIdFilter)]) || count($categoryIdFilter[array_key_first($categoryIdFilter)]) <= 1) {
216+
if (!is_array($categoryIdFilter[array_key_first($categoryIdFilter)])
217+
|| count($categoryIdFilter[array_key_first($categoryIdFilter)]) <= 1
218+
) {
217219
$defaultSortOrder[] = $this->sortOrderBuilder
218220
->setField(EavAttributeInterface::POSITION)
219221
->setDirection(SortOrder::SORT_ASC)

app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ProductSearch.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,15 +87,14 @@ public function __construct(
8787
*
8888
* @param SearchCriteriaInterface $searchCriteria
8989
* @param SearchResultInterface $searchResult
90-
* @param array $args
9190
* @param array $attributes
9291
* @param ContextInterface|null $context
9392
* @return SearchResultsInterface
93+
* @throws InputException
9494
*/
9595
public function getList(
9696
SearchCriteriaInterface $searchCriteria,
9797
SearchResultInterface $searchResult,
98-
array $args,
9998
array $attributes = [],
10099
ContextInterface $context = null
101100
): SearchResultsInterface {
@@ -108,7 +107,7 @@ public function getList(
108107
$this->getSearchResultsApplier(
109108
$searchResult,
110109
$collection,
111-
$this->getSortOrderArray($searchCriteriaForCollection, $args)
110+
$this->getSortOrderArray($searchCriteriaForCollection)
112111
)->apply();
113112

114113
$this->collectionPreProcessor->process($collection, $searchCriteriaForCollection, $attributes, $context);
@@ -154,7 +153,7 @@ private function getSearchResultsApplier(
154153
* @return array
155154
* @throws InputException
156155
*/
157-
private function getSortOrderArray(SearchCriteriaInterface $searchCriteria, $args)
156+
private function getSortOrderArray(SearchCriteriaInterface $searchCriteria)
158157
{
159158
$ordersArray = [];
160159
$sortOrders = $searchCriteria->getSortOrders();

app/code/Magento/CatalogGraphQl/Model/Resolver/Products/Query/Search.php

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
use Magento\CatalogGraphQl\Model\Resolver\Products\SearchResult;
1313
use Magento\CatalogGraphQl\Model\Resolver\Products\SearchResultFactory;
1414
use Magento\Framework\Api\Search\SearchCriteriaInterface;
15+
use Magento\Framework\Exception\InputException;
1516
use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
1617
use Magento\GraphQl\Model\Query\ContextInterface;
1718
use Magento\Search\Api\SearchInterface;
@@ -83,6 +84,7 @@ public function __construct(
8384
* @param ResolveInfo $info
8485
* @param ContextInterface $context
8586
* @return SearchResult
87+
* @throws InputException
8688
*/
8789
public function getResult(
8890
array $args,
@@ -103,7 +105,12 @@ public function getResult(
103105
//Address limitations of sort and pagination on search API apply original pagination from GQL query
104106
$searchCriteria->setPageSize($realPageSize);
105107
$searchCriteria->setCurrentPage($realCurrentPage);
106-
$searchResults = $this->productsProvider->getList($searchCriteria, $itemsResults, $args, $queryFields, $context);
108+
$searchResults = $this->productsProvider->getList(
109+
$searchCriteria,
110+
$itemsResults,
111+
$queryFields,
112+
$context
113+
);
107114

108115
$totalPages = $realPageSize ? ((int)ceil($searchResults->getTotalCount() / $realPageSize)) : 0;
109116

0 commit comments

Comments
 (0)