Skip to content

Commit 686760c

Browse files
RachanaRachana
authored andcommitted
BUG#AC-6666:resolved code review comments
1 parent dea8dff commit 686760c

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

app/code/Magento/CatalogGraphQl/Model/AttributesJoiner.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
use GraphQL\Language\AST\FieldNode;
1111
use GraphQL\Language\AST\InlineFragmentNode;
1212
use GraphQL\Language\AST\NodeKind;
13+
use GraphQL\Language\AST\NodeList;
1314
use Magento\Eav\Model\Entity\Collection\AbstractCollection;
1415
use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
1516

@@ -81,13 +82,13 @@ public function getQueryFields(FieldNode $fieldNode, ResolveInfo $resolveInfo):
8182
/**
8283
* Get an array of queried data.
8384
*
84-
* @param array $query
85+
* @param NodeList $query
8586
* @param ResolveInfo $resolveInfo
8687
* @return array
8788
*/
88-
public function getQueryData($query, $resolveInfo): array
89+
public function getQueryData(NodeList $query, ResolveInfo $resolveInfo): array
8990
{
90-
$selectedFields = $fragmentFields = [];
91+
$selectedFields = $fragmentFields = $data = [];
9192
foreach ($query as $field) {
9293
if ($field->kind === NodeKind::INLINE_FRAGMENT) {
9394
$fragmentFields[] = $this->addInlineFragmentFields($resolveInfo, $field);
@@ -107,9 +108,9 @@ public function getQueryData($query, $resolveInfo): array
107108
$selectedFields[] = $field->name->value;
108109
}
109110
}
110-
$data = [];
111111
$data['selectedFields'] = $selectedFields;
112112
$data['fragmentFields'] = $fragmentFields;
113+
113114
return $data;
114115
}
115116

app/code/Magento/CatalogGraphQl/Model/Resolver/Product/ProductFieldsSelector.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public function getProductFieldsFromInfo(ResolveInfo $info, string $productNodeN
5555
$queryFields = $this->attributesJoiner->getQueryFields($node, $info);
5656
$fieldNames[] = $queryFields;
5757
}
58-
$fieldNames = array_merge(...$fieldNames);
59-
return $fieldNames;
58+
59+
return array_merge(...$fieldNames);
6060
}
6161
}

0 commit comments

Comments
 (0)