Merge remote-tracking branch 'l3/ACP2E-677' into PR_L3_05_04_2022

Author: veloraven

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

@@ -607,7 +607,6 @@ public function save(ProductInterface $product, $saveOptions = false)
                     if ($existingProduct->getData($attributeCode) === $value
                         && $attribute->getScope() !== EavAttributeInterface::SCOPE_GLOBAL_TEXT
                         && !is_array($value)
-                        && $attribute->getData('frontend_input') !== 'media_image'
                         && !$attribute->isStatic()
                         && !array_key_exists($attributeCode, $productDataToChange)
                         && $value !== null

dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryMultiWebsiteTest.php

@@ -383,6 +383,38 @@ public function testUpdatePrice(): void
         $this->assertEquals(8, $secondWebsiteStore2Response['special_price']);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Store/_files/second_website_with_two_stores.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_with_image.php
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function testPartialUpdateShouldNotOverrideImagesRolesInheritance(): void
+    {
+        $sku = 'simple';
+        $name = 'Product Simple edited';
+        $store = $this->objectManager->get(Store::class);
+        $storeId = (int) $store->load('fixture_third_store', 'code')->getId();
+        /** @var ProductRepositoryInterface $productRepository */
+        $productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+        $product = $productRepository->get($sku);
+        $request = [
+            ProductInterface::SKU => $sku,
+            ProductInterface::NAME => $name,
+        ];
+        $response = $this->saveProduct($request, 'fixture_third_store');
+        $this->assertEquals($name, $response['name']);
+        $this->assertOverriddenValues(
+            [
+                'name' => true,
+                'image' => false,
+                'small_image' => false,
+                'thumbnail' => false,
+            ],
+            $product,
+            $storeId
+        );
+    }
+
     /**
      * @param array $expected
      * @param array $actual