Skip to content

Commit cdf40b8

Browse files
duhonduhon
committed
Merge remote-tracking branch 'goinc/MAGETWO-47656' into pr-613
2 parents 566902e + 6d3ab34 commit cdf40b8

File tree

4 files changed

+140
-3
lines changed

4 files changed

+140
-3
lines changed

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

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
<?php
2+
/**
3+
* Copyright © 2016 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
namespace Magento\CatalogUrlRewrite\Model\Product;
7+
8+
use Magento\Catalog\Api\CategoryRepositoryInterface;
9+
use Magento\Catalog\Model\Product;
10+
use Magento\CatalogUrlRewrite\Model\ObjectRegistry;
11+
use Magento\CatalogUrlRewrite\Model\ProductUrlPathGenerator;
12+
use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
13+
use Magento\Framework\Exception\NoSuchEntityException;
14+
use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
15+
use Magento\UrlRewrite\Service\V1\Data\UrlRewriteFactory;
16+
17+
class AnchorUrlRewriteGenerator
18+
{
19+
/** @var ProductUrlPathGenerator */
20+
protected $urlPathGenerator;
21+
22+
/** @var UrlRewriteFactory */
23+
protected $urlRewriteFactory;
24+
25+
/** @var CategoryRepositoryInterface */
26+
private $categoryRepository;
27+
28+
/**
29+
* @param ProductUrlPathGenerator $urlPathGenerator
30+
* @param UrlRewriteFactory $urlRewriteFactory
31+
* @param CategoryRepositoryInterface $categoryRepository
32+
*/
33+
public function __construct(
34+
ProductUrlPathGenerator $urlPathGenerator,
35+
UrlRewriteFactory $urlRewriteFactory,
36+
CategoryRepositoryInterface $categoryRepository
37+
) {
38+
$this->urlPathGenerator = $urlPathGenerator;
39+
$this->urlRewriteFactory = $urlRewriteFactory;
40+
$this->categoryRepository = $categoryRepository;
41+
}
42+
43+
/**
44+
* Generate list based on categories
45+
*
46+
* @param int $storeId
47+
* @param Product $product
48+
* @param ObjectRegistry $productCategories
49+
* @return UrlRewrite[]
50+
*/
51+
public function generate($storeId, Product $product, ObjectRegistry $productCategories)
52+
{
53+
$urls = [];
54+
foreach ($productCategories->getList() as $category) {
55+
$anchorCategoryIds = $category->getAnchorsAbove();
56+
if ($anchorCategoryIds) {
57+
foreach ($anchorCategoryIds as $anchorCategoryId) {
58+
$anchorCategory = $this->categoryRepository->get($anchorCategoryId);
59+
$urls[] = $this->urlRewriteFactory->create()
60+
->setEntityType(ProductUrlRewriteGenerator::ENTITY_TYPE)
61+
->setEntityId($product->getId())
62+
->setRequestPath(
63+
$this->urlPathGenerator->getUrlPathWithSuffix(
64+
$product,
65+
$storeId,
66+
$anchorCategory
67+
)
68+
)
69+
->setTargetPath(
70+
$this->urlPathGenerator->getCanonicalUrlPath(
71+
$product,
72+
$anchorCategory
73+
)
74+
)
75+
->setStoreId($storeId)
76+
->setMetadata(['category_id' => $anchorCategory->getId()]);
77+
}
78+
}
79+
}
80+
81+
return $urls;
82+
}
83+
}

‎app/code/Magento/CatalogUrlRewrite/Model/ProductUrlRewriteGenerator.php

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,15 @@
99
use Magento\CatalogUrlRewrite\Model\Product\CanonicalUrlRewriteGenerator;
1010
use Magento\CatalogUrlRewrite\Model\Product\CategoriesUrlRewriteGenerator;
1111
use Magento\CatalogUrlRewrite\Model\Product\CurrentUrlRewritesRegenerator;
12+
use Magento\CatalogUrlRewrite\Model\Product\AnchorUrlRewriteGenerator;
1213
use Magento\CatalogUrlRewrite\Service\V1\StoreViewService;
1314
use Magento\Store\Model\Store;
1415

16+
/**
17+
* Class ProductUrlRewriteGenerator
18+
* @package Magento\CatalogUrlRewrite\Model
19+
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
20+
*/
1521
class ProductUrlRewriteGenerator
1622
{
1723
/**
@@ -43,6 +49,9 @@ class ProductUrlRewriteGenerator
4349
/** @var \Magento\Store\Model\StoreManagerInterface */
4450
protected $storeManager;
4551

52+
/** @var AnchorUrlRewriteGenerator */
53+
private $anchorUrlRewriteGenerator;
54+
4655
/**
4756
* @param \Magento\CatalogUrlRewrite\Model\Product\CanonicalUrlRewriteGenerator $canonicalUrlRewriteGenerator
4857
* @param \Magento\CatalogUrlRewrite\Model\Product\CurrentUrlRewritesRegenerator $currentUrlRewritesRegenerator
@@ -67,6 +76,20 @@ public function __construct(
6776
$this->storeManager = $storeManager;
6877
}
6978

79+
/**
80+
* @return AnchorUrlRewriteGenerator
81+
*
82+
* @deprecated
83+
*/
84+
private function getAnchorUrlRewriteGenerator()
85+
{
86+
if ($this->anchorUrlRewriteGenerator === null) {
87+
$this->anchorUrlRewriteGenerator = \Magento\Framework\App\ObjectManager::getInstance()
88+
->get('Magento\CatalogUrlRewrite\Model\Product\AnchorUrlRewriteGenerator');
89+
}
90+
return $this->anchorUrlRewriteGenerator;
91+
}
92+
7093
/**
7194
* Generate product url rewrites
7295
*
@@ -143,7 +166,8 @@ protected function generateForSpecificStoreView($storeId, $productCategories)
143166
$urls = array_merge(
144167
$this->canonicalUrlRewriteGenerator->generate($storeId, $this->product),
145168
$this->categoriesUrlRewriteGenerator->generate($storeId, $this->product, $this->productCategories),
146-
$this->currentUrlRewritesRegenerator->generate($storeId, $this->product, $this->productCategories)
169+
$this->currentUrlRewritesRegenerator->generate($storeId, $this->product, $this->productCategories),
170+
$this->getAnchorUrlRewriteGenerator()->generate($storeId, $this->product, $this->productCategories)
147171
);
148172

149173
/* Reduce duplicates. Last wins */

‎app/code/Magento/CatalogUrlRewrite/Observer/CategoryProcessUrlRewriteSavingObserver.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,10 @@ public function execute(\Magento\Framework\Event\Observer $observer)
4949
if ($category->getParentId() == Category::TREE_ROOT_ID) {
5050
return;
5151
}
52-
if ($category->dataHasChangedFor('url_key') || $category->getIsChangedProductList()) {
52+
if ($category->dataHasChangedFor('url_key')
53+
|| $category->dataHasChangedFor('is_anchor')
54+
|| $category->getIsChangedProductList()
55+
) {
5356
$urlRewrites = array_merge(
5457
$this->categoryUrlRewriteGenerator->generate($category),
5558
$this->urlRewriteHandler->generateProductUrlRewrites($category)

‎app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/ProductUrlRewriteGeneratorTest.php

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ class ProductUrlRewriteGeneratorTest extends \PHPUnit_Framework_TestCase
2222
/** @var \PHPUnit_Framework_MockObject_MockObject */
2323
protected $categoriesUrlRewriteGenerator;
2424

25+
/** @var \PHPUnit_Framework_MockObject_MockObject */
26+
protected $anchorUrlRewriteGenerator;
27+
2528
/** @var \Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator */
2629
protected $productUrlRewriteGenerator;
2730

@@ -63,6 +66,9 @@ protected function setUp()
6366
$this->categoriesUrlRewriteGenerator = $this->getMockBuilder(
6467
'Magento\CatalogUrlRewrite\Model\Product\CategoriesUrlRewriteGenerator'
6568
)->disableOriginalConstructor()->getMock();
69+
$this->anchorUrlRewriteGenerator = $this->getMockBuilder(
70+
'Magento\CatalogUrlRewrite\Model\Product\AnchorUrlRewriteGenerator'
71+
)->disableOriginalConstructor()->getMock();
6672
$this->objectRegistryFactory = $this->getMockBuilder('Magento\CatalogUrlRewrite\Model\ObjectRegistryFactory')
6773
->disableOriginalConstructor()->setMethods(['create'])->getMock();
6874
$this->storeViewService = $this->getMockBuilder('Magento\CatalogUrlRewrite\Service\V1\StoreViewService')
@@ -79,6 +85,11 @@ protected function setUp()
7985
'storeManager' => $this->storeManager,
8086
]
8187
);
88+
89+
$reflection = new \ReflectionClass(get_class($this->productUrlRewriteGenerator));
90+
$reflectionProperty = $reflection->getProperty('anchorUrlRewriteGenerator');
91+
$reflectionProperty->setAccessible(true);
92+
$reflectionProperty->setValue($this->productUrlRewriteGenerator, $this->anchorUrlRewriteGenerator);
8293
}
8394

8495
/**
@@ -108,9 +119,19 @@ public function testGenerationForGlobalScope()
108119
->setStoreId(3);
109120
$this->currentUrlRewritesRegenerator->expects($this->any())->method('generate')
110121
->will($this->returnValue([$current]));
122+
$anchorCategories = new \Magento\UrlRewrite\Service\V1\Data\UrlRewrite();
123+
$anchorCategories->setTargetPath('category-4')
124+
->setStoreId(4);
125+
$this->anchorUrlRewriteGenerator->expects($this->any())->method('generate')
126+
->will($this->returnValue([$anchorCategories]));
111127

112128
$this->assertEquals(
113-
['category-1-1' => $canonical, 'category-2-2' => $categories, 'category-3-3' => $current],
129+
[
130+
'category-1-1' => $canonical,
131+
'category-2-2' => $categories,
132+
'category-3-3' => $current,
133+
'category-4-4' => $anchorCategories
134+
],
114135
$this->productUrlRewriteGenerator->generate($this->product)
115136
);
116137
}
@@ -143,6 +164,8 @@ public function testGenerationForSpecificStore()
143164
->will($this->returnValue([]));
144165
$this->currentUrlRewritesRegenerator->expects($this->any())->method('generate')
145166
->will($this->returnValue([]));
167+
$this->anchorUrlRewriteGenerator->expects($this->any())->method('generate')
168+
->will($this->returnValue([]));
146169

147170
$this->assertEquals(['category-1-1' => $canonical], $this->productUrlRewriteGenerator->generate($this->product));
148171
}
@@ -172,6 +195,8 @@ public function testSkipRootCategoryForCategoriesGenerator()
172195
->will($this->returnValue([]));
173196
$this->currentUrlRewritesRegenerator->expects($this->any())->method('generate')
174197
->will($this->returnValue([]));
198+
$this->anchorUrlRewriteGenerator->expects($this->any())->method('generate')
199+
->will($this->returnValue([]));
175200

176201
$this->assertEquals(['category-1-1' => $canonical], $this->productUrlRewriteGenerator->generate($this->product));
177202
}
@@ -201,6 +226,8 @@ public function testSkipGenerationForNotStoreRootCategory()
201226
->will($this->returnValue([]));
202227
$this->currentUrlRewritesRegenerator->expects($this->any())->method('generate')
203228
->will($this->returnValue([]));
229+
$this->anchorUrlRewriteGenerator->expects($this->any())->method('generate')
230+
->will($this->returnValue([]));
204231

205232
$this->assertEquals(['category-1-1' => $canonical], $this->productUrlRewriteGenerator->generate($this->product));
206233
}

0 commit comments

Comments
 (0)