AC-2904-v1:: Saving product with non-default store scope causes untouched attributes to become store scoped if loaded using ProductRepository

Author: glo63652

app/code/Magento/Catalog/Model/ProductRepository.php

@@ -7,7 +7,6 @@
 namespace Magento\Catalog\Model;
 
 use Magento\Catalog\Api\CategoryLinkManagementInterface;
-use Magento\Catalog\Api\Data\ProductAttributeInterface;
 use Magento\Catalog\Api\Data\ProductExtension;
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper\AttributeFilter;
@@ -188,10 +187,6 @@ class ProductRepository implements \Magento\Catalog\Api\ProductRepositoryInterfa
      */
     private $scopeOverriddenValue;
 
-    /**
-     * @var AttributeFilter
-     */
-    private $attributeFilter;
 
     /**
      * ProductRepository constructor.
@@ -214,7 +209,6 @@ class ProductRepository implements \Magento\Catalog\Api\ProductRepositoryInterfa
      * @param MimeTypeExtensionMap $mimeTypeExtensionMap
      * @param ImageProcessorInterface $imageProcessor
      * @param \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface $extensionAttributesJoinProcessor
-     * @param AttributeFilter|null $attributeFilter
      * @param CollectionProcessorInterface $collectionProcessor [optional]
      * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
      * @param int $cacheLimit [optional]
@@ -244,7 +238,6 @@ public function __construct(
         MimeTypeExtensionMap $mimeTypeExtensionMap,
         ImageProcessorInterface $imageProcessor,
         \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface $extensionAttributesJoinProcessor,
-        AttributeFilter $attributeFilter = null,
         CollectionProcessorInterface $collectionProcessor = null,
         \Magento\Framework\Serialize\Serializer\Json $serializer = null,
         $cacheLimit = 1000,
@@ -599,56 +592,35 @@ public function save(ProductInterface $product, $saveOptions = false)
             $websites = null;
         }
 
-        $useDefault = [];
         if (!empty($existingProduct) && is_array($stores) && is_array($websites)) {
             $hasDataChanged = false;
             $productAttributes = $product->getAttributes();
             if ($productAttributes !== null
                 && $product->getStoreId() !== Store::DEFAULT_STORE_ID
                 && (count($stores) > 1 || count($websites) >= 1)
             ) {
-                $imageRoles = ['image', 'small_image', 'thumbnail'];
-                foreach ($product->getAttributes() as $attribute) {
-                    $defaultValue = $attribute->getDefaultValue();
+                foreach ($productAttributes as $attribute) {
                     $attributeCode = $attribute->getAttributeCode();
                     $value = $product->getData($attributeCode);
-                    if ($defaultValue
-                        && $defaultValue === $value
-                        && $value !== null
+                    if ($existingProduct->getData($attributeCode) === $value
                         && $attribute->getScope() !== EavAttributeInterface::SCOPE_GLOBAL_TEXT
+                        && !is_array($value)
+                        && !$attribute->isStatic()
+                        && $value !== null
                         && !$this->scopeOverriddenValue->containsValue(
                             ProductInterface::class,
                             $product,
                             $attributeCode,
                             $product->getStoreId()
                         )
                     ) {
-                        $useDefault[$attributeCode] = '1';
-                    } elseif (!$defaultValue && $value !== null
-                        && !in_array($attributeCode, $imageRoles)
-                        && $attribute->getScope() !== EavAttributeInterface::SCOPE_GLOBAL_TEXT
-                        && $existingProduct->getData($attributeCode) === $value
-                        && $existingProduct->getOrigData($attributeCode) === $value
-                        && !$this->scopeOverriddenValue->containsValue(
-                            ProductInterface::class,
-                            $product,
+                        $product->setData(
                             $attributeCode,
-                            $product->getStoreId()
-                        )
-                    ) {
-                        $useDefault[$attributeCode] = '1';
-                    } else {
-                        $useDefault[$attributeCode] = '0';
+                            $attributeCode === ProductAttributeInterface::CODE_SEO_FIELD_URL_KEY ? false : null
+                        );
                         $hasDataChanged = true;
                     }
                 }
-                $productDataArray = $this->attributeFilter->prepareProductAttributes(
-                    $product,
-                    $productDataArray,
-                    $useDefault
-                );
-                $product->setData($productDataArray);
-
                 if ($hasDataChanged) {
                     $product->setData('_edit_mode', true);
                 }