Merge branch 'MC-41109' of github.com:magento-tsg/magento2ce into cia-2.4.3-3172021

Author: admanesachin

app/code/Magento/ConfigurableProduct/Plugin/Model/Attribute/Backend/AttributeValidation.php

@@ -3,13 +3,17 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\ConfigurableProduct\Plugin\Model\Attribute\Backend;
 
+use Closure;
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
+use Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend;
+use Magento\Framework\DataObject;
 
 /**
- * Skip validate attributes used for create configurable product
+ * Skip validate attributes used for create configurable product.
  */
 class AttributeValidation
 {
@@ -19,29 +23,36 @@ class AttributeValidation
     private $configurableProductType;
 
     /**
-     * AttributeValidation constructor.
+     * @var array
+     */
+    private $unskippableAttributes;
+
+    /**
      * @param Configurable $configurableProductType
+     * @param array|null $unskippableAttributes
      */
     public function __construct(
-        Configurable $configurableProductType
+        Configurable $configurableProductType,
+        array $unskippableAttributes = []
     ) {
         $this->configurableProductType = $configurableProductType;
+        $this->unskippableAttributes = $unskippableAttributes;
     }
 
     /**
-     * @param \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend $subject
+     * Around plugin to skip attribute validation used for create configurable product.
+     *
+     * @param AbstractBackend $subject
      * @param \Closure $proceed
-     * @param \Magento\Framework\DataObject $entity
+     * @param DataObject $entity
      * @return bool
      */
-    public function aroundValidate(
-        \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend $subject,
-        \Closure $proceed,
-        \Magento\Framework\DataObject $entity
-    ) {
+    public function aroundValidate(AbstractBackend $subject, Closure $proceed, DataObject $entity)
+    {
         $attribute = $subject->getAttribute();
         if ($entity instanceof ProductInterface
             && $entity->getTypeId() == Configurable::TYPE_CODE
+            && !in_array($attribute->getAttributeCode(), $this->unskippableAttributes)
             && in_array(
                 $attribute->getAttributeId(),
                 $this->configurableProductType->getUsedProductAttributeIds($entity),
@@ -50,6 +61,7 @@ public function aroundValidate(
         ) {
             return true;
         }
+
         return $proceed($entity);
     }
 }

app/code/Magento/ConfigurableProduct/etc/di.xml

@@ -33,6 +33,13 @@
     <type name="Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend">
         <plugin name="ConfigurableProduct::skipValidation" type="Magento\ConfigurableProduct\Plugin\Model\Attribute\Backend\AttributeValidation"/>
     </type>
+    <type name="Magento\ConfigurableProduct\Plugin\Model\Attribute\Backend\AttributeValidation">
+        <arguments>
+            <argument name="unskippableAttributes" xsi:type="array">
+                <item name="custom_layout_update" xsi:type="string">custom_layout_update</item>
+            </argument>
+        </arguments>
+    </type>
     <type name="Magento\Catalog\Model\Entity\Product\Attribute\Group\AttributeMapperInterface">
         <plugin name="configurable_product" type="Magento\ConfigurableProduct\Model\Entity\Product\Attribute\Group\AttributeMapper\Plugin" sortOrder="50" />
     </type>