Merge branch 'ACP2E-2255' of https://github.com/magento-l3/magento2ce into PR-10122023

Author: chittima

app/code/Magento/ConfigurableProduct/Test/Fixture/Attribute.php

@@ -7,22 +7,12 @@
 
 namespace Magento\ConfigurableProduct\Test\Fixture;
 
+use Magento\Catalog\Test\Fixture\SelectAttribute;
 use Magento\Framework\DataObject;
 
-class Attribute extends \Magento\Catalog\Test\Fixture\Attribute
+class Attribute extends SelectAttribute
 {
     private const DEFAULT_DATA = [
-        'frontend_input' => 'select',
-        'options' => [
-            [
-                'label' => 'option1%uniqid%',
-                'sort_order' => 0,
-            ],
-            [
-                'label' => 'option2%uniqid%',
-                'sort_order' => 1,
-            ]
-        ],
         'scope' => 'global',
     ];
 

app/code/Magento/ConfigurableProduct/Test/Fixture/Product.php

@@ -197,15 +197,15 @@ static function (array $value) {
         );
         $variationIndex = 0;
         foreach ($variations as $variation) {
-            foreach ($variation as $attributeId => $valueInfo) {
-                if (isset($links[$variationIndex]) && $links[$variationIndex] !== 0) {
+            if (isset($links[$variationIndex]) && $links[$variationIndex] !== 0) {
+                foreach ($variation as $attributeId => $valueInfo) {
                     $attribute = $this->eavConfig->getAttribute(\Magento\Catalog\Model\Product::ENTITY, $attributeId);
                     $product = $this->productRepository->getById($links[$variationIndex]);
                     $product->setCustomAttribute($attribute->getAttributeCode(), $valueInfo['value']);
                     $this->productRepository->save($product);
                 }
-                $variationIndex++;
             }
+            $variationIndex++;
         }
     }
 }