ACP2E-2098: addressed CR comments

Author: alzota

app/code/Magento/QuoteGraphQl/Plugin/ProductAttributesExtender.php

@@ -26,11 +26,6 @@ class ProductAttributesExtender
      */
     private $attributeCollectionFactory;
 
-    /**
-     * @var string
-     */
-    private $fieldsHash = '';
-
     /**
      * @var array
      */
@@ -58,15 +53,11 @@ public function __construct(
      */
     public function afterGetProductAttributes(QuoteConfig $subject, array $result): array
     {
-
-        $fieldsUsedInQuery = $this->fields->getFieldsUsedInQuery();
-        $fieldsHash = hash('sha256', json_encode($fieldsUsedInQuery));
-        if (!$this->fieldsHash || $this->fieldsHash !== $fieldsHash) {
-            $this->fieldsHash = hash('sha256', json_encode($fieldsUsedInQuery));
+        if (!$this->attributes) {
             $attributeCollection = $this->attributeCollectionFactory->create()
                 ->removeAllFieldsFromSelect()
                 ->addFieldToSelect('attribute_code')
-                ->setCodeFilter($fieldsUsedInQuery)
+                ->setCodeFilter($this->fields->getFieldsUsedInQuery())
                 ->load();
             $this->attributes = $attributeCollection->getColumnValues('attribute_code');
         }

dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddProductsToCartWithVariablesTest.php

@@ -57,15 +57,13 @@ protected function setUp(): void
      */
     #[
         DataFixture(AttributeFixture::class, ['is_visible_on_front' => true], as: 'attr'),
-        DataFixture(ProductFixture::class, ['attribute_set_id' => 4], as: 'product'),
+        DataFixture(ProductFixture::class, ['attribute_set_id' => 4, '$attr.attribute_code$' => 'default_value'], as: 'product'),
         DataFixture(GuestCartFixture::class, as: 'cart'),
     ]
     public function testAddProductsToEmptyCartWithVariables(): void
     {
         $attribute = $this->fixtures->get('attr');
         $product = $this->fixtures->get('product');
-        $product->setCustomAttribute($attribute->getAttributeCode(), 'default_value');
-        $this->productRepository->save($product);
 
         $this->cleanCache();
 

dev/tests/integration/framework/Magento/TestFramework/Annotation/DataFixtureSetup.php

@@ -8,6 +8,7 @@
 namespace Magento\TestFramework\Annotation;
 
 use Magento\Framework\DataObject;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Registry;
 use Magento\TestFramework\Fixture\DataFixtureFactory;
@@ -37,6 +38,7 @@ public function __construct(
      *
      * @param array $fixture
      * @return DataObject|null
+     * @throws LocalizedException
      */
     public function apply(array $fixture): ?DataObject
     {
@@ -96,25 +98,52 @@ public function revert(array $fixture): void
      *
      * @param array $data
      * @return array
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      */
     private function resolveVariables(array $data): array
     {
         foreach ($data as $key => $value) {
             if (is_array($value)) {
                 $data[$key] = $this->resolveVariables($value);
             } else {
-                if (is_string($value) && preg_match('/^\$\w+(\.\w+)?\$$/', $value)) {
-                    list($fixtureName, $attribute) = array_pad(explode('.', trim($value, '$')), 2, null);
-                    $fixtureData = DataFixtureStorageManager::getStorage()->get($fixtureName);
-                    if (!$fixtureData) {
-                        throw new \InvalidArgumentException("Unable to resolve fixture reference '$value'");
+                if (is_string($value)) {
+                    $value = $this->parseFixtureKeyValue($value);
+                    if ($value) {
+                        $data[$key] = $value;
                     }
-                    $data[$key] = $attribute ? $fixtureData->getDataUsingMethod($attribute) : $fixtureData;
+                }
+            }
+
+            if (is_string($key)) {
+                $newKey = $this->parseFixtureKeyValue($key);
+                if (is_string($newKey)) {
+                    $value = $data[$key];
+                    unset($data[$key]);
+                    $data[$newKey] = $value;
                 }
             }
         }
 
         return $data;
     }
+
+    /**
+     * Parse either key or value of the fixture data
+     *
+     * @param string $data
+     * @return DataObject|mixed|void
+     * @throws LocalizedException
+     */
+    private function parseFixtureKeyValue(string $data)
+    {
+        if (preg_match('/^\$\w+(\.\w+)?\$$/', $data)) {
+            list($fixtureName, $attribute) = array_pad(explode('.', trim($data, '$')), 2, null);
+            $fixtureData = DataFixtureStorageManager::getStorage()->get($fixtureName);
+            if (!$fixtureData) {
+                throw new \InvalidArgumentException("Unable to resolve fixture reference '$data'");
+            }
+            return $attribute ? $fixtureData->getDataUsingMethod($attribute) : $fixtureData;
+        }
+        return false;
+    }
 }

lib/internal/Magento/Framework/GraphQl/Test/Unit/Query/FieldsTest.php

@@ -27,10 +27,7 @@ class FieldsTest extends TestCase
 
     protected function setUp(): void
     {
-        $objectManager = new ObjectManager($this);
-        $this->queryParser = $objectManager->getObject(
-            QueryParser::class
-        );
+        $this->queryParser = new QueryParser();
 
         $this->fields = new Fields(
             $this->queryParser