Merge remote-tracking branch 'local/ACP2E-981' into PR_21_SEP_2022

Author: o-dubovyk

app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php

@@ -326,6 +326,9 @@ public function execute()
                 return $this->returnResult('catalog/*/', [], ['error' => false]);
             } catch (\Exception $e) {
                 $this->messageManager->addErrorMessage($e->getMessage());
+                if ($attributeId === null) {
+                    unset($data['frontend_input']);
+                }
                 $this->_session->setAttributeData($data);
                 return $this->returnResult(
                     'catalog/*/edit',

app/code/Magento/Eav/Model/Entity/Attribute.php

@@ -5,6 +5,7 @@
  */
 namespace Magento\Eav\Model\Entity;
 
+use Magento\Eav\Model\ReservedAttributeCheckerInterface;
 use Magento\Eav\Model\Validator\Attribute\Code as AttributeCodeValidator;
 use Magento\Framework\Api\AttributeValueFactory;
 use Magento\Framework\App\ObjectManager;
@@ -29,17 +30,17 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute\AbstractAttribute im
      * The value is defined as 60 because in the flat mode attribute code will be transformed into column name.
      * MySQL allows only 64 symbols in column name.
      */
-    const ATTRIBUTE_CODE_MAX_LENGTH = 60;
+    public const ATTRIBUTE_CODE_MAX_LENGTH = 60;
 
     /**
      * Min accepted length of an attribute code.
      */
-    const ATTRIBUTE_CODE_MIN_LENGTH = 1;
+    public const ATTRIBUTE_CODE_MIN_LENGTH = 1;
 
     /**
      * Tag to use for attributes caching.
      */
-    const CACHE_TAG = 'EAV_ATTRIBUTE';
+    public const CACHE_TAG = 'EAV_ATTRIBUTE';
 
     /**
      * Prefix of model events names
@@ -69,6 +70,9 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute\AbstractAttribute im
 
     /**
      * @var \Magento\Catalog\Model\Product\ReservedAttributeList
+     *
+     * @deprecated Incorrect direct dependency on Product attribute.
+     * @see \Magento\Eav\Model\Entity\Attribute::$reservedAttributeChecker
      */
     protected $reservedAttributeList;
 
@@ -87,6 +91,11 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute\AbstractAttribute im
      */
     private $attributeCodeValidator;
 
+    /**
+     * @var ReservedAttributeCheckerInterface|null
+     */
+    private $reservedAttributeChecker;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -108,6 +117,7 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute\AbstractAttribute im
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @param AttributeCodeValidator|null $attributeCodeValidator
+     * @param ReservedAttributeCheckerInterface|null $reservedAttributeChecker
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      * @codeCoverageIgnore
      */
@@ -131,7 +141,8 @@ public function __construct(
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
         array $data = [],
-        AttributeCodeValidator $attributeCodeValidator = null
+        AttributeCodeValidator $attributeCodeValidator = null,
+        ?ReservedAttributeCheckerInterface $reservedAttributeChecker = null
     ) {
         parent::__construct(
             $context,
@@ -157,6 +168,9 @@ public function __construct(
         $this->attributeCodeValidator = $attributeCodeValidator ?: ObjectManager::getInstance()->get(
             AttributeCodeValidator::class
         );
+        $this->reservedAttributeChecker = $reservedAttributeChecker ?: ObjectManager::getInstance()->get(
+            ReservedAttributeCheckerInterface::class
+        );
     }
 
     /**
@@ -251,7 +265,7 @@ public function beforeSave()
         }
 
         // prevent overriding product data
-        if (isset($this->_data['attribute_code']) && $this->reservedAttributeList->isReservedAttribute($this)) {
+        if (isset($this->_data['attribute_code']) && $this->reservedAttributeChecker->isReservedAttribute($this)) {
             throw new LocalizedException(
                 __(
                     'The attribute code \'%1\' is reserved by system. Please try another attribute code',
@@ -535,6 +549,7 @@ public function __wakeup()
         $this->_localeDate = $objectManager->get(\Magento\Framework\Stdlib\DateTime\TimezoneInterface::class);
         $this->_localeResolver = $objectManager->get(\Magento\Framework\Locale\ResolverInterface::class);
         $this->reservedAttributeList = $objectManager->get(\Magento\Catalog\Model\Product\ReservedAttributeList::class);
+        $this->reservedAttributeChecker = $objectManager->get(ReservedAttributeCheckerInterface::class);
         $this->dateTimeFormatter = $objectManager->get(DateTimeFormatterInterface::class);
     }
 

app/code/Magento/Eav/Model/ReservedAttributeChecker.php

@@ -18,7 +18,7 @@
 class ReservedAttributeChecker implements ReservedAttributeCheckerInterface
 {
     /**
-     * @var ReservedAttributeCheckerInterface[][]
+     * @var ReservedAttributeCheckerInterface[]
      */
     private $validators;
 
@@ -37,7 +37,8 @@ public function __construct(
     public function isReservedAttribute(AbstractAttribute $attribute): bool
     {
         $isReserved = false;
-        $validators = $this->validators[$attribute->getEntityType()->getEntityTypeCode()] ?? [];
+        $entityTypeCode = $this->getAttributeEntityTypeCode($attribute);
+        $validators = $this->validators[$entityTypeCode] ?? [];
         foreach ($validators as $validator) {
             $isReserved = $validator->isReservedAttribute($attribute);
             if ($isReserved === true) {
@@ -47,4 +48,21 @@ public function isReservedAttribute(AbstractAttribute $attribute): bool
 
         return $isReserved;
     }
+
+    /**
+     * Returns attribute entity type code.
+     *
+     * @param AbstractAttribute $attribute
+     * @return string|null
+     */
+    private function getAttributeEntityTypeCode(AbstractAttribute $attribute): ?string
+    {
+        try {
+            $result = $attribute->getEntityType()->getEntityTypeCode();
+        } catch (LocalizedException $e) {
+            $result = null;
+        }
+
+        return $result;
+    }
 }