MC-34483: Moving a store view to a different website resets URLs

Author: tsviklinskyi

app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Store/View.php

@@ -106,8 +106,8 @@ public function afterSave(
     ): Store {
         if ($this->origStore->isObjectNew() || $this->origStore->dataHasChangedFor('group_id')) {
             $categoryRewriteUrls = $this->generateCategoryUrls(
-                $this->origStore->getRootCategoryId(),
-                $this->origStore->getId()
+                (int)$this->origStore->getRootCategoryId(),
+                (int)$this->origStore->getId()
             );
 
             $this->urlPersist->replace($categoryRewriteUrls);
@@ -135,7 +135,7 @@ protected function generateProductUrls(int $storeId): array
             ->addAttributeToSelect(['name', 'url_path', 'url_key', 'visibility'])
             ->addStoreFilter($storeId);
         foreach ($collection as $product) {
-            /** @var \Magento\Catalog\Model\Product $product */
+            /** @var Product $product */
             $product->setStoreId($storeId);
             $urls[] = $this->productUrlRewriteGenerator->generate($product);
         }