From 16b77ca932fcd500274ef5ac9c9f88a74d1f1187 Mon Sep 17 00:00:00 2001 From: Piotr Kwiecinski Date: Fri, 4 Aug 2017 22:18:48 +0100 Subject: [PATCH] magento/magento2#10045 Rename item resolver to item provider --- app/code/Magento/Sitemap/Helper/Data.php | 6 ++--- .../Category.php | 4 ++-- .../CategoryConfigReader.php | 2 +- .../CmsPage.php | 4 ++-- .../CmsPageConfigReader.php | 2 +- .../Composite.php | 16 ++++++------- .../ConfigReaderInterface.php | 2 +- .../ItemProviderInterface.php} | 6 ++--- .../Product.php | 4 ++-- .../ProductConfigReader.php | 2 +- app/code/Magento/Sitemap/Model/Sitemap.php | 18 +++++++------- .../CategoryTest.php | 6 ++--- .../CmsPageTest.php | 6 ++--- .../CompositeTest.php | 8 +++---- .../ProductTest.php | 6 ++--- .../Sitemap/Test/Unit/Model/SitemapTest.php | 14 +++++------ app/code/Magento/Sitemap/etc/di.xml | 24 +++++++++---------- .../CategoryConfigReaderTest.php | 2 +- .../CmsPageConfigReaderTest.php | 2 +- .../ProductConfigReaderTest.php | 2 +- 20 files changed, 68 insertions(+), 68 deletions(-) rename app/code/Magento/Sitemap/Model/{ItemResolver => ItemProvider}/Category.php (94%) rename app/code/Magento/Sitemap/Model/{ItemResolver => ItemProvider}/CategoryConfigReader.php (96%) rename app/code/Magento/Sitemap/Model/{ItemResolver => ItemProvider}/CmsPage.php (94%) rename app/code/Magento/Sitemap/Model/{ItemResolver => ItemProvider}/CmsPageConfigReader.php (96%) rename app/code/Magento/Sitemap/Model/{ItemResolver => ItemProvider}/Composite.php (56%) rename app/code/Magento/Sitemap/Model/{ItemResolver => ItemProvider}/ConfigReaderInterface.php (91%) rename app/code/Magento/Sitemap/Model/{ItemResolver/ItemResolverInterface.php => ItemProvider/ItemProviderInterface.php} (74%) rename app/code/Magento/Sitemap/Model/{ItemResolver => ItemProvider}/Product.php (94%) rename app/code/Magento/Sitemap/Model/{ItemResolver => ItemProvider}/ProductConfigReader.php (96%) rename app/code/Magento/Sitemap/Test/Unit/Model/{ItemResolver => ItemProvider}/CategoryTest.php (96%) rename app/code/Magento/Sitemap/Test/Unit/Model/{ItemResolver => ItemProvider}/CmsPageTest.php (96%) rename app/code/Magento/Sitemap/Test/Unit/Model/{ItemResolver => ItemProvider}/CompositeTest.php (87%) rename app/code/Magento/Sitemap/Test/Unit/Model/{ItemResolver => ItemProvider}/ProductTest.php (97%) rename dev/tests/integration/testsuite/Magento/Sitemap/Model/{ItemResolver => ItemProvider}/CategoryConfigReaderTest.php (96%) rename dev/tests/integration/testsuite/Magento/Sitemap/Model/{ItemResolver => ItemProvider}/CmsPageConfigReaderTest.php (96%) rename dev/tests/integration/testsuite/Magento/Sitemap/Model/{ItemResolver => ItemProvider}/ProductConfigReaderTest.php (96%) diff --git a/app/code/Magento/Sitemap/Helper/Data.php b/app/code/Magento/Sitemap/Helper/Data.php index 6dc2346aa0b87..04734a2e9e17c 100644 --- a/app/code/Magento/Sitemap/Helper/Data.php +++ b/app/code/Magento/Sitemap/Helper/Data.php @@ -10,9 +10,9 @@ */ namespace Magento\Sitemap\Helper; -use Magento\Sitemap\Model\ItemResolver\CategoryConfigReader; -use Magento\Sitemap\Model\ItemResolver\CmsPageConfigReader; -use Magento\Sitemap\Model\ItemResolver\ProductConfigReader; +use Magento\Sitemap\Model\ItemProvider\CategoryConfigReader; +use Magento\Sitemap\Model\ItemProvider\CmsPageConfigReader; +use Magento\Sitemap\Model\ItemProvider\ProductConfigReader; use Magento\Sitemap\Model\SitemapConfigReader; use Magento\Store\Model\ScopeInterface; diff --git a/app/code/Magento/Sitemap/Model/ItemResolver/Category.php b/app/code/Magento/Sitemap/Model/ItemProvider/Category.php similarity index 94% rename from app/code/Magento/Sitemap/Model/ItemResolver/Category.php rename to app/code/Magento/Sitemap/Model/ItemProvider/Category.php index e95be6519d509..2c41915c72e98 100644 --- a/app/code/Magento/Sitemap/Model/ItemResolver/Category.php +++ b/app/code/Magento/Sitemap/Model/ItemProvider/Category.php @@ -4,12 +4,12 @@ * See COPYING.txt for license details. */ -namespace Magento\Sitemap\Model\ItemResolver; +namespace Magento\Sitemap\Model\ItemProvider; use Magento\Sitemap\Model\ResourceModel\Catalog\CategoryFactory; use Magento\Sitemap\Model\SitemapItemInterfaceFactory; -class Category implements ItemResolverInterface +class Category implements ItemProviderInterface { /** * Category factory diff --git a/app/code/Magento/Sitemap/Model/ItemResolver/CategoryConfigReader.php b/app/code/Magento/Sitemap/Model/ItemProvider/CategoryConfigReader.php similarity index 96% rename from app/code/Magento/Sitemap/Model/ItemResolver/CategoryConfigReader.php rename to app/code/Magento/Sitemap/Model/ItemProvider/CategoryConfigReader.php index 7f6622825dd28..2dee63eff2600 100644 --- a/app/code/Magento/Sitemap/Model/ItemResolver/CategoryConfigReader.php +++ b/app/code/Magento/Sitemap/Model/ItemProvider/CategoryConfigReader.php @@ -4,7 +4,7 @@ * See COPYING.txt for license details. */ -namespace Magento\Sitemap\Model\ItemResolver; +namespace Magento\Sitemap\Model\ItemProvider; use Magento\Framework\App\Config\ScopeConfigInterface; use Magento\Store\Model\ScopeInterface; diff --git a/app/code/Magento/Sitemap/Model/ItemResolver/CmsPage.php b/app/code/Magento/Sitemap/Model/ItemProvider/CmsPage.php similarity index 94% rename from app/code/Magento/Sitemap/Model/ItemResolver/CmsPage.php rename to app/code/Magento/Sitemap/Model/ItemProvider/CmsPage.php index f46cf5b310f30..bc9e6eef7aa36 100644 --- a/app/code/Magento/Sitemap/Model/ItemResolver/CmsPage.php +++ b/app/code/Magento/Sitemap/Model/ItemProvider/CmsPage.php @@ -4,12 +4,12 @@ * See COPYING.txt for license details. */ -namespace Magento\Sitemap\Model\ItemResolver; +namespace Magento\Sitemap\Model\ItemProvider; use Magento\Sitemap\Model\ResourceModel\Cms\PageFactory; use Magento\Sitemap\Model\SitemapItemInterfaceFactory; -class CmsPage implements ItemResolverInterface +class CmsPage implements ItemProviderInterface { /** * Cms page factory diff --git a/app/code/Magento/Sitemap/Model/ItemResolver/CmsPageConfigReader.php b/app/code/Magento/Sitemap/Model/ItemProvider/CmsPageConfigReader.php similarity index 96% rename from app/code/Magento/Sitemap/Model/ItemResolver/CmsPageConfigReader.php rename to app/code/Magento/Sitemap/Model/ItemProvider/CmsPageConfigReader.php index 6139c9c46b680..e173dc79e343d 100644 --- a/app/code/Magento/Sitemap/Model/ItemResolver/CmsPageConfigReader.php +++ b/app/code/Magento/Sitemap/Model/ItemProvider/CmsPageConfigReader.php @@ -4,7 +4,7 @@ * See COPYING.txt for license details. */ -namespace Magento\Sitemap\Model\ItemResolver; +namespace Magento\Sitemap\Model\ItemProvider; use Magento\Framework\App\Config\ScopeConfigInterface; use Magento\Store\Model\ScopeInterface; diff --git a/app/code/Magento/Sitemap/Model/ItemResolver/Composite.php b/app/code/Magento/Sitemap/Model/ItemProvider/Composite.php similarity index 56% rename from app/code/Magento/Sitemap/Model/ItemResolver/Composite.php rename to app/code/Magento/Sitemap/Model/ItemProvider/Composite.php index f60b07e18620a..60137fac6e013 100644 --- a/app/code/Magento/Sitemap/Model/ItemResolver/Composite.php +++ b/app/code/Magento/Sitemap/Model/ItemProvider/Composite.php @@ -4,25 +4,25 @@ * See COPYING.txt for license details. */ -namespace Magento\Sitemap\Model\ItemResolver; +namespace Magento\Sitemap\Model\ItemProvider; -class Composite implements ItemResolverInterface +class Composite implements ItemProviderInterface { /** * Item resolvers * - * @var ItemResolverInterface[] + * @var ItemProviderInterface[] */ - private $itemResolvers; + private $itemProviders; /** * Composite constructor. * - * @param ItemResolverInterface[] $itemResolvers + * @param ItemProviderInterface[] $itemProviders */ - public function __construct($itemResolvers = []) + public function __construct($itemProviders = []) { - $this->itemResolvers = $itemResolvers; + $this->itemProviders = $itemProviders; } /** @@ -32,7 +32,7 @@ public function getItems($storeId) { $items = []; - foreach ($this->itemResolvers as $resolver) { + foreach ($this->itemProviders as $resolver) { foreach ($resolver->getItems($storeId) as $item) { $items[] = $item; } diff --git a/app/code/Magento/Sitemap/Model/ItemResolver/ConfigReaderInterface.php b/app/code/Magento/Sitemap/Model/ItemProvider/ConfigReaderInterface.php similarity index 91% rename from app/code/Magento/Sitemap/Model/ItemResolver/ConfigReaderInterface.php rename to app/code/Magento/Sitemap/Model/ItemProvider/ConfigReaderInterface.php index 49d33bf4f39a7..1e8b545728a04 100644 --- a/app/code/Magento/Sitemap/Model/ItemResolver/ConfigReaderInterface.php +++ b/app/code/Magento/Sitemap/Model/ItemProvider/ConfigReaderInterface.php @@ -4,7 +4,7 @@ * See COPYING.txt for license details. */ -namespace Magento\Sitemap\Model\ItemResolver; +namespace Magento\Sitemap\Model\ItemProvider; /** * Item resolver config reader interface diff --git a/app/code/Magento/Sitemap/Model/ItemResolver/ItemResolverInterface.php b/app/code/Magento/Sitemap/Model/ItemProvider/ItemProviderInterface.php similarity index 74% rename from app/code/Magento/Sitemap/Model/ItemResolver/ItemResolverInterface.php rename to app/code/Magento/Sitemap/Model/ItemProvider/ItemProviderInterface.php index dad71096e1f68..89ad2afdd01a2 100644 --- a/app/code/Magento/Sitemap/Model/ItemResolver/ItemResolverInterface.php +++ b/app/code/Magento/Sitemap/Model/ItemProvider/ItemProviderInterface.php @@ -3,16 +3,16 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ -namespace Magento\Sitemap\Model\ItemResolver; +namespace Magento\Sitemap\Model\ItemProvider; use Magento\Sitemap\Model\SitemapItemInterface; /** - * Sitemap item resolver interface + * Sitemap item provider interface * * @api */ -interface ItemResolverInterface +interface ItemProviderInterface { /** * Get sitemap items diff --git a/app/code/Magento/Sitemap/Model/ItemResolver/Product.php b/app/code/Magento/Sitemap/Model/ItemProvider/Product.php similarity index 94% rename from app/code/Magento/Sitemap/Model/ItemResolver/Product.php rename to app/code/Magento/Sitemap/Model/ItemProvider/Product.php index 792eb10615469..aecba66580794 100644 --- a/app/code/Magento/Sitemap/Model/ItemResolver/Product.php +++ b/app/code/Magento/Sitemap/Model/ItemProvider/Product.php @@ -4,12 +4,12 @@ * See COPYING.txt for license details. */ -namespace Magento\Sitemap\Model\ItemResolver; +namespace Magento\Sitemap\Model\ItemProvider; use Magento\Sitemap\Model\ResourceModel\Catalog\ProductFactory; use Magento\Sitemap\Model\SitemapItemInterfaceFactory; -class Product implements ItemResolverInterface +class Product implements ItemProviderInterface { /** * Product factory diff --git a/app/code/Magento/Sitemap/Model/ItemResolver/ProductConfigReader.php b/app/code/Magento/Sitemap/Model/ItemProvider/ProductConfigReader.php similarity index 96% rename from app/code/Magento/Sitemap/Model/ItemResolver/ProductConfigReader.php rename to app/code/Magento/Sitemap/Model/ItemProvider/ProductConfigReader.php index c8a1df24a6f74..c1a01d2ed60c4 100644 --- a/app/code/Magento/Sitemap/Model/ItemResolver/ProductConfigReader.php +++ b/app/code/Magento/Sitemap/Model/ItemProvider/ProductConfigReader.php @@ -4,7 +4,7 @@ * See COPYING.txt for license details. */ -namespace Magento\Sitemap\Model\ItemResolver; +namespace Magento\Sitemap\Model\ItemProvider; use Magento\Framework\App\Config\ScopeConfigInterface; use Magento\Store\Model\ScopeInterface; diff --git a/app/code/Magento/Sitemap/Model/Sitemap.php b/app/code/Magento/Sitemap/Model/Sitemap.php index 6009f43d84545..767d189a3310b 100644 --- a/app/code/Magento/Sitemap/Model/Sitemap.php +++ b/app/code/Magento/Sitemap/Model/Sitemap.php @@ -14,7 +14,7 @@ use Magento\Framework\Exception\LocalizedException; use Magento\Framework\UrlInterface; use Magento\Robots\Model\Config\Value; -use Magento\Sitemap\Model\ItemResolver\ItemResolverInterface; +use Magento\Sitemap\Model\ItemProvider\ItemProviderInterface; use Magento\Sitemap\Model\ResourceModel\Sitemap as SitemapResource; /** @@ -164,9 +164,9 @@ class Sitemap extends \Magento\Framework\Model\AbstractModel implements \Magento /** * Item resolver * - * @var ItemResolverInterface + * @var ItemProviderInterface */ - private $itemResolver; + private $itemProvider; /** * Sitemap config reader @@ -201,7 +201,7 @@ class Sitemap extends \Magento\Framework\Model\AbstractModel implements \Magento * @param \Magento\Framework\Data\Collection\AbstractDb|null $resourceCollection * @param array $data * @param DocumentRoot|null $documentRoot - * @param ItemResolverInterface|null $itemResolver + * @param ItemProviderInterface|null $itemProvider * @param SitemapConfigReaderInterface|null $configReader * @param \Magento\Sitemap\Model\SitemapItemInterfaceFactory|null $sitemapItemFactory * @SuppressWarnings(PHPMD.ExcessiveParameterList) @@ -223,7 +223,7 @@ public function __construct( \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null, array $data = [], \Magento\Config\Model\Config\Reader\Source\Deployed\DocumentRoot $documentRoot = null, - ItemResolverInterface $itemResolver = null, + ItemProviderInterface $itemProvider = null, SitemapConfigReaderInterface $configReader = null, \Magento\Sitemap\Model\SitemapItemInterfaceFactory $sitemapItemFactory = null ) { @@ -238,7 +238,7 @@ public function __construct( $this->_storeManager = $storeManager; $this->_request = $request; $this->dateTime = $dateTime; - $this->itemResolver = $itemResolver ?: ObjectManager::getInstance()->get(ItemResolverInterface::class); + $this->itemProvider = $itemProvider ?: ObjectManager::getInstance()->get(ItemProviderInterface::class); $this->configReader = $configReader ?: ObjectManager::getInstance()->get(SitemapConfigReaderInterface::class); $this->sitemapItemFactory = $sitemapItemFactory ?: ObjectManager::getInstance()->get( \Magento\Sitemap\Model\SitemapItemInterfaceFactory::class @@ -278,7 +278,7 @@ protected function _getStream() * @param DataObject $sitemapItem * @return $this * @deprecated - * @see ItemResolverInterface + * @see ItemProviderInterface */ public function addSitemapItem(DataObject $sitemapItem) { @@ -292,7 +292,7 @@ public function addSitemapItem(DataObject $sitemapItem) * * @return void * @deprecated - * @see ItemResolverInterface + * @see ItemProviderInterface */ public function collectSitemapItems() { @@ -332,7 +332,7 @@ public function collectSitemapItems() */ protected function _initSitemapItems() { - $sitemapItems = $this->itemResolver->getItems($this->getStoreId()); + $sitemapItems = $this->itemProvider->getItems($this->getStoreId()); $mappedItems = $this->mapToSitemapItem(); $this->_sitemapItems = array_merge($sitemapItems, $mappedItems); diff --git a/app/code/Magento/Sitemap/Test/Unit/Model/ItemResolver/CategoryTest.php b/app/code/Magento/Sitemap/Test/Unit/Model/ItemProvider/CategoryTest.php similarity index 96% rename from app/code/Magento/Sitemap/Test/Unit/Model/ItemResolver/CategoryTest.php rename to app/code/Magento/Sitemap/Test/Unit/Model/ItemProvider/CategoryTest.php index 0d46f6b75e6c7..0986418fa1aca 100644 --- a/app/code/Magento/Sitemap/Test/Unit/Model/ItemResolver/CategoryTest.php +++ b/app/code/Magento/Sitemap/Test/Unit/Model/ItemProvider/CategoryTest.php @@ -4,12 +4,12 @@ * See COPYING.txt for license details. */ -namespace Magento\Sitemap\Test\Unit\Model\ItemResolver; +namespace Magento\Sitemap\Test\Unit\Model\ItemProvider; use Magento\Framework\DataObject; use Magento\Framework\TestFramework\Unit\Helper\ObjectManager; -use Magento\Sitemap\Model\ItemResolver\Category as CategoryItemResolver; -use Magento\Sitemap\Model\ItemResolver\ConfigReaderInterface; +use Magento\Sitemap\Model\ItemProvider\Category as CategoryItemResolver; +use Magento\Sitemap\Model\ItemProvider\ConfigReaderInterface; use Magento\Sitemap\Model\ResourceModel\Catalog\Category as CategoryResource; use Magento\Sitemap\Model\ResourceModel\Catalog\CategoryFactory; use Magento\Sitemap\Model\SitemapItem; diff --git a/app/code/Magento/Sitemap/Test/Unit/Model/ItemResolver/CmsPageTest.php b/app/code/Magento/Sitemap/Test/Unit/Model/ItemProvider/CmsPageTest.php similarity index 96% rename from app/code/Magento/Sitemap/Test/Unit/Model/ItemResolver/CmsPageTest.php rename to app/code/Magento/Sitemap/Test/Unit/Model/ItemProvider/CmsPageTest.php index 6a29f4985fa29..718b6947a6961 100644 --- a/app/code/Magento/Sitemap/Test/Unit/Model/ItemResolver/CmsPageTest.php +++ b/app/code/Magento/Sitemap/Test/Unit/Model/ItemProvider/CmsPageTest.php @@ -4,12 +4,12 @@ * See COPYING.txt for license details. */ -namespace Magento\Sitemap\Test\Unit\Model\ItemResolver; +namespace Magento\Sitemap\Test\Unit\Model\ItemProvider; use Magento\Framework\DataObject; use Magento\Framework\TestFramework\Unit\Helper\ObjectManager; -use Magento\Sitemap\Model\ItemResolver\CmsPage as CmsPageItemResolver; -use Magento\Sitemap\Model\ItemResolver\ConfigReaderInterface; +use Magento\Sitemap\Model\ItemProvider\CmsPage as CmsPageItemResolver; +use Magento\Sitemap\Model\ItemProvider\ConfigReaderInterface; use Magento\Sitemap\Model\ResourceModel\Cms\Page as CmsPageResource; use Magento\Sitemap\Model\ResourceModel\Cms\PageFactory; use Magento\Sitemap\Model\SitemapItem; diff --git a/app/code/Magento/Sitemap/Test/Unit/Model/ItemResolver/CompositeTest.php b/app/code/Magento/Sitemap/Test/Unit/Model/ItemProvider/CompositeTest.php similarity index 87% rename from app/code/Magento/Sitemap/Test/Unit/Model/ItemResolver/CompositeTest.php rename to app/code/Magento/Sitemap/Test/Unit/Model/ItemProvider/CompositeTest.php index 58438b6606ae0..8347ef0339478 100644 --- a/app/code/Magento/Sitemap/Test/Unit/Model/ItemResolver/CompositeTest.php +++ b/app/code/Magento/Sitemap/Test/Unit/Model/ItemProvider/CompositeTest.php @@ -4,10 +4,10 @@ * See COPYING.txt for license details. */ -namespace Magento\Sitemap\Test\Unit\Model\ItemResolver; +namespace Magento\Sitemap\Test\Unit\Model\ItemProvider; -use Magento\Sitemap\Model\ItemResolver\Composite as CompositeItemResolver; -use Magento\Sitemap\Model\ItemResolver\ItemResolverInterface; +use Magento\Sitemap\Model\ItemProvider\Composite as CompositeItemResolver; +use Magento\Sitemap\Model\ItemProvider\ItemProviderInterface; use Magento\Sitemap\Model\SitemapItemInterface; class CompositeTest extends \PHPUnit_Framework_TestCase @@ -28,7 +28,7 @@ public function testGetItems($itemResolverData, $expectedItems) $mockResolvers = []; foreach ($itemResolverData as $data) { - $mockResolver = $this->getMockForAbstractClass(ItemResolverInterface::class); + $mockResolver = $this->getMockForAbstractClass(ItemProviderInterface::class); $mockResolver->expects(self::once()) ->method('getItems') ->willReturn($data); diff --git a/app/code/Magento/Sitemap/Test/Unit/Model/ItemResolver/ProductTest.php b/app/code/Magento/Sitemap/Test/Unit/Model/ItemProvider/ProductTest.php similarity index 97% rename from app/code/Magento/Sitemap/Test/Unit/Model/ItemResolver/ProductTest.php rename to app/code/Magento/Sitemap/Test/Unit/Model/ItemProvider/ProductTest.php index 0f60849378e4e..adb3c00189200 100644 --- a/app/code/Magento/Sitemap/Test/Unit/Model/ItemResolver/ProductTest.php +++ b/app/code/Magento/Sitemap/Test/Unit/Model/ItemProvider/ProductTest.php @@ -4,12 +4,12 @@ * See COPYING.txt for license details. */ -namespace Magento\Sitemap\Test\Unit\Model\ItemResolver; +namespace Magento\Sitemap\Test\Unit\Model\ItemProvider; use Magento\Framework\DataObject; use Magento\Framework\TestFramework\Unit\Helper\ObjectManager; -use Magento\Sitemap\Model\ItemResolver\ConfigReaderInterface; -use Magento\Sitemap\Model\ItemResolver\Product as ProductItemResolver; +use Magento\Sitemap\Model\ItemProvider\ConfigReaderInterface; +use Magento\Sitemap\Model\ItemProvider\Product as ProductItemResolver; use Magento\Sitemap\Model\ResourceModel\Catalog\Product as ProductResource; use Magento\Sitemap\Model\ResourceModel\Catalog\ProductFactory; use Magento\Sitemap\Model\SitemapItem; diff --git a/app/code/Magento/Sitemap/Test/Unit/Model/SitemapTest.php b/app/code/Magento/Sitemap/Test/Unit/Model/SitemapTest.php index 3464436a087c8..51ce898d68f9f 100644 --- a/app/code/Magento/Sitemap/Test/Unit/Model/SitemapTest.php +++ b/app/code/Magento/Sitemap/Test/Unit/Model/SitemapTest.php @@ -11,8 +11,8 @@ use Magento\Framework\Filesystem\File\Write; use Magento\Framework\TestFramework\Unit\Helper\ObjectManager; use Magento\Sitemap\Helper\Data; -use Magento\Sitemap\Model\ItemResolver\ConfigReaderInterface; -use Magento\Sitemap\Model\ItemResolver\ItemResolverInterface; +use Magento\Sitemap\Model\ItemProvider\ConfigReaderInterface; +use Magento\Sitemap\Model\ItemProvider\ItemProviderInterface; use Magento\Sitemap\Model\ResourceModel\Catalog\Category; use Magento\Sitemap\Model\ResourceModel\Catalog\CategoryFactory; use Magento\Sitemap\Model\ResourceModel\Catalog\Product; @@ -77,9 +77,9 @@ class SitemapTest extends \PHPUnit_Framework_TestCase private $storeManagerMock; /** - * @var ItemResolverInterface|\PHPUnit_Framework_MockObject_MockObject + * @var ItemProviderInterface|\PHPUnit_Framework_MockObject_MockObject */ - private $itemResolverMock; + private $itemProviderMock; /** * @var ConfigReaderInterface|\PHPUnit_Framework_MockObject_MockObject @@ -146,7 +146,7 @@ protected function setUp() ->willReturn($this->directoryMock); $this->configReaderMock = $this->getMockForAbstractClass(SitemapConfigReaderInterface::class); - $this->itemResolverMock = $this->getMockForAbstractClass(ItemResolverInterface::class); + $this->itemProviderMock = $this->getMockForAbstractClass(ItemProviderInterface::class); } /** @@ -525,7 +525,7 @@ protected function getModelMock($mockBeforeSave = false) $storeBaseMediaUrl = 'http://store.com/pub/media/catalog/product/cache/c9e0b0ef589f3508e5ba515cde53c5ff/'; - $this->itemResolverMock->expects($this->any()) + $this->itemProviderMock->expects($this->any()) ->method('getItems') ->willReturn([ new SitemapItem('category.html', '1.0', 'daily', '2012-12-21 00:00:00'), @@ -610,7 +610,7 @@ private function getModelConstructorArgs() 'storeManager' => $this->storeManagerMock, 'sitemapData' => $this->helperMockSitemap, 'filesystem' => $this->filesystemMock, - 'itemResolver' => $this->itemResolverMock, + 'itemProvider' => $this->itemProviderMock, 'configReader' => $this->configReaderMock, ] ); diff --git a/app/code/Magento/Sitemap/etc/di.xml b/app/code/Magento/Sitemap/etc/di.xml index e8200bbc9e50c..e627b3b50fff9 100644 --- a/app/code/Magento/Sitemap/etc/di.xml +++ b/app/code/Magento/Sitemap/etc/di.xml @@ -7,7 +7,7 @@ --> - + @@ -22,28 +22,28 @@ - + - - Magento\Sitemap\Model\ItemResolver\Category - Magento\Sitemap\Model\ItemResolver\CmsPage - Magento\Sitemap\Model\ItemResolver\Product + + Magento\Sitemap\Model\ItemProvider\Category + Magento\Sitemap\Model\ItemProvider\CmsPage + Magento\Sitemap\Model\ItemProvider\Product - + - Magento\Sitemap\Model\ItemResolver\CategoryConfigReader + Magento\Sitemap\Model\ItemProvider\CategoryConfigReader - + - Magento\Sitemap\Model\ItemResolver\ProductConfigReader + Magento\Sitemap\Model\ItemProvider\ProductConfigReader - + - Magento\Sitemap\Model\ItemResolver\CmsPageConfigReader + Magento\Sitemap\Model\ItemProvider\CmsPageConfigReader diff --git a/dev/tests/integration/testsuite/Magento/Sitemap/Model/ItemResolver/CategoryConfigReaderTest.php b/dev/tests/integration/testsuite/Magento/Sitemap/Model/ItemProvider/CategoryConfigReaderTest.php similarity index 96% rename from dev/tests/integration/testsuite/Magento/Sitemap/Model/ItemResolver/CategoryConfigReaderTest.php rename to dev/tests/integration/testsuite/Magento/Sitemap/Model/ItemProvider/CategoryConfigReaderTest.php index d4d24daf00429..fbaf57e069a6e 100644 --- a/dev/tests/integration/testsuite/Magento/Sitemap/Model/ItemResolver/CategoryConfigReaderTest.php +++ b/dev/tests/integration/testsuite/Magento/Sitemap/Model/ItemProvider/CategoryConfigReaderTest.php @@ -4,7 +4,7 @@ * See COPYING.txt for license details. */ -namespace Magento\Sitemap\Model\ItemResolver; +namespace Magento\Sitemap\Model\ItemProvider; use Magento\Store\Model\Store; use Magento\TestFramework\Helper\Bootstrap; diff --git a/dev/tests/integration/testsuite/Magento/Sitemap/Model/ItemResolver/CmsPageConfigReaderTest.php b/dev/tests/integration/testsuite/Magento/Sitemap/Model/ItemProvider/CmsPageConfigReaderTest.php similarity index 96% rename from dev/tests/integration/testsuite/Magento/Sitemap/Model/ItemResolver/CmsPageConfigReaderTest.php rename to dev/tests/integration/testsuite/Magento/Sitemap/Model/ItemProvider/CmsPageConfigReaderTest.php index 89142d451aada..24cc56778efdb 100644 --- a/dev/tests/integration/testsuite/Magento/Sitemap/Model/ItemResolver/CmsPageConfigReaderTest.php +++ b/dev/tests/integration/testsuite/Magento/Sitemap/Model/ItemProvider/CmsPageConfigReaderTest.php @@ -4,7 +4,7 @@ * See COPYING.txt for license details. */ -namespace Magento\Sitemap\Model\ItemResolver; +namespace Magento\Sitemap\Model\ItemProvider; use Magento\Store\Model\Store; use Magento\TestFramework\Helper\Bootstrap; diff --git a/dev/tests/integration/testsuite/Magento/Sitemap/Model/ItemResolver/ProductConfigReaderTest.php b/dev/tests/integration/testsuite/Magento/Sitemap/Model/ItemProvider/ProductConfigReaderTest.php similarity index 96% rename from dev/tests/integration/testsuite/Magento/Sitemap/Model/ItemResolver/ProductConfigReaderTest.php rename to dev/tests/integration/testsuite/Magento/Sitemap/Model/ItemProvider/ProductConfigReaderTest.php index f130996e73a0a..81b79e6270cd3 100644 --- a/dev/tests/integration/testsuite/Magento/Sitemap/Model/ItemResolver/ProductConfigReaderTest.php +++ b/dev/tests/integration/testsuite/Magento/Sitemap/Model/ItemProvider/ProductConfigReaderTest.php @@ -4,7 +4,7 @@ * See COPYING.txt for license details. */ -namespace Magento\Sitemap\Model\ItemResolver; +namespace Magento\Sitemap\Model\ItemProvider; use Magento\Store\Model\Store; use Magento\TestFramework\Helper\Bootstrap;