LYNX-100: Fix WebAPI tests

Author: bl4de

app/code/Magento/EavGraphQl/Model/Output/GetAttributeData.php

@@ -1,8 +1,10 @@
 <?php
+
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 declare(strict_types=1);
 
 namespace Magento\EavGraphQl\Model\Output;
@@ -76,7 +78,7 @@ public function execute(
             'is_required' => $attribute->getIsRequired(),
             'default_value' => $attribute->getDefaultValue(),
             'is_unique' => $attribute->getIsUnique(),
-            // 'options' => $this->getOptions($attribute),
+            'options' => $this->getOptions($attribute),
             'attribute' => $attribute
         ];
     }
@@ -95,7 +97,7 @@ private function getOptions(AttributeInterface $attribute): array
         return array_filter(
             array_map(
                 function (AttributeOptionInterface $option) use ($attribute) {
-                    $value = (string)$option->getValue();
+                    $value = is_array($option->getValue()) ? (empty($option->getValue()) ? '' : (string)$option->getValue()[0]['value']) : (string)$option->getValue();
                     $label = (string)$option->getLabel();
                     if (empty(trim($value)) && empty(trim($label))) {
                         return null;

app/code/Magento/EavGraphQl/Model/Resolver/AttributesList.php

@@ -15,8 +15,7 @@
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\EavGraphQl\Model\Output\GetAttributeData;
-use Magento\Framework\GraphQl\Query\Uid;
-use Magento\EavGraphQl\Model\Uid as AttributeUid;
+use Magento\EavGraphQl\Model\Output\GetAttributeDataInterface;
 
 /**
  * Resolve attribute options data for custom attribute.
@@ -29,19 +28,9 @@ class AttributesList implements ResolverInterface
     private AttributeRepository $attributeRepository;
 
     /**
-     * @var Uid
+     * @var GetAttributeDataInterface
      */
-    private Uid $uid;
-
-    /**
-     * @var AttributeUid
-     */
-    private AttributeUid $attributeUid;
-
-     /**
-     * @var GetAttributeData
-     */
-    private GetAttributeData $getAttributeData;
+    private GetAttributeDataInterface $getAttributeData;
 
     /**
      * @var SearchCriteriaBuilder
@@ -62,25 +51,21 @@ class AttributesList implements ResolverInterface
      * @param AttributeRepository $attributeRepository
      * @param SearchCriteriaBuilder $searchCriteriaBuilder
      * @param EnumLookup $enumLookup
-     * @param Uid $uid
-     * @param AttributeUid $attributeUid
+     * @param GetAttributeDataInterface $getAttributeData
      * @param array $resolvers
      */
     public function __construct(
         AttributeRepository $attributeRepository,
         SearchCriteriaBuilder $searchCriteriaBuilder,
         EnumLookup $enumLookup,
-        Uid $uid,
-        AttributeUid $attributeUid,
+        GetAttributeDataInterface $getAttributeData,
         array $resolvers = []
     ) {
         $this->attributeRepository = $attributeRepository;
         $this->searchCriteriaBuilder = $searchCriteriaBuilder;
         $this->enumLookup = $enumLookup;
-        $this->uid = $uid;
-        $this->attributeUid = $attributeUid;
+        $this->getAttributeData = $getAttributeData;
         $this->resolvers = $resolvers;
-        $this->getAttributeData = new GetAttributeData($this->attributeUid, $this->uid, $this->enumLookup);
     }
 
     /**