Skip to content

Commit 0548157

Browse files
author
Oleksii Korshenko
authored
Merge pull request #1386 from magento-engcom/develop-prs
Public Pull Requests #10442
2 parents ae6cac2 + 873c0a5 commit 0548157

20 files changed

+68
-68
lines changed

‎app/code/Magento/Sitemap/Helper/Data.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
*/
1111
namespace Magento\Sitemap\Helper;
1212

13-
use Magento\Sitemap\Model\ItemResolver\CategoryConfigReader;
14-
use Magento\Sitemap\Model\ItemResolver\CmsPageConfigReader;
15-
use Magento\Sitemap\Model\ItemResolver\ProductConfigReader;
13+
use Magento\Sitemap\Model\ItemProvider\CategoryConfigReader;
14+
use Magento\Sitemap\Model\ItemProvider\CmsPageConfigReader;
15+
use Magento\Sitemap\Model\ItemProvider\ProductConfigReader;
1616
use Magento\Sitemap\Model\SitemapConfigReader;
1717
use Magento\Store\Model\ScopeInterface;
1818

‎app/code/Magento/Sitemap/Model/ItemResolver/Category.php renamed to ‎app/code/Magento/Sitemap/Model/ItemProvider/Category.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
namespace Magento\Sitemap\Model\ItemResolver;
7+
namespace Magento\Sitemap\Model\ItemProvider;
88

99
use Magento\Sitemap\Model\ResourceModel\Catalog\CategoryFactory;
1010
use Magento\Sitemap\Model\SitemapItemInterfaceFactory;
1111

12-
class Category implements ItemResolverInterface
12+
class Category implements ItemProviderInterface
1313
{
1414
/**
1515
* Category factory

‎app/code/Magento/Sitemap/Model/ItemResolver/CategoryConfigReader.php renamed to ‎app/code/Magento/Sitemap/Model/ItemProvider/CategoryConfigReader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
namespace Magento\Sitemap\Model\ItemResolver;
7+
namespace Magento\Sitemap\Model\ItemProvider;
88

99
use Magento\Framework\App\Config\ScopeConfigInterface;
1010
use Magento\Store\Model\ScopeInterface;

‎app/code/Magento/Sitemap/Model/ItemResolver/CmsPage.php renamed to ‎app/code/Magento/Sitemap/Model/ItemProvider/CmsPage.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
namespace Magento\Sitemap\Model\ItemResolver;
7+
namespace Magento\Sitemap\Model\ItemProvider;
88

99
use Magento\Sitemap\Model\ResourceModel\Cms\PageFactory;
1010
use Magento\Sitemap\Model\SitemapItemInterfaceFactory;
1111

12-
class CmsPage implements ItemResolverInterface
12+
class CmsPage implements ItemProviderInterface
1313
{
1414
/**
1515
* Cms page factory

‎app/code/Magento/Sitemap/Model/ItemResolver/CmsPageConfigReader.php renamed to ‎app/code/Magento/Sitemap/Model/ItemProvider/CmsPageConfigReader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
namespace Magento\Sitemap\Model\ItemResolver;
7+
namespace Magento\Sitemap\Model\ItemProvider;
88

99
use Magento\Framework\App\Config\ScopeConfigInterface;
1010
use Magento\Store\Model\ScopeInterface;

‎app/code/Magento/Sitemap/Model/ItemResolver/Composite.php renamed to ‎app/code/Magento/Sitemap/Model/ItemProvider/Composite.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,25 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
namespace Magento\Sitemap\Model\ItemResolver;
7+
namespace Magento\Sitemap\Model\ItemProvider;
88

9-
class Composite implements ItemResolverInterface
9+
class Composite implements ItemProviderInterface
1010
{
1111
/**
1212
* Item resolvers
1313
*
14-
* @var ItemResolverInterface[]
14+
* @var ItemProviderInterface[]
1515
*/
16-
private $itemResolvers;
16+
private $itemProviders;
1717

1818
/**
1919
* Composite constructor.
2020
*
21-
* @param ItemResolverInterface[] $itemResolvers
21+
* @param ItemProviderInterface[] $itemProviders
2222
*/
23-
public function __construct($itemResolvers = [])
23+
public function __construct($itemProviders = [])
2424
{
25-
$this->itemResolvers = $itemResolvers;
25+
$this->itemProviders = $itemProviders;
2626
}
2727

2828
/**
@@ -32,7 +32,7 @@ public function getItems($storeId)
3232
{
3333
$items = [];
3434

35-
foreach ($this->itemResolvers as $resolver) {
35+
foreach ($this->itemProviders as $resolver) {
3636
foreach ($resolver->getItems($storeId) as $item) {
3737
$items[] = $item;
3838
}

‎app/code/Magento/Sitemap/Model/ItemResolver/ConfigReaderInterface.php renamed to ‎app/code/Magento/Sitemap/Model/ItemProvider/ConfigReaderInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
namespace Magento\Sitemap\Model\ItemResolver;
7+
namespace Magento\Sitemap\Model\ItemProvider;
88

99
/**
1010
* Item resolver config reader interface

‎app/code/Magento/Sitemap/Model/ItemResolver/ItemResolverInterface.php renamed to ‎app/code/Magento/Sitemap/Model/ItemProvider/ItemProviderInterface.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
namespace Magento\Sitemap\Model\ItemResolver;
6+
namespace Magento\Sitemap\Model\ItemProvider;
77

88
use Magento\Sitemap\Model\SitemapItemInterface;
99

1010
/**
11-
* Sitemap item resolver interface
11+
* Sitemap item provider interface
1212
*
1313
* @api
1414
*/
15-
interface ItemResolverInterface
15+
interface ItemProviderInterface
1616
{
1717
/**
1818
* Get sitemap items

‎app/code/Magento/Sitemap/Model/ItemResolver/Product.php renamed to ‎app/code/Magento/Sitemap/Model/ItemProvider/Product.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
namespace Magento\Sitemap\Model\ItemResolver;
7+
namespace Magento\Sitemap\Model\ItemProvider;
88

99
use Magento\Sitemap\Model\ResourceModel\Catalog\ProductFactory;
1010
use Magento\Sitemap\Model\SitemapItemInterfaceFactory;
1111

12-
class Product implements ItemResolverInterface
12+
class Product implements ItemProviderInterface
1313
{
1414
/**
1515
* Product factory

‎app/code/Magento/Sitemap/Model/ItemResolver/ProductConfigReader.php renamed to ‎app/code/Magento/Sitemap/Model/ItemProvider/ProductConfigReader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
namespace Magento\Sitemap\Model\ItemResolver;
7+
namespace Magento\Sitemap\Model\ItemProvider;
88

99
use Magento\Framework\App\Config\ScopeConfigInterface;
1010
use Magento\Store\Model\ScopeInterface;

‎app/code/Magento/Sitemap/Model/Sitemap.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
use Magento\Framework\Exception\LocalizedException;
1515
use Magento\Framework\UrlInterface;
1616
use Magento\Robots\Model\Config\Value;
17-
use Magento\Sitemap\Model\ItemResolver\ItemResolverInterface;
17+
use Magento\Sitemap\Model\ItemProvider\ItemProviderInterface;
1818
use Magento\Sitemap\Model\ResourceModel\Sitemap as SitemapResource;
1919

2020
/**
@@ -164,9 +164,9 @@ class Sitemap extends \Magento\Framework\Model\AbstractModel implements \Magento
164164
/**
165165
* Item resolver
166166
*
167-
* @var ItemResolverInterface
167+
* @var ItemProviderInterface
168168
*/
169-
private $itemResolver;
169+
private $itemProvider;
170170

171171
/**
172172
* Sitemap config reader
@@ -201,7 +201,7 @@ class Sitemap extends \Magento\Framework\Model\AbstractModel implements \Magento
201201
* @param \Magento\Framework\Data\Collection\AbstractDb|null $resourceCollection
202202
* @param array $data
203203
* @param DocumentRoot|null $documentRoot
204-
* @param ItemResolverInterface|null $itemResolver
204+
* @param ItemProviderInterface|null $itemProvider
205205
* @param SitemapConfigReaderInterface|null $configReader
206206
* @param \Magento\Sitemap\Model\SitemapItemInterfaceFactory|null $sitemapItemFactory
207207
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
@@ -223,7 +223,7 @@ public function __construct(
223223
\Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
224224
array $data = [],
225225
\Magento\Config\Model\Config\Reader\Source\Deployed\DocumentRoot $documentRoot = null,
226-
ItemResolverInterface $itemResolver = null,
226+
ItemProviderInterface $itemProvider = null,
227227
SitemapConfigReaderInterface $configReader = null,
228228
\Magento\Sitemap\Model\SitemapItemInterfaceFactory $sitemapItemFactory = null
229229
) {
@@ -238,7 +238,7 @@ public function __construct(
238238
$this->_storeManager = $storeManager;
239239
$this->_request = $request;
240240
$this->dateTime = $dateTime;
241-
$this->itemResolver = $itemResolver ?: ObjectManager::getInstance()->get(ItemResolverInterface::class);
241+
$this->itemProvider = $itemProvider ?: ObjectManager::getInstance()->get(ItemProviderInterface::class);
242242
$this->configReader = $configReader ?: ObjectManager::getInstance()->get(SitemapConfigReaderInterface::class);
243243
$this->sitemapItemFactory = $sitemapItemFactory ?: ObjectManager::getInstance()->get(
244244
\Magento\Sitemap\Model\SitemapItemInterfaceFactory::class
@@ -278,7 +278,7 @@ protected function _getStream()
278278
* @param DataObject $sitemapItem
279279
* @return $this
280280
* @deprecated
281-
* @see ItemResolverInterface
281+
* @see ItemProviderInterface
282282
*/
283283
public function addSitemapItem(DataObject $sitemapItem)
284284
{
@@ -292,7 +292,7 @@ public function addSitemapItem(DataObject $sitemapItem)
292292
*
293293
* @return void
294294
* @deprecated
295-
* @see ItemResolverInterface
295+
* @see ItemProviderInterface
296296
*/
297297
public function collectSitemapItems()
298298
{
@@ -332,7 +332,7 @@ public function collectSitemapItems()
332332
*/
333333
protected function _initSitemapItems()
334334
{
335-
$sitemapItems = $this->itemResolver->getItems($this->getStoreId());
335+
$sitemapItems = $this->itemProvider->getItems($this->getStoreId());
336336
$mappedItems = $this->mapToSitemapItem();
337337
$this->_sitemapItems = array_merge($sitemapItems, $mappedItems);
338338

‎app/code/Magento/Sitemap/Test/Unit/Model/ItemResolver/CategoryTest.php renamed to ‎app/code/Magento/Sitemap/Test/Unit/Model/ItemProvider/CategoryTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
namespace Magento\Sitemap\Test\Unit\Model\ItemResolver;
7+
namespace Magento\Sitemap\Test\Unit\Model\ItemProvider;
88

99
use Magento\Framework\DataObject;
1010
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
11-
use Magento\Sitemap\Model\ItemResolver\Category as CategoryItemResolver;
12-
use Magento\Sitemap\Model\ItemResolver\ConfigReaderInterface;
11+
use Magento\Sitemap\Model\ItemProvider\Category as CategoryItemResolver;
12+
use Magento\Sitemap\Model\ItemProvider\ConfigReaderInterface;
1313
use Magento\Sitemap\Model\ResourceModel\Catalog\Category as CategoryResource;
1414
use Magento\Sitemap\Model\ResourceModel\Catalog\CategoryFactory;
1515
use Magento\Sitemap\Model\SitemapItem;

‎app/code/Magento/Sitemap/Test/Unit/Model/ItemResolver/CmsPageTest.php renamed to ‎app/code/Magento/Sitemap/Test/Unit/Model/ItemProvider/CmsPageTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
namespace Magento\Sitemap\Test\Unit\Model\ItemResolver;
7+
namespace Magento\Sitemap\Test\Unit\Model\ItemProvider;
88

99
use Magento\Framework\DataObject;
1010
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
11-
use Magento\Sitemap\Model\ItemResolver\CmsPage as CmsPageItemResolver;
12-
use Magento\Sitemap\Model\ItemResolver\ConfigReaderInterface;
11+
use Magento\Sitemap\Model\ItemProvider\CmsPage as CmsPageItemResolver;
12+
use Magento\Sitemap\Model\ItemProvider\ConfigReaderInterface;
1313
use Magento\Sitemap\Model\ResourceModel\Cms\Page as CmsPageResource;
1414
use Magento\Sitemap\Model\ResourceModel\Cms\PageFactory;
1515
use Magento\Sitemap\Model\SitemapItem;

‎app/code/Magento/Sitemap/Test/Unit/Model/ItemResolver/CompositeTest.php renamed to ‎app/code/Magento/Sitemap/Test/Unit/Model/ItemProvider/CompositeTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
namespace Magento\Sitemap\Test\Unit\Model\ItemResolver;
7+
namespace Magento\Sitemap\Test\Unit\Model\ItemProvider;
88

9-
use Magento\Sitemap\Model\ItemResolver\Composite as CompositeItemResolver;
10-
use Magento\Sitemap\Model\ItemResolver\ItemResolverInterface;
9+
use Magento\Sitemap\Model\ItemProvider\Composite as CompositeItemResolver;
10+
use Magento\Sitemap\Model\ItemProvider\ItemProviderInterface;
1111
use Magento\Sitemap\Model\SitemapItemInterface;
1212

1313
class CompositeTest extends \PHPUnit_Framework_TestCase
@@ -28,7 +28,7 @@ public function testGetItems($itemResolverData, $expectedItems)
2828
$mockResolvers = [];
2929

3030
foreach ($itemResolverData as $data) {
31-
$mockResolver = $this->getMockForAbstractClass(ItemResolverInterface::class);
31+
$mockResolver = $this->getMockForAbstractClass(ItemProviderInterface::class);
3232
$mockResolver->expects(self::once())
3333
->method('getItems')
3434
->willReturn($data);

‎app/code/Magento/Sitemap/Test/Unit/Model/ItemResolver/ProductTest.php renamed to ‎app/code/Magento/Sitemap/Test/Unit/Model/ItemProvider/ProductTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
namespace Magento\Sitemap\Test\Unit\Model\ItemResolver;
7+
namespace Magento\Sitemap\Test\Unit\Model\ItemProvider;
88

99
use Magento\Framework\DataObject;
1010
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
11-
use Magento\Sitemap\Model\ItemResolver\ConfigReaderInterface;
12-
use Magento\Sitemap\Model\ItemResolver\Product as ProductItemResolver;
11+
use Magento\Sitemap\Model\ItemProvider\ConfigReaderInterface;
12+
use Magento\Sitemap\Model\ItemProvider\Product as ProductItemResolver;
1313
use Magento\Sitemap\Model\ResourceModel\Catalog\Product as ProductResource;
1414
use Magento\Sitemap\Model\ResourceModel\Catalog\ProductFactory;
1515
use Magento\Sitemap\Model\SitemapItem;

‎app/code/Magento/Sitemap/Test/Unit/Model/SitemapTest.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
use Magento\Framework\Filesystem\File\Write;
1212
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
1313
use Magento\Sitemap\Helper\Data;
14-
use Magento\Sitemap\Model\ItemResolver\ConfigReaderInterface;
15-
use Magento\Sitemap\Model\ItemResolver\ItemResolverInterface;
14+
use Magento\Sitemap\Model\ItemProvider\ConfigReaderInterface;
15+
use Magento\Sitemap\Model\ItemProvider\ItemProviderInterface;
1616
use Magento\Sitemap\Model\ResourceModel\Catalog\Category;
1717
use Magento\Sitemap\Model\ResourceModel\Catalog\CategoryFactory;
1818
use Magento\Sitemap\Model\ResourceModel\Catalog\Product;
@@ -77,9 +77,9 @@ class SitemapTest extends \PHPUnit_Framework_TestCase
7777
private $storeManagerMock;
7878

7979
/**
80-
* @var ItemResolverInterface|\PHPUnit_Framework_MockObject_MockObject
80+
* @var ItemProviderInterface|\PHPUnit_Framework_MockObject_MockObject
8181
*/
82-
private $itemResolverMock;
82+
private $itemProviderMock;
8383

8484
/**
8585
* @var ConfigReaderInterface|\PHPUnit_Framework_MockObject_MockObject
@@ -146,7 +146,7 @@ protected function setUp()
146146
->willReturn($this->directoryMock);
147147

148148
$this->configReaderMock = $this->getMockForAbstractClass(SitemapConfigReaderInterface::class);
149-
$this->itemResolverMock = $this->getMockForAbstractClass(ItemResolverInterface::class);
149+
$this->itemProviderMock = $this->getMockForAbstractClass(ItemProviderInterface::class);
150150
}
151151

152152
/**
@@ -525,7 +525,7 @@ protected function getModelMock($mockBeforeSave = false)
525525

526526
$storeBaseMediaUrl = 'http://store.com/pub/media/catalog/product/cache/c9e0b0ef589f3508e5ba515cde53c5ff/';
527527

528-
$this->itemResolverMock->expects($this->any())
528+
$this->itemProviderMock->expects($this->any())
529529
->method('getItems')
530530
->willReturn([
531531
new SitemapItem('category.html', '1.0', 'daily', '2012-12-21 00:00:00'),
@@ -610,7 +610,7 @@ private function getModelConstructorArgs()
610610
'storeManager' => $this->storeManagerMock,
611611
'sitemapData' => $this->helperMockSitemap,
612612
'filesystem' => $this->filesystemMock,
613-
'itemResolver' => $this->itemResolverMock,
613+
'itemProvider' => $this->itemProviderMock,
614614
'configReader' => $this->configReaderMock,
615615
]
616616
);

0 commit comments

Comments
 (0)