Merge remote-tracking branch 'origin/MC-32810' into 2.3-develop-pr41

Author: serhii-balko

app/code/Magento/CatalogUrlRewrite/Model/CategoryProductUrlPathGenerator.php

@@ -7,10 +7,10 @@
 
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\Product\Visibility;
+use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
 
 /**
- * Class ProductUrlRewriteGenerator
- * @package Magento\CatalogUrlRewrite\Model
+ * Class to generate product url path
  */
 class CategoryProductUrlPathGenerator
 {
@@ -31,9 +31,9 @@ public function __construct(
     /**
      * Generate product url rewrites based on all product categories
      *
-     * @param \Magento\Catalog\Model\Product $product
+     * @param Product $product
      * @param int|null $rootCategoryId
-     * @return \Magento\UrlRewrite\Service\V1\Data\UrlRewrite[]
+     * @return UrlRewrite[]
      */
     public function generate(Product $product, $rootCategoryId = null)
     {
@@ -44,6 +44,7 @@ public function generate(Product $product, $rootCategoryId = null)
         $storeId = $product->getStoreId();
 
         $productCategories = $product->getCategoryCollection()
+            ->setStoreId($storeId)
             ->addAttributeToSelect('url_key')
             ->addAttributeToSelect('url_path');
 

app/code/Magento/CatalogUrlRewrite/Model/Product/AnchorUrlRewriteGenerator.php

@@ -67,7 +67,7 @@ public function generate($storeId, Product $product, ObjectRegistry $productCate
             $anchorCategoryIds = $category->getAnchorsAbove();
             if ($anchorCategoryIds) {
                 foreach ($anchorCategoryIds as $anchorCategoryId) {
-                    $anchorCategory = $this->categoryRepository->get($anchorCategoryId);
+                    $anchorCategory = $this->categoryRepository->get($anchorCategoryId, $storeId);
                     if ((int)$anchorCategory->getParentId() === Category::TREE_ROOT_ID) {
                         continue;
                     }

app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/CategoryProductUrlPathGeneratorTest.php

@@ -5,19 +5,20 @@
  */
 namespace Magento\CatalogUrlRewrite\Test\Unit\Model;
 
-use Magento\Catalog\Model\Category;
 use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\ResourceModel\Category\Collection;
 use Magento\CatalogUrlRewrite\Model\CategoryProductUrlPathGenerator;
 use Magento\CatalogUrlRewrite\Model\ProductScopeRewriteGenerator;
-use Magento\Catalog\Model\ResourceModel\Category\Collection;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
 
 /**
- * Class CategoryProductUrlPathGeneratorTest
+ * Class test generate product url path
  */
-class CategoryProductUrlPathGeneratorTest extends \PHPUnit\Framework\TestCase
+class CategoryProductUrlPathGeneratorTest extends TestCase
 {
     /**
-     * @var ProductScopeRewriteGenerator|\PHPUnit_Framework_MockObject_MockObject
+     * @var ProductScopeRewriteGenerator|MockObject
      */
     private $productScopeRewriteGeneratorMock;
 
@@ -26,6 +27,9 @@ class CategoryProductUrlPathGeneratorTest extends \PHPUnit\Framework\TestCase
      */
     private $generator;
 
+    /**
+     * @inheritdoc
+     */
     public function setUp()
     {
         $this->productScopeRewriteGeneratorMock = $this->getMockBuilder(ProductScopeRewriteGenerator::class)
@@ -37,11 +41,16 @@ public function setUp()
         );
     }
 
+    /**
+     * Test to generate product url rewrites based on all product categories on global scope
+     */
     public function testGenerationWithGlobalScope()
     {
+        /** @var Collection|MockObject $categoryCollectionMock */
         $categoryCollectionMock = $this->getMockBuilder(Collection::class)
             ->disableOriginalConstructor()
             ->getMock();
+        /** @var Product|MockObject $productMock */
         $productMock = $this->getMockBuilder(Product::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -58,6 +67,10 @@ public function testGenerationWithGlobalScope()
         $productMock->expects($this->once())
             ->method('getCategoryCollection')
             ->willReturn($categoryCollectionMock);
+        $categoryCollectionMock->expects($this->once())
+            ->method('setStoreId')
+            ->with($storeId)
+            ->willReturnSelf();
         $categoryCollectionMock->expects($this->atLeastOnce())
             ->method('addAttributeToSelect')
             ->willReturnSelf();
@@ -74,11 +87,16 @@ public function testGenerationWithGlobalScope()
         $this->assertEquals($urls, $this->generator->generate($productMock, $categoryId));
     }
 
+    /**
+     * Test to generate product url rewrites based on all product categories on specific store
+     */
     public function testGenerationWithSpecificStore()
     {
+        /** @var Collection|MockObject $categoryCollectionMock */
         $categoryCollectionMock = $this->getMockBuilder(Collection::class)
             ->disableOriginalConstructor()
             ->getMock();
+        /** @var Product|MockObject $productMock */
         $productMock = $this->getMockBuilder(Product::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -95,6 +113,10 @@ public function testGenerationWithSpecificStore()
         $productMock->expects($this->once())
             ->method('getCategoryCollection')
             ->willReturn($categoryCollectionMock);
+        $categoryCollectionMock->expects($this->once())
+            ->method('setStoreId')
+            ->with($storeId)
+            ->willReturnSelf();
         $categoryCollectionMock->expects($this->atLeastOnce())
             ->method('addAttributeToSelect')
             ->willReturnSelf();