Merge remote-tracking branch 'origin/AC-7114' into Arrows_2.4.7_Backlog_Delivery

Author: rimple-saini

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

@@ -61,6 +61,7 @@ public function join(FieldNode $fieldNode, AbstractCollection $collection, Resol
      *
      * @param FieldNode $fieldNode
      * @param ResolveInfo $resolveInfo
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @return string[]
      */
     public function getQueryFields(FieldNode $fieldNode, ResolveInfo $resolveInfo): array
@@ -77,7 +78,11 @@ public function getQueryFields(FieldNode $fieldNode, ResolveInfo $resolveInfo):
                     ($spreadFragmentNode = $resolveInfo->fragments[$field->name->value])) {
 
                     foreach ($spreadFragmentNode->selectionSet->selections as $spreadNode) {
-                        if (isset($spreadNode->selectionSet->selections)) {
+                        if (isset($spreadNode->selectionSet->selections)
+                            && $spreadNode->kind === NodeKind::INLINE_FRAGMENT) {
+                            $fragmentFields[] = $this->addInlineFragmentFields($resolveInfo, $spreadNode);
+                        } elseif (isset($spreadNode->selectionSet->selections)
+                            && $spreadNode->kind !== NodeKind::INLINE_FRAGMENT) {
                             $fragmentFields[] = $this->getQueryFields($spreadNode, $resolveInfo);
                         } else {
                             $selectedFields[] = $spreadNode->name->value;