Merge remote-tracking branch 'origin/2.4-develop' into MC-40859

Author: rostyslav-hymon

app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php

@@ -102,6 +102,6 @@ private function isAttributeShouldNotBeUpdated(Product $product, array $useDefau
     {
         $considerUseDefaultsAttribute = !isset($useDefaults[$attribute]) || $useDefaults[$attribute] === '1';
 
-        return ($value === '' && $considerUseDefaultsAttribute && !$product->getData($attribute));
+        return ($value === '' && $considerUseDefaultsAttribute && ($product->getData($attribute) === null));
     }
 }

app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilterTest.php

@@ -216,6 +216,29 @@ public function setupInputDataProvider()
                     ['description', null, 'descr text'],
                 ],
             ],
+            'update_product_with_empty_string_attribute' => [
+                'requestProductData' => [
+                    'name' => 'testName3',
+                    'sku' => 'testSku3',
+                    'price' => '103',
+                    'special_price' => '100',
+                    'custom_attribute' => '',
+                ],
+                'useDefaults' => [],
+                'expectedProductData' => [
+                    'name' => 'testName3',
+                    'sku' => 'testSku3',
+                    'price' => '103',
+                    'special_price' => '100',
+                    'custom_attribute' => '',
+                ],
+                'initialProductData' => [
+                    ['name', null, 'testName2'],
+                    ['sku', null, 'testSku2'],
+                    ['price', null, '101'],
+                    ['custom_attribute', null, '0'],
+                ],
+            ],
         ];
     }
 

app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Category/Move.php

@@ -67,13 +67,11 @@ public function afterChangeParent(
         $categoryStoreId = $category->getStoreId();
         foreach ($category->getStoreIds() as $storeId) {
             $category->setStoreId($storeId);
-            if (!$this->isGlobalScope($storeId)) {
-                $this->updateCategoryUrlKeyForStore($category);
-                $category->unsUrlPath();
-                $category->setUrlPath($this->categoryUrlPathGenerator->getUrlPath($category));
-                $category->getResource()->saveAttribute($category, 'url_path');
-                $this->updateUrlPathForChildren($category);
-            }
+            $this->updateCategoryUrlKeyForStore($category);
+            $category->unsUrlPath();
+            $category->setUrlPath($this->categoryUrlPathGenerator->getUrlPath($category));
+            $category->getResource()->saveAttribute($category, 'url_path');
+            $this->updateUrlPathForChildren($category);
         }
         $category->setStoreId($categoryStoreId);
 

app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Category/Plugin/Category/MoveTest.php

@@ -91,27 +91,26 @@ protected function setUp(): void
     public function testAfterChangeParent()
     {
         $urlPath = 'test/path';
-        $storeIds = [1];
+        $storeIds = [0, 1];
         $originalCategory = $this->getMockBuilder(Category::class)
             ->disableOriginalConstructor()
             ->getMock();
         $this->categoryFactory->method('create')
             ->willReturn($originalCategory);
-
         $this->categoryMock->method('getResource')
             ->willReturn($this->subjectMock);
         $this->categoryMock->expects($this->once())
             ->method('getStoreIds')
             ->willReturn($storeIds);
-        $this->childrenCategoriesProviderMock->expects($this->once())
+        $this->childrenCategoriesProviderMock->expects($this->exactly(2))
             ->method('getChildren')
             ->with($this->categoryMock, true)
             ->willReturn([]);
-        $this->categoryUrlPathGeneratorMock->expects($this->once())
+        $this->categoryUrlPathGeneratorMock->expects($this->exactly(2))
             ->method('getUrlPath')
             ->with($this->categoryMock)
             ->willReturn($urlPath);
-        $this->categoryMock->expects($this->once())
+        $this->categoryMock->expects($this->exactly(2))
             ->method('setUrlPath')
             ->with($urlPath);
         $this->assertSame(