diff --git a/app/code/Magento/AdminNotification/Model/Resource/System/Message/Collection.php b/app/code/Magento/AdminNotification/Model/Resource/System/Message/Collection.php
index 3d6f8a615c239..f577ac72d814f 100644
--- a/app/code/Magento/AdminNotification/Model/Resource/System/Message/Collection.php
+++ b/app/code/Magento/AdminNotification/Model/Resource/System/Message/Collection.php
@@ -22,7 +22,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
protected $_countBySeverity = [];
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -31,7 +31,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
* @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
diff --git a/app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php b/app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php
index ddab16bc6d71b..6f43d668a4ad2 100644
--- a/app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php
+++ b/app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php
@@ -21,7 +21,7 @@ class Baseurl implements \Magento\Framework\Notification\MessageInterface
protected $_config;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -32,13 +32,13 @@ class Baseurl implements \Magento\Framework\Notification\MessageInterface
/**
* @param \Magento\Framework\App\Config\ScopeConfigInterface $config
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\UrlInterface $urlBuilder
* @param \Magento\Framework\App\Config\ValueFactory $configValueFactory
*/
public function __construct(
\Magento\Framework\App\Config\ScopeConfigInterface $config,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\UrlInterface $urlBuilder,
\Magento\Framework\App\Config\ValueFactory $configValueFactory
) {
diff --git a/app/code/Magento/Backend/App/Router.php b/app/code/Magento/Backend/App/Router.php
index 3ae734acb76f9..062d70ac4654f 100644
--- a/app/code/Magento/Backend/App/Router.php
+++ b/app/code/Magento/Backend/App/Router.php
@@ -53,7 +53,7 @@ class Router extends \Magento\Core\App\Router\Base
* @param \Magento\Framework\App\ResponseFactory $responseFactory
* @param \Magento\Framework\App\Route\ConfigInterface $routeConfig
* @param \Magento\Framework\UrlInterface $url
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param \Magento\Framework\Url\SecurityInfoInterface $urlSecurityInfo
* @param string $routerId
@@ -70,7 +70,7 @@ public function __construct(
\Magento\Framework\App\ResponseFactory $responseFactory,
\Magento\Framework\App\Route\ConfigInterface $routeConfig,
\Magento\Framework\UrlInterface $url,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
\Magento\Framework\Url\SecurityInfoInterface $urlSecurityInfo,
$routerId,
diff --git a/app/code/Magento/Backend/Block/Dashboard.php b/app/code/Magento/Backend/Block/Dashboard.php
index 6433c0a0514b7..b6713c9e90ab3 100644
--- a/app/code/Magento/Backend/Block/Dashboard.php
+++ b/app/code/Magento/Backend/Block/Dashboard.php
@@ -31,7 +31,7 @@ protected function _prepareLayout()
$this->addChild('sales', 'Magento\Backend\Block\Dashboard\Sales');
- if ($this->_scopeConfig->getValue(self::XML_PATH_ENABLE_CHARTS, \Magento\Store\Model\ScopeInterface::SCOPE_STORE)) {
+ if ($this->_scopeConfig->getValue(self::XML_PATH_ENABLE_CHARTS, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)) {
$block = $this->getLayout()->createBlock('Magento\Backend\Block\Dashboard\Diagrams');
} else {
$block = $this->getLayout()->createBlock(
diff --git a/app/code/Magento/Backend/Block/Dashboard/Graph.php b/app/code/Magento/Backend/Block/Dashboard/Graph.php
index 91c4d619072ba..ae9f2d4a868db 100644
--- a/app/code/Magento/Backend/Block/Dashboard/Graph.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Graph.php
@@ -210,7 +210,7 @@ public function getChartUrl($directUrl = true)
$timezoneLocal = $this->_scopeConfig->getValue(
$this->_localeDate->getDefaultTimezonePath(),
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
list($dateStart, $dateEnd) = $this->_collectionFactory->create()->getDateRange(
diff --git a/app/code/Magento/Backend/Block/Page/Header.php b/app/code/Magento/Backend/Block/Page/Header.php
index f4b8eb0b23ed3..227db0beb9a1b 100644
--- a/app/code/Magento/Backend/Block/Page/Header.php
+++ b/app/code/Magento/Backend/Block/Page/Header.php
@@ -80,6 +80,6 @@ public function getLogoutLink()
*/
public function displayNoscriptNotice()
{
- return $this->_scopeConfig->getValue('web/browser_capabilities/javascript', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+ return $this->_scopeConfig->getValue('web/browser_capabilities/javascript', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
}
}
diff --git a/app/code/Magento/Backend/Block/Page/Notices.php b/app/code/Magento/Backend/Block/Page/Notices.php
index 231d51c9919dd..3ae3ef4f719ef 100644
--- a/app/code/Magento/Backend/Block/Page/Notices.php
+++ b/app/code/Magento/Backend/Block/Page/Notices.php
@@ -22,7 +22,7 @@ class Notices extends \Magento\Backend\Block\Template
*/
public function displayNoscriptNotice()
{
- return $this->_scopeConfig->getValue('web/browser_capabilities/javascript', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+ return $this->_scopeConfig->getValue('web/browser_capabilities/javascript', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
}
/**
@@ -32,6 +32,6 @@ public function displayNoscriptNotice()
*/
public function displayDemoNotice()
{
- return $this->_scopeConfig->getValue('design/head/demonotice', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+ return $this->_scopeConfig->getValue('design/head/demonotice', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
}
}
diff --git a/app/code/Magento/Backend/Block/Template.php b/app/code/Magento/Backend/Block/Template.php
index ed21d0025e4ab..b9546009a53f3 100644
--- a/app/code/Magento/Backend/Block/Template.php
+++ b/app/code/Magento/Backend/Block/Template.php
@@ -79,7 +79,7 @@ public function isOutputEnabled($moduleName = null)
return !$this->_scopeConfig->isSetFlag(
'advanced/modules_disable_output/' . $moduleName,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
}
diff --git a/app/code/Magento/Backend/Block/Template/Context.php b/app/code/Magento/Backend/Block/Template/Context.php
index da4142f87c2f1..5be2763e3a500 100644
--- a/app/code/Magento/Backend/Block/Template/Context.php
+++ b/app/code/Magento/Backend/Block/Template/Context.php
@@ -66,7 +66,7 @@ class Context extends \Magento\Framework\View\Element\Template\Context
* @param \Magento\Framework\View\FileSystem $viewFileSystem
* @param \Magento\Framework\View\TemplateEnginePool $enginePool
* @param \Magento\Framework\App\State $appState
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\View\Page\Config $pageConfig
* @param \Magento\Framework\AuthorizationInterface $authorization
* @param \Magento\Backend\Model\Session $backendSession
@@ -99,7 +99,7 @@ public function __construct(
\Magento\Framework\View\FileSystem $viewFileSystem,
\Magento\Framework\View\TemplateEnginePool $enginePool,
\Magento\Framework\App\State $appState,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\View\Page\Config $pageConfig,
\Magento\Framework\AuthorizationInterface $authorization,
\Magento\Backend\Model\Session $backendSession,
@@ -143,7 +143,7 @@ public function __construct(
/**
* Get store manager
*
- * @return \Magento\Store\Model\StoreManagerInterface
+ * @return \Magento\Framework\Store\StoreManagerInterface
*/
public function getStoreManager()
{
diff --git a/app/code/Magento/Backend/Block/Widget/Context.php b/app/code/Magento/Backend/Block/Widget/Context.php
index 40bb65bc78fba..e5ab71975d5ee 100644
--- a/app/code/Magento/Backend/Block/Widget/Context.php
+++ b/app/code/Magento/Backend/Block/Widget/Context.php
@@ -49,7 +49,7 @@ class Context extends \Magento\Backend\Block\Template\Context
* @param \Magento\Framework\View\FileSystem $viewFileSystem
* @param \Magento\Framework\View\TemplateEnginePool $enginePool
* @param \Magento\Framework\App\State $appState
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\AuthorizationInterface $authorization
* @param \Magento\Backend\Model\Session $backendSession
* @param \Magento\Framework\Math\Random $mathRandom
@@ -84,7 +84,7 @@ public function __construct(
\Magento\Framework\View\FileSystem $viewFileSystem,
\Magento\Framework\View\TemplateEnginePool $enginePool,
\Magento\Framework\App\State $appState,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\View\Page\Config $pageConfig,
\Magento\Framework\AuthorizationInterface $authorization,
\Magento\Backend\Model\Session $backendSession,
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Date.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Date.php
index fa7185cca11b7..646aa02918598 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Date.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Date.php
@@ -203,7 +203,7 @@ protected function _convertDate($date, $locale)
$dateObj->setTimezone(
$this->_scopeConfig->getValue(
$this->_localeDate->getDefaultTimezonePath(),
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)
);
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php
index 3ea98889419dc..65a71d3944aea 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php
@@ -44,7 +44,7 @@ public function getValue($index = null)
$datetimeTo->setTimezone(
$this->_scopeConfig->getValue(
$this->_localeDate->getDefaultTimezonePath(),
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)
);
$datetimeTo->addDay(1)->subSecond(1);
@@ -70,7 +70,7 @@ protected function _convertDate($date, $locale)
$dateObj->setTimezone(
$this->_scopeConfig->getValue(
$this->_localeDate->getDefaultTimezonePath(),
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)
);
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php
index f0454dd37a9ec..d8e73328b9167 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php
@@ -30,7 +30,7 @@ class Currency extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstra
/**
* Application object
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -51,7 +51,7 @@ class Currency extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstra
/**
* @param \Magento\Backend\Block\Context $context
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Directory\Model\Currency\DefaultLocator $currencyLocator
* @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
* @param \Magento\Framework\Locale\CurrencyInterface $localeCurrency
@@ -59,7 +59,7 @@ class Currency extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstra
*/
public function __construct(
\Magento\Backend\Block\Context $context,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Directory\Model\Currency\DefaultLocator $currencyLocator,
\Magento\Directory\Model\CurrencyFactory $currencyFactory,
\Magento\Framework\Locale\CurrencyInterface $localeCurrency,
diff --git a/app/code/Magento/Backend/Helper/Dashboard/Data.php b/app/code/Magento/Backend/Helper/Dashboard/Data.php
index 17cffb3f53c45..25b527c5013b0 100644
--- a/app/code/Magento/Backend/Helper/Dashboard/Data.php
+++ b/app/code/Magento/Backend/Helper/Dashboard/Data.php
@@ -30,7 +30,7 @@ class Data extends \Magento\Core\Helper\Data
/**
* @param \Magento\Framework\App\Helper\Context $context
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\State $appState
* @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
* @param DeploymentConfig $deploymentConfig
@@ -39,7 +39,7 @@ class Data extends \Magento\Core\Helper\Data
public function __construct(
\Magento\Framework\App\Helper\Context $context,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\App\State $appState,
\Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
DeploymentConfig $deploymentConfig,
diff --git a/app/code/Magento/Backend/Helper/Dashboard/Order.php b/app/code/Magento/Backend/Helper/Dashboard/Order.php
index 899e2b2ee6e04..a78e32e23d17d 100644
--- a/app/code/Magento/Backend/Helper/Dashboard/Order.php
+++ b/app/code/Magento/Backend/Helper/Dashboard/Order.php
@@ -18,7 +18,7 @@ class Order extends \Magento\Backend\Helper\Dashboard\AbstractDashboard
/**
* @param \Magento\Framework\App\Helper\Context $context
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\State $appState
* @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
* @param \Magento\Reports\Model\Resource\Order\Collection $orderCollection
@@ -27,7 +27,7 @@ class Order extends \Magento\Backend\Helper\Dashboard\AbstractDashboard
public function __construct(
\Magento\Framework\App\Helper\Context $context,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\App\State $appState,
\Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
\Magento\Reports\Model\Resource\Order\Collection $orderCollection,
diff --git a/app/code/Magento/Backend/Model/Auth.php b/app/code/Magento/Backend/Model/Auth.php
index 41bf18a229d63..6a1eabc8b7379 100644
--- a/app/code/Magento/Backend/Model/Auth.php
+++ b/app/code/Magento/Backend/Model/Auth.php
@@ -40,7 +40,7 @@ class Auth
protected $_coreConfig;
/**
- * @var \Magento\Core\Model\Factory
+ * @var \Magento\Framework\Data\Collection\ModelFactory
*/
protected $_modelFactory;
@@ -50,7 +50,7 @@ class Auth
* @param \Magento\Backend\Model\Auth\StorageInterface $authStorage
* @param \Magento\Backend\Model\Auth\Credential\StorageInterface $credentialStorage
* @param \Magento\Framework\App\Config\ScopeConfigInterface $coreConfig
- * @param \Magento\Core\Model\Factory $modelFactory
+ * @param \Magento\Framework\Data\Collection\ModelFactory $modelFactory
*/
public function __construct(
\Magento\Framework\Event\ManagerInterface $eventManager,
@@ -58,7 +58,7 @@ public function __construct(
\Magento\Backend\Model\Auth\StorageInterface $authStorage,
\Magento\Backend\Model\Auth\Credential\StorageInterface $credentialStorage,
\Magento\Framework\App\Config\ScopeConfigInterface $coreConfig,
- \Magento\Core\Model\Factory $modelFactory
+ \Magento\Framework\Data\Collection\ModelFactory $modelFactory
) {
$this->_eventManager = $eventManager;
$this->_backendData = $backendData;
diff --git a/app/code/Magento/Backend/Model/Cache/Resource/Grid/Collection.php b/app/code/Magento/Backend/Model/Cache/Resource/Grid/Collection.php
index da72e1cdd7ae0..0006b2f1be3ea 100644
--- a/app/code/Magento/Backend/Model/Cache/Resource/Grid/Collection.php
+++ b/app/code/Magento/Backend/Model/Cache/Resource/Grid/Collection.php
@@ -15,11 +15,11 @@ class Collection extends \Magento\Framework\Data\Collection
protected $_cacheTypeList;
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Magento\Framework\App\Cache\TypeListInterface $cacheTypeList
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Magento\Framework\App\Cache\TypeListInterface $cacheTypeList
) {
$this->_cacheTypeList = $cacheTypeList;
diff --git a/app/code/Magento/Backend/Model/Config.php b/app/code/Magento/Backend/Model/Config.php
index b5b099997e327..fac2a55a463c5 100644
--- a/app/code/Magento/Backend/Model/Config.php
+++ b/app/code/Magento/Backend/Model/Config.php
@@ -71,7 +71,7 @@ class Config extends \Magento\Framework\Object
protected $_configValueFactory;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -82,7 +82,7 @@ class Config extends \Magento\Framework\Object
* @param \Magento\Framework\DB\TransactionFactory $transactionFactory
* @param \Magento\Backend\Model\Config\Loader $configLoader
* @param \Magento\Framework\App\Config\ValueFactory $configValueFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param array $data
*/
public function __construct(
@@ -92,7 +92,7 @@ public function __construct(
\Magento\Framework\DB\TransactionFactory $transactionFactory,
\Magento\Backend\Model\Config\Loader $configLoader,
\Magento\Framework\App\Config\ValueFactory $configValueFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
array $data = []
) {
parent::__construct($data);
diff --git a/app/code/Magento/Backend/Model/Config/Backend/Admin/Observer.php b/app/code/Magento/Backend/Model/Config/Backend/Admin/Observer.php
index a2ab813d88d44..be0e1bfd8ded4 100644
--- a/app/code/Magento/Backend/Model/Config/Backend/Admin/Observer.php
+++ b/app/code/Magento/Backend/Model/Config/Backend/Admin/Observer.php
@@ -32,7 +32,7 @@ class Observer
protected $_response;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -48,7 +48,7 @@ public function __construct(
\Magento\Framework\Registry $coreRegistry,
\Magento\Backend\Model\Auth\Session $authSession,
\Magento\Framework\App\ResponseInterface $response,
- \Magento\Store\Model\StoreManagerInterface $storeManager
+ \Magento\Framework\Store\StoreManagerInterface $storeManager
) {
$this->_backendData = $backendData;
$this->_coreRegistry = $coreRegistry;
diff --git a/app/code/Magento/Backend/Model/Config/Backend/Currency/AbstractCurrency.php b/app/code/Magento/Backend/Model/Config/Backend/Currency/AbstractCurrency.php
index 677c9e83854db..b2eac31749d0a 100644
--- a/app/code/Magento/Backend/Model/Config/Backend/Currency/AbstractCurrency.php
+++ b/app/code/Magento/Backend/Model/Config/Backend/Currency/AbstractCurrency.php
@@ -77,7 +77,7 @@ protected function _getInstalledCurrencies()
',',
$this->_scopeConfig->getValue(
'system/currency/installed',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)
);
}
diff --git a/app/code/Magento/Backend/Model/Config/Backend/Locale.php b/app/code/Magento/Backend/Model/Config/Backend/Locale.php
index 8341277a0f883..37d3b759e0f19 100644
--- a/app/code/Magento/Backend/Model/Config/Backend/Locale.php
+++ b/app/code/Magento/Backend/Model/Config/Backend/Locale.php
@@ -95,14 +95,14 @@ public function afterSave()
$scopeName = __('Default scope');
break;
- case \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE:
+ case \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE:
/** @var $website \Magento\Store\Model\Website */
$website = $this->_websiteFactory->create();
$websiteName = $website->load($data->getScopeId())->getName();
$scopeName = __('website(%1) scope', $websiteName);
break;
- case \Magento\Store\Model\ScopeInterface::SCOPE_STORE:
+ case \Magento\Framework\Store\ScopeInterface::SCOPE_STORE:
/** @var $store \Magento\Store\Model\Store */
$store = $this->_storeFactory->create();
$storeName = $store->load($data->getScopeId())->getName();
diff --git a/app/code/Magento/Backend/Model/Config/Backend/Store.php b/app/code/Magento/Backend/Model/Config/Backend/Store.php
index 8ada34865bf60..0926b1a7d46b4 100644
--- a/app/code/Magento/Backend/Model/Config/Backend/Store.php
+++ b/app/code/Magento/Backend/Model/Config/Backend/Store.php
@@ -46,7 +46,7 @@ public function afterSave()
$this->_mutableConfig->setValue(
\Magento\Store\Model\Store::XML_PATH_STORE_IN_URL,
$this->getValue(),
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
$this->_cacheManager->clean();
}
diff --git a/app/code/Magento/Backend/Model/Config/Backend/Translate.php b/app/code/Magento/Backend/Model/Config/Backend/Translate.php
index eddfffe2a06ba..9fb7b137db93e 100644
--- a/app/code/Magento/Backend/Model/Config/Backend/Translate.php
+++ b/app/code/Magento/Backend/Model/Config/Backend/Translate.php
@@ -67,7 +67,7 @@ public function afterSave()
$types = array_keys(
$this->_scopeConfig->getValue(
self::XML_PATH_INVALID_CACHES,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)
);
if ($this->isValueChanged()) {
diff --git a/app/code/Magento/Backend/Model/Config/ScopeDefiner.php b/app/code/Magento/Backend/Model/Config/ScopeDefiner.php
index e8303c46c0e8f..fc5f1ad32413e 100644
--- a/app/code/Magento/Backend/Model/Config/ScopeDefiner.php
+++ b/app/code/Magento/Backend/Model/Config/ScopeDefiner.php
@@ -3,12 +3,13 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
+namespace Magento\Backend\Model\Config;
+
+use Magento\Framework\Store\ScopeInterface as StoreScopeInterface;
/**
* System configuration scope
*/
-namespace Magento\Backend\Model\Config;
-
class ScopeDefiner
{
/**
@@ -35,8 +36,8 @@ public function getScope()
{
return $this->_request->getParam(
'store'
- ) ? \Magento\Store\Model\ScopeInterface::SCOPE_STORE : ($this->_request->getParam(
+ ) ? StoreScopeInterface::SCOPE_STORE : ($this->_request->getParam(
'website'
- ) ? \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE : \Magento\Framework\App\ScopeInterface::SCOPE_DEFAULT);
+ ) ? StoreScopeInterface::SCOPE_WEBSITE : \Magento\Framework\App\ScopeInterface::SCOPE_DEFAULT);
}
}
diff --git a/app/code/Magento/Backend/Model/Config/Source/Website.php b/app/code/Magento/Backend/Model/Config/Source/Website.php
index da9f210595c37..3998a2ba1534a 100644
--- a/app/code/Magento/Backend/Model/Config/Source/Website.php
+++ b/app/code/Magento/Backend/Model/Config/Source/Website.php
@@ -13,14 +13,14 @@ class Website implements \Magento\Framework\Option\ArrayInterface
protected $_options;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
/**
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
*/
- public function __construct(\Magento\Store\Model\StoreManagerInterface $storeManager)
+ public function __construct(\Magento\Framework\Store\StoreManagerInterface $storeManager)
{
$this->_storeManager = $storeManager;
}
diff --git a/app/code/Magento/Backend/Model/Config/Structure/AbstractElement.php b/app/code/Magento/Backend/Model/Config/Structure/AbstractElement.php
index 711ac4da6e270..cd53f3bf0dbc4 100644
--- a/app/code/Magento/Backend/Model/Config/Structure/AbstractElement.php
+++ b/app/code/Magento/Backend/Model/Config/Structure/AbstractElement.php
@@ -5,7 +5,7 @@
*/
namespace Magento\Backend\Model\Config\Structure;
-use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\Store\StoreManagerInterface;
abstract class AbstractElement implements ElementInterface
{
@@ -26,12 +26,12 @@ abstract class AbstractElement implements ElementInterface
/**
* Store manager
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
/**
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
*/
public function __construct(StoreManagerInterface $storeManager)
{
@@ -134,8 +134,8 @@ public function getAttribute($key)
public function isVisible()
{
$showInScope = [
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE => $this->_hasVisibilityValue('showInStore'),
- \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE => $this->_hasVisibilityValue('showInWebsite'),
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE => $this->_hasVisibilityValue('showInStore'),
+ \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE => $this->_hasVisibilityValue('showInWebsite'),
\Magento\Framework\App\ScopeInterface::SCOPE_DEFAULT => $this->_hasVisibilityValue('showInDefault'),
];
diff --git a/app/code/Magento/Backend/Model/Config/Structure/Element/AbstractComposite.php b/app/code/Magento/Backend/Model/Config/Structure/Element/AbstractComposite.php
index 3751181eabc0f..0083aebe7fb9a 100644
--- a/app/code/Magento/Backend/Model/Config/Structure/Element/AbstractComposite.php
+++ b/app/code/Magento/Backend/Model/Config/Structure/Element/AbstractComposite.php
@@ -15,11 +15,13 @@ abstract class AbstractComposite extends \Magento\Backend\Model\Config\Structure
protected $_childrenIterator;
/**
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param Iterator $childrenIterator
*/
- public function __construct(\Magento\Store\Model\StoreManagerInterface $storeManager, Iterator $childrenIterator)
- {
+ public function __construct(
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ Iterator $childrenIterator
+ ) {
parent::__construct($storeManager);
$this->_childrenIterator = $childrenIterator;
}
diff --git a/app/code/Magento/Backend/Model/Config/Structure/Element/Dependency/Mapper.php b/app/code/Magento/Backend/Model/Config/Structure/Element/Dependency/Mapper.php
index e5458890fe645..429afca222f75 100644
--- a/app/code/Magento/Backend/Model/Config/Structure/Element/Dependency/Mapper.php
+++ b/app/code/Magento/Backend/Model/Config/Structure/Element/Dependency/Mapper.php
@@ -66,7 +66,7 @@ public function getDependencies($dependencies, $storeCode, $fieldPrefix = '')
if (false == $dependentField->isVisible()) {
$valueInStore = $this->_scopeConfig->getValue(
$dependentField->getPath($fieldPrefix),
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$storeCode
);
$shouldAddDependency = !$field->isValueSatisfy($valueInStore);
diff --git a/app/code/Magento/Backend/Model/Config/Structure/Element/Field.php b/app/code/Magento/Backend/Model/Config/Structure/Element/Field.php
index 3263d3dc619ea..d591f2f3a69a1 100644
--- a/app/code/Magento/Backend/Model/Config/Structure/Element/Field.php
+++ b/app/code/Magento/Backend/Model/Config/Structure/Element/Field.php
@@ -49,7 +49,7 @@ class Field extends \Magento\Backend\Model\Config\Structure\AbstractElement
protected $_blockFactory;
/**
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Backend\Model\Config\BackendFactory $backendFactory
* @param \Magento\Backend\Model\Config\SourceFactory $sourceFactory
* @param \Magento\Backend\Model\Config\CommentFactory $commentFactory
@@ -57,7 +57,7 @@ class Field extends \Magento\Backend\Model\Config\Structure\AbstractElement
* @param \Magento\Backend\Model\Config\Structure\Element\Dependency\Mapper $dependencyMapper
*/
public function __construct(
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Backend\Model\Config\BackendFactory $backendFactory,
\Magento\Backend\Model\Config\SourceFactory $sourceFactory,
\Magento\Backend\Model\Config\CommentFactory $commentFactory,
diff --git a/app/code/Magento/Backend/Model/Config/Structure/Element/Group.php b/app/code/Magento/Backend/Model/Config/Structure/Element/Group.php
index 251fa37a319d1..7213a534cc9da 100644
--- a/app/code/Magento/Backend/Model/Config/Structure/Element/Group.php
+++ b/app/code/Magento/Backend/Model/Config/Structure/Element/Group.php
@@ -24,13 +24,13 @@ class Group extends AbstractComposite
protected $_dependencyMapper;
/**
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Backend\Model\Config\Structure\Element\Iterator\Field $childrenIterator
* @param \Magento\Backend\Model\Config\BackendClone\Factory $cloneModelFactory
* @param \Magento\Backend\Model\Config\Structure\Element\Dependency\Mapper $dependencyMapper
*/
public function __construct(
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Backend\Model\Config\Structure\Element\Iterator\Field $childrenIterator,
\Magento\Backend\Model\Config\BackendClone\Factory $cloneModelFactory,
\Magento\Backend\Model\Config\Structure\Element\Dependency\Mapper $dependencyMapper
diff --git a/app/code/Magento/Backend/Model/Config/Structure/Element/Section.php b/app/code/Magento/Backend/Model/Config/Structure/Element/Section.php
index 3965d01a4d26a..e5f75aae53644 100644
--- a/app/code/Magento/Backend/Model/Config/Structure/Element/Section.php
+++ b/app/code/Magento/Backend/Model/Config/Structure/Element/Section.php
@@ -15,12 +15,12 @@ class Section extends AbstractComposite
protected $_authorization;
/**
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param Iterator $childrenIterator
* @param \Magento\Framework\AuthorizationInterface $authorization
*/
public function __construct(
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
Iterator $childrenIterator,
\Magento\Framework\AuthorizationInterface $authorization
) {
diff --git a/app/code/Magento/Backend/Model/Menu/Item.php b/app/code/Magento/Backend/Model/Menu/Item.php
index c52c96fe555ab..6ed736567dfde 100644
--- a/app/code/Magento/Backend/Model/Menu/Item.php
+++ b/app/code/Magento/Backend/Model/Menu/Item.php
@@ -425,7 +425,7 @@ protected function _isModuleDependenciesAvailable()
protected function _isConfigDependenciesAvailable()
{
if ($this->_dependsOnConfig) {
- return $this->_scopeConfig->isSetFlag((string)$this->_dependsOnConfig, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+ return $this->_scopeConfig->isSetFlag((string)$this->_dependsOnConfig, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
}
return true;
}
diff --git a/app/code/Magento/Backend/Model/Observer.php b/app/code/Magento/Backend/Model/Observer.php
index a120afa972210..285ffdd4d0b18 100644
--- a/app/code/Magento/Backend/Model/Observer.php
+++ b/app/code/Magento/Backend/Model/Observer.php
@@ -13,31 +13,25 @@ class Observer
/**
* @var \Magento\Backend\Model\Session
*/
- protected $_backendSession;
+ protected $backendSession;
/**
- * @var \Magento\Framework\App\CacheInterface
+ * @var \Magento\Framework\App\Cache\Frontend\Pool
*/
- protected $cache;
-
- /**
- * @var \Magento\Framework\App\RequestInterface
- */
- protected $_request;
+ private $cacheFrontendPool;
/**
+ * Initialize dependencies
+ *
* @param Session $backendSession
- * @param \Magento\Framework\App\CacheInterface $cache
- * @param \Magento\Framework\App\RequestInterface $request
+ * @param \Magento\Framework\App\Cache\Frontend\Pool $cacheFrontendPool
*/
public function __construct(
\Magento\Backend\Model\Session $backendSession,
- \Magento\Framework\App\CacheInterface $cache,
- \Magento\Framework\App\RequestInterface $request
+ \Magento\Framework\App\Cache\Frontend\Pool $cacheFrontendPool
) {
- $this->_backendSession = $backendSession;
- $this->cache = $cache;
- $this->_request = $request;
+ $this->backendSession = $backendSession;
+ $this->cacheFrontendPool = $cacheFrontendPool;
}
/**
@@ -50,7 +44,7 @@ public function bindLocale($observer)
{
$locale = $observer->getEvent()->getLocale();
if ($locale) {
- $selectedLocale = $this->_backendSession->getLocale();
+ $selectedLocale = $this->backendSession->getLocale();
if ($selectedLocale) {
$locale->setLocaleCode($selectedLocale);
}
@@ -67,4 +61,20 @@ public function clearCacheConfigurationFilesAccessLevelVerification()
{
return $this;
}
+
+ /**
+ * Cron job method to clean old cache resources
+ *
+ * @param \Magento\Cron\Model\Schedule $schedule
+ * @return void
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ */
+ public function cleanCache(\Magento\Cron\Model\Schedule $schedule)
+ {
+ /** @var $cacheFrontend \Magento\Framework\Cache\FrontendInterface */
+ foreach ($this->cacheFrontendPool as $cacheFrontend) {
+ // Magento cache frontend does not support the 'old' cleaning mode, that's why backend is used directly
+ $cacheFrontend->getBackend()->clean(\Zend_Cache::CLEANING_MODE_OLD);
+ }
+ }
}
diff --git a/app/code/Magento/Backend/Model/Session/AdminConfig.php b/app/code/Magento/Backend/Model/Session/AdminConfig.php
index 564f9540a9703..0e66533f78691 100644
--- a/app/code/Magento/Backend/Model/Session/AdminConfig.php
+++ b/app/code/Magento/Backend/Model/Session/AdminConfig.php
@@ -30,7 +30,7 @@ class AdminConfig extends Config
protected $_frontNameResolver;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -43,7 +43,7 @@ class AdminConfig extends Config
* @param DeploymentConfig $deploymentConfig
* @param string $scopeType
* @param FrontNameResolver $frontNameResolver
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param string $lifetimePath
* @param string $sessionName
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
@@ -57,7 +57,7 @@ public function __construct(
DeploymentConfig $deploymentConfig,
$scopeType,
FrontNameResolver $frontNameResolver,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
$lifetimePath = self::XML_PATH_COOKIE_LIFETIME,
$sessionName = self::SESSION_NAME_ADMIN
) {
diff --git a/app/code/Magento/Backend/Model/Session/Quote.php b/app/code/Magento/Backend/Model/Session/Quote.php
index 96141a383c690..644ea27c6057f 100644
--- a/app/code/Magento/Backend/Model/Session/Quote.php
+++ b/app/code/Magento/Backend/Model/Session/Quote.php
@@ -65,7 +65,7 @@ class Quote extends \Magento\Framework\Session\SessionManager
protected $quoteRepository;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -86,7 +86,7 @@ class Quote extends \Magento\Framework\Session\SessionManager
* @param CustomerRepositoryInterface $customerRepository
* @param \Magento\Quote\Model\QuoteRepository $quoteRepository
* @param \Magento\Sales\Model\OrderFactory $orderFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param GroupManagementInterface $groupManagement
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
@@ -102,7 +102,7 @@ public function __construct(
CustomerRepositoryInterface $customerRepository,
\Magento\Quote\Model\QuoteRepository $quoteRepository,
\Magento\Sales\Model\OrderFactory $orderFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
GroupManagementInterface $groupManagement
) {
$this->customerRepository = $customerRepository;
diff --git a/app/code/Magento/Backend/Model/Url/ScopeResolver.php b/app/code/Magento/Backend/Model/Url/ScopeResolver.php
index e43f2b2e4fd6d..8c3caf5b1bdbf 100644
--- a/app/code/Magento/Backend/Model/Url/ScopeResolver.php
+++ b/app/code/Magento/Backend/Model/Url/ScopeResolver.php
@@ -5,6 +5,6 @@
*/
namespace Magento\Backend\Model\Url;
-class ScopeResolver extends \Magento\Core\Model\Url\ScopeResolver
+class ScopeResolver extends \Magento\Framework\Url\ScopeResolver
{
}
diff --git a/app/code/Magento/Backend/etc/adminhtml/system.xml b/app/code/Magento/Backend/etc/adminhtml/system.xml
index c4d90dd0232f5..adba54d656028 100644
--- a/app/code/Magento/Backend/etc/adminhtml/system.xml
+++ b/app/code/Magento/Backend/etc/adminhtml/system.xml
@@ -105,13 +105,13 @@
Magento\Framework\View\Design\Theme\Label::getLabelsCollectionForSystemConfiguration
- Magento\Core\Model\Design\Backend\Theme
+ Magento\Theme\Model\Design\Backend\Theme
Magento\Backend\Block\System\Config\Form\Field\Regexceptions
- Magento\Core\Model\Design\Backend\Exceptions
+ Magento\Theme\Model\Design\Backend\Exceptions
Firefox
/^mozilla/i]]>
diff --git a/app/code/Magento/Core/etc/crontab.xml b/app/code/Magento/Backend/etc/crontab.xml
similarity index 77%
rename from app/code/Magento/Core/etc/crontab.xml
rename to app/code/Magento/Backend/etc/crontab.xml
index 5b41a8ae8952b..aaca66d2f8d0f 100644
--- a/app/code/Magento/Core/etc/crontab.xml
+++ b/app/code/Magento/Backend/etc/crontab.xml
@@ -7,7 +7,7 @@
-->
-
+
30 2 * * *
diff --git a/app/code/Magento/Backend/etc/di.xml b/app/code/Magento/Backend/etc/di.xml
index 5445af580b20c..4d5f28658fb33 100644
--- a/app/code/Magento/Backend/etc/di.xml
+++ b/app/code/Magento/Backend/etc/di.xml
@@ -79,7 +79,7 @@
Magento\Backend\Model\Url\ScopeResolver
Magento\Backend\Model\Auth\Session\Proxy
Magento\Framework\Data\Form\FormKey\Proxy
- Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ Magento\Framework\Store\ScopeInterface::SCOPE_STORE
Magento\Backend\Helper\Data\Proxy
diff --git a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_design_grid_block.xml b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_design_grid_block.xml
index b0e763b488eba..fc93ac15471fe 100644
--- a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_design_grid_block.xml
+++ b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_design_grid_block.xml
@@ -11,7 +11,7 @@
designGrid
- Magento\Core\Model\Resource\Design\Collection
+ Magento\Theme\Model\Resource\Design\Collection
1
1
diff --git a/app/code/Magento/Backup/Model/Fs/Collection.php b/app/code/Magento/Backup/Model/Fs/Collection.php
index c61a374ba3d91..289a1434e716f 100644
--- a/app/code/Magento/Backup/Model/Fs/Collection.php
+++ b/app/code/Magento/Backup/Model/Fs/Collection.php
@@ -39,13 +39,13 @@ class Collection extends \Magento\Framework\Data\Collection\Filesystem
protected $_backup = null;
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Magento\Backup\Helper\Data $backupData
* @param \Magento\Framework\Filesystem $filesystem
* @param \Magento\Backup\Model\Backup $backup
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Magento\Backup\Helper\Data $backupData,
\Magento\Framework\Filesystem $filesystem,
\Magento\Backup\Model\Backup $backup
diff --git a/app/code/Magento/Backup/Model/Observer.php b/app/code/Magento/Backup/Model/Observer.php
index 6518b64e61ee0..56e4bc515c5a9 100644
--- a/app/code/Magento/Backup/Model/Observer.php
+++ b/app/code/Magento/Backup/Model/Observer.php
@@ -12,7 +12,7 @@
namespace Magento\Backup\Model;
use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\Store\ScopeInterface;
class Observer
{
diff --git a/app/code/Magento/Backup/composer.json b/app/code/Magento/Backup/composer.json
index e84901d7a97de..176e88bbb61da 100644
--- a/app/code/Magento/Backup/composer.json
+++ b/app/code/Magento/Backup/composer.json
@@ -3,8 +3,6 @@
"description": "N/A",
"require": {
"php": "~5.4.11|~5.5.0|~5.6.0",
- "magento/module-store": "0.42.0-beta5",
- "magento/module-core": "0.42.0-beta5",
"magento/module-backend": "0.42.0-beta5",
"magento/module-cron": "0.42.0-beta5",
"magento/framework": "0.42.0-beta5",
diff --git a/app/code/Magento/Backup/etc/module.xml b/app/code/Magento/Backup/etc/module.xml
index 46987d2eec5dd..315546d99b5af 100644
--- a/app/code/Magento/Backup/etc/module.xml
+++ b/app/code/Magento/Backup/etc/module.xml
@@ -8,8 +8,6 @@
-
-
diff --git a/app/code/Magento/Bundle/Model/LinkManagement.php b/app/code/Magento/Bundle/Model/LinkManagement.php
index 35bda8aafe5bb..77d839b7cb9bc 100644
--- a/app/code/Magento/Bundle/Model/LinkManagement.php
+++ b/app/code/Magento/Bundle/Model/LinkManagement.php
@@ -46,7 +46,7 @@ class LinkManagement implements \Magento\Bundle\Api\ProductLinkManagementInterfa
* @param \Magento\Bundle\Model\Resource\BundleFactory $bundleFactory
* @param \Magento\Bundle\Model\SelectionFactory $bundleSelection
* @param \Magento\Bundle\Model\Resource\Option\CollectionFactory $optionCollection
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
*/
public function __construct(
ProductRepositoryInterface $productRepository,
@@ -54,7 +54,7 @@ public function __construct(
\Magento\Bundle\Model\SelectionFactory $bundleSelection,
\Magento\Bundle\Model\Resource\BundleFactory $bundleFactory,
\Magento\Bundle\Model\Resource\Option\CollectionFactory $optionCollection,
- \Magento\Store\Model\StoreManagerInterface $storeManager
+ \Magento\Framework\Store\StoreManagerInterface $storeManager
) {
$this->productRepository = $productRepository;
$this->linkBuilder = $linkBuilder;
diff --git a/app/code/Magento/Bundle/Model/OptionRepository.php b/app/code/Magento/Bundle/Model/OptionRepository.php
index 438a229021721..d02ce9ebb95d7 100644
--- a/app/code/Magento/Bundle/Model/OptionRepository.php
+++ b/app/code/Magento/Bundle/Model/OptionRepository.php
@@ -60,7 +60,7 @@ class OptionRepository implements \Magento\Bundle\Api\ProductOptionRepositoryInt
* @param Product\Type $type
* @param \Magento\Bundle\Api\Data\OptionDataBuilder $optionBuilder
* @param Resource\Option $optionResource
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Bundle\Api\ProductLinkManagementInterface $linkManagement
* @param Product\OptionList $productOptionList
* @param Product\LinksList $linkList
@@ -70,7 +70,7 @@ public function __construct(
\Magento\Bundle\Model\Product\Type $type,
\Magento\Bundle\Api\Data\OptionDataBuilder $optionBuilder,
\Magento\Bundle\Model\Resource\Option $optionResource,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Bundle\Api\ProductLinkManagementInterface $linkManagement,
\Magento\Bundle\Model\Product\OptionList $productOptionList,
\Magento\Bundle\Model\Product\LinksList $linkList
diff --git a/app/code/Magento/Bundle/Model/Product/CatalogPrice.php b/app/code/Magento/Bundle/Model/Product/CatalogPrice.php
index 8594145622882..977a927516459 100644
--- a/app/code/Magento/Bundle/Model/Product/CatalogPrice.php
+++ b/app/code/Magento/Bundle/Model/Product/CatalogPrice.php
@@ -11,7 +11,7 @@
class CatalogPrice implements \Magento\Catalog\Model\Product\CatalogPriceInterface
{
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $storeManager;
@@ -26,12 +26,12 @@ class CatalogPrice implements \Magento\Catalog\Model\Product\CatalogPriceInterfa
protected $coreRegistry;
/**
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Model\Product\CatalogPrice $commonPriceModel
* @param \Magento\Framework\Registry $coreRegistry
*/
public function __construct(
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Product\CatalogPrice $commonPriceModel,
\Magento\Framework\Registry $coreRegistry
) {
@@ -80,6 +80,7 @@ public function getCatalogPrice(\Magento\Catalog\Model\Product $product, $store
*
* @param \Magento\Catalog\Model\Product $product
* @return null
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function getCatalogRegularPrice(\Magento\Catalog\Model\Product $product)
{
diff --git a/app/code/Magento/Bundle/Model/Product/Price.php b/app/code/Magento/Bundle/Model/Product/Price.php
index af198bf0b1b72..4fc817f7006e7 100644
--- a/app/code/Magento/Bundle/Model/Product/Price.php
+++ b/app/code/Magento/Bundle/Model/Product/Price.php
@@ -41,7 +41,7 @@ class Price extends \Magento\Catalog\Model\Product\Type\Price
/**
* @param \Magento\CatalogRule\Model\Resource\RuleFactory $ruleFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
* @param \Magento\Customer\Model\Session $customerSession
* @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -51,7 +51,7 @@ class Price extends \Magento\Catalog\Model\Product\Type\Price
*/
public function __construct(
\Magento\CatalogRule\Model\Resource\RuleFactory $ruleFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
\Magento\Customer\Model\Session $customerSession,
\Magento\Framework\Event\ManagerInterface $eventManager,
diff --git a/app/code/Magento/Bundle/Model/Product/Type.php b/app/code/Magento/Bundle/Model/Product/Type.php
index 08d39b8d14bd8..8ad7f0d1dee9d 100644
--- a/app/code/Magento/Bundle/Model/Product/Type.php
+++ b/app/code/Magento/Bundle/Model/Product/Type.php
@@ -90,7 +90,7 @@ class Type extends \Magento\Catalog\Model\Product\Type\AbstractType
protected $_catalogProduct = null;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -158,7 +158,7 @@ class Type extends \Magento\Catalog\Model\Product\Type\AbstractType
* @param \Magento\Catalog\Model\Config $config
* @param \Magento\Bundle\Model\Resource\Selection $bundleSelection
* @param \Magento\Bundle\Model\OptionFactory $bundleOption
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param PriceCurrencyInterface $priceCurrency
* @param \Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry
* @param \Magento\CatalogInventory\Api\StockStateInterface $stockState
@@ -184,7 +184,7 @@ public function __construct(
\Magento\Catalog\Model\Config $config,
\Magento\Bundle\Model\Resource\Selection $bundleSelection,
\Magento\Bundle\Model\OptionFactory $bundleOption,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
PriceCurrencyInterface $priceCurrency,
\Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry,
\Magento\CatalogInventory\Api\StockStateInterface $stockState
diff --git a/app/code/Magento/Captcha/Helper/Data.php b/app/code/Magento/Captcha/Helper/Data.php
index 47c0ad3a56bb0..af41ad286188a 100644
--- a/app/code/Magento/Captcha/Helper/Data.php
+++ b/app/code/Magento/Captcha/Helper/Data.php
@@ -55,7 +55,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
protected $_filesystem;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -66,14 +66,14 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
/**
* @param \Magento\Framework\App\Helper\Context $context
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\Config\ScopeConfigInterface $config
* @param Filesystem $filesystem
* @param \Magento\Captcha\Model\CaptchaFactory $factory
*/
public function __construct(
\Magento\Framework\App\Helper\Context $context,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\App\Config\ScopeConfigInterface $config,
Filesystem $filesystem,
\Magento\Captcha\Model\CaptchaFactory $factory
@@ -117,7 +117,7 @@ public function getConfig($key, $store = null)
{
return $this->_config->getValue(
'customer/captcha/' . $key,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
}
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Image.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Image.php
index 023b9f78f2c0a..9e99b739b3528 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Image.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Image.php
@@ -14,7 +14,7 @@
class Image extends \Magento\Framework\Data\Form\Element\Image
{
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -23,7 +23,7 @@ class Image extends \Magento\Framework\Data\Form\Element\Image
* @param \Magento\Framework\Data\Form\Element\CollectionFactory $factoryCollection
* @param \Magento\Framework\Escaper $escaper
* @param \Magento\Framework\UrlInterface $urlBuilder
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param array $data
*/
public function __construct(
@@ -31,7 +31,7 @@ public function __construct(
\Magento\Framework\Data\Form\Element\CollectionFactory $factoryCollection,
\Magento\Framework\Escaper $escaper,
\Magento\Framework\UrlInterface $urlBuilder,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
$data = []
) {
$this->_storeManager = $storeManager;
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tab/Product.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tab/Product.php
index e45d7cbb1aebd..3085a2ebba94c 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tab/Product.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tab/Product.php
@@ -164,7 +164,7 @@ protected function _prepareColumns()
'type' => 'currency',
'currency_code' => (string)$this->_scopeConfig->getValue(
\Magento\Directory\Model\Currency::XML_PATH_CURRENCY_BASE,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
),
'index' => 'price'
]
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts.php
index f757d4f3e99c1..f9d6a0e2c2955 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts.php
@@ -28,8 +28,8 @@ protected function _prepareLayout()
$accordion = $this->getLayout()->createBlock('Magento\Backend\Block\Widget\Accordion')->setId('productAlerts');
/* @var $accordion \Magento\Backend\Block\Widget\Accordion */
- $alertPriceAllow = $this->_scopeConfig->getValue('catalog/productalert/allow_price', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
- $alertStockAllow = $this->_scopeConfig->getValue('catalog/productalert/allow_stock', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+ $alertPriceAllow = $this->_scopeConfig->getValue('catalog/productalert/allow_price', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+ $alertStockAllow = $this->_scopeConfig->getValue('catalog/productalert/allow_stock', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
if ($alertPriceAllow) {
$accordion->addItem(
@@ -76,8 +76,8 @@ public function getAccordionHtml()
*/
public function canShowTab()
{
- $alertPriceAllow = $this->_scopeConfig->getValue('catalog/productalert/allow_price', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
- $alertStockAllow = $this->_scopeConfig->getValue('catalog/productalert/allow_stock', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+ $alertPriceAllow = $this->_scopeConfig->getValue('catalog/productalert/allow_price', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+ $alertStockAllow = $this->_scopeConfig->getValue('catalog/productalert/allow_stock', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
return ($alertPriceAllow || $alertStockAllow) && parent::canShowTab();
}
}
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts/Price.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts/Price.php
index 3a3b7c04f5ff5..f1906209cf6a7 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts/Price.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts/Price.php
@@ -99,7 +99,7 @@ protected function _prepareColumns()
'type' => 'currency',
'currency_code' => $this->_scopeConfig->getValue(
\Magento\Directory\Model\Currency::XML_PATH_CURRENCY_BASE,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)
]
);
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Crosssell.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Crosssell.php
index 9f6229afbb32b..d0fca12a103bb 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Crosssell.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Crosssell.php
@@ -299,7 +299,7 @@ protected function _prepareColumns()
'type' => 'currency',
'currency_code' => (string)$this->_scopeConfig->getValue(
\Magento\Directory\Model\Currency::XML_PATH_CURRENCY_BASE,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
),
'index' => 'price',
'header_css_class' => 'col-price',
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php
index 3a86850d5f87c..45b9a559cb502 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php
@@ -284,7 +284,7 @@ public function getOptionValues()
$values = [];
$scope = (int)$this->_scopeConfig->getValue(
\Magento\Store\Model\Store::XML_PATH_PRICE_SCOPE,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
foreach ($optionsArr as $option) {
/* @var $option \Magento\Catalog\Model\Product\Option */
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Related.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Related.php
index 685aa481fe9fa..23a5257f146a2 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Related.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Related.php
@@ -293,7 +293,7 @@ protected function _prepareColumns()
'type' => 'currency',
'currency_code' => (string)$this->_scopeConfig->getValue(
\Magento\Directory\Model\Currency::XML_PATH_CURRENCY_BASE,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
),
'index' => 'price',
'header_css_class' => 'col-price',
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Upsell.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Upsell.php
index ca442c0b98b3e..0a55182e300a4 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Upsell.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Upsell.php
@@ -289,7 +289,7 @@ protected function _prepareColumns()
'type' => 'currency',
'currency_code' => (string)$this->_scopeConfig->getValue(
\Magento\Directory\Model\Currency::XML_PATH_CURRENCY_BASE,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
),
'index' => 'price',
'header_css_class' => 'col-price',
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery.php
index d8ad928169948..b7d4052a455e0 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery.php
@@ -20,7 +20,7 @@
class Gallery extends AbstractElement
{
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -34,7 +34,7 @@ class Gallery extends AbstractElement
* @param \Magento\Framework\Data\Form\Element\CollectionFactory $factoryCollection
* @param \Magento\Framework\Escaper $escaper
* @param \Magento\Framework\View\LayoutInterface $layout
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param array $data
*/
public function __construct(
@@ -42,7 +42,7 @@ public function __construct(
\Magento\Framework\Data\Form\Element\CollectionFactory $factoryCollection,
\Magento\Framework\Escaper $escaper,
\Magento\Framework\View\LayoutInterface $layout,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
$data = []
) {
$this->_layout = $layout;
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Price.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Price.php
index dc39a52818a2e..fb9cf9a0b43e1 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Price.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Price.php
@@ -19,7 +19,7 @@ class Price extends \Magento\Framework\Data\Form\Element\Text
protected $_taxData;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -32,7 +32,7 @@ class Price extends \Magento\Framework\Data\Form\Element\Text
* @param \Magento\Framework\Data\Form\Element\Factory $factoryElement
* @param \Magento\Framework\Data\Form\Element\CollectionFactory $factoryCollection
* @param \Magento\Framework\Escaper $escaper
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\Locale\CurrencyInterface $localeCurrency
* @param \Magento\Tax\Helper\Data $taxData
* @param array $data
@@ -41,7 +41,7 @@ public function __construct(
\Magento\Framework\Data\Form\Element\Factory $factoryElement,
\Magento\Framework\Data\Form\Element\CollectionFactory $factoryCollection,
\Magento\Framework\Escaper $escaper,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\Locale\CurrencyInterface $localeCurrency,
\Magento\Tax\Helper\Data $taxData,
array $data = []
@@ -109,6 +109,7 @@ protected function _getTaxObservingCode($attribute)
/**
* @param null|int|string $index
* @return null|string
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function getEscapedValue($index = null)
{
diff --git a/app/code/Magento/Catalog/Block/Breadcrumbs.php b/app/code/Magento/Catalog/Block/Breadcrumbs.php
index 5b6769b296d1a..248bc8e5a7c22 100644
--- a/app/code/Magento/Catalog/Block/Breadcrumbs.php
+++ b/app/code/Magento/Catalog/Block/Breadcrumbs.php
@@ -43,7 +43,7 @@ public function __construct(Context $context, Data $catalogData, array $data = [
*/
public function getTitleSeparator($store = null)
{
- $separator = (string)$this->_scopeConfig->getValue('catalog/seo/title_separator', \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
+ $separator = (string)$this->_scopeConfig->getValue('catalog/seo/title_separator', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store);
return ' ' . $separator . ' ';
}
diff --git a/app/code/Magento/Catalog/Block/Category/Rss/Link.php b/app/code/Magento/Catalog/Block/Category/Rss/Link.php
index 5db6d06d81b93..f13dc6550417b 100644
--- a/app/code/Magento/Catalog/Block/Category/Rss/Link.php
+++ b/app/code/Magento/Catalog/Block/Category/Rss/Link.php
@@ -45,7 +45,10 @@ public function __construct(
*/
public function isRssAllowed()
{
- return $this->_scopeConfig->getValue('rss/catalog/category', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+ return $this->_scopeConfig->getValue(
+ 'rss/catalog/category',
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ );
}
/**
diff --git a/app/code/Magento/Catalog/Block/Product/Context.php b/app/code/Magento/Catalog/Block/Product/Context.php
index 7244352e26286..10f1d2ab54814 100644
--- a/app/code/Magento/Catalog/Block/Product/Context.php
+++ b/app/code/Magento/Catalog/Block/Product/Context.php
@@ -94,7 +94,7 @@ class Context extends \Magento\Framework\View\Element\Template\Context
* @param \Magento\Framework\View\FileSystem $viewFileSystem
* @param \Magento\Framework\View\TemplateEnginePool $enginePool
* @param \Magento\Framework\App\State $appState
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Model\Config $catalogConfig
* @param \Magento\Framework\Registry $registry
* @param \Magento\Tax\Helper\Data $taxHelper
@@ -133,7 +133,7 @@ public function __construct(
\Magento\Framework\View\FileSystem $viewFileSystem,
\Magento\Framework\View\TemplateEnginePool $enginePool,
\Magento\Framework\App\State $appState,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\View\Page\Config $pageConfig,
\Magento\Catalog\Model\Config $catalogConfig,
\Magento\Framework\Registry $registry,
diff --git a/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php b/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
index b2f02218b1d7e..7177c8a45c7da 100644
--- a/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
+++ b/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
@@ -650,12 +650,12 @@ public function getPagerHtml()
)->setFrameLength(
$this->_scopeConfig->getValue(
'design/pagination/pagination_frame',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)
)->setJump(
$this->_scopeConfig->getValue(
'design/pagination/pagination_frame_skip',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)
)->setLimit(
$this->getLimit()
diff --git a/app/code/Magento/Catalog/Block/Rss/Category.php b/app/code/Magento/Catalog/Block/Rss/Category.php
index aa9048ae51fe0..2453f3c5e4795 100644
--- a/app/code/Magento/Catalog/Block/Rss/Category.php
+++ b/app/code/Magento/Catalog/Block/Rss/Category.php
@@ -37,7 +37,7 @@ class Category extends \Magento\Framework\View\Element\AbstractBlock implements
protected $rssModel;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $storeManager;
@@ -215,7 +215,10 @@ public function getCacheLifetime()
*/
public function isAllowed()
{
- return $this->_scopeConfig->isSetFlag('rss/catalog/category', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+ return $this->_scopeConfig->isSetFlag(
+ 'rss/catalog/category',
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ );
}
/**
diff --git a/app/code/Magento/Catalog/Block/Rss/Product/NewProducts.php b/app/code/Magento/Catalog/Block/Rss/Product/NewProducts.php
index 85c4cca4dcee2..69634b68d58d6 100644
--- a/app/code/Magento/Catalog/Block/Rss/Product/NewProducts.php
+++ b/app/code/Magento/Catalog/Block/Rss/Product/NewProducts.php
@@ -29,7 +29,7 @@ class NewProducts extends \Magento\Framework\View\Element\AbstractBlock implemen
protected $rssUrlBuilder;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $storeManager;
@@ -68,7 +68,7 @@ protected function _construct()
*/
public function isAllowed()
{
- return $this->_scopeConfig->isSetFlag('rss/catalog/new', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+ return $this->_scopeConfig->isSetFlag('rss/catalog/new', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
}
/**
@@ -81,7 +81,7 @@ public function getRssData()
$title = __('New Products from %1', $storeModel->getFrontendName());
$lang = $this->_scopeConfig->getValue(
'general/locale/code',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$storeModel
);
$data = [
diff --git a/app/code/Magento/Catalog/Block/Rss/Product/Special.php b/app/code/Magento/Catalog/Block/Rss/Product/Special.php
index d5da4e503b8bc..499e8e652e47e 100644
--- a/app/code/Magento/Catalog/Block/Rss/Product/Special.php
+++ b/app/code/Magento/Catalog/Block/Rss/Product/Special.php
@@ -41,7 +41,7 @@ class Special extends \Magento\Framework\View\Element\AbstractBlock implements D
protected $httpContext;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $storeManager;
@@ -121,7 +121,10 @@ public function getRssData()
{
$newUrl = $this->rssUrlBuilder->getUrl(['type' => 'special_products', 'store_id' => $this->getStoreId()]);
$title = __('%1 - Special Products', $this->storeManager->getStore()->getFrontendName());
- $lang = $this->_scopeConfig->getValue('general/locale/code', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+ $lang = $this->_scopeConfig->getValue(
+ 'general/locale/code',
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ );
$data = [
'title' => $title,
@@ -253,7 +256,10 @@ protected function getCustomerGroupId()
*/
public function isAllowed()
{
- return $this->_scopeConfig->isSetFlag('rss/catalog/special', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+ return $this->_scopeConfig->isSetFlag(
+ 'rss/catalog/special',
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ );
}
/**
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category.php
index 048739d49b1dd..9e7071dd11744 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Category.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category.php
@@ -45,7 +45,7 @@ protected function _initCategory($getRootInstead = false)
$category->load($categoryId);
if ($storeId) {
$rootId = $this->_objectManager->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->getStore(
$storeId
)->getRootCategoryId();
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Edit.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Edit.php
index f6b54278aa3ea..d1c6b3a1c1419 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Edit.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Edit.php
@@ -49,7 +49,7 @@ public function execute()
$categoryId = (int)$this->getRequest()->getParam('id');
if ($storeId && !$categoryId && !$parentId) {
- $store = $this->_objectManager->get('Magento\Store\Model\StoreManagerInterface')->getStore($storeId);
+ $store = $this->_objectManager->get('Magento\Framework\Store\StoreManagerInterface')->getStore($storeId);
$this->getRequest()->setParam('id', (int)$store->getRootCategoryId());
}
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php
index 4599a379adbc9..669584b1a84ab 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php
@@ -93,7 +93,7 @@ public function execute()
if (!$parentId) {
if ($storeId) {
$parentId = $this->_objectManager->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->getStore(
$storeId
)->getRootCategoryId();
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Tree.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Tree.php
index b4a312fd8aec1..790959ea64e7f 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Tree.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Tree.php
@@ -48,7 +48,9 @@ public function execute()
if ($storeId) {
if (!$categoryId) {
- $store = $this->_objectManager->get('Magento\Store\Model\StoreManagerInterface')->getStore($storeId);
+ $store = $this->_objectManager
+ ->get('Magento\Framework\Store\StoreManagerInterface')
+ ->getStore($storeId);
$rootId = $store->getRootCategoryId();
$this->getRequest()->setParam('id', $rootId);
}
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Edit.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Edit.php
index 34d74da1fa0c0..31a448a81d1d8 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Edit.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Edit.php
@@ -68,7 +68,7 @@ public function execute()
$resultPage->getConfig()->getTitle()->prepend(__('Products'));
$resultPage->getConfig()->getTitle()->prepend($product->getName());
- if (!$this->_objectManager->get('Magento\Store\Model\StoreManagerInterface')->isSingleStoreMode()
+ if (!$this->_objectManager->get('Magento\Framework\Store\StoreManagerInterface')->isSingleStoreMode()
&&
($switchBlock = $resultPage->getLayout()->getBlock('store_switcher'))
) {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php
index 9dbbddcee68f8..fc23b7d3f5a83 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php
@@ -13,7 +13,7 @@ class Helper
protected $request;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $storeManager;
@@ -34,14 +34,14 @@ class Helper
/**
* @param \Magento\Framework\App\RequestInterface $request
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param StockDataFilter $stockFilter
* @param \Magento\Catalog\Model\Product\Initialization\Helper\ProductLinks $productLinks
* @param \Magento\Backend\Helper\Js $jsHelper
*/
public function __construct(
\Magento\Framework\App\RequestInterface $request,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
StockDataFilter $stockFilter,
\Magento\Catalog\Model\Product\Initialization\Helper\ProductLinks $productLinks,
\Magento\Backend\Helper\Js $jsHelper
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Wysiwyg.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Wysiwyg.php
index f0f0b5274a667..f12d2aa2f1ec4 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Wysiwyg.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Wysiwyg.php
@@ -44,7 +44,7 @@ public function execute()
{
$elementId = $this->getRequest()->getParam('element_id', md5(microtime()));
$storeId = $this->getRequest()->getParam('store_id', 0);
- $storeMediaUrl = $this->_objectManager->get('Magento\Store\Model\StoreManagerInterface')
+ $storeMediaUrl = $this->_objectManager->get('Magento\Framework\Store\StoreManagerInterface')
->getStore($storeId)
->getBaseUrl(\Magento\Framework\UrlInterface::URL_TYPE_MEDIA);
diff --git a/app/code/Magento/Catalog/Controller/Category/View.php b/app/code/Magento/Catalog/Controller/Category/View.php
index 82f6992c1e8bb..79be48c730c5c 100644
--- a/app/code/Magento/Catalog/Controller/Category/View.php
+++ b/app/code/Magento/Catalog/Controller/Category/View.php
@@ -38,7 +38,7 @@ class View extends \Magento\Framework\App\Action\Action
protected $_catalogDesign;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -71,7 +71,7 @@ class View extends \Magento\Framework\App\Action\Action
* @param \Magento\Catalog\Model\Design $catalogDesign
* @param \Magento\Catalog\Model\Session $catalogSession
* @param \Magento\Framework\Registry $coreRegistry
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator $categoryUrlPathGenerator
* @param Resolver $layerResolver
* @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
@@ -82,7 +82,7 @@ public function __construct(
\Magento\Catalog\Model\Design $catalogDesign,
\Magento\Catalog\Model\Session $catalogSession,
\Magento\Framework\Registry $coreRegistry,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator $categoryUrlPathGenerator,
PageFactory $resultPageFactory,
Resolver $layerResolver,
diff --git a/app/code/Magento/Catalog/Controller/Product/Compare.php b/app/code/Magento/Catalog/Controller/Product/Compare.php
index 4e934b0685e69..2fce69244f5a0 100644
--- a/app/code/Magento/Catalog/Controller/Product/Compare.php
+++ b/app/code/Magento/Catalog/Controller/Product/Compare.php
@@ -68,7 +68,7 @@ class Compare extends \Magento\Framework\App\Action\Action
protected $_compareItemFactory;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -102,7 +102,7 @@ class Compare extends \Magento\Framework\App\Action\Action
* @param \Magento\Customer\Model\Visitor $customerVisitor
* @param \Magento\Catalog\Model\Product\Compare\ListCompare $catalogProductCompareList
* @param \Magento\Catalog\Model\Session $catalogSession
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param FormKeyValidator $formKeyValidator
* @param \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
* @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
@@ -117,7 +117,7 @@ public function __construct(
\Magento\Customer\Model\Visitor $customerVisitor,
\Magento\Catalog\Model\Product\Compare\ListCompare $catalogProductCompareList,
\Magento\Catalog\Model\Session $catalogSession,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
FormKeyValidator $formKeyValidator,
Result\RedirectFactory $resultRedirectFactory,
PageFactory $resultPageFactory,
diff --git a/app/code/Magento/Catalog/Controller/Product/Compare/Index.php b/app/code/Magento/Catalog/Controller/Product/Compare/Index.php
index aa311afa1c330..5090c890f13d2 100644
--- a/app/code/Magento/Catalog/Controller/Product/Compare/Index.php
+++ b/app/code/Magento/Catalog/Controller/Product/Compare/Index.php
@@ -29,7 +29,7 @@ class Index extends \Magento\Catalog\Controller\Product\Compare
* @param \Magento\Customer\Model\Visitor $customerVisitor
* @param \Magento\Catalog\Model\Product\Compare\ListCompare $catalogProductCompareList
* @param \Magento\Catalog\Model\Session $catalogSession
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param FormKeyValidator $formKeyValidator
* @param Result\RedirectFactory $resultRedirectFactory
* @param PageFactory $resultPageFactory
@@ -46,7 +46,7 @@ public function __construct(
\Magento\Customer\Model\Visitor $customerVisitor,
\Magento\Catalog\Model\Product\Compare\ListCompare $catalogProductCompareList,
\Magento\Catalog\Model\Session $catalogSession,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
FormKeyValidator $formKeyValidator,
Result\RedirectFactory $resultRedirectFactory,
PageFactory $resultPageFactory,
diff --git a/app/code/Magento/Catalog/Helper/Category.php b/app/code/Magento/Catalog/Helper/Category.php
index 04492509b595c..22ef6b0ca9861 100644
--- a/app/code/Magento/Catalog/Helper/Category.php
+++ b/app/code/Magento/Catalog/Helper/Category.php
@@ -39,7 +39,7 @@ class Category extends AbstractHelper
/**
* Store manager
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -65,7 +65,7 @@ class Category extends AbstractHelper
/**
* @param \Magento\Framework\App\Helper\Context $context
* @param \Magento\Catalog\Model\CategoryFactory $categoryFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param \Magento\Framework\Data\CollectionFactory $dataCollectionFactory
* @param CategoryRepositoryInterface $categoryRepository
@@ -73,7 +73,7 @@ class Category extends AbstractHelper
public function __construct(
\Magento\Framework\App\Helper\Context $context,
\Magento\Catalog\Model\CategoryFactory $categoryFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
\Magento\Framework\Data\CollectionFactory $dataCollectionFactory,
CategoryRepositoryInterface $categoryRepository
@@ -118,7 +118,7 @@ public function getStoreCategories($sorted = false, $asCollection = false, $toLo
0,
(int)$this->_scopeConfig->getValue(
'catalog/navigation/max_depth',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)
);
$storeCategories = $category->getCategories($parent, $recursionLevel, $sorted, $asCollection, $toLoad);
@@ -181,7 +181,7 @@ public function canUseCanonicalTag($store = null)
{
return $this->_scopeConfig->getValue(
self::XML_PATH_USE_CATEGORY_CANONICAL_TAG,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
}
diff --git a/app/code/Magento/Catalog/Helper/Data.php b/app/code/Magento/Catalog/Helper/Data.php
index 4609524bd509b..217f17cbd716d 100644
--- a/app/code/Magento/Catalog/Helper/Data.php
+++ b/app/code/Magento/Catalog/Helper/Data.php
@@ -98,7 +98,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
/**
* Store manager
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -168,7 +168,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
/**
* @param \Magento\Framework\App\Helper\Context $context
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Model\Session $catalogSession
* @param \Magento\Framework\Stdlib\String $string
* @param Category $catalogCategory
@@ -190,7 +190,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
*/
public function __construct(
\Magento\Framework\App\Helper\Context $context,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Session $catalogSession,
\Magento\Framework\Stdlib\String $string,
Category $catalogCategory,
@@ -388,7 +388,7 @@ public function getPriceScope()
{
return $this->_scopeConfig->getValue(
self::XML_PATH_PRICE_SCOPE,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
}
@@ -411,7 +411,7 @@ public function isUsingStaticUrlsAllowed()
{
return $this->_scopeConfig->isSetFlag(
self::CONFIG_USE_STATIC_URLS,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$this->_storeId
);
}
@@ -425,7 +425,7 @@ public function isUrlDirectivesParsingAllowed()
{
return $this->_scopeConfig->isSetFlag(
self::CONFIG_PARSE_URL_DIRECTIVES,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$this->_storeId
);
}
@@ -449,7 +449,7 @@ public function shouldDisplayProductCountOnLayer($storeId = null)
{
return $this->_scopeConfig->isSetFlag(
self::XML_PATH_DISPLAY_PRODUCT_COUNT,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$storeId
);
}
diff --git a/app/code/Magento/Catalog/Helper/Image.php b/app/code/Magento/Catalog/Helper/Image.php
index add8bd324ce95..c0b6a1720694d 100644
--- a/app/code/Magento/Catalog/Helper/Image.php
+++ b/app/code/Magento/Catalog/Helper/Image.php
@@ -164,25 +164,25 @@ public function init(\Magento\Catalog\Model\Product $product, $attributeName, $i
$this->setWatermark(
$this->_scopeConfig->getValue(
"design/watermark/{$this->_getModel()->getDestinationSubdir()}_image",
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)
);
$this->setWatermarkImageOpacity(
$this->_scopeConfig->getValue(
"design/watermark/{$this->_getModel()->getDestinationSubdir()}_imageOpacity",
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)
);
$this->setWatermarkPosition(
$this->_scopeConfig->getValue(
"design/watermark/{$this->_getModel()->getDestinationSubdir()}_position",
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)
);
$this->setWatermarkSize(
$this->_scopeConfig->getValue(
"design/watermark/{$this->_getModel()->getDestinationSubdir()}_size",
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)
);
diff --git a/app/code/Magento/Catalog/Helper/Product.php b/app/code/Magento/Catalog/Helper/Product.php
index 5adf09c4ce778..72000f42184c9 100644
--- a/app/code/Magento/Catalog/Helper/Product.php
+++ b/app/code/Magento/Catalog/Helper/Product.php
@@ -100,7 +100,7 @@ class Product extends \Magento\Core\Helper\Url
/**
* @param \Magento\Framework\App\Helper\Context $context
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Model\Session $catalogSession
* @param \Magento\Framework\View\Asset\Repository $assetRepo
* @param \Magento\Framework\Registry $coreRegistry
@@ -115,7 +115,7 @@ class Product extends \Magento\Core\Helper\Url
*/
public function __construct(
\Magento\Framework\App\Helper\Context $context,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Session $catalogSession,
\Magento\Framework\View\Asset\Repository $assetRepo,
\Magento\Framework\Registry $coreRegistry,
@@ -315,7 +315,7 @@ public function canUseCanonicalTag($store = null)
{
return $this->_scopeConfig->getValue(
self::XML_PATH_USE_PRODUCT_CANONICAL_TAG,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
}
diff --git a/app/code/Magento/Catalog/Helper/Product/Compare.php b/app/code/Magento/Catalog/Helper/Product/Compare.php
index 469c47e77d539..de95592316a2b 100644
--- a/app/code/Magento/Catalog/Helper/Product/Compare.php
+++ b/app/code/Magento/Catalog/Helper/Product/Compare.php
@@ -96,7 +96,7 @@ class Compare extends \Magento\Core\Helper\Url
/**
* @param \Magento\Framework\App\Helper\Context $context
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Model\Resource\Product\Compare\Item\CollectionFactory $itemCollectionFactory
* @param \Magento\Catalog\Model\Product\Visibility $catalogProductVisibility
* @param \Magento\Customer\Model\Visitor $customerVisitor
@@ -109,7 +109,7 @@ class Compare extends \Magento\Core\Helper\Url
*/
public function __construct(
\Magento\Framework\App\Helper\Context $context,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Resource\Product\Compare\Item\CollectionFactory $itemCollectionFactory,
\Magento\Catalog\Model\Product\Visibility $catalogProductVisibility,
\Magento\Customer\Model\Visitor $customerVisitor,
diff --git a/app/code/Magento/Catalog/Helper/Product/Composite.php b/app/code/Magento/Catalog/Helper/Product/Composite.php
index eca50adc3e225..a74b848da95df 100644
--- a/app/code/Magento/Catalog/Helper/Product/Composite.php
+++ b/app/code/Magento/Catalog/Helper/Product/Composite.php
@@ -10,7 +10,7 @@
use Magento\Framework\View\Result\LayoutFactory;
use Magento\Framework\Exception\NoSuchEntityException;
use Magento\Catalog\Helper\Product;
-use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\Store\StoreManagerInterface;
use Magento\Customer\Controller\RegistryConstants;
use Magento\Customer\Api\CustomerRepositoryInterface;
use Magento\Framework\Registry;
@@ -38,7 +38,7 @@ class Composite extends \Magento\Framework\App\Helper\AbstractHelper
protected $_catalogProduct = null;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -59,7 +59,7 @@ class Composite extends \Magento\Framework\App\Helper\AbstractHelper
/**
* @param \Magento\Framework\App\Helper\Context $context
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param Product $catalogProduct
* @param Registry $coreRegistry
* @param LayoutFactory $resultLayoutFactory
diff --git a/app/code/Magento/Catalog/Helper/Product/Edit/Action/Attribute.php b/app/code/Magento/Catalog/Helper/Product/Edit/Action/Attribute.php
index add782fd4d41e..8cca46b6a9da1 100644
--- a/app/code/Magento/Catalog/Helper/Product/Edit/Action/Attribute.php
+++ b/app/code/Magento/Catalog/Helper/Product/Edit/Action/Attribute.php
@@ -52,7 +52,7 @@ class Attribute extends \Magento\Backend\Helper\Data
protected $_eavConfig;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -67,7 +67,7 @@ class Attribute extends \Magento\Backend\Helper\Data
* @param \Magento\Eav\Model\Config $eavConfig
* @param \Magento\Backend\Model\Session $session
* @param \Magento\Catalog\Model\Resource\Product\CollectionFactory $productsFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
@@ -81,7 +81,7 @@ public function __construct(
\Magento\Eav\Model\Config $eavConfig,
\Magento\Backend\Model\Session $session,
\Magento\Catalog\Model\Resource\Product\CollectionFactory $productsFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager
+ \Magento\Framework\Store\StoreManagerInterface $storeManager
) {
$this->_eavConfig = $eavConfig;
$this->_session = $session;
diff --git a/app/code/Magento/Catalog/Helper/Product/Flat/Indexer.php b/app/code/Magento/Catalog/Helper/Product/Flat/Indexer.php
index 27d3d25fa89dc..1d0d2ef7ac8d5 100644
--- a/app/code/Magento/Catalog/Helper/Product/Flat/Indexer.php
+++ b/app/code/Magento/Catalog/Helper/Product/Flat/Indexer.php
@@ -101,7 +101,7 @@ class Indexer extends \Magento\Framework\App\Helper\AbstractHelper
protected $_attributeFactory;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -127,7 +127,7 @@ class Indexer extends \Magento\Framework\App\Helper\AbstractHelper
* @param \Magento\Catalog\Model\Attribute\Config $attributeConfig
* @param \Magento\Catalog\Model\Resource\ConfigFactory $configFactory
* @param \Magento\Eav\Model\Entity\AttributeFactory $attributeFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\Mview\View\Changelog $changelog
* @param bool $addFilterableAttrs
* @param bool $addChildData
@@ -141,7 +141,7 @@ public function __construct(
\Magento\Catalog\Model\Attribute\Config $attributeConfig,
\Magento\Catalog\Model\Resource\ConfigFactory $configFactory,
\Magento\Eav\Model\Entity\AttributeFactory $attributeFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\Mview\View\Changelog $changelog,
$addFilterableAttrs = false,
$addChildData = false,
diff --git a/app/code/Magento/Catalog/Helper/Product/ProductList.php b/app/code/Magento/Catalog/Helper/Product/ProductList.php
index f298f7b940f79..63940f6072228 100644
--- a/app/code/Magento/Catalog/Helper/Product/ProductList.php
+++ b/app/code/Magento/Catalog/Helper/Product/ProductList.php
@@ -50,7 +50,7 @@ public function __construct(
*/
public function getAvailableViewMode()
{
- switch ($this->scopeConfig->getValue(self::XML_PATH_LIST_MODE, \Magento\Store\Model\ScopeInterface::SCOPE_STORE)) {
+ switch ($this->scopeConfig->getValue(self::XML_PATH_LIST_MODE, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)) {
case 'grid':
$availableMode = ['grid' => __('Grid')];
break;
@@ -96,7 +96,7 @@ public function getDefaultSortField()
{
return $this->scopeConfig->getValue(
\Magento\Catalog\Model\Config::XML_PATH_LIST_DEFAULT_SORT_BY,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
}
@@ -114,13 +114,13 @@ public function getAvailableLimit($mode)
$perPageConfigKey = 'catalog/frontend/' . $mode . '_per_page_values';
$perPageValues = (string)$this->scopeConfig->getValue(
$perPageConfigKey,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
$perPageValues = explode(',', $perPageValues);
$perPageValues = array_combine($perPageValues, $perPageValues);
if ($this->scopeConfig->isSetFlag(
'catalog/frontend/list_allow_all',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)) {
return ($perPageValues + ['all' => __('All')]);
} else {
@@ -139,12 +139,12 @@ public function getDefaultLimitPerPageValue($viewMode)
if ($viewMode == self::VIEW_MODE_LIST) {
return $this->scopeConfig->getValue(
'catalog/frontend/list_per_page',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
} elseif ($viewMode == self::VIEW_MODE_GRID) {
return $this->scopeConfig->getValue(
'catalog/frontend/grid_per_page',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
}
return 0;
diff --git a/app/code/Magento/Catalog/Model/AbstractModel.php b/app/code/Magento/Catalog/Model/AbstractModel.php
index 5694254c627ca..db9aef0d7d9d3 100644
--- a/app/code/Magento/Catalog/Model/AbstractModel.php
+++ b/app/code/Magento/Catalog/Model/AbstractModel.php
@@ -55,7 +55,7 @@ abstract class AbstractModel extends \Magento\Framework\Model\AbstractExtensible
/**
* Store manager
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -64,7 +64,7 @@ abstract class AbstractModel extends \Magento\Framework\Model\AbstractExtensible
* @param \Magento\Framework\Registry $registry
* @param \Magento\Framework\Api\MetadataServiceInterface $metadataService
* @param AttributeDataBuilder $customAttributeBuilder
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
@@ -74,7 +74,7 @@ public function __construct(
\Magento\Framework\Registry $registry,
\Magento\Framework\Api\MetadataServiceInterface $metadataService,
AttributeDataBuilder $customAttributeBuilder,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\Model\Resource\AbstractResource $resource = null,
\Magento\Framework\Data\Collection\Db $resourceCollection = null,
array $data = []
diff --git a/app/code/Magento/Catalog/Model/Category.php b/app/code/Magento/Catalog/Model/Category.php
index 214cb33195bcb..750ed9ff5a2e1 100644
--- a/app/code/Magento/Catalog/Model/Category.php
+++ b/app/code/Magento/Catalog/Model/Category.php
@@ -178,7 +178,7 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
* @param \Magento\Framework\Registry $registry
* @param \Magento\Catalog\Api\CategoryAttributeRepositoryInterface $metadataService
* @param AttributeDataBuilder $customAttributeBuilder
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param Resource\Category\Tree $categoryTreeResource
* @param Resource\Category\TreeFactory $categoryTreeFactory
* @param \Magento\Store\Model\Resource\Store\CollectionFactory $storeCollectionFactory
@@ -201,7 +201,7 @@ public function __construct(
\Magento\Framework\Registry $registry,
\Magento\Catalog\Api\CategoryAttributeRepositoryInterface $metadataService,
AttributeDataBuilder $customAttributeBuilder,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Resource\Category\Tree $categoryTreeResource,
\Magento\Catalog\Model\Resource\Category\TreeFactory $categoryTreeFactory,
\Magento\Store\Model\Resource\Store\CollectionFactory $storeCollectionFactory,
diff --git a/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Sortby.php b/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Sortby.php
index c1d07fc693ab2..7aebe4cc11837 100644
--- a/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Sortby.php
+++ b/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Sortby.php
@@ -68,7 +68,7 @@ public function validate($object)
$attributeCode
) : $this->_scopeConfig->getValue(
"catalog/frontend/default_sort_by",
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
if (!in_array($data, $available) && !in_array('available_sort_by', $postDataConfig)) {
throw new \Magento\Framework\Model\Exception(
diff --git a/app/code/Magento/Catalog/Model/Category/Tree.php b/app/code/Magento/Catalog/Model/Category/Tree.php
index 8b131a66d64a1..538605dd82d16 100644
--- a/app/code/Magento/Catalog/Model/Category/Tree.php
+++ b/app/code/Magento/Catalog/Model/Category/Tree.php
@@ -18,7 +18,7 @@ class Tree
protected $categoryTree;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $storeManager;
@@ -34,13 +34,13 @@ class Tree
/**
* @param \Magento\Catalog\Model\Resource\Category\Tree $categoryTree
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Model\Resource\Category\Collection $categoryCollection
* @param \Magento\Catalog\Api\Data\CategoryTreeDataBuilder $treeBuilder
*/
public function __construct(
\Magento\Catalog\Model\Resource\Category\Tree $categoryTree,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Resource\Category\Collection $categoryCollection,
\Magento\Catalog\Api\Data\CategoryTreeDataBuilder $treeBuilder
) {
diff --git a/app/code/Magento/Catalog/Model/CategoryRepository.php b/app/code/Magento/Catalog/Model/CategoryRepository.php
index 161c990a845e6..b4929f290f59c 100644
--- a/app/code/Magento/Catalog/Model/CategoryRepository.php
+++ b/app/code/Magento/Catalog/Model/CategoryRepository.php
@@ -19,7 +19,7 @@ class CategoryRepository implements \Magento\Catalog\Api\CategoryRepositoryInter
protected $instances = [];
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $storeManager;
@@ -48,13 +48,13 @@ class CategoryRepository implements \Magento\Catalog\Api\CategoryRepositoryInter
/**
* @param \Magento\Catalog\Model\CategoryFactory $categoryFactory
* @param \Magento\Catalog\Model\Resource\Category $categoryResource
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Api\Data\CategoryDataBuilder $dataBuilder
*/
public function __construct(
\Magento\Catalog\Model\CategoryFactory $categoryFactory,
\Magento\Catalog\Model\Resource\Category $categoryResource,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Catalog\Api\Data\CategoryDataBuilder $dataBuilder
) {
$this->categoryFactory = $categoryFactory;
diff --git a/app/code/Magento/Catalog/Model/Config.php b/app/code/Magento/Catalog/Model/Config.php
index 8cbdb43ad337b..eb7e12ddc7c83 100644
--- a/app/code/Magento/Catalog/Model/Config.php
+++ b/app/code/Magento/Catalog/Model/Config.php
@@ -85,7 +85,7 @@ class Config extends \Magento\Eav\Model\Config
/**
* Store manager
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -130,7 +130,7 @@ class Config extends \Magento\Eav\Model\Config
* @param \Magento\Catalog\Model\Product\TypeFactory $productTypeFactory
* @param \Magento\Eav\Model\Resource\Entity\Attribute\Group\CollectionFactory $groupCollectionFactory
* @param \Magento\Eav\Model\Resource\Entity\Attribute\Set\CollectionFactory $setCollectionFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Eav\Model\Config $eavConfig
*
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
@@ -146,7 +146,7 @@ public function __construct(
\Magento\Catalog\Model\Product\TypeFactory $productTypeFactory,
\Magento\Eav\Model\Resource\Entity\Attribute\Group\CollectionFactory $groupCollectionFactory,
\Magento\Eav\Model\Resource\Entity\Attribute\Set\CollectionFactory $setCollectionFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Eav\Model\Config $eavConfig
) {
$this->_scopeConfig = $scopeConfig;
@@ -481,6 +481,6 @@ public function getAttributeUsedForSortByArray()
*/
public function getProductListDefaultSortBy($store = null)
{
- return $this->_scopeConfig->getValue(self::XML_PATH_LIST_DEFAULT_SORT_BY, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
+ return $this->_scopeConfig->getValue(self::XML_PATH_LIST_DEFAULT_SORT_BY, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store);
}
}
diff --git a/app/code/Magento/Catalog/Model/Entity/Attribute.php b/app/code/Magento/Catalog/Model/Entity/Attribute.php
index fa8019fc6298c..aeabc8475323b 100644
--- a/app/code/Magento/Catalog/Model/Entity/Attribute.php
+++ b/app/code/Magento/Catalog/Model/Entity/Attribute.php
@@ -76,7 +76,7 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute
* @param \Magento\Core\Helper\Data $coreData
* @param \Magento\Eav\Model\Config $eavConfig
* @param \Magento\Eav\Model\Entity\TypeFactory $eavTypeFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Eav\Model\Resource\Helper $resourceHelper
* @param \Magento\Framework\Validator\UniversalFactory $universalFactory
* @param \Magento\Eav\Api\Data\AttributeOptionDataBuilder $optionDataBuilder
@@ -97,7 +97,7 @@ public function __construct(
\Magento\Core\Helper\Data $coreData,
\Magento\Eav\Model\Config $eavConfig,
\Magento\Eav\Model\Entity\TypeFactory $eavTypeFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Eav\Model\Resource\Helper $resourceHelper,
\Magento\Framework\Validator\UniversalFactory $universalFactory,
\Magento\Eav\Api\Data\AttributeOptionDataBuilder $optionDataBuilder,
diff --git a/app/code/Magento/Catalog/Model/Indexer/AbstractFlatState.php b/app/code/Magento/Catalog/Model/Indexer/AbstractFlatState.php
index ee3f56b70d965..25580a392be25 100644
--- a/app/code/Magento/Catalog/Model/Indexer/AbstractFlatState.php
+++ b/app/code/Magento/Catalog/Model/Indexer/AbstractFlatState.php
@@ -5,7 +5,7 @@
*/
namespace Magento\Catalog\Model\Indexer;
-use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\Store\ScopeInterface;
abstract class AbstractFlatState
{
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Flat/AbstractAction.php b/app/code/Magento/Catalog/Model/Indexer/Category/Flat/AbstractAction.php
index 9fba6a8ae9670..96f73c1fab612 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Flat/AbstractAction.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Flat/AbstractAction.php
@@ -28,7 +28,7 @@ class AbstractAction
protected $resource;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $storeManager;
@@ -48,12 +48,12 @@ class AbstractAction
/**
* @param \Magento\Framework\App\Resource $resource
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Model\Resource\Helper $resourceHelper
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Resource\Helper $resourceHelper
) {
$this->resource = $resource;
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Flat/Action/Rows.php b/app/code/Magento/Catalog/Model/Indexer/Category/Flat/Action/Rows.php
index 34c02fd4e7e02..2015ea5681c0e 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Flat/Action/Rows.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Flat/Action/Rows.php
@@ -17,13 +17,13 @@ class Rows extends \Magento\Catalog\Model\Indexer\Category\Flat\AbstractAction
/**
* @param \Magento\Framework\App\Resource $resource
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Model\Resource\Helper $resourceHelper
* @param CategoryRepositoryInterface $categoryRepository
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Resource\Helper $resourceHelper,
CategoryRepositoryInterface $categoryRepository
) {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php
index fc76af0a7552b..c8869611bf2ce 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php
@@ -64,7 +64,7 @@ abstract class AbstractAction
protected $resource;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $storeManager;
@@ -82,12 +82,12 @@ abstract class AbstractAction
/**
* @param \Magento\Framework\App\Resource $resource
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Model\Config $config
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Config $config
) {
$this->resource = $resource;
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/AbstractAction.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/AbstractAction.php
index c160e95db9b1f..e0481f9859d6a 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/AbstractAction.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/AbstractAction.php
@@ -26,7 +26,7 @@ abstract class AbstractAction
protected $_tableDropSuffix = '_drop_indexer';
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -71,7 +71,7 @@ abstract class AbstractAction
/**
* @param \Magento\Framework\App\Resource $resource
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Helper\Product\Flat\Indexer $productHelper
* @param \Magento\Catalog\Model\Product\Type $productType
* @param TableBuilder $tableBuilder
@@ -79,7 +79,7 @@ abstract class AbstractAction
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Catalog\Helper\Product\Flat\Indexer $productHelper,
\Magento\Catalog\Model\Product\Type $productType,
TableBuilder $tableBuilder,
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Eraser.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Eraser.php
index f3f78f4e1edae..c6050d69cedb9 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Eraser.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Eraser.php
@@ -20,19 +20,19 @@ class Eraser
protected $connection;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $storeManager;
/**
* @param \Magento\Framework\App\Resource $resource
* @param \Magento\Catalog\Helper\Product\Flat\Indexer $productHelper
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
\Magento\Catalog\Helper\Product\Flat\Indexer $productHelper,
- \Magento\Store\Model\StoreManagerInterface $storeManager
+ \Magento\Framework\Store\StoreManagerInterface $storeManager
) {
$this->productIndexerHelper = $productHelper;
$this->connection = $resource->getConnection('default');
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Row.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Row.php
index d7f2bda96a5fc..5b04085972308 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Row.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Row.php
@@ -25,7 +25,7 @@ class Row extends \Magento\Catalog\Model\Indexer\Product\Flat\AbstractAction
/**
* @param \Magento\Framework\App\Resource $resource
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Helper\Product\Flat\Indexer $productHelper
* @param \Magento\Catalog\Model\Product\Type $productType
* @param TableBuilder $tableBuilder
@@ -35,7 +35,7 @@ class Row extends \Magento\Catalog\Model\Indexer\Product\Flat\AbstractAction
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Catalog\Helper\Product\Flat\Indexer $productHelper,
\Magento\Catalog\Model\Product\Type $productType,
TableBuilder $tableBuilder,
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Rows.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Rows.php
index 1014882f1ef82..079ff838e3614 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Rows.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Rows.php
@@ -21,7 +21,7 @@ class Rows extends \Magento\Catalog\Model\Indexer\Product\Flat\AbstractAction
/**
* @param \Magento\Framework\App\Resource $resource
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Helper\Product\Flat\Indexer $productHelper
* @param \Magento\Catalog\Model\Product\Type $productType
* @param TableBuilder $tableBuilder
@@ -30,7 +30,7 @@ class Rows extends \Magento\Catalog\Model\Indexer\Product\Flat\AbstractAction
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Catalog\Helper\Product\Flat\Indexer $productHelper,
\Magento\Catalog\Model\Product\Type $productType,
TableBuilder $tableBuilder,
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php
index 3c5fd37274111..bab6bd58d3d13 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php
@@ -31,7 +31,7 @@ class FlatTableBuilder
protected $_config;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -44,14 +44,14 @@ class FlatTableBuilder
* @param \Magento\Catalog\Helper\Product\Flat\Indexer $productIndexerHelper
* @param \Magento\Framework\App\Resource $resource
* @param \Magento\Framework\App\Config\ScopeConfigInterface $config
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param TableDataInterface $tableData
*/
public function __construct(
\Magento\Catalog\Helper\Product\Flat\Indexer $productIndexerHelper,
\Magento\Framework\App\Resource $resource,
\Magento\Framework\App\Config\ScopeConfigInterface $config,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Indexer\Product\Flat\TableDataInterface $tableData
) {
$this->_productIndexerHelper = $productIndexerHelper;
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Price/AbstractAction.php b/app/code/Magento/Catalog/Model/Indexer/Product/Price/AbstractAction.php
index 52861a1d42ada..c922137b49815 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Price/AbstractAction.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Price/AbstractAction.php
@@ -39,7 +39,7 @@ abstract class AbstractAction
protected $_config;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -87,7 +87,7 @@ abstract class AbstractAction
/**
* @param \Magento\Framework\App\Resource $resource
* @param \Magento\Framework\App\Config\ScopeConfigInterface $config
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
* @param \Magento\Framework\Stdlib\DateTime $dateTime
@@ -98,7 +98,7 @@ abstract class AbstractAction
public function __construct(
\Magento\Framework\App\Resource $resource,
\Magento\Framework\App\Config\ScopeConfigInterface $config,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Directory\Model\CurrencyFactory $currencyFactory,
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
\Magento\Framework\Stdlib\DateTime $dateTime,
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Price/Observer.php b/app/code/Magento/Catalog/Model/Indexer/Product/Price/Observer.php
index 0d8b328c8873a..3d7782328365e 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Price/Observer.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Price/Observer.php
@@ -8,7 +8,7 @@
class Observer
{
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -43,7 +43,7 @@ class Observer
protected $_connection;
/**
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\Resource $resource
* @param \Magento\Framework\Stdlib\DateTime $dateTime
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
@@ -51,7 +51,7 @@ class Observer
* @param \Magento\Catalog\Model\Indexer\Product\Price\Processor $processor
*/
public function __construct(
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\App\Resource $resource,
\Magento\Framework\Stdlib\DateTime $dateTime,
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
diff --git a/app/code/Magento/Catalog/Model/Layer.php b/app/code/Magento/Catalog/Model/Layer.php
index 74bcbfdf7cc84..812edf9327932 100644
--- a/app/code/Magento/Catalog/Model/Layer.php
+++ b/app/code/Magento/Catalog/Model/Layer.php
@@ -40,7 +40,7 @@ class Layer extends \Magento\Framework\Object
/**
* Store manager
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -90,7 +90,7 @@ class Layer extends \Magento\Framework\Object
* @param Layer\StateFactory $layerStateFactory
* @param Resource\Product\Attribute\CollectionFactory $attributeCollectionFactory
* @param Resource\Product $catalogProduct
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\Registry $registry
* @param CategoryRepositoryInterface $categoryRepository
* @param array $data
@@ -100,7 +100,7 @@ public function __construct(
\Magento\Catalog\Model\Layer\StateFactory $layerStateFactory,
\Magento\Catalog\Model\Resource\Product\Attribute\CollectionFactory $attributeCollectionFactory,
\Magento\Catalog\Model\Resource\Product $catalogProduct,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\Registry $registry,
CategoryRepositoryInterface $categoryRepository,
array $data = []
diff --git a/app/code/Magento/Catalog/Model/Layer/Category.php b/app/code/Magento/Catalog/Model/Layer/Category.php
index c27f563e8b5f2..22fb2dba6197c 100644
--- a/app/code/Magento/Catalog/Model/Layer/Category.php
+++ b/app/code/Magento/Catalog/Model/Layer/Category.php
@@ -16,7 +16,7 @@ class Category extends \Magento\Catalog\Model\Layer
* @param StateFactory $layerStateFactory
* @param Resource\Product\Attribute\CollectionFactory $attributeCollectionFactory
* @param Resource\Product $catalogProduct
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\Registry $registry
* @param CategoryRepositoryInterface $categoryRepository
* @param array $data
@@ -26,7 +26,7 @@ public function __construct(
StateFactory $layerStateFactory,
Resource\Product\Attribute\CollectionFactory $attributeCollectionFactory,
Resource\Product $catalogProduct,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\Registry $registry,
CategoryRepositoryInterface $categoryRepository,
array $data = []
diff --git a/app/code/Magento/Catalog/Model/Layer/Category/FilterableAttributeList.php b/app/code/Magento/Catalog/Model/Layer/Category/FilterableAttributeList.php
index 7d37ce6bf92c2..4ba8fb004975e 100644
--- a/app/code/Magento/Catalog/Model/Layer/Category/FilterableAttributeList.php
+++ b/app/code/Magento/Catalog/Model/Layer/Category/FilterableAttributeList.php
@@ -17,7 +17,7 @@ class FilterableAttributeList implements FilterableAttributeListInterface
protected $collectionFactory;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $storeManager;
@@ -30,12 +30,12 @@ class FilterableAttributeList implements FilterableAttributeListInterface
* FilterableAttributeList constructor
*
* @param \Magento\Catalog\Model\Resource\Product\Attribute\CollectionFactory $collectionFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Model\Layer\Resolver $layerResolver
*/
public function __construct(
\Magento\Catalog\Model\Resource\Product\Attribute\CollectionFactory $collectionFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Layer\Resolver $layerResolver
) {
$this->collectionFactory = $collectionFactory;
diff --git a/app/code/Magento/Catalog/Model/Layer/Category/StateKey.php b/app/code/Magento/Catalog/Model/Layer/Category/StateKey.php
index 35fa74eebaa1f..d935d6db2f07c 100644
--- a/app/code/Magento/Catalog/Model/Layer/Category/StateKey.php
+++ b/app/code/Magento/Catalog/Model/Layer/Category/StateKey.php
@@ -12,7 +12,7 @@
class StateKey implements StateKeyInterface
{
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $storeManager;
@@ -22,11 +22,11 @@ class StateKey implements StateKeyInterface
protected $customerSession;
/**
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Customer\Model\Session $customerSession
*/
public function __construct(
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Customer\Model\Session $customerSession
) {
$this->storeManager = $storeManager;
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/AbstractFilter.php b/app/code/Magento/Catalog/Model/Layer/Filter/AbstractFilter.php
index 9e2a1e4d6cd9b..b3ccf6aac75bb 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/AbstractFilter.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/AbstractFilter.php
@@ -36,7 +36,7 @@ abstract class AbstractFilter extends \Magento\Framework\Object implements Filte
/**
* Store manager
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -58,7 +58,7 @@ abstract class AbstractFilter extends \Magento\Framework\Object implements Filte
* Constructor
*
* @param \Magento\Catalog\Model\Layer\Filter\ItemFactory $filterItemFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Model\Layer $layer
* @param \Magento\Catalog\Model\Layer\Filter\Item\DataBuilder $itemDataBuilder
* @param array $data
@@ -66,7 +66,7 @@ abstract class AbstractFilter extends \Magento\Framework\Object implements Filte
*/
public function __construct(
\Magento\Catalog\Model\Layer\Filter\ItemFactory $filterItemFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Layer $layer,
\Magento\Catalog\Model\Layer\Filter\Item\DataBuilder $itemDataBuilder,
array $data = []
@@ -128,6 +128,7 @@ public function getCleanValue()
*
* @param \Magento\Framework\App\RequestInterface $request
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function apply(\Magento\Framework\App\RequestInterface $request)
{
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/Attribute.php b/app/code/Magento/Catalog/Model/Layer/Filter/Attribute.php
index b46e0d63c8831..8d1cde939fb2e 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/Attribute.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/Attribute.php
@@ -33,7 +33,7 @@ class Attribute extends \Magento\Catalog\Model\Layer\Filter\AbstractFilter
/**
* @param ItemFactory $filterItemFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Model\Layer $layer
* @param \Magento\Catalog\Model\Layer\Filter\Item\DataBuilder $itemDataBuilder
* @param \Magento\Catalog\Model\Resource\Layer\Filter\AttributeFactory $filterAttributeFactory
@@ -43,7 +43,7 @@ class Attribute extends \Magento\Catalog\Model\Layer\Filter\AbstractFilter
*/
public function __construct(
\Magento\Catalog\Model\Layer\Filter\ItemFactory $filterItemFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Layer $layer,
\Magento\Catalog\Model\Layer\Filter\Item\DataBuilder $itemDataBuilder,
\Magento\Catalog\Model\Resource\Layer\Filter\AttributeFactory $filterAttributeFactory,
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/Category.php b/app/code/Magento/Catalog/Model/Layer/Filter/Category.php
index 6c03530f09d80..9924b0bd8503e 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/Category.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/Category.php
@@ -53,7 +53,7 @@ class Category extends \Magento\Catalog\Model\Layer\Filter\AbstractFilter
* Construct
*
* @param \Magento\Catalog\Model\Layer\Filter\ItemFactory $filterItemFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Model\Layer $layer
* @param \Magento\Catalog\Model\Layer\Filter\Item\DataBuilder $itemDataBuilder
* @param \Magento\Framework\Escaper $escaper
@@ -62,7 +62,7 @@ class Category extends \Magento\Catalog\Model\Layer\Filter\AbstractFilter
*/
public function __construct(
\Magento\Catalog\Model\Layer\Filter\ItemFactory $filterItemFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Layer $layer,
\Magento\Catalog\Model\Layer\Filter\Item\DataBuilder $itemDataBuilder,
\Magento\Framework\Escaper $escaper,
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/DataProvider/Price.php b/app/code/Magento/Catalog/Model/Layer/Filter/DataProvider/Price.php
index cc9e06a5a80a1..783ab5ac822e4 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/DataProvider/Price.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/DataProvider/Price.php
@@ -8,7 +8,7 @@
use Magento\Catalog\Model\Layer;
use Magento\Framework\App\Config\ScopeConfigInterface;
use Magento\Framework\Registry;
-use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\Store\ScopeInterface;
class Price
{
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/Decimal.php b/app/code/Magento/Catalog/Model/Layer/Filter/Decimal.php
index f51521e4772ce..8c3b30fb4628b 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/Decimal.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/Decimal.php
@@ -32,7 +32,7 @@ class Decimal extends \Magento\Catalog\Model\Layer\Filter\AbstractFilter
/**
* @param ItemFactory $filterItemFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Model\Layer $layer
* @param \Magento\Catalog\Model\Layer\Filter\Item\DataBuilder $itemDataBuilder
* @param \Magento\Catalog\Model\Resource\Layer\Filter\DecimalFactory $filterDecimalFactory
@@ -41,7 +41,7 @@ class Decimal extends \Magento\Catalog\Model\Layer\Filter\AbstractFilter
*/
public function __construct(
\Magento\Catalog\Model\Layer\Filter\ItemFactory $filterItemFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Layer $layer,
\Magento\Catalog\Model\Layer\Filter\Item\DataBuilder $itemDataBuilder,
\Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/AlgorithmFactory.php b/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/AlgorithmFactory.php
index d86b8220296bf..b8c4183760e10 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/AlgorithmFactory.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/AlgorithmFactory.php
@@ -11,7 +11,7 @@
use Magento\Framework\App\Config\ScopeConfigInterface;
use Magento\Framework\Model\Exception;
use Magento\Framework\ObjectManagerInterface;
-use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\Store\ScopeInterface;
class AlgorithmFactory
{
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/Improved.php b/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/Improved.php
index ab08c7eb49de9..d53ed9bbda47b 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/Improved.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/Improved.php
@@ -10,7 +10,7 @@
use Magento\Framework\App\Config\ScopeConfigInterface;
use Magento\Framework\Search\Dynamic\Algorithm;
use Magento\Framework\Search\Dynamic\IntervalFactory;
-use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\Store\ScopeInterface;
class Improved implements AlgorithmInterface
{
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/Manual.php b/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/Manual.php
index c39673c1bd220..6d8a98eaa43bc 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/Manual.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/Manual.php
@@ -12,7 +12,7 @@
use Magento\Framework\App\Config\ScopeConfigInterface;
use Magento\Framework\Registry;
use Magento\Framework\Search\Dynamic\Algorithm;
-use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\Store\ScopeInterface;
class Manual implements AlgorithmInterface
{
@@ -49,6 +49,7 @@ public function __construct(
* @param int[] $intervals
* @param string $additionalRequestData
* @return array
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function getItemsData(array $intervals = [], $additionalRequestData = '')
{
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/Price.php b/app/code/Magento/Catalog/Model/Layer/Filter/Price.php
index 8db29096c2852..ac5c0e707620a 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/Price.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/Price.php
@@ -64,7 +64,7 @@ class Price extends \Magento\Catalog\Model\Layer\Filter\AbstractFilter
/**
* @param ItemFactory $filterItemFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Model\Layer $layer
* @param \Magento\Catalog\Model\Layer\Filter\Item\DataBuilder $itemDataBuilder
* @param \Magento\Catalog\Model\Resource\Layer\Filter\Price $resource
@@ -78,7 +78,7 @@ class Price extends \Magento\Catalog\Model\Layer\Filter\AbstractFilter
*/
public function __construct(
\Magento\Catalog\Model\Layer\Filter\ItemFactory $filterItemFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Layer $layer,
\Magento\Catalog\Model\Layer\Filter\Item\DataBuilder $itemDataBuilder,
\Magento\Catalog\Model\Resource\Layer\Filter\Price $resource,
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/Price/Range.php b/app/code/Magento/Catalog/Model/Layer/Filter/Price/Range.php
index c1ff0681b3e7f..5c80ebacb6db1 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/Price/Range.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/Price/Range.php
@@ -8,7 +8,7 @@
use Magento\Catalog\Model\Layer\Resolver;
use Magento\Framework\App\Config\ScopeConfigInterface;
use Magento\Framework\Registry;
-use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\Store\ScopeInterface;
class Range
{
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/Price/Render.php b/app/code/Magento/Catalog/Model/Layer/Filter/Price/Render.php
index ecd5e62378872..a8a1735867e34 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/Price/Render.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/Price/Render.php
@@ -8,7 +8,7 @@
use Magento\Catalog\Model\Layer\Filter\Item\DataBuilder;
use Magento\Framework\App\Config\ScopeConfigInterface;
use Magento\Framework\Pricing\PriceCurrencyInterface;
-use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\Store\ScopeInterface;
class Render
{
diff --git a/app/code/Magento/Catalog/Model/Layer/Search.php b/app/code/Magento/Catalog/Model/Layer/Search.php
index 467fe6462d900..150dfab4b28a6 100644
--- a/app/code/Magento/Catalog/Model/Layer/Search.php
+++ b/app/code/Magento/Catalog/Model/Layer/Search.php
@@ -17,7 +17,7 @@ class Search extends \Magento\Catalog\Model\Layer
* @param StateFactory $layerStateFactory
* @param Resource\Product\Attribute\CollectionFactory $attributeCollectionFactory
* @param Resource\Product $catalogProduct
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\Registry $registry
* @param CategoryRepositoryInterface $categoryRepository
* @param array $data
@@ -27,7 +27,7 @@ public function __construct(
StateFactory $layerStateFactory,
Resource\Product\Attribute\CollectionFactory $attributeCollectionFactory,
Resource\Product $catalogProduct,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\Registry $registry,
CategoryRepositoryInterface $categoryRepository,
array $data = []
diff --git a/app/code/Magento/Catalog/Model/Layer/Search/CollectionFilter.php b/app/code/Magento/Catalog/Model/Layer/Search/CollectionFilter.php
index 3a015ea7790b8..630b4179b45ac 100644
--- a/app/code/Magento/Catalog/Model/Layer/Search/CollectionFilter.php
+++ b/app/code/Magento/Catalog/Model/Layer/Search/CollectionFilter.php
@@ -9,7 +9,7 @@
use Magento\Catalog\Model\Layer\CollectionFilterInterface;
use Magento\Catalog\Model\Product\Visibility;
use Magento\Framework\DB\Select;
-use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\Store\StoreManagerInterface;
class CollectionFilter implements CollectionFilterInterface
{
@@ -19,7 +19,7 @@ class CollectionFilter implements CollectionFilterInterface
protected $catalogConfig;
/**
- * @var StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $storeManager;
@@ -30,7 +30,7 @@ class CollectionFilter implements CollectionFilterInterface
/**
* @param Config $catalogConfig
- * @param StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param Visibility $productVisibility
*/
public function __construct(
@@ -49,6 +49,7 @@ public function __construct(
* @param \Magento\Catalog\Model\Resource\Product\Collection $collection
* @param \Magento\Catalog\Model\Category $category
* @return void
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function filter(
$collection,
diff --git a/app/code/Magento/Catalog/Model/Layer/Search/FilterableAttributeList.php b/app/code/Magento/Catalog/Model/Layer/Search/FilterableAttributeList.php
index 45093a58a2818..1918ab29b016f 100644
--- a/app/code/Magento/Catalog/Model/Layer/Search/FilterableAttributeList.php
+++ b/app/code/Magento/Catalog/Model/Layer/Search/FilterableAttributeList.php
@@ -10,12 +10,12 @@ class FilterableAttributeList extends \Magento\Catalog\Model\Layer\Category\Filt
{
/**
* @param \Magento\Catalog\Model\Resource\Product\Attribute\CollectionFactory $collectionFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Model\Layer\Resolver $layerResolver
*/
public function __construct(
\Magento\Catalog\Model\Resource\Product\Attribute\CollectionFactory $collectionFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Layer\Resolver $layerResolver
) {
parent::__construct($collectionFactory, $storeManager, $layerResolver);
diff --git a/app/code/Magento/Catalog/Model/Observer.php b/app/code/Magento/Catalog/Model/Observer.php
index dac92e427e266..ea38137a24a35 100644
--- a/app/code/Magento/Catalog/Model/Observer.php
+++ b/app/code/Magento/Catalog/Model/Observer.php
@@ -36,7 +36,7 @@ class Observer
/**
* Store manager
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -64,7 +64,7 @@ class Observer
/**
* @param \Magento\Catalog\Model\Resource\Category $categoryResource
* @param \Magento\Catalog\Model\Resource\Product $catalogProduct
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Model\Layer\Resolver $layerResolver
* @param \Magento\Catalog\Helper\Category $catalogCategory
* @param \Magento\Catalog\Helper\Data $catalogData
@@ -74,7 +74,7 @@ class Observer
public function __construct(
\Magento\Catalog\Model\Resource\Category $categoryResource,
\Magento\Catalog\Model\Resource\Product $catalogProduct,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Layer\Resolver $layerResolver,
\Magento\Catalog\Helper\Category $catalogCategory,
\Magento\Catalog\Helper\Data $catalogData,
diff --git a/app/code/Magento/Catalog/Model/Product.php b/app/code/Magento/Catalog/Model/Product.php
index 8d7b4d3c72661..c9eebd9ca3d86 100644
--- a/app/code/Magento/Catalog/Model/Product.php
+++ b/app/code/Magento/Catalog/Model/Product.php
@@ -245,7 +245,7 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
* @param \Magento\Framework\Registry $registry
* @param \Magento\Catalog\Api\ProductAttributeRepositoryInterface $metadataService
* @param AttributeDataBuilder $customAttributeBuilder
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param Product\Url $url
* @param Product\Link $productLink
* @param Product\Configuration\Item\OptionFactory $itemOptionFactory
@@ -276,7 +276,7 @@ public function __construct(
\Magento\Framework\Registry $registry,
\Magento\Catalog\Api\ProductAttributeRepositoryInterface $metadataService,
AttributeDataBuilder $customAttributeBuilder,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
Product\Url $url,
Product\Link $productLink,
\Magento\Catalog\Model\Product\Configuration\Item\OptionFactory $itemOptionFactory,
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice.php
index 455ada210a9a8..be7e03bd46b32 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice.php
@@ -21,7 +21,7 @@ class GroupPrice extends \Magento\Catalog\Model\Product\Attribute\Backend\GroupP
/**
* @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Helper\Data $catalogData
* @param \Magento\Framework\App\Config\ScopeConfigInterface $config
* @param \Magento\Catalog\Model\Product\Type $catalogProductType
@@ -30,7 +30,7 @@ class GroupPrice extends \Magento\Catalog\Model\Product\Attribute\Backend\GroupP
*/
public function __construct(
\Magento\Directory\Model\CurrencyFactory $currencyFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Catalog\Helper\Data $catalogData,
\Magento\Framework\App\Config\ScopeConfigInterface $config,
\Magento\Catalog\Model\Product\Type $catalogProductType,
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php
index 6aeacc7c2cd91..43cb781a09052 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php
@@ -45,7 +45,7 @@ abstract protected function _getDuplicateErrorMessage();
/**
* @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Helper\Data $catalogData
* @param \Magento\Framework\App\Config\ScopeConfigInterface $config
* @param \Magento\Catalog\Model\Product\Type $catalogProductType
@@ -53,7 +53,7 @@ abstract protected function _getDuplicateErrorMessage();
*/
public function __construct(
\Magento\Directory\Model\CurrencyFactory $currencyFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Catalog\Helper\Data $catalogData,
\Magento\Framework\App\Config\ScopeConfigInterface $config,
\Magento\Catalog\Model\Product\Type $catalogProductType,
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Price.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Price.php
index 79b2b1b752ad9..5fdb39d5408fa 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Price.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Price.php
@@ -22,7 +22,7 @@ class Price extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
/**
* Store manager
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -44,13 +44,13 @@ class Price extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
* Construct
*
* @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Helper\Data $catalogData
* @param \Magento\Framework\App\Config\ScopeConfigInterface $config
*/
public function __construct(
\Magento\Directory\Model\CurrencyFactory $currencyFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Catalog\Helper\Data $catalogData,
\Magento\Framework\App\Config\ScopeConfigInterface $config
) {
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Tierprice.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Tierprice.php
index 91da3fa75adb2..6a83277a6157a 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Tierprice.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Tierprice.php
@@ -22,7 +22,7 @@ class Tierprice extends \Magento\Catalog\Model\Product\Attribute\Backend\GroupPr
/**
* @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Helper\Data $catalogData
* @param \Magento\Framework\App\Config\ScopeConfigInterface $config
* @param \Magento\Catalog\Model\Product\Type $catalogProductType
@@ -31,7 +31,7 @@ class Tierprice extends \Magento\Catalog\Model\Product\Attribute\Backend\GroupPr
*/
public function __construct(
\Magento\Directory\Model\CurrencyFactory $currencyFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Catalog\Helper\Data $catalogData,
\Magento\Framework\App\Config\ScopeConfigInterface $config,
\Magento\Catalog\Model\Product\Type $catalogProductType,
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Frontend/Image.php b/app/code/Magento/Catalog/Model/Product/Attribute/Frontend/Image.php
index 389500c6108a2..01cf095460868 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Frontend/Image.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Frontend/Image.php
@@ -16,16 +16,16 @@ class Image extends \Magento\Eav\Model\Entity\Attribute\Frontend\AbstractFronten
/**
* Store manager
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
/**
* Construct
*
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
*/
- public function __construct(\Magento\Store\Model\StoreManagerInterface $storeManager)
+ public function __construct(\Magento\Framework\Store\StoreManagerInterface $storeManager)
{
$this->_storeManager = $storeManager;
}
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Source/Countryofmanufacture.php b/app/code/Magento/Catalog/Model/Product/Attribute/Source/Countryofmanufacture.php
index 11d9864f39bb0..2a5f2607b0170 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Source/Countryofmanufacture.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Source/Countryofmanufacture.php
@@ -21,7 +21,7 @@ class Countryofmanufacture extends \Magento\Eav\Model\Entity\Attribute\Source\Ab
/**
* Store manager
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -36,12 +36,12 @@ class Countryofmanufacture extends \Magento\Eav\Model\Entity\Attribute\Source\Ab
* Construct
*
* @param \Magento\Directory\Model\CountryFactory $countryFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\Cache\Type\Config $configCacheType
*/
public function __construct(
\Magento\Directory\Model\CountryFactory $countryFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\App\Cache\Type\Config $configCacheType
) {
$this->_countryFactory = $countryFactory;
diff --git a/app/code/Magento/Catalog/Model/Product/Compare/Item.php b/app/code/Magento/Catalog/Model/Product/Compare/Item.php
index b488f1d02e0bd..21565cb006149 100644
--- a/app/code/Magento/Catalog/Model/Product/Compare/Item.php
+++ b/app/code/Magento/Catalog/Model/Product/Compare/Item.php
@@ -65,14 +65,14 @@ class Item extends \Magento\Framework\Model\AbstractModel implements \Magento\Fr
/**
* Store manager
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
/**
* @param \Magento\Framework\Model\Context $context
* @param \Magento\Framework\Registry $registry
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Customer\Model\Visitor $customerVisitor
* @param \Magento\Customer\Model\Session $customerSession
* @param \Magento\Catalog\Helper\Product\Compare $catalogProductCompare
@@ -83,7 +83,7 @@ class Item extends \Magento\Framework\Model\AbstractModel implements \Magento\Fr
public function __construct(
\Magento\Framework\Model\Context $context,
\Magento\Framework\Registry $registry,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Customer\Model\Visitor $customerVisitor,
\Magento\Customer\Model\Session $customerSession,
\Magento\Catalog\Helper\Product\Compare $catalogProductCompare,
diff --git a/app/code/Magento/Catalog/Model/Product/Gallery/GalleryManagement.php b/app/code/Magento/Catalog/Model/Product/Gallery/GalleryManagement.php
index bedbdec0d8860..7e38fc5705e38 100644
--- a/app/code/Magento/Catalog/Model/Product/Gallery/GalleryManagement.php
+++ b/app/code/Magento/Catalog/Model/Product/Gallery/GalleryManagement.php
@@ -33,7 +33,7 @@ class GalleryManagement implements \Magento\Catalog\Api\ProductAttributeMediaGal
];
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $storeManager;
@@ -73,7 +73,7 @@ class GalleryManagement implements \Magento\Catalog\Api\ProductAttributeMediaGal
protected $attributeRepository;
/**
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
* @param \Magento\Catalog\Api\ProductAttributeRepositoryInterface $attributeRepository
* @param MediaConfig $mediaConfig
@@ -84,7 +84,7 @@ class GalleryManagement implements \Magento\Catalog\Api\ProductAttributeMediaGal
* @param \Magento\Catalog\Model\Resource\Product\Attribute\Backend\Media $mediaGallery
*/
public function __construct(
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Catalog\Api\ProductRepositoryInterface $productRepository,
\Magento\Catalog\Api\ProductAttributeRepositoryInterface $attributeRepository,
MediaConfig $mediaConfig,
diff --git a/app/code/Magento/Catalog/Model/Product/GroupPriceManagement.php b/app/code/Magento/Catalog/Model/Product/GroupPriceManagement.php
index 63b9a377bf952..7c270cfc54dc6 100644
--- a/app/code/Magento/Catalog/Model/Product/GroupPriceManagement.php
+++ b/app/code/Magento/Catalog/Model/Product/GroupPriceManagement.php
@@ -39,13 +39,13 @@ class GroupPriceManagement implements \Magento\Catalog\Api\ProductGroupPriceMana
protected $config;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $storeManager;
/**
* @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Api\Data\ProductGroupPriceDataBuilder $groupPriceBuilder
* @param GroupRepositoryInterface $groupRepository
* @param PriceModifier $priceModifier
@@ -57,7 +57,7 @@ public function __construct(
GroupRepositoryInterface $groupRepository,
\Magento\Catalog\Model\Product\PriceModifier $priceModifier,
\Magento\Framework\App\Config\ScopeConfigInterface $config,
- \Magento\Store\Model\StoreManagerInterface $storeManager
+ \Magento\Framework\Store\StoreManagerInterface $storeManager
) {
$this->productRepository = $productRepository;
$this->groupPriceBuilder = $groupPriceBuilder;
@@ -81,7 +81,8 @@ public function add($productSku, $customerGroupId, $price)
$product = $this->productRepository->get($productSku, true);
$groupPrices = $product->getData('group_price');
$websiteIdentifier = 0;
- if ($this->config->getValue('catalog/price/scope', \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE) != 0) {
+ $value = $this->config->getValue('catalog/price/scope', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE);
+ if ($value != 0) {
$websiteIdentifier = $this->storeManager->getWebsite()->getId();
}
$found = false;
@@ -125,7 +126,8 @@ public function remove($productSku, $customerGroupId)
{
$product = $this->productRepository->get($productSku, true);
$websiteIdentifier = 0;
- if ($this->config->getValue('catalog/price/scope', \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE) != 0) {
+ $value = $this->config->getValue('catalog/price/scope', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE);
+ if ($value != 0) {
$websiteIdentifier = $this->storeManager->getWebsite()->getId();
}
$this->priceModifier->removeGroupPrice($product, $customerGroupId, $websiteIdentifier);
@@ -139,7 +141,8 @@ public function getList($productSku, $websiteId = null)
{
$product = $this->productRepository->get($productSku, true);
$priceKey = 'website_price';
- if ($this->config->getValue('catalog/price/scope', \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE) == 0) {
+ $value = $this->config->getValue('catalog/price/scope', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE);
+ if ($value == 0) {
$priceKey = 'price';
}
diff --git a/app/code/Magento/Catalog/Model/Product/Image.php b/app/code/Magento/Catalog/Model/Product/Image.php
index d133d26599e35..cbf1c5197722b 100644
--- a/app/code/Magento/Catalog/Model/Product/Image.php
+++ b/app/code/Magento/Catalog/Model/Product/Image.php
@@ -161,14 +161,14 @@ class Image extends \Magento\Framework\Model\AbstractModel
/**
* Store manager
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
/**
* @param \Magento\Framework\Model\Context $context
* @param \Magento\Framework\Registry $registry
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Model\Product\Media\Config $catalogProductMediaConfig
* @param \Magento\Core\Helper\File\Storage\Database $coreFileStorageDatabase
* @param \Magento\Framework\Filesystem $filesystem
@@ -185,7 +185,7 @@ class Image extends \Magento\Framework\Model\AbstractModel
public function __construct(
\Magento\Framework\Model\Context $context,
\Magento\Framework\Registry $registry,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Product\Media\Config $catalogProductMediaConfig,
\Magento\Core\Helper\File\Storage\Database $coreFileStorageDatabase,
\Magento\Framework\Filesystem $filesystem,
@@ -469,7 +469,7 @@ public function setBaseFile($file)
// check if placeholder defined in config
$isConfigPlaceholder = $this->_scopeConfig->getValue(
"catalog/placeholder/{$this->getDestinationSubdir()}_placeholder",
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
$configPlaceholder = '/placeholder/' . $isConfigPlaceholder;
if (!empty($isConfigPlaceholder) && $this->_fileExists($baseDir . $configPlaceholder)) {
diff --git a/app/code/Magento/Catalog/Model/Product/Media/AttributeManagement.php b/app/code/Magento/Catalog/Model/Product/Media/AttributeManagement.php
index 3babcdc846db6..35d07d3cf0d36 100644
--- a/app/code/Magento/Catalog/Model/Product/Media/AttributeManagement.php
+++ b/app/code/Magento/Catalog/Model/Product/Media/AttributeManagement.php
@@ -6,7 +6,7 @@
namespace Magento\Catalog\Model\Product\Media;
use Magento\Catalog\Api\ProductMediaAttributeManagementInterface;
-use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\Store\StoreManagerInterface;
use Magento\Catalog\Model\Product;
class AttributeManagement implements ProductMediaAttributeManagementInterface
@@ -17,7 +17,7 @@ class AttributeManagement implements ProductMediaAttributeManagementInterface
private $collectionFactory;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
private $storeManager;
diff --git a/app/code/Magento/Catalog/Model/Product/Media/Config.php b/app/code/Magento/Catalog/Model/Product/Media/Config.php
index 55b22c509a945..b1ebf440a003d 100644
--- a/app/code/Magento/Catalog/Model/Product/Media/Config.php
+++ b/app/code/Magento/Catalog/Model/Product/Media/Config.php
@@ -18,14 +18,14 @@ class Config implements ConfigInterface
/**
* Store manager
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $storeManager;
/**
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
*/
- public function __construct(\Magento\Store\Model\StoreManagerInterface $storeManager)
+ public function __construct(\Magento\Framework\Store\StoreManagerInterface $storeManager)
{
$this->storeManager = $storeManager;
}
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php b/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php
index b573c37ee059e..6271c735c6b66 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php
@@ -190,7 +190,7 @@ public function getRequest()
*/
public function getConfigData($key)
{
- return $this->_scopeConfig->getValue('catalog/custom_options/' . $key, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+ return $this->_scopeConfig->getValue('catalog/custom_options/' . $key, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
}
/**
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/File/Validator.php b/app/code/Magento/Catalog/Model/Product/Option/Type/File/Validator.php
index f3c7d273db324..55710d57ac5de 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Type/File/Validator.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Type/File/Validator.php
@@ -7,6 +7,9 @@
use Magento\Framework\App\Filesystem\DirectoryList;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
abstract class Validator
{
/**
@@ -49,7 +52,7 @@ protected function getConfigData($key)
{
return $this->scopeConfig->getValue(
'catalog/custom_options/' . $key,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
}
diff --git a/app/code/Magento/Catalog/Model/Product/TierPriceManagement.php b/app/code/Magento/Catalog/Model/Product/TierPriceManagement.php
index acc29e26adb59..f40ae21baed3e 100644
--- a/app/code/Magento/Catalog/Model/Product/TierPriceManagement.php
+++ b/app/code/Magento/Catalog/Model/Product/TierPriceManagement.php
@@ -29,7 +29,7 @@ class TierPriceManagement implements \Magento\Catalog\Api\ProductTierPriceManage
protected $priceBuilder;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $storeManager;
@@ -56,7 +56,7 @@ class TierPriceManagement implements \Magento\Catalog\Api\ProductTierPriceManage
/**
* @param ProductRepositoryInterface $productRepository
* @param \Magento\Catalog\Api\Data\ProductTierPriceDataBuilder $priceBuilder
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param PriceModifier $priceModifier
* @param \Magento\Framework\App\Config\ScopeConfigInterface $config
* @param GroupManagementInterface $groupManagement
@@ -65,7 +65,7 @@ class TierPriceManagement implements \Magento\Catalog\Api\ProductTierPriceManage
public function __construct(
ProductRepositoryInterface $productRepository,
\Magento\Catalog\Api\Data\ProductTierPriceDataBuilder $priceBuilder,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Product\PriceModifier $priceModifier,
\Magento\Framework\App\Config\ScopeConfigInterface $config,
GroupManagementInterface $groupManagement,
@@ -93,7 +93,8 @@ public function add($productSku, $customerGroupId, $price, $qty)
$product = $this->productRepository->get($productSku, ['edit_mode' => true]);
$tierPrices = $product->getData('tier_price');
$websiteIdentifier = 0;
- if ($this->config->getValue('catalog/price/scope', \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE) != 0) {
+ $value = $this->config->getValue('catalog/price/scope', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE);
+ if ($value != 0) {
$websiteIdentifier = $this->storeManager->getWebsite()->getId();
}
$found = false;
@@ -148,7 +149,8 @@ public function remove($productSku, $customerGroupId, $qty)
{
$product = $this->productRepository->get($productSku, ['edit_mode' => true]);
$websiteIdentifier = 0;
- if ($this->config->getValue('catalog/price/scope', \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE) != 0) {
+ $value = $this->config->getValue('catalog/price/scope', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE);
+ if ($value != 0) {
$websiteIdentifier = $this->storeManager->getWebsite()->getId();
}
$this->priceModifier->removeTierPrice($product, $customerGroupId, $qty, $websiteIdentifier);
@@ -163,7 +165,8 @@ public function getList($productSku, $customerGroupId)
$product = $this->productRepository->get($productSku, ['edit_mode' => true]);
$priceKey = 'website_price';
- if ($this->config->getValue('catalog/price/scope', \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE) == 0) {
+ $value = $this->config->getValue('catalog/price/scope', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE);
+ if ($value == 0) {
$priceKey = 'price';
}
diff --git a/app/code/Magento/Catalog/Model/Product/Type/Price.php b/app/code/Magento/Catalog/Model/Product/Type/Price.php
index 43d0e981d6e45..f4deb0adc24f5 100644
--- a/app/code/Magento/Catalog/Model/Product/Type/Price.php
+++ b/app/code/Magento/Catalog/Model/Product/Type/Price.php
@@ -48,7 +48,7 @@ class Price
/**
* Store manager
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -71,7 +71,7 @@ class Price
/**
* @param \Magento\CatalogRule\Model\Resource\RuleFactory $ruleFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
* @param \Magento\Customer\Model\Session $customerSession
* @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -80,7 +80,7 @@ class Price
*/
public function __construct(
\Magento\CatalogRule\Model\Resource\RuleFactory $ruleFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
\Magento\Customer\Model\Session $customerSession,
\Magento\Framework\Event\ManagerInterface $eventManager,
diff --git a/app/code/Magento/Catalog/Model/Product/Url.php b/app/code/Magento/Catalog/Model/Product/Url.php
index 819232c072597..e4fb8ac7baa07 100644
--- a/app/code/Magento/Catalog/Model/Product/Url.php
+++ b/app/code/Magento/Catalog/Model/Product/Url.php
@@ -38,7 +38,7 @@ class Url extends \Magento\Framework\Object
/**
* Store manager
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -55,7 +55,7 @@ class Url extends \Magento\Framework\Object
/**
* @param \Magento\Framework\UrlInterface $url
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Helper\Category $catalogCategory
* @param \Magento\Framework\Filter\FilterManager $filter
* @param \Magento\Framework\Session\SidResolverInterface $sidResolver
@@ -65,7 +65,7 @@ class Url extends \Magento\Framework\Object
*/
public function __construct(
\Magento\Framework\UrlInterface $url,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Catalog\Helper\Category $catalogCategory,
\Magento\Framework\Filter\FilterManager $filter,
\Magento\Framework\Session\SidResolverInterface $sidResolver,
diff --git a/app/code/Magento/Catalog/Model/Resource/AbstractResource.php b/app/code/Magento/Catalog/Model/Resource/AbstractResource.php
index 4a62d1cfc8f2a..adfda93a7c98e 100644
--- a/app/code/Magento/Catalog/Model/Resource/AbstractResource.php
+++ b/app/code/Magento/Catalog/Model/Resource/AbstractResource.php
@@ -26,7 +26,7 @@ abstract class AbstractResource extends \Magento\Eav\Model\Entity\AbstractEntity
/**
* Store manager
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -46,7 +46,7 @@ abstract class AbstractResource extends \Magento\Eav\Model\Entity\AbstractEntity
* @param \Magento\Framework\Locale\FormatInterface $localeFormat
* @param \Magento\Eav\Model\Resource\Helper $resourceHelper
* @param \Magento\Framework\Validator\UniversalFactory $universalFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Model\Factory $modelFactory
* @param array $data
*/
@@ -57,7 +57,7 @@ public function __construct(
\Magento\Framework\Locale\FormatInterface $localeFormat,
\Magento\Eav\Model\Resource\Helper $resourceHelper,
\Magento\Framework\Validator\UniversalFactory $universalFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Factory $modelFactory,
$data = []
) {
@@ -345,6 +345,7 @@ protected function _insertAttribute($object, $attribute, $value)
* @param mixed $valueId
* @param mixed $value
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
protected function _updateAttribute($object, $attribute, $valueId, $value)
{
@@ -490,6 +491,7 @@ protected function _getOrigObject($object)
* @param AbstractAttribute $attribute
* @param mixed $value
* @return bool
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
protected function _isAttributeValueEmpty(AbstractAttribute $attribute, $value)
{
diff --git a/app/code/Magento/Catalog/Model/Resource/Attribute.php b/app/code/Magento/Catalog/Model/Resource/Attribute.php
index 26ca2463c968d..21813424a1193 100644
--- a/app/code/Magento/Catalog/Model/Resource/Attribute.php
+++ b/app/code/Magento/Catalog/Model/Resource/Attribute.php
@@ -28,14 +28,14 @@ class Attribute extends \Magento\Eav\Model\Resource\Entity\Attribute
/**
* @param \Magento\Framework\App\Resource $resource
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Eav\Model\Resource\Entity\Type $eavEntityType
* @param \Magento\Eav\Model\Config $eavConfig
* @param LockValidatorInterface $lockValidator
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Eav\Model\Resource\Entity\Type $eavEntityType,
\Magento\Eav\Model\Config $eavConfig,
LockValidatorInterface $lockValidator
diff --git a/app/code/Magento/Catalog/Model/Resource/Category.php b/app/code/Magento/Catalog/Model/Resource/Category.php
index 02a2c6d82a4d6..19eb4ee65f49c 100644
--- a/app/code/Magento/Catalog/Model/Resource/Category.php
+++ b/app/code/Magento/Catalog/Model/Resource/Category.php
@@ -74,7 +74,7 @@ class Category extends AbstractResource
* @param \Magento\Framework\Locale\FormatInterface $localeFormat
* @param \Magento\Eav\Model\Resource\Helper $resourceHelper
* @param \Magento\Framework\Validator\UniversalFactory $universalFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Model\Factory $modelFactory
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Catalog\Model\Resource\Category\TreeFactory $categoryTreeFactory
@@ -90,7 +90,7 @@ public function __construct(
\Magento\Framework\Locale\FormatInterface $localeFormat,
\Magento\Eav\Model\Resource\Helper $resourceHelper,
\Magento\Framework\Validator\UniversalFactory $universalFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Factory $modelFactory,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Catalog\Model\Resource\Category\TreeFactory $categoryTreeFactory,
diff --git a/app/code/Magento/Catalog/Model/Resource/Category/Attribute/Collection.php b/app/code/Magento/Catalog/Model/Resource/Category/Attribute/Collection.php
index 48b47eac24ddb..2cf830f89f811 100644
--- a/app/code/Magento/Catalog/Model/Resource/Category/Attribute/Collection.php
+++ b/app/code/Magento/Catalog/Model/Resource/Category/Attribute/Collection.php
@@ -20,7 +20,7 @@ class Collection extends \Magento\Eav\Model\Resource\Entity\Attribute\Collection
protected $_eavEntityFactory;
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -30,7 +30,7 @@ class Collection extends \Magento\Eav\Model\Resource\Entity\Attribute\Collection
* @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
@@ -68,6 +68,7 @@ protected function _initSelect()
*
* @param int $typeId
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function setEntityTypeFilter($typeId)
{
diff --git a/app/code/Magento/Catalog/Model/Resource/Category/Attribute/Frontend/Image.php b/app/code/Magento/Catalog/Model/Resource/Category/Attribute/Frontend/Image.php
index 61b59b70d9d56..c4d1e5e602c4b 100644
--- a/app/code/Magento/Catalog/Model/Resource/Category/Attribute/Frontend/Image.php
+++ b/app/code/Magento/Catalog/Model/Resource/Category/Attribute/Frontend/Image.php
@@ -17,16 +17,16 @@ class Image extends \Magento\Eav\Model\Entity\Attribute\Frontend\AbstractFronten
/**
* Store manager
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
/**
* Construct
*
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
*/
- public function __construct(\Magento\Store\Model\StoreManagerInterface $storeManager)
+ public function __construct(\Magento\Framework\Store\StoreManagerInterface $storeManager)
{
$this->_storeManager = $storeManager;
}
diff --git a/app/code/Magento/Catalog/Model/Resource/Category/Flat.php b/app/code/Magento/Catalog/Model/Resource/Category/Flat.php
index e18f88ff4d18a..95227879e5cbb 100644
--- a/app/code/Magento/Catalog/Model/Resource/Category/Flat.php
+++ b/app/code/Magento/Catalog/Model/Resource/Category/Flat.php
@@ -59,7 +59,7 @@ class Flat extends \Magento\Indexer\Model\Resource\AbstractResource
/**
* Store manager
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -81,7 +81,7 @@ class Flat extends \Magento\Indexer\Model\Resource\AbstractResource
* @param \Magento\Framework\App\Resource $resource
* @param \Magento\Catalog\Model\CategoryFactory $categoryFactory
* @param \Magento\Catalog\Model\Resource\Category\CollectionFactory $categoryCollectionFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Model\Config $catalogConfig
* @param \Magento\Framework\Event\ManagerInterface $eventManager
*/
@@ -89,7 +89,7 @@ public function __construct(
\Magento\Framework\App\Resource $resource,
\Magento\Catalog\Model\CategoryFactory $categoryFactory,
\Magento\Catalog\Model\Resource\Category\CollectionFactory $categoryCollectionFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Config $catalogConfig,
\Magento\Framework\Event\ManagerInterface $eventManager
) {
diff --git a/app/code/Magento/Catalog/Model/Resource/Category/Flat/Collection.php b/app/code/Magento/Catalog/Model/Resource/Category/Flat/Collection.php
index 3a16a9de8edf7..adb32fd357681 100644
--- a/app/code/Magento/Catalog/Model/Resource/Category/Flat/Collection.php
+++ b/app/code/Magento/Catalog/Model/Resource/Category/Flat/Collection.php
@@ -6,12 +6,12 @@
namespace Magento\Catalog\Model\Resource\Category\Flat;
use Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator;
-use Magento\Core\Model\EntityFactory;
+use Magento\Framework\Data\Collection\EntityFactory;
use Magento\Framework\Event\ManagerInterface;
use Magento\Framework\Data\Collection\Db\FetchStrategyInterface;
use Magento\Framework\Model\Resource\Db\AbstractDb;
use Psr\Log\LoggerInterface as Logger;
-use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\Store\StoreManagerInterface;
/**
* Catalog category flat collection
@@ -37,7 +37,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
/**
* Store manager
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -49,11 +49,11 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
protected $_storeId;
/**
- * @param EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param Logger $logger
* @param FetchStrategyInterface $fetchStrategy
* @param ManagerInterface $eventManager
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Zend_Db_Adapter_Abstract $connection
* @param AbstractDb $resource
*/
diff --git a/app/code/Magento/Catalog/Model/Resource/Category/Tree.php b/app/code/Magento/Catalog/Model/Resource/Category/Tree.php
index bbd46711f99c3..bf196c00952a8 100644
--- a/app/code/Magento/Catalog/Model/Resource/Category/Tree.php
+++ b/app/code/Magento/Catalog/Model/Resource/Category/Tree.php
@@ -69,7 +69,7 @@ class Tree extends \Magento\Framework\Data\Tree\Dbp
/**
* Store manager
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -92,7 +92,7 @@ class Tree extends \Magento\Framework\Data\Tree\Dbp
*
* @param \Magento\Catalog\Model\Resource\Category $catalogCategory
* @param \Magento\Framework\App\CacheInterface $cache
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\Resource $resource
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Catalog\Model\Attribute\Config $attributeConfig
@@ -101,7 +101,7 @@ class Tree extends \Magento\Framework\Data\Tree\Dbp
public function __construct(
\Magento\Catalog\Model\Resource\Category $catalogCategory,
\Magento\Framework\App\CacheInterface $cache,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\App\Resource $resource,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Catalog\Model\Attribute\Config $attributeConfig,
diff --git a/app/code/Magento/Catalog/Model/Resource/Collection/AbstractCollection.php b/app/code/Magento/Catalog/Model/Resource/Collection/AbstractCollection.php
index 899d2a419ede9..de2727ae8b93f 100644
--- a/app/code/Magento/Catalog/Model/Resource/Collection/AbstractCollection.php
+++ b/app/code/Magento/Catalog/Model/Resource/Collection/AbstractCollection.php
@@ -23,12 +23,12 @@ class AbstractCollection extends \Magento\Eav\Model\Entity\Collection\AbstractCo
/**
* Store manager
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -37,13 +37,13 @@ class AbstractCollection extends \Magento\Eav\Model\Entity\Collection\AbstractCo
* @param \Magento\Eav\Model\EntityFactory $eavEntityFactory
* @param \Magento\Eav\Model\Resource\Helper $resourceHelper
* @param \Magento\Framework\Validator\UniversalFactory $universalFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Zend_Db_Adapter_Abstract $connection
*
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
@@ -52,7 +52,7 @@ public function __construct(
\Magento\Eav\Model\EntityFactory $eavEntityFactory,
\Magento\Eav\Model\Resource\Helper $resourceHelper,
\Magento\Framework\Validator\UniversalFactory $universalFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
$connection = null
) {
$this->_storeManager = $storeManager;
diff --git a/app/code/Magento/Catalog/Model/Resource/Config.php b/app/code/Magento/Catalog/Model/Resource/Config.php
index d4abad7a0ed0c..1a650c5c7f09b 100644
--- a/app/code/Magento/Catalog/Model/Resource/Config.php
+++ b/app/code/Magento/Catalog/Model/Resource/Config.php
@@ -36,18 +36,18 @@ class Config extends \Magento\Framework\Model\Resource\Db\AbstractDb
/**
* Store manager
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
/**
* @param \Magento\Framework\App\Resource $resource
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Eav\Model\Config $eavConfig
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Eav\Model\Config $eavConfig
) {
$this->_storeManager = $storeManager;
diff --git a/app/code/Magento/Catalog/Model/Resource/Eav/Attribute.php b/app/code/Magento/Catalog/Model/Resource/Eav/Attribute.php
index f031041f9db93..2fee21bbf4d3e 100644
--- a/app/code/Magento/Catalog/Model/Resource/Eav/Attribute.php
+++ b/app/code/Magento/Catalog/Model/Resource/Eav/Attribute.php
@@ -103,7 +103,7 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute implements
* @param \Magento\Core\Helper\Data $coreData
* @param \Magento\Eav\Model\Config $eavConfig
* @param \Magento\Eav\Model\Entity\TypeFactory $eavTypeFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Eav\Model\Resource\Helper $resourceHelper
* @param \Magento\Framework\Validator\UniversalFactory $universalFactory
* @param \Magento\Eav\Api\Data\AttributeOptionDataBuilder $optionDataBuilder
@@ -127,7 +127,7 @@ public function __construct(
\Magento\Core\Helper\Data $coreData,
\Magento\Eav\Model\Config $eavConfig,
\Magento\Eav\Model\Entity\TypeFactory $eavTypeFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Eav\Model\Resource\Helper $resourceHelper,
\Magento\Framework\Validator\UniversalFactory $universalFactory,
\Magento\Eav\Api\Data\AttributeOptionDataBuilder $optionDataBuilder,
diff --git a/app/code/Magento/Catalog/Model/Resource/Layer/Filter/Price.php b/app/code/Magento/Catalog/Model/Resource/Layer/Filter/Price.php
index 7dfcf7810f121..fdcc55de263dd 100644
--- a/app/code/Magento/Catalog/Model/Resource/Layer/Filter/Price.php
+++ b/app/code/Magento/Catalog/Model/Resource/Layer/Filter/Price.php
@@ -33,7 +33,7 @@ class Price extends \Magento\Framework\Model\Resource\Db\AbstractDb
private $session;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
private $storeManager;
@@ -42,14 +42,14 @@ class Price extends \Magento\Framework\Model\Resource\Db\AbstractDb
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Catalog\Model\Layer\Resolver $layerResolver
* @param \Magento\Customer\Model\Session $session
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Catalog\Model\Layer\Resolver $layerResolver,
\Magento\Customer\Model\Session $session,
- \Magento\Store\Model\StoreManagerInterface $storeManager
+ \Magento\Framework\Store\StoreManagerInterface $storeManager
) {
$this->layer = $layerResolver->get();
$this->session = $session;
diff --git a/app/code/Magento/Catalog/Model/Resource/Product.php b/app/code/Magento/Catalog/Model/Resource/Product.php
index 814f9e6ec81e9..abfa6e7998c71 100644
--- a/app/code/Magento/Catalog/Model/Resource/Product.php
+++ b/app/code/Magento/Catalog/Model/Resource/Product.php
@@ -63,7 +63,7 @@ class Product extends AbstractResource
* @param \Magento\Framework\Locale\FormatInterface $localeFormat
* @param \Magento\Eav\Model\Resource\Helper $resourceHelper
* @param \Magento\Framework\Validator\UniversalFactory $universalFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Model\Factory $modelFactory
* @param Category\CollectionFactory $categoryCollectionFactory
* @param Category $catalogCategory
@@ -81,7 +81,7 @@ public function __construct(
\Magento\Framework\Locale\FormatInterface $localeFormat,
\Magento\Eav\Model\Resource\Helper $resourceHelper,
\Magento\Framework\Validator\UniversalFactory $universalFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Factory $modelFactory,
\Magento\Catalog\Model\Resource\Category\CollectionFactory $categoryCollectionFactory,
Category $catalogCategory,
diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Attribute/Collection.php b/app/code/Magento/Catalog/Model/Resource/Product/Attribute/Collection.php
index 3eee3dbc770e1..2d3bd8216f344 100644
--- a/app/code/Magento/Catalog/Model/Resource/Product/Attribute/Collection.php
+++ b/app/code/Magento/Catalog/Model/Resource/Product/Attribute/Collection.php
@@ -18,7 +18,7 @@ class Collection extends \Magento\Eav\Model\Resource\Entity\Attribute\Collection
protected $_eavEntityFactory;
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -28,7 +28,7 @@ class Collection extends \Magento\Eav\Model\Resource\Entity\Attribute\Collection
* @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
@@ -89,6 +89,7 @@ protected function _initSelect()
*
* @param int $typeId
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function setEntityTypeFilter($typeId)
{
diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Collection.php b/app/code/Magento/Catalog/Model/Resource/Product/Collection.php
index 2d7139d498184..a5ef49306bc7d 100644
--- a/app/code/Magento/Catalog/Model/Resource/Product/Collection.php
+++ b/app/code/Magento/Catalog/Model/Resource/Product/Collection.php
@@ -256,7 +256,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Collection\AbstractColl
protected $_groupManagement;
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -265,7 +265,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Collection\AbstractColl
* @param \Magento\Eav\Model\EntityFactory $eavEntityFactory
* @param \Magento\Catalog\Model\Resource\Helper $resourceHelper
* @param \Magento\Framework\Validator\UniversalFactory $universalFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\Module\Manager $moduleManager
* @param \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
@@ -280,7 +280,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Collection\AbstractColl
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
@@ -289,7 +289,7 @@ public function __construct(
\Magento\Eav\Model\EntityFactory $eavEntityFactory,
\Magento\Catalog\Model\Resource\Helper $resourceHelper,
\Magento\Framework\Validator\UniversalFactory $universalFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\Module\Manager $moduleManager,
\Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
@@ -1244,7 +1244,7 @@ public function addUrlRewrite($categoryId = '')
$this->_addUrlRewrite = true;
$useCategoryUrl = $this->_scopeConfig->getValue(
\Magento\Catalog\Helper\Product::XML_PATH_PRODUCT_URL_USE_CATEGORY,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$this->getStoreId()
);
if ($useCategoryUrl) {
diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Compare/Item/Collection.php b/app/code/Magento/Catalog/Model/Resource/Product/Compare/Item/Collection.php
index c9a4fd6abfe36..d64d6cc2d5bb5 100644
--- a/app/code/Magento/Catalog/Model/Resource/Product/Compare/Item/Collection.php
+++ b/app/code/Magento/Catalog/Model/Resource/Product/Compare/Item/Collection.php
@@ -50,7 +50,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection
protected $_catalogProductCompareItem;
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -59,7 +59,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection
* @param \Magento\Eav\Model\EntityFactory $eavEntityFactory
* @param \Magento\Catalog\Model\Resource\Helper $resourceHelper
* @param \Magento\Framework\Validator\UniversalFactory $universalFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\Module\Manager $moduleManager
* @param \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
@@ -76,7 +76,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
@@ -85,7 +85,7 @@ public function __construct(
\Magento\Eav\Model\EntityFactory $eavEntityFactory,
\Magento\Catalog\Model\Resource\Helper $resourceHelper,
\Magento\Framework\Validator\UniversalFactory $universalFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\Module\Manager $moduleManager,
\Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Flat.php b/app/code/Magento/Catalog/Model/Resource/Product/Flat.php
index 711a988b91a94..ecdac4c6c4ee8 100644
--- a/app/code/Magento/Catalog/Model/Resource/Product/Flat.php
+++ b/app/code/Magento/Catalog/Model/Resource/Product/Flat.php
@@ -31,18 +31,18 @@ class Flat extends \Magento\Framework\Model\Resource\Db\AbstractDb
/**
* Store manager
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
/**
* @param \Magento\Framework\App\Resource $resource
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Model\Config $catalogConfig
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Config $catalogConfig
) {
$this->_storeManager = $storeManager;
diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Option.php b/app/code/Magento/Catalog/Model/Resource/Product/Option.php
index 0150acf9b0e76..1e3882df9ae61 100644
--- a/app/code/Magento/Catalog/Model/Resource/Product/Option.php
+++ b/app/code/Magento/Catalog/Model/Resource/Product/Option.php
@@ -15,7 +15,7 @@ class Option extends \Magento\Framework\Model\Resource\Db\AbstractDb
/**
* Store manager
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -38,13 +38,13 @@ class Option extends \Magento\Framework\Model\Resource\Db\AbstractDb
*
* @param \Magento\Framework\App\Resource $resource
* @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\Config\ScopeConfigInterface $config
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
\Magento\Directory\Model\CurrencyFactory $currencyFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\App\Config\ScopeConfigInterface $config
) {
$this->_currencyFactory = $currencyFactory;
@@ -153,7 +153,7 @@ protected function _saveValuePrices(\Magento\Framework\Model\AbstractModel $obje
$scope = (int)$this->_config->getValue(
\Magento\Store\Model\Store::XML_PATH_PRICE_SCOPE,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
if ($object->getStoreId() != '0' && $scope == \Magento\Store\Model\Store::PRICE_SCOPE_WEBSITE) {
diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Option/Collection.php b/app/code/Magento/Catalog/Model/Resource/Product/Option/Collection.php
index b985d79cdd6bc..851bfa2bd096e 100644
--- a/app/code/Magento/Catalog/Model/Resource/Product/Option/Collection.php
+++ b/app/code/Magento/Catalog/Model/Resource/Product/Option/Collection.php
@@ -15,7 +15,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
/**
* Store manager
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -27,22 +27,22 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
protected $_optionValueCollectionFactory;
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Catalog\Model\Resource\Product\Option\Value\CollectionFactory $optionValueCollectionFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Zend_Db_Adapter_Abstract $connection
* @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Catalog\Model\Resource\Product\Option\Value\CollectionFactory $optionValueCollectionFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
$connection = null,
\Magento\Framework\Model\Resource\Db\AbstractDb $resource = null
) {
diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Option/Value.php b/app/code/Magento/Catalog/Model/Resource/Product/Option/Value.php
index 89ecd99e7b368..89a1dba13bc49 100644
--- a/app/code/Magento/Catalog/Model/Resource/Product/Option/Value.php
+++ b/app/code/Magento/Catalog/Model/Resource/Product/Option/Value.php
@@ -15,7 +15,7 @@ class Value extends \Magento\Framework\Model\Resource\Db\AbstractDb
/**
* Store manager
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -38,13 +38,13 @@ class Value extends \Magento\Framework\Model\Resource\Db\AbstractDb
*
* @param \Magento\Framework\App\Resource $resource
* @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\Config\ScopeConfigInterface $config
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
\Magento\Directory\Model\CurrencyFactory $currencyFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\App\Config\ScopeConfigInterface $config
) {
$this->_currencyFactory = $currencyFactory;
@@ -130,7 +130,7 @@ protected function _saveValuePrices(\Magento\Framework\Model\AbstractModel $obje
$scope = (int)$this->_config->getValue(
\Magento\Store\Model\Store::XML_PATH_PRICE_SCOPE,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
if ($scope == \Magento\Store\Model\Store::PRICE_SCOPE_WEBSITE
diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Website.php b/app/code/Magento/Catalog/Model/Resource/Product/Website.php
index 25c5a807fe892..f73573e2e5074 100644
--- a/app/code/Magento/Catalog/Model/Resource/Product/Website.php
+++ b/app/code/Magento/Catalog/Model/Resource/Product/Website.php
@@ -13,17 +13,17 @@ class Website extends \Magento\Framework\Model\Resource\Db\AbstractDb
/**
* Store manager
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
/**
* @param \Magento\Framework\App\Resource $resource
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
- \Magento\Store\Model\StoreManagerInterface $storeManager
+ \Magento\Framework\Store\StoreManagerInterface $storeManager
) {
$this->_storeManager = $storeManager;
parent::__construct($resource);
diff --git a/app/code/Magento/Catalog/Model/Resource/Setup.php b/app/code/Magento/Catalog/Model/Resource/Setup.php
index 1b9a020792dc1..a32005ec5a719 100644
--- a/app/code/Magento/Catalog/Model/Resource/Setup.php
+++ b/app/code/Magento/Catalog/Model/Resource/Setup.php
@@ -219,7 +219,7 @@ public function getDefaultEntities()
'type' => 'varchar',
'label' => 'Custom Design',
'input' => 'select',
- 'source' => 'Magento\Core\Model\Theme\Source\Theme',
+ 'source' => 'Magento\Theme\Model\Theme\Source\Theme',
'required' => false,
'sort_order' => 10,
'global' => \Magento\Catalog\Model\Resource\Eav\Attribute::SCOPE_STORE,
@@ -654,7 +654,7 @@ public function getDefaultEntities()
'type' => 'varchar',
'label' => 'Custom Design',
'input' => 'select',
- 'source' => 'Magento\Core\Model\Theme\Source\Theme',
+ 'source' => 'Magento\Theme\Model\Theme\Source\Theme',
'required' => false,
'sort_order' => 1,
'global' => \Magento\Catalog\Model\Resource\Eav\Attribute::SCOPE_STORE,
diff --git a/app/code/Magento/Catalog/Model/Resource/Url.php b/app/code/Magento/Catalog/Model/Resource/Url.php
index b41e752056677..8bbcdb9f5adb2 100644
--- a/app/code/Magento/Catalog/Model/Resource/Url.php
+++ b/app/code/Magento/Catalog/Model/Resource/Url.php
@@ -78,7 +78,7 @@ class Url extends \Magento\Framework\Model\Resource\Db\AbstractDb
/**
* Store manager
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -89,7 +89,7 @@ class Url extends \Magento\Framework\Model\Resource\Db\AbstractDb
/**
* @param \Magento\Framework\App\Resource $resource
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Eav\Model\Config $eavConfig
* @param Product $productResource
* @param \Magento\Catalog\Model\Category $catalogCategory
@@ -97,7 +97,7 @@ class Url extends \Magento\Framework\Model\Resource\Db\AbstractDb
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Eav\Model\Config $eavConfig,
Product $productResource,
\Magento\Catalog\Model\Category $catalogCategory,
diff --git a/app/code/Magento/Catalog/Model/Rss/Product/Special.php b/app/code/Magento/Catalog/Model/Rss/Product/Special.php
index 9bcf78cea24bf..488c04a652f18 100644
--- a/app/code/Magento/Catalog/Model/Rss/Product/Special.php
+++ b/app/code/Magento/Catalog/Model/Rss/Product/Special.php
@@ -17,17 +17,17 @@ class Special
protected $productFactory;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $storeManager;
/**
* @param \Magento\Catalog\Model\ProductFactory $productFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
*/
public function __construct(
\Magento\Catalog\Model\ProductFactory $productFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager
+ \Magento\Framework\Store\StoreManagerInterface $storeManager
) {
$this->productFactory = $productFactory;
$this->storeManager = $storeManager;
diff --git a/app/code/Magento/Catalog/Model/System/Config/Backend/Catalog/Url/Rewrite/Suffix.php b/app/code/Magento/Catalog/Model/System/Config/Backend/Catalog/Url/Rewrite/Suffix.php
index c9054ef4160d0..5872ea852a0e7 100644
--- a/app/code/Magento/Catalog/Model/System/Config/Backend/Catalog/Url/Rewrite/Suffix.php
+++ b/app/code/Magento/Catalog/Model/System/Config/Backend/Catalog/Url/Rewrite/Suffix.php
@@ -14,7 +14,7 @@
use Magento\CatalogUrlRewrite\Model\ProductUrlPathGenerator;
use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
use Magento\Framework\App\Resource;
-use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\Store\ScopeInterface;
use Magento\UrlRewrite\Model\Storage\DbStorage;
use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
@@ -26,7 +26,7 @@ class Suffix extends \Magento\Framework\App\Config\Value
/** @var \Magento\UrlRewrite\Helper\UrlRewrite */
protected $urlRewriteHelper;
- /** @var \Magento\Store\Model\StoreManagerInterface */
+ /** @var \Magento\Framework\Store\StoreManagerInterface */
protected $storeManager;
/** @var \Magento\UrlRewrite\Model\UrlFinderInterface */
@@ -42,7 +42,7 @@ class Suffix extends \Magento\Framework\App\Config\Value
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param \Magento\UrlRewrite\Helper\UrlRewrite $urlRewriteHelper
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\Resource $appResource
* @param \Magento\UrlRewrite\Model\UrlFinderInterface $urlFinder
* @param array $data
@@ -53,7 +53,7 @@ public function __construct(
\Magento\Framework\Registry $registry,
\Magento\Framework\App\Config\ScopeConfigInterface $config,
\Magento\UrlRewrite\Helper\UrlRewrite $urlRewriteHelper,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\App\Resource $appResource,
\Magento\UrlRewrite\Model\UrlFinderInterface $urlFinder,
\Magento\Framework\Model\Resource\AbstractResource $resource = null,
diff --git a/app/code/Magento/Catalog/Model/Template/Filter.php b/app/code/Magento/Catalog/Model/Template/Filter.php
index 93376946e09d1..f8912a3edfe9d 100644
--- a/app/code/Magento/Catalog/Model/Template/Filter.php
+++ b/app/code/Magento/Catalog/Model/Template/Filter.php
@@ -38,19 +38,19 @@ class Filter extends \Magento\Framework\Filter\Template
/**
* Store manager
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
/**
* @param \Magento\Framework\Stdlib\String $string
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\View\Asset\Repository $assetRepo
* @param array $variables
*/
public function __construct(
\Magento\Framework\Stdlib\String $string,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\View\Asset\Repository $assetRepo,
$variables = []
) {
diff --git a/app/code/Magento/CatalogImportExport/Model/Export/Product.php b/app/code/Magento/CatalogImportExport/Model/Export/Product.php
index 58aa1666678f9..e97ee609b72ba 100644
--- a/app/code/Magento/CatalogImportExport/Model/Export/Product.php
+++ b/app/code/Magento/CatalogImportExport/Model/Export/Product.php
@@ -210,7 +210,7 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
* @param \Magento\Eav\Model\Config $config
* @param \Magento\Framework\App\Resource $resource
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Catalog\Model\Resource\Product\Collection $collection
* @param \Magento\ImportExport\Model\Export\ConfigInterface $exportConfig
@@ -229,7 +229,7 @@ public function __construct(
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
\Magento\Eav\Model\Config $config,
\Magento\Framework\App\Resource $resource,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Psr\Log\LoggerInterface $logger,
\Magento\Catalog\Model\Resource\Product\Collection $collection,
\Magento\ImportExport\Model\Export\ConfigInterface $exportConfig,
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php
index 979a5ede17cf5..c4bbe716a9450 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php
@@ -276,7 +276,7 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
protected $_resource;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -304,7 +304,7 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
* @param \Magento\ImportExport\Model\Resource\Import\Data $importData
* @param \Magento\Framework\App\Resource $resource
* @param \Magento\ImportExport\Model\Resource\Helper $resourceHelper
- * @param \Magento\Store\Model\StoreManagerInterface $_storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $_storeManager
* @param \Magento\Catalog\Model\ProductFactory $productFactory
* @param \Magento\Catalog\Model\Resource\Product\Option\CollectionFactory $optionColFactory
* @param \Magento\ImportExport\Model\Resource\CollectionByPagesIteratorFactory $colIteratorFactory
@@ -319,7 +319,7 @@ public function __construct(
\Magento\ImportExport\Model\Resource\Import\Data $importData,
\Magento\Framework\App\Resource $resource,
\Magento\ImportExport\Model\Resource\Helper $resourceHelper,
- \Magento\Store\Model\StoreManagerInterface $_storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $_storeManager,
\Magento\Catalog\Model\ProductFactory $productFactory,
\Magento\Catalog\Model\Resource\Product\Option\CollectionFactory $optionColFactory,
\Magento\ImportExport\Model\Resource\CollectionByPagesIteratorFactory $colIteratorFactory,
@@ -484,7 +484,7 @@ protected function _initSourceEntities(array $data)
} else {
$this->_pageSize = self::XML_PATH_PAGE_SIZE ? (int)$this->_scopeConfig->getValue(
self::XML_PATH_PAGE_SIZE,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
) : 0;
}
return $this;
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/StoreResolver.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/StoreResolver.php
index af478e82e4c3f..e720730c386bc 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/StoreResolver.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/StoreResolver.php
@@ -8,7 +8,7 @@
class StoreResolver
{
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $storeManager;
@@ -40,9 +40,9 @@ class StoreResolver
protected $storeIdToWebsiteStoreIds = [];
/**
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
*/
- public function __construct(\Magento\Store\Model\StoreManagerInterface $storeManager)
+ public function __construct(\Magento\Framework\Store\StoreManagerInterface $storeManager)
{
$this->storeManager = $storeManager;
}
diff --git a/app/code/Magento/CatalogInventory/Block/Stockqty/AbstractStockqty.php b/app/code/Magento/CatalogInventory/Block/Stockqty/AbstractStockqty.php
index 93224e80fe3ef..699139cb7e9d2 100644
--- a/app/code/Magento/CatalogInventory/Block/Stockqty/AbstractStockqty.php
+++ b/app/code/Magento/CatalogInventory/Block/Stockqty/AbstractStockqty.php
@@ -105,7 +105,7 @@ public function getThresholdQty()
if (!$this->hasData('threshold_qty')) {
$qty = (float)$this->_scopeConfig->getValue(
self::XML_PATH_STOCK_THRESHOLD_QTY,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
$this->setData('threshold_qty', $qty);
}
diff --git a/app/code/Magento/CatalogInventory/Helper/Minsaleqty.php b/app/code/Magento/CatalogInventory/Helper/Minsaleqty.php
index a68ab1576e1bd..dba9ec3ae9a91 100644
--- a/app/code/Magento/CatalogInventory/Helper/Minsaleqty.php
+++ b/app/code/Magento/CatalogInventory/Helper/Minsaleqty.php
@@ -175,7 +175,7 @@ public function getConfigValue($customerGroupId, $store = null)
{
$value = $this->scopeConfig->getValue(
\Magento\CatalogInventory\Model\Configuration::XML_PATH_MIN_SALE_QTY,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
$value = $this->unserializeValue($value);
diff --git a/app/code/Magento/CatalogInventory/Helper/Stock.php b/app/code/Magento/CatalogInventory/Helper/Stock.php
index e8d111dfa1f35..2d8efe41d2b75 100644
--- a/app/code/Magento/CatalogInventory/Helper/Stock.php
+++ b/app/code/Magento/CatalogInventory/Helper/Stock.php
@@ -6,7 +6,7 @@
namespace Magento\CatalogInventory\Helper;
use Magento\CatalogInventory\Api\StockRegistryInterface;
-use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\Store\StoreManagerInterface;
use Magento\Framework\App\Config\ScopeConfigInterface;
use Magento\Framework\ObjectManagerInterface;
@@ -46,7 +46,7 @@ class Stock
/**
* @param StockRegistryInterface $stockRegistry
- * @param StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param ScopeConfigInterface $scopeConfig
* @param ObjectManagerInterface $objectManager
*/
@@ -109,7 +109,7 @@ public function addInStockFilterToCollection($collection)
{
$manageStock = $this->scopeConfig->getValue(
\Magento\CatalogInventory\Model\Configuration::XML_PATH_MANAGE_STOCK,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
$cond = [
'{{table}}.use_config_manage_stock = 0 AND {{table}}.manage_stock=1 AND {{table}}.is_in_stock=1',
diff --git a/app/code/Magento/CatalogInventory/Model/Adminhtml/Stock/Item.php b/app/code/Magento/CatalogInventory/Model/Adminhtml/Stock/Item.php
index d4612c3e2e32c..b639334365c38 100644
--- a/app/code/Magento/CatalogInventory/Model/Adminhtml/Stock/Item.php
+++ b/app/code/Magento/CatalogInventory/Model/Adminhtml/Stock/Item.php
@@ -28,7 +28,7 @@ class Item extends \Magento\CatalogInventory\Model\Stock\Item
* @param MetadataServiceInterface $metadataService
* @param AttributeDataBuilder $customAttributeBuilder
* @param \Magento\Customer\Model\Session $customerSession
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param StockConfigurationInterface $stockConfiguration
* @param StockRegistryInterface $stockRegistry
* @param StockItemRepositoryInterface $stockItemRepository
@@ -44,7 +44,7 @@ public function __construct(
MetadataServiceInterface $metadataService,
AttributeDataBuilder $customAttributeBuilder,
\Magento\Customer\Model\Session $customerSession,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
StockConfigurationInterface $stockConfiguration,
StockRegistryInterface $stockRegistry,
StockItemRepositoryInterface $stockItemRepository,
diff --git a/app/code/Magento/CatalogInventory/Model/Configuration.php b/app/code/Magento/CatalogInventory/Model/Configuration.php
index 2d4d0189a63c5..3f587e9fbcd0c 100644
--- a/app/code/Magento/CatalogInventory/Model/Configuration.php
+++ b/app/code/Magento/CatalogInventory/Model/Configuration.php
@@ -9,7 +9,7 @@
use Magento\CatalogInventory\Helper\Minsaleqty as MinsaleqtyHelper;
use Magento\Framework\App\Config\ScopeConfigInterface;
use Magento\Catalog\Model\ProductTypes\ConfigInterface;
-use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\Store\StoreManagerInterface;
/**
* Class Configuration
@@ -129,13 +129,13 @@ class Configuration implements StockConfigurationInterface
* @param ConfigInterface $config
* @param ScopeConfigInterface $scopeConfig
* @param MinsaleqtyHelper $minsaleqtyHelper
- * @param StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
*/
public function __construct(
ConfigInterface $config,
ScopeConfigInterface $scopeConfig,
MinsaleqtyHelper $minsaleqtyHelper,
- StoreManagerInterface $storeManager
+ \Magento\Framework\Store\StoreManagerInterface $storeManager
) {
$this->config = $config;
$this->scopeConfig = $scopeConfig;
@@ -196,7 +196,7 @@ public function canSubtractQty($store = null)
{
return $this->scopeConfig->isSetFlag(
self::XML_PATH_CAN_SUBTRACT,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -209,7 +209,7 @@ public function getMinQty($store = null)
{
return (float)$this->scopeConfig->getValue(
self::XML_PATH_MIN_QTY,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -232,7 +232,7 @@ public function getMaxSaleQty($store = null)
{
return (float)$this->scopeConfig->getValue(
self::XML_PATH_MAX_SALE_QTY,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -245,7 +245,7 @@ public function getNotifyStockQty($store = null)
{
return (float) $this->scopeConfig->getValue(
self::XML_PATH_NOTIFY_STOCK_QTY,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -261,7 +261,7 @@ public function getEnableQtyIncrements($store = null)
{
return (bool) $this->scopeConfig->getValue(
self::XML_PATH_ENABLE_QTY_INCREMENTS,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -274,7 +274,7 @@ public function getQtyIncrements($store = null)
{
return (float)$this->scopeConfig->getValue(
self::XML_PATH_QTY_INCREMENTS,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -289,7 +289,7 @@ public function getBackorders($store = null)
{
return (int) $this->scopeConfig->getValue(
self::XML_PATH_BACKORDERS,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -304,7 +304,7 @@ public function getManageStock($store = null)
{
return (int) $this->scopeConfig->isSetFlag(
self::XML_PATH_MANAGE_STOCK,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -320,7 +320,7 @@ public function getCanBackInStock($store = null)
{
return $this->scopeConfig->isSetFlag(
self::XML_PATH_CAN_BACK_IN_STOCK,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -335,7 +335,7 @@ public function isShowOutOfStock($store = null)
{
return $this->scopeConfig->isSetFlag(
self::XML_PATH_SHOW_OUT_OF_STOCK,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -350,7 +350,7 @@ public function isAutoReturnEnabled($store = null)
{
return $this->scopeConfig->isSetFlag(
self::XML_PATH_ITEM_AUTO_RETURN,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -366,7 +366,7 @@ public function isDisplayProductStockStatus($store = null)
{
return $this->scopeConfig->isSetFlag(
self::XML_PATH_DISPLAY_PRODUCT_STOCK_STATUS,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -380,7 +380,7 @@ public function getDefaultConfigValue($field, $store = null)
{
return $this->scopeConfig->getValue(
self::XML_PATH_ITEM . $field,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
}
diff --git a/app/code/Magento/CatalogInventory/Model/Plugin/Layer.php b/app/code/Magento/CatalogInventory/Model/Plugin/Layer.php
index 3b16b43106e80..18a88e83fb758 100644
--- a/app/code/Magento/CatalogInventory/Model/Plugin/Layer.php
+++ b/app/code/Magento/CatalogInventory/Model/Plugin/Layer.php
@@ -61,7 +61,7 @@ protected function _isEnabledShowOutOfStock()
{
return $this->scopeConfig->isSetFlag(
'cataloginventory/options/show_out_of_stock',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
}
}
diff --git a/app/code/Magento/CatalogInventory/Model/Resource/Indexer/Stock/DefaultStock.php b/app/code/Magento/CatalogInventory/Model/Resource/Indexer/Stock/DefaultStock.php
index 6be23ba43302a..9699aa3e98b36 100644
--- a/app/code/Magento/CatalogInventory/Model/Resource/Indexer/Stock/DefaultStock.php
+++ b/app/code/Magento/CatalogInventory/Model/Resource/Indexer/Stock/DefaultStock.php
@@ -148,7 +148,7 @@ protected function _isManageStock()
{
return $this->_scopeConfig->isSetFlag(
\Magento\CatalogInventory\Model\Configuration::XML_PATH_MANAGE_STOCK,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
}
diff --git a/app/code/Magento/CatalogInventory/Model/Resource/Stock.php b/app/code/Magento/CatalogInventory/Model/Resource/Stock.php
index 42c162eb4f8ed..25d8f752f5a42 100644
--- a/app/code/Magento/CatalogInventory/Model/Resource/Stock.php
+++ b/app/code/Magento/CatalogInventory/Model/Resource/Stock.php
@@ -7,7 +7,7 @@
namespace Magento\CatalogInventory\Model\Resource;
use Magento\CatalogInventory\Api\StockConfigurationInterface;
-use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\Store\StoreManagerInterface;
/**
* Stock resource model
@@ -74,7 +74,7 @@ class Stock extends \Magento\Framework\Model\Resource\Db\AbstractDb
protected $dateTime;
/**
- * @var StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $storeManager;
@@ -181,7 +181,7 @@ protected function _initConfig()
foreach ($configMap as $field => $const) {
$this->{$field} = (int) $this->_scopeConfig->getValue(
$const,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
}
diff --git a/app/code/Magento/CatalogInventory/Model/Resource/Stock/Item/StockItemCriteriaMapper.php b/app/code/Magento/CatalogInventory/Model/Resource/Stock/Item/StockItemCriteriaMapper.php
index a78cd2b52317e..7754966be9461 100644
--- a/app/code/Magento/CatalogInventory/Model/Resource/Stock/Item/StockItemCriteriaMapper.php
+++ b/app/code/Magento/CatalogInventory/Model/Resource/Stock/Item/StockItemCriteriaMapper.php
@@ -10,7 +10,7 @@
use Magento\Framework\DB\MapperFactory;
use Magento\Framework\DB\Select;
use Magento\Framework\Data\ObjectFactory;
-use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\Store\StoreManagerInterface;
use Psr\Log\LoggerInterface as Logger;
use Magento\Framework\Data\Collection\Db\FetchStrategyInterface;
@@ -24,7 +24,7 @@ class StockItemCriteriaMapper extends GenericMapper
* @param Logger $logger
* @param FetchStrategyInterface $fetchStrategy
* @param ObjectFactory $objectFactory
- * @param StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param MapperFactory $mapperFactory
* @param Select $select
*/
diff --git a/app/code/Magento/CatalogInventory/Model/Resource/Stock/Status.php b/app/code/Magento/CatalogInventory/Model/Resource/Stock/Status.php
index 4b971fecf3131..ff68cf46fb9dc 100644
--- a/app/code/Magento/CatalogInventory/Model/Resource/Stock/Status.php
+++ b/app/code/Magento/CatalogInventory/Model/Resource/Stock/Status.php
@@ -15,7 +15,7 @@ class Status extends \Magento\Framework\Model\Resource\Db\AbstractDb
/**
* Store model manager
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -33,13 +33,13 @@ class Status extends \Magento\Framework\Model\Resource\Db\AbstractDb
/**
* @param \Magento\Framework\App\Resource $resource
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Store\Model\WebsiteFactory $websiteFactory
* @param \Magento\Eav\Model\Config $eavConfig
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Store\Model\WebsiteFactory $websiteFactory,
\Magento\Eav\Model\Config $eavConfig
) {
diff --git a/app/code/Magento/CatalogInventory/Model/Stock/Item.php b/app/code/Magento/CatalogInventory/Model/Stock/Item.php
index 51a72cdf1d364..6d24403a9cacd 100644
--- a/app/code/Magento/CatalogInventory/Model/Stock/Item.php
+++ b/app/code/Magento/CatalogInventory/Model/Stock/Item.php
@@ -68,7 +68,7 @@ class Item extends AbstractExtensibleModel implements StockItemInterface
/**
* Store model manager
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $storeManager;
@@ -117,7 +117,7 @@ class Item extends AbstractExtensibleModel implements StockItemInterface
* @param MetadataServiceInterface $metadataService
* @param AttributeDataBuilder $customAttributeBuilder
* @param \Magento\Customer\Model\Session $customerSession
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param StockConfigurationInterface $stockConfiguration
* @param StockRegistryInterface $stockRegistry
* @param StockItemRepositoryInterface $stockItemRepository
@@ -132,7 +132,7 @@ public function __construct(
MetadataServiceInterface $metadataService,
AttributeDataBuilder $customAttributeBuilder,
\Magento\Customer\Model\Session $customerSession,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
StockConfigurationInterface $stockConfiguration,
StockRegistryInterface $stockRegistry,
StockItemRepositoryInterface $stockItemRepository,
diff --git a/app/code/Magento/CatalogInventory/Model/StockRegistryProvider.php b/app/code/Magento/CatalogInventory/Model/StockRegistryProvider.php
index 0a9f1f04d0132..2051eaa9ce0b8 100644
--- a/app/code/Magento/CatalogInventory/Model/StockRegistryProvider.php
+++ b/app/code/Magento/CatalogInventory/Model/StockRegistryProvider.php
@@ -15,7 +15,7 @@
use Magento\CatalogInventory\Api\StockCriteriaInterfaceFactory;
use Magento\CatalogInventory\Api\StockItemCriteriaInterfaceFactory;
use Magento\CatalogInventory\Api\StockStatusCriteriaInterfaceFactory;
-use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\Store\StoreManagerInterface;
/**
* Class StockRegistryProvider
diff --git a/app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder.php b/app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder.php
index 5812b16b0832d..02afbcf4eb9d9 100644
--- a/app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder.php
+++ b/app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder.php
@@ -25,7 +25,7 @@ class IndexBuilder
protected $resource;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $storeManager;
@@ -78,7 +78,7 @@ class IndexBuilder
* @param RuleCollectionFactory $ruleCollectionFactory
* @param PriceCurrencyInterface $priceCurrency
* @param \Magento\Framework\App\Resource $resource
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Eav\Model\Config $eavConfig
* @param \Magento\Framework\Stdlib\DateTime $dateFormat
@@ -91,7 +91,7 @@ public function __construct(
RuleCollectionFactory $ruleCollectionFactory,
PriceCurrencyInterface $priceCurrency,
\Magento\Framework\App\Resource $resource,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Psr\Log\LoggerInterface $logger,
\Magento\Eav\Model\Config $eavConfig,
\Magento\Framework\Stdlib\DateTime $dateFormat,
diff --git a/app/code/Magento/CatalogRule/Model/Observer.php b/app/code/Magento/CatalogRule/Model/Observer.php
index 887b60b9c8a2e..b0c6ff50c45aa 100644
--- a/app/code/Magento/CatalogRule/Model/Observer.php
+++ b/app/code/Magento/CatalogRule/Model/Observer.php
@@ -15,7 +15,7 @@
use Magento\CatalogRule\Model\Rule;
use Magento\CatalogRule\Model\Rule\Product\Price;
use Magento\Framework\Registry;
-use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\Store\StoreManagerInterface;
use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
use Magento\Customer\Api\GroupManagementInterface;
use Magento\Customer\Model\Session as CustomerModelSession;
diff --git a/app/code/Magento/CatalogRule/Model/Resource/Rule.php b/app/code/Magento/CatalogRule/Model/Resource/Rule.php
index 330c01f9680b2..f9e6ee80903b4 100644
--- a/app/code/Magento/CatalogRule/Model/Resource/Rule.php
+++ b/app/code/Magento/CatalogRule/Model/Resource/Rule.php
@@ -78,7 +78,7 @@ class Rule extends \Magento\Rule\Model\Resource\AbstractResource
protected $_conditionFactory;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -94,7 +94,7 @@ class Rule extends \Magento\Rule\Model\Resource\AbstractResource
/**
* @param \Magento\Framework\App\Resource $resource
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param Product\ConditionFactory $conditionFactory
* @param \Magento\Framework\Stdlib\DateTime\DateTime $coreDate
* @param \Magento\Eav\Model\Config $eavConfig
@@ -107,7 +107,7 @@ class Rule extends \Magento\Rule\Model\Resource\AbstractResource
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Product\ConditionFactory $conditionFactory,
\Magento\Framework\Stdlib\DateTime\DateTime $coreDate,
\Magento\Eav\Model\Config $eavConfig,
diff --git a/app/code/Magento/CatalogRule/Model/Rule.php b/app/code/Magento/CatalogRule/Model/Rule.php
index 1228ac74d24cb..44ba49e140294 100644
--- a/app/code/Magento/CatalogRule/Model/Rule.php
+++ b/app/code/Magento/CatalogRule/Model/Rule.php
@@ -129,7 +129,7 @@ class Rule extends \Magento\Rule\Model\AbstractModel
protected $_productFactory;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -149,7 +149,7 @@ class Rule extends \Magento\Rule\Model\AbstractModel
* @param \Magento\Framework\Data\FormFactory $formFactory
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
* @param \Magento\Catalog\Model\Resource\Product\CollectionFactory $productCollectionFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\CatalogRule\Model\Rule\Condition\CombineFactory $combineFactory
* @param \Magento\CatalogRule\Model\Rule\Action\CollectionFactory $actionCollectionFactory
* @param \Magento\Catalog\Model\ProductFactory $productFactory
@@ -170,7 +170,7 @@ public function __construct(
\Magento\Framework\Data\FormFactory $formFactory,
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
\Magento\Catalog\Model\Resource\Product\CollectionFactory $productCollectionFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\CatalogRule\Model\Rule\Condition\CombineFactory $combineFactory,
\Magento\CatalogRule\Model\Rule\Action\CollectionFactory $actionCollectionFactory,
\Magento\Catalog\Model\ProductFactory $productFactory,
diff --git a/app/code/Magento/CatalogSearch/Controller/Result/Index.php b/app/code/Magento/CatalogSearch/Controller/Result/Index.php
index 4392814b229bd..6c98094d8f55f 100644
--- a/app/code/Magento/CatalogSearch/Controller/Result/Index.php
+++ b/app/code/Magento/CatalogSearch/Controller/Result/Index.php
@@ -9,7 +9,7 @@
use Magento\Catalog\Model\Layer\Resolver;
use Magento\Catalog\Model\Session;
use Magento\Framework\App\Action\Context;
-use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\Store\StoreManagerInterface;
use Magento\Search\Model\QueryFactory;
class Index extends \Magento\Framework\App\Action\Action
@@ -41,7 +41,7 @@ class Index extends \Magento\Framework\App\Action\Action
/**
* @param Context $context
* @param Session $catalogSession
- * @param StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param QueryFactory $queryFactory
* @param Resolver $layerResolver
*/
diff --git a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Dynamic/DataProvider.php b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Dynamic/DataProvider.php
index 341783fa0dcd6..30b8477a0bdae 100644
--- a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Dynamic/DataProvider.php
+++ b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Dynamic/DataProvider.php
@@ -15,7 +15,7 @@
use Magento\Framework\Search\Dynamic\DataProviderInterface;
use Magento\Framework\Search\Dynamic\IntervalFactory;
use Magento\Framework\Search\Request\BucketInterface;
-use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\Store\ScopeInterface;
/**
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/CatalogSearch/Model/Advanced.php b/app/code/Magento/CatalogSearch/Model/Advanced.php
index 5558d89322e00..a943dd06abab5 100644
--- a/app/code/Magento/CatalogSearch/Model/Advanced.php
+++ b/app/code/Magento/CatalogSearch/Model/Advanced.php
@@ -18,7 +18,7 @@
use Magento\Framework\Model\Context;
use Magento\Framework\Model\Exception;
use Magento\Framework\Registry;
-use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\Store\StoreManagerInterface;
/**
* Catalog advanced search model
@@ -83,7 +83,7 @@ class Advanced extends \Magento\Framework\Model\AbstractModel
/**
* Store manager
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -118,7 +118,7 @@ class Advanced extends \Magento\Framework\Model\AbstractModel
* @param Config $catalogConfig
* @param CurrencyFactory $currencyFactory
* @param ProductFactory $productFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param ResourceProvider $resourceProvider
* @param array $data
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/Full.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/Full.php
index e4f6fea57b08b..fab9da1af37c8 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/Full.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/Full.php
@@ -98,7 +98,7 @@ class Full
/**
* Store manager
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $storeManager;
@@ -153,7 +153,7 @@ class Full
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\CatalogSearch\Helper\Data $catalogSearchData
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\Stdlib\DateTime $dateTime
* @param \Magento\Framework\Locale\ResolverInterface $localeResolver
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
@@ -172,7 +172,7 @@ public function __construct(
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\CatalogSearch\Helper\Data $catalogSearchData,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\Stdlib\DateTime $dateTime,
\Magento\Framework\Locale\ResolverInterface $localeResolver,
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
@@ -765,12 +765,12 @@ protected function getStoreDate($storeId, $date = null)
if (!isset($this->dates[$storeId])) {
$timezone = $this->scopeConfig->getValue(
$this->localeDate->getDefaultTimezonePath(),
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$storeId
);
$locale = $this->scopeConfig->getValue(
$this->localeResolver->getDefaultLocalePath(),
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$storeId
);
$locale = new \Zend_Locale($locale);
diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Advanced.php b/app/code/Magento/CatalogSearch/Model/Layer/Advanced.php
index 1603844981af7..3cd2c5a514c59 100644
--- a/app/code/Magento/CatalogSearch/Model/Layer/Advanced.php
+++ b/app/code/Magento/CatalogSearch/Model/Layer/Advanced.php
@@ -18,7 +18,7 @@ class Advanced extends \Magento\Catalog\Model\Layer
* @param \Magento\Catalog\Model\Layer\StateFactory $layerStateFactory
* @param Resource\Product\Attribute\CollectionFactory $attributeCollectionFactory
* @param Resource\Product $catalogProduct
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\Registry $registry
* @param CategoryRepositoryInterface $categoryRepository
* @param array $data
@@ -28,7 +28,7 @@ public function __construct(
\Magento\Catalog\Model\Layer\StateFactory $layerStateFactory,
Resource\Product\Attribute\CollectionFactory $attributeCollectionFactory,
Resource\Product $catalogProduct,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\Registry $registry,
CategoryRepositoryInterface $categoryRepository,
array $data = []
diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Advanced/CollectionFilter.php b/app/code/Magento/CatalogSearch/Model/Layer/Advanced/CollectionFilter.php
index 7acc2cd6a3b20..7f2b7be73cfcf 100644
--- a/app/code/Magento/CatalogSearch/Model/Layer/Advanced/CollectionFilter.php
+++ b/app/code/Magento/CatalogSearch/Model/Layer/Advanced/CollectionFilter.php
@@ -21,7 +21,7 @@ class CollectionFilter implements CollectionFilterInterface
protected $helper;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $storeManager;
@@ -33,14 +33,14 @@ class CollectionFilter implements CollectionFilterInterface
/**
* @param \Magento\Catalog\Model\Config $catalogConfig
* @param \Magento\CatalogSearch\Helper\Data $helper
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Model\Product\Visibility $productVisibility
* @param \Magento\Framework\Registry $registry
*/
public function __construct(
\Magento\Catalog\Model\Config $catalogConfig,
\Magento\CatalogSearch\Helper\Data $helper,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Product\Visibility $productVisibility,
\Magento\Framework\Registry $registry
) {
diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Advanced/FilterableAttributeList.php b/app/code/Magento/CatalogSearch/Model/Layer/Advanced/FilterableAttributeList.php
index 645f8a5901f00..c5277044a26f3 100644
--- a/app/code/Magento/CatalogSearch/Model/Layer/Advanced/FilterableAttributeList.php
+++ b/app/code/Magento/CatalogSearch/Model/Layer/Advanced/FilterableAttributeList.php
@@ -10,12 +10,12 @@ class FilterableAttributeList extends \Magento\Catalog\Model\Layer\Category\Filt
{
/**
* @param \Magento\Catalog\Model\Resource\Product\Attribute\CollectionFactory $collectionFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Model\Layer\Resolver $layerResolver
*/
public function __construct(
\Magento\Catalog\Model\Resource\Product\Attribute\CollectionFactory $collectionFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Layer\Resolver $layerResolver
) {
parent::__construct($collectionFactory, $storeManager, $layerResolver);
diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Attribute.php b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Attribute.php
index ec2782eb07c4f..33eb26bbafba6 100644
--- a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Attribute.php
+++ b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Attribute.php
@@ -19,7 +19,7 @@ class Attribute extends AbstractFilter
/**
* @param \Magento\Catalog\Model\Layer\Filter\ItemFactory $filterItemFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Model\Layer $layer
* @param \Magento\Catalog\Model\Layer\Filter\Item\DataBuilder $itemDataBuilder
* @param \Magento\Framework\Filter\StripTags $tagFilter
@@ -27,7 +27,7 @@ class Attribute extends AbstractFilter
*/
public function __construct(
\Magento\Catalog\Model\Layer\Filter\ItemFactory $filterItemFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Layer $layer,
\Magento\Catalog\Model\Layer\Filter\Item\DataBuilder $itemDataBuilder,
\Magento\Framework\Filter\StripTags $tagFilter,
diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Category.php b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Category.php
index 677abd9b5db63..26a7bf5d5092a 100644
--- a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Category.php
+++ b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Category.php
@@ -25,7 +25,7 @@ class Category extends AbstractFilter
/**
* @param \Magento\Catalog\Model\Layer\Filter\ItemFactory $filterItemFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Model\Layer $layer
* @param \Magento\Catalog\Model\Layer\Filter\Item\DataBuilder $itemDataBuilder
* @param \Magento\Catalog\Model\CategoryFactory $categoryFactory
@@ -35,7 +35,7 @@ class Category extends AbstractFilter
*/
public function __construct(
\Magento\Catalog\Model\Layer\Filter\ItemFactory $filterItemFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Layer $layer,
\Magento\Catalog\Model\Layer\Filter\Item\DataBuilder $itemDataBuilder,
\Magento\Framework\Escaper $escaper,
diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Decimal.php b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Decimal.php
index 9061a5755b2df..087e2c88c003d 100644
--- a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Decimal.php
+++ b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Decimal.php
@@ -24,7 +24,7 @@ class Decimal extends AbstractFilter
/**
* @param \Magento\Catalog\Model\Layer\Filter\ItemFactory $filterItemFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Model\Layer $layer
* @param \Magento\Catalog\Model\Layer\Filter\Item\DataBuilder $itemDataBuilder
* @param \Magento\Catalog\Model\Resource\Layer\Filter\DecimalFactory $filterDecimalFactory
@@ -33,7 +33,7 @@ class Decimal extends AbstractFilter
*/
public function __construct(
\Magento\Catalog\Model\Layer\Filter\ItemFactory $filterItemFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Layer $layer,
\Magento\Catalog\Model\Layer\Filter\Item\DataBuilder $itemDataBuilder,
\Magento\Catalog\Model\Resource\Layer\Filter\DecimalFactory $filterDecimalFactory,
diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Price.php b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Price.php
index e3a419bbe47de..713e3b12e8fb0 100644
--- a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Price.php
+++ b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Price.php
@@ -43,7 +43,7 @@ class Price extends AbstractFilter
/**
* @param \Magento\Catalog\Model\Layer\Filter\ItemFactory $filterItemFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Model\Layer $layer
* @param \Magento\Catalog\Model\Layer\Filter\Item\DataBuilder $itemDataBuilder
* @param \Magento\Catalog\Model\Resource\Layer\Filter\Price $resource
@@ -59,7 +59,7 @@ class Price extends AbstractFilter
*/
public function __construct(
\Magento\Catalog\Model\Layer\Filter\ItemFactory $filterItemFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Layer $layer,
\Magento\Catalog\Model\Layer\Filter\Item\DataBuilder $itemDataBuilder,
\Magento\Catalog\Model\Resource\Layer\Filter\Price $resource,
diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Search/StateKey.php b/app/code/Magento/CatalogSearch/Model/Layer/Search/StateKey.php
index 5f38437c05978..20633d528d21a 100644
--- a/app/code/Magento/CatalogSearch/Model/Layer/Search/StateKey.php
+++ b/app/code/Magento/CatalogSearch/Model/Layer/Search/StateKey.php
@@ -17,12 +17,12 @@ class StateKey extends \Magento\Catalog\Model\Layer\Category\StateKey implements
protected $queryFactory;
/**
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Customer\Model\Session $customerSession
* @param \Magento\Search\Model\QueryFactory $queryFactory
*/
public function __construct(
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Customer\Model\Session $customerSession,
\Magento\Search\Model\QueryFactory $queryFactory
) {
diff --git a/app/code/Magento/CatalogSearch/Model/Resource/Advanced.php b/app/code/Magento/CatalogSearch/Model/Resource/Advanced.php
index 2cbb9e51f972c..2227c8bfa7cf2 100644
--- a/app/code/Magento/CatalogSearch/Model/Resource/Advanced.php
+++ b/app/code/Magento/CatalogSearch/Model/Resource/Advanced.php
@@ -22,7 +22,7 @@ class Advanced extends \Magento\Framework\Model\Resource\Db\AbstractDb
/**
* Store manager
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -30,12 +30,12 @@ class Advanced extends \Magento\Framework\Model\Resource\Db\AbstractDb
* Construct
*
* @param \Magento\Framework\App\Resource $resource
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\Event\ManagerInterface $eventManager
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\Event\ManagerInterface $eventManager
) {
$this->_storeManager = $storeManager;
diff --git a/app/code/Magento/CatalogSearch/Model/Resource/Advanced/Collection.php b/app/code/Magento/CatalogSearch/Model/Resource/Advanced/Collection.php
index 32c9cc3208602..8f004d5d809ee 100644
--- a/app/code/Magento/CatalogSearch/Model/Resource/Advanced/Collection.php
+++ b/app/code/Magento/CatalogSearch/Model/Resource/Advanced/Collection.php
@@ -32,7 +32,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection
private $searchEngine;
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -41,7 +41,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection
* @param \Magento\Eav\Model\EntityFactory $eavEntityFactory
* @param \Magento\Catalog\Model\Resource\Helper $resourceHelper
* @param \Magento\Framework\Validator\UniversalFactory $universalFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\Module\Manager $moduleManager ,
* @param \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
@@ -57,7 +57,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
@@ -66,7 +66,7 @@ public function __construct(
\Magento\Eav\Model\EntityFactory $eavEntityFactory,
\Magento\Catalog\Model\Resource\Helper $resourceHelper,
\Magento\Framework\Validator\UniversalFactory $universalFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\Module\Manager $moduleManager,
\Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
diff --git a/app/code/Magento/CatalogSearch/Model/Resource/EngineProvider.php b/app/code/Magento/CatalogSearch/Model/Resource/EngineProvider.php
index 1d021b322f757..cb6636b0520e7 100644
--- a/app/code/Magento/CatalogSearch/Model/Resource/EngineProvider.php
+++ b/app/code/Magento/CatalogSearch/Model/Resource/EngineProvider.php
@@ -9,7 +9,7 @@
*/
namespace Magento\CatalogSearch\Model\Resource;
-use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\Store\ScopeInterface;
class EngineProvider
{
diff --git a/app/code/Magento/CatalogSearch/Model/Resource/Fulltext/Collection.php b/app/code/Magento/CatalogSearch/Model/Resource/Fulltext/Collection.php
index 31c0545235348..02aa586bcb5da 100644
--- a/app/code/Magento/CatalogSearch/Model/Resource/Fulltext/Collection.php
+++ b/app/code/Magento/CatalogSearch/Model/Resource/Fulltext/Collection.php
@@ -49,7 +49,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection
private $order = null;
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -58,7 +58,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection
* @param \Magento\Eav\Model\EntityFactory $eavEntityFactory
* @param \Magento\Catalog\Model\Resource\Helper $resourceHelper
* @param \Magento\Framework\Validator\UniversalFactory $universalFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\Module\Manager $moduleManager
* @param \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
@@ -76,7 +76,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
@@ -85,7 +85,7 @@ public function __construct(
\Magento\Eav\Model\EntityFactory $eavEntityFactory,
\Magento\Catalog\Model\Resource\Helper $resourceHelper,
\Magento\Framework\Validator\UniversalFactory $universalFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\Module\Manager $moduleManager,
\Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
@@ -178,7 +178,7 @@ protected function _renderFiltersBefore()
$priceRangeCalculation = $this->_scopeConfig->getValue(
\Magento\Catalog\Model\Layer\Filter\Dynamic\AlgorithmFactory::XML_PATH_RANGE_CALCULATION,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
if ($priceRangeCalculation) {
$this->requestBuilder->bind('price_dynamic_algorithm', $priceRangeCalculation);
diff --git a/app/code/Magento/CatalogSearch/Model/Resource/ResourceProvider.php b/app/code/Magento/CatalogSearch/Model/Resource/ResourceProvider.php
index c18aa10f02c43..9389b9f22b0a1 100644
--- a/app/code/Magento/CatalogSearch/Model/Resource/ResourceProvider.php
+++ b/app/code/Magento/CatalogSearch/Model/Resource/ResourceProvider.php
@@ -5,7 +5,7 @@
*/
namespace Magento\CatalogSearch\Model\Resource;
-use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\Store\ScopeInterface;
class ResourceProvider
{
diff --git a/app/code/Magento/CatalogSearch/Model/Resource/Search/Collection.php b/app/code/Magento/CatalogSearch/Model/Resource/Search/Collection.php
index 331a441f066ea..caa53627c4210 100644
--- a/app/code/Magento/CatalogSearch/Model/Resource/Search/Collection.php
+++ b/app/code/Magento/CatalogSearch/Model/Resource/Search/Collection.php
@@ -38,7 +38,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection impl
protected $_attributeCollectionFactory;
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -47,7 +47,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection impl
* @param \Magento\Eav\Model\EntityFactory $eavEntityFactory
* @param \Magento\Catalog\Model\Resource\Helper $resourceHelper
* @param \Magento\Framework\Validator\UniversalFactory $universalFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\Module\Manager $moduleManager
* @param \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
@@ -63,7 +63,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection impl
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
@@ -72,7 +72,7 @@ public function __construct(
\Magento\Eav\Model\EntityFactory $eavEntityFactory,
\Magento\Catalog\Model\Resource\Helper $resourceHelper,
\Magento\Framework\Validator\UniversalFactory $universalFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\Module\Manager $moduleManager,
\Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
diff --git a/app/code/Magento/CatalogSearch/Model/Search/IndexBuilder.php b/app/code/Magento/CatalogSearch/Model/Search/IndexBuilder.php
index e47ba631ebfca..74c68b4fdae12 100644
--- a/app/code/Magento/CatalogSearch/Model/Search/IndexBuilder.php
+++ b/app/code/Magento/CatalogSearch/Model/Search/IndexBuilder.php
@@ -11,8 +11,8 @@
use Magento\Framework\DB\Select;
use Magento\Framework\Search\Adapter\Mysql\IndexBuilderInterface;
use Magento\Framework\Search\RequestInterface;
-use Magento\Store\Model\ScopeInterface;
-use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\Store\ScopeInterface;
+use Magento\Framework\Store\StoreManagerInterface;
/**
* Build base Query for Index
@@ -30,14 +30,14 @@ class IndexBuilder implements IndexBuilderInterface
private $config;
/**
- * @var StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
private $storeManager;
/**
* @param \Magento\Framework\App\Resource $resource
* @param ScopeConfigInterface $config
- * @param StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
*/
public function __construct(Resource $resource, ScopeConfigInterface $config, StoreManagerInterface $storeManager)
{
diff --git a/app/code/Magento/CatalogSearch/etc/di.xml b/app/code/Magento/CatalogSearch/etc/di.xml
index e4c718050c3ff..566fe53bf30fe 100644
--- a/app/code/Magento/CatalogSearch/etc/di.xml
+++ b/app/code/Magento/CatalogSearch/etc/di.xml
@@ -74,7 +74,7 @@
- Magento\CatalogSearch\Model\Price\Interval
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
diff --git a/app/code/Magento/CatalogUrlRewrite/Block/UrlKeyRenderer.php b/app/code/Magento/CatalogUrlRewrite/Block/UrlKeyRenderer.php
index 5e6cd86f1757f..070fcc526da05 100644
--- a/app/code/Magento/CatalogUrlRewrite/Block/UrlKeyRenderer.php
+++ b/app/code/Magento/CatalogUrlRewrite/Block/UrlKeyRenderer.php
@@ -5,7 +5,7 @@
*/
namespace Magento\CatalogUrlRewrite\Block;
-use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\Store\ScopeInterface;
/**
* Renderer for URL key input
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/Category/Observer.php b/app/code/Magento/CatalogUrlRewrite/Model/Category/Observer.php
index c250ca3f2f677..1a6fc23b6d0a1 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/Category/Observer.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/Category/Observer.php
@@ -11,10 +11,13 @@
use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
use Magento\Framework\App\Config\ScopeConfigInterface;
use Magento\Framework\Event\Observer as EventObserver;
-use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\Store\ScopeInterface;
use Magento\UrlRewrite\Model\UrlPersistInterface;
use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class Observer
{
/** @var \Magento\CatalogUrlRewrite\Model\Category\ChildrenCategoriesProvider */
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Store/Group.php b/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Store/Group.php
index 2f0e619c5f68d..aea86ff792c0d 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Store/Group.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Store/Group.php
@@ -9,12 +9,15 @@
use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
use Magento\Catalog\Model\CategoryFactory;
use Magento\Catalog\Model\ProductFactory;
-use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\Store\StoreManagerInterface;
use Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator;
use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
use Magento\Store\Model\Store;
use Magento\Framework\Model\AbstractModel;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class Group
{
/** @var UrlPersistInterface */
@@ -32,7 +35,7 @@ class Group
/** @var ProductUrlRewriteGenerator */
protected $productUrlRewriteGenerator;
- /** @var StoreManagerInterface */
+ /** @var \Magento\Framework\Store\StoreManagerInterface */
protected $storeManager;
/**
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/CategoryUrlPathGenerator.php b/app/code/Magento/CatalogUrlRewrite/Model/CategoryUrlPathGenerator.php
index 6e7547e9ce886..6eda18ccc1870 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/CategoryUrlPathGenerator.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/CategoryUrlPathGenerator.php
@@ -30,7 +30,7 @@ class CategoryUrlPathGenerator
/** @var \Magento\Framework\App\Config\ScopeConfigInterface */
protected $scopeConfig;
- /** @var \Magento\Store\Model\StoreManagerInterface */
+ /** @var \Magento\Framework\Store\StoreManagerInterface */
protected $storeManager;
/**
@@ -39,12 +39,12 @@ class CategoryUrlPathGenerator
protected $categoryRepository;
/**
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param CategoryRepositoryInterface $categoryRepository
*/
public function __construct(
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
CategoryRepositoryInterface $categoryRepository
) {
@@ -117,7 +117,7 @@ protected function getCategoryUrlSuffix($storeId = null)
if (!isset($this->categoryUrlSuffix[$storeId])) {
$this->categoryUrlSuffix[$storeId] = $this->scopeConfig->getValue(
self::XML_PATH_CATEGORY_URL_SUFFIX,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$storeId
);
}
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/Product/CurrentUrlRewritesRegenerator.php b/app/code/Magento/CatalogUrlRewrite/Model/Product/CurrentUrlRewritesRegenerator.php
index 84029da04df0c..1c64c8a1a3449 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/Product/CurrentUrlRewritesRegenerator.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/Product/CurrentUrlRewritesRegenerator.php
@@ -14,8 +14,11 @@
use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
use Magento\CatalogUrlRewrite\Model\ProductUrlPathGenerator;
use Magento\UrlRewrite\Service\V1\Data\UrlRewriteBuilder;
-use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\Store\StoreManagerInterface;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class CurrentUrlRewritesRegenerator
{
/** @var Product */
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/ProductUrlPathGenerator.php b/app/code/Magento/CatalogUrlRewrite/Model/ProductUrlPathGenerator.php
index bdf70eeb288bd..6a7a4a6b4bfa9 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/ProductUrlPathGenerator.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/ProductUrlPathGenerator.php
@@ -16,7 +16,7 @@ class ProductUrlPathGenerator
*/
protected $productUrlSuffix = [];
- /** @var \Magento\Store\Model\StoreManagerInterface */
+ /** @var \Magento\Framework\Store\StoreManagerInterface */
protected $storeManager;
/** @var \Magento\Framework\App\Config\ScopeConfigInterface */
@@ -26,12 +26,12 @@ class ProductUrlPathGenerator
protected $categoryUrlPathGenerator;
/**
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param CategoryUrlPathGenerator $categoryUrlPathGenerator
*/
public function __construct(
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
\Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator $categoryUrlPathGenerator
) {
@@ -111,7 +111,7 @@ protected function getProductUrlSuffix($storeId = null)
if (!isset($this->productUrlSuffix[$storeId])) {
$this->productUrlSuffix[$storeId] = $this->scopeConfig->getValue(
self::XML_PATH_PRODUCT_URL_SUFFIX,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$storeId
);
}
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/ProductUrlRewriteGenerator.php b/app/code/Magento/CatalogUrlRewrite/Model/ProductUrlRewriteGenerator.php
index a8661bfdc9eaa..507febcf075c2 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/ProductUrlRewriteGenerator.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/ProductUrlRewriteGenerator.php
@@ -40,7 +40,7 @@ class ProductUrlRewriteGenerator
/** @var \Magento\CatalogUrlRewrite\Model\ObjectRegistry */
protected $productCategories;
- /** @var \Magento\Store\Model\StoreManagerInterface */
+ /** @var \Magento\Framework\Store\StoreManagerInterface */
protected $storeManager;
/**
@@ -49,7 +49,7 @@ class ProductUrlRewriteGenerator
* @param \Magento\CatalogUrlRewrite\Model\Product\CategoriesUrlRewriteGenerator $categoriesUrlRewriteGenerator
* @param \Magento\CatalogUrlRewrite\Model\ObjectRegistryFactory $objectRegistryFactory
* @param \Magento\CatalogUrlRewrite\Service\V1\StoreViewService $storeViewService
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
*/
public function __construct(
CanonicalUrlRewriteGenerator $canonicalUrlRewriteGenerator,
@@ -57,7 +57,7 @@ public function __construct(
CategoriesUrlRewriteGenerator $categoriesUrlRewriteGenerator,
ObjectRegistryFactory $objectRegistryFactory,
StoreViewService $storeViewService,
- \Magento\Store\Model\StoreManagerInterface $storeManager
+ \Magento\Framework\Store\StoreManagerInterface $storeManager
) {
$this->canonicalUrlRewriteGenerator = $canonicalUrlRewriteGenerator;
$this->currentUrlRewritesRegenerator = $currentUrlRewritesRegenerator;
diff --git a/app/code/Magento/CatalogWidget/Model/Rule/Condition/Product.php b/app/code/Magento/CatalogWidget/Model/Rule/Condition/Product.php
index 19da2e1702c3f..588cc9809bc84 100644
--- a/app/code/Magento/CatalogWidget/Model/Rule/Condition/Product.php
+++ b/app/code/Magento/CatalogWidget/Model/Rule/Condition/Product.php
@@ -28,7 +28,7 @@ class Product extends \Magento\Rule\Model\Condition\Product\AbstractProduct
/**
* Store manager
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $storeManager;
@@ -41,7 +41,7 @@ class Product extends \Magento\Rule\Model\Condition\Product\AbstractProduct
* @param \Magento\Catalog\Model\Resource\Product $productResource
* @param \Magento\Eav\Model\Resource\Entity\Attribute\Set\Collection $attrSetCollection
* @param \Magento\Framework\Locale\FormatInterface $localeFormat
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param array $data
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
@@ -54,7 +54,7 @@ public function __construct(
\Magento\Catalog\Model\Resource\Product $productResource,
\Magento\Eav\Model\Resource\Entity\Attribute\Set\Collection $attrSetCollection,
\Magento\Framework\Locale\FormatInterface $localeFormat,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
array $data = []
) {
$this->storeManager = $storeManager;
diff --git a/app/code/Magento/Centinel/Model/Config.php b/app/code/Magento/Centinel/Model/Config.php
index 81d187f3ed2ed..5bc8147524de4 100644
--- a/app/code/Magento/Centinel/Model/Config.php
+++ b/app/code/Magento/Centinel/Model/Config.php
@@ -134,7 +134,7 @@ public function getIsTestMode()
*/
private function _getServiceConfigValue($key)
{
- return $this->_scopeConfig->getValue($this->_serviceConfigPath . '/' . $key, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $this->getStore());
+ return $this->_scopeConfig->getValue($this->_serviceConfigPath . '/' . $key, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $this->getStore());
}
/**
diff --git a/app/code/Magento/Centinel/composer.json b/app/code/Magento/Centinel/composer.json
index 3146aae7bf54f..4e25f830eefc7 100644
--- a/app/code/Magento/Centinel/composer.json
+++ b/app/code/Magento/Centinel/composer.json
@@ -3,7 +3,6 @@
"description": "N/A",
"require": {
"php": "~5.4.11|~5.5.0|~5.6.0",
- "magento/module-store": "0.42.0-beta5",
"magento/module-checkout": "0.42.0-beta5",
"magento/module-core": "0.42.0-beta5",
"magento/module-backend": "0.42.0-beta5",
diff --git a/app/code/Magento/Centinel/etc/frontend/di.xml b/app/code/Magento/Centinel/etc/frontend/di.xml
index 7ae4496323f9c..4ec66c4094e59 100644
--- a/app/code/Magento/Centinel/etc/frontend/di.xml
+++ b/app/code/Magento/Centinel/etc/frontend/di.xml
@@ -16,7 +16,7 @@
Magento\Centinel\Model\Session\Storage
-
+
- /centinel/
diff --git a/app/code/Magento/Checkout/Block/Cart.php b/app/code/Magento/Checkout/Block/Cart.php
index 6e406dae410fc..6c3e87661066d 100644
--- a/app/code/Magento/Checkout/Block/Cart.php
+++ b/app/code/Magento/Checkout/Block/Cart.php
@@ -130,7 +130,7 @@ public function isWishlistActive()
if ($isActive === null) {
$isActive = $this->_scopeConfig->getValue(
'wishlist/general/active',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
) && $this->httpContext->getValue(
Context::CONTEXT_AUTH
);
diff --git a/app/code/Magento/Checkout/Block/Cart/Shipping.php b/app/code/Magento/Checkout/Block/Cart/Shipping.php
index 27f72fb347f39..9b314544b8893 100644
--- a/app/code/Magento/Checkout/Block/Cart/Shipping.php
+++ b/app/code/Magento/Checkout/Block/Cart/Shipping.php
@@ -76,7 +76,7 @@ public function __construct(
*/
public function getConfig($path)
{
- return $this->_scopeConfig->getValue($path, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+ return $this->_scopeConfig->getValue($path, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
}
/**
@@ -124,7 +124,7 @@ public function getCarrierName($carrierCode)
{
if ($name = $this->_scopeConfig->getValue(
'carriers/' . $carrierCode . '/title',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)
) {
return $name;
diff --git a/app/code/Magento/Checkout/Block/Cart/Sidebar.php b/app/code/Magento/Checkout/Block/Cart/Sidebar.php
index a811d6069b6ff..6170e65cef60c 100644
--- a/app/code/Magento/Checkout/Block/Cart/Sidebar.php
+++ b/app/code/Magento/Checkout/Block/Cart/Sidebar.php
@@ -73,7 +73,7 @@ public function getItemCount()
if (is_null($count)) {
$count = $this->_scopeConfig->getValue(
self::XML_PATH_CHECKOUT_SIDEBAR_COUNT,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
$this->setData('item_count', $count);
}
@@ -179,7 +179,7 @@ public function getIsNeedToDisplaySideBar()
{
return (bool)$this->_scopeConfig->getValue(
'checkout/sidebar/display',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
}
diff --git a/app/code/Magento/Checkout/Block/Onepage/AbstractOnepage.php b/app/code/Magento/Checkout/Block/Onepage/AbstractOnepage.php
index 941b0425c66f4..6189b5f5e0a13 100644
--- a/app/code/Magento/Checkout/Block/Onepage/AbstractOnepage.php
+++ b/app/code/Magento/Checkout/Block/Onepage/AbstractOnepage.php
@@ -139,7 +139,7 @@ public function __construct(
*/
public function getConfig($path)
{
- return $this->_scopeConfig->getValue($path, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+ return $this->_scopeConfig->getValue($path, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
}
/**
diff --git a/app/code/Magento/Checkout/Block/Onepage/Shipping/Method/Available.php b/app/code/Magento/Checkout/Block/Onepage/Shipping/Method/Available.php
index 679f00970c0e2..2e56f635a2d7d 100644
--- a/app/code/Magento/Checkout/Block/Onepage/Shipping/Method/Available.php
+++ b/app/code/Magento/Checkout/Block/Onepage/Shipping/Method/Available.php
@@ -103,7 +103,7 @@ public function getCarrierName($carrierCode)
{
if ($name = $this->_scopeConfig->getValue(
'carriers/' . $carrierCode . '/title',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)
) {
return $name;
diff --git a/app/code/Magento/Checkout/Controller/Cart.php b/app/code/Magento/Checkout/Controller/Cart.php
index 557e98447c5ef..d3ce20b7be2fd 100644
--- a/app/code/Magento/Checkout/Controller/Cart.php
+++ b/app/code/Magento/Checkout/Controller/Cart.php
@@ -24,7 +24,7 @@ class Cart extends \Magento\Framework\App\Action\Action implements ViewInterface
protected $_checkoutSession;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -42,7 +42,7 @@ class Cart extends \Magento\Framework\App\Action\Action implements ViewInterface
* @param \Magento\Framework\App\Action\Context $context
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param \Magento\Checkout\Model\Session $checkoutSession
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
* @param CustomerCart $cart
*/
@@ -50,7 +50,7 @@ public function __construct(
\Magento\Framework\App\Action\Context $context,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
\Magento\Checkout\Model\Session $checkoutSession,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Core\App\Action\FormKeyValidator $formKeyValidator,
CustomerCart $cart
) {
@@ -75,7 +75,7 @@ protected function _goBack()
$this->getResponse()->setRedirect($returnUrl);
} elseif (!$this->_scopeConfig->getValue(
'checkout/cart/redirect_to_cart',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
) && !$this->getRequest()->getParam(
'in_cart'
) && ($backUrl = $this->_redirect->getRefererUrl())
diff --git a/app/code/Magento/Checkout/Controller/Cart/Add.php b/app/code/Magento/Checkout/Controller/Cart/Add.php
index dc61e5350b9d5..d6cafaf38a008 100644
--- a/app/code/Magento/Checkout/Controller/Cart/Add.php
+++ b/app/code/Magento/Checkout/Controller/Cart/Add.php
@@ -13,6 +13,9 @@
use Magento\Checkout\Model\Cart as CustomerCart;
use Magento\Framework\Exception\NoSuchEntityException;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class Add extends \Magento\Checkout\Controller\Cart
{
/**
@@ -24,7 +27,7 @@ class Add extends \Magento\Checkout\Controller\Cart
* @param \Magento\Framework\App\Action\Context $context
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param \Magento\Checkout\Model\Session $checkoutSession
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
* @param CustomerCart $cart
* @param ProductRepositoryInterface $productRepository
@@ -33,7 +36,7 @@ public function __construct(
\Magento\Framework\App\Action\Context $context,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
\Magento\Checkout\Model\Session $checkoutSession,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Core\App\Action\FormKeyValidator $formKeyValidator,
CustomerCart $cart,
ProductRepositoryInterface $productRepository
@@ -51,7 +54,7 @@ protected function _initProduct()
{
$productId = (int)$this->getRequest()->getParam('product');
if ($productId) {
- $storeId = $this->_objectManager->get('Magento\Store\Model\StoreManagerInterface')->getStore()->getId();
+ $storeId = $this->_objectManager->get('Magento\Framework\Store\StoreManagerInterface')->getStore()->getId();
try {
return $this->productRepository->getById($productId, false, $storeId);
} catch (NoSuchEntityException $e) {
diff --git a/app/code/Magento/Checkout/Controller/Cart/Configure.php b/app/code/Magento/Checkout/Controller/Cart/Configure.php
index 0c09470858bd3..5b3cbc4aef6a5 100644
--- a/app/code/Magento/Checkout/Controller/Cart/Configure.php
+++ b/app/code/Magento/Checkout/Controller/Cart/Configure.php
@@ -17,7 +17,7 @@ class Configure extends \Magento\Checkout\Controller\Cart
* @param \Magento\Framework\App\Action\Context $context
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param \Magento\Checkout\Model\Session $checkoutSession
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
* @param \Magento\Checkout\Model\Cart $cart
* @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
@@ -26,7 +26,7 @@ public function __construct(
\Magento\Framework\App\Action\Context $context,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
\Magento\Checkout\Model\Session $checkoutSession,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Core\App\Action\FormKeyValidator $formKeyValidator,
\Magento\Checkout\Model\Cart $cart,
\Magento\Framework\View\Result\PageFactory $resultPageFactory
diff --git a/app/code/Magento/Checkout/Controller/Cart/CouponPost.php b/app/code/Magento/Checkout/Controller/Cart/CouponPost.php
index 0cf8613f7b2ea..c617613c273cb 100644
--- a/app/code/Magento/Checkout/Controller/Cart/CouponPost.php
+++ b/app/code/Magento/Checkout/Controller/Cart/CouponPost.php
@@ -21,7 +21,7 @@ class CouponPost extends \Magento\Checkout\Controller\Cart
* @param \Magento\Framework\App\Action\Context $context
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param \Magento\Checkout\Model\Session $checkoutSession
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
* @param CustomerCart $cart
* @param \Magento\Quote\Model\QuoteRepository $quoteRepository
@@ -30,7 +30,7 @@ public function __construct(
\Magento\Framework\App\Action\Context $context,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
\Magento\Checkout\Model\Session $checkoutSession,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Core\App\Action\FormKeyValidator $formKeyValidator,
CustomerCart $cart,
\Magento\Quote\Model\QuoteRepository $quoteRepository
diff --git a/app/code/Magento/Checkout/Controller/Cart/EstimatePost.php b/app/code/Magento/Checkout/Controller/Cart/EstimatePost.php
index f0b4013f995cb..46b3174768e39 100644
--- a/app/code/Magento/Checkout/Controller/Cart/EstimatePost.php
+++ b/app/code/Magento/Checkout/Controller/Cart/EstimatePost.php
@@ -19,7 +19,7 @@ class EstimatePost extends \Magento\Checkout\Controller\Cart
* @param \Magento\Framework\App\Action\Context $context
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param \Magento\Checkout\Model\Session $checkoutSession
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
* @param CustomerCart $cart
* @param \Magento\Quote\Model\QuoteRepository $quoteRepository
@@ -28,7 +28,7 @@ public function __construct(
\Magento\Framework\App\Action\Context $context,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
\Magento\Checkout\Model\Session $checkoutSession,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Core\App\Action\FormKeyValidator $formKeyValidator,
CustomerCart $cart,
\Magento\Quote\Model\QuoteRepository $quoteRepository
diff --git a/app/code/Magento/Checkout/Controller/Cart/Index.php b/app/code/Magento/Checkout/Controller/Cart/Index.php
index 144ae3fdeaa81..8b5c9154e943d 100644
--- a/app/code/Magento/Checkout/Controller/Cart/Index.php
+++ b/app/code/Magento/Checkout/Controller/Cart/Index.php
@@ -25,7 +25,7 @@ public function execute()
if (!$this->cart->getQuote()->validateMinimumAmount()) {
$currencyCode = $this->_objectManager->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->getStore()->getCurrentCurrencyCode();
$minimumAmount = $this->_objectManager->get(
'Magento\Framework\Locale\CurrencyInterface'
@@ -34,16 +34,16 @@ public function execute()
)->toCurrency(
$this->_scopeConfig->getValue(
'sales/minimum_order/amount',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)
);
$warning = $this->_scopeConfig->getValue(
'sales/minimum_order/description',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
) ? $this->_scopeConfig->getValue(
'sales/minimum_order/description',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
) : __(
'Minimum order amount is %1',
$minimumAmount
diff --git a/app/code/Magento/Checkout/Controller/Onepage/SaveBilling.php b/app/code/Magento/Checkout/Controller/Onepage/SaveBilling.php
index f82cbca32e546..b3b1e3e5fd89c 100644
--- a/app/code/Magento/Checkout/Controller/Onepage/SaveBilling.php
+++ b/app/code/Magento/Checkout/Controller/Onepage/SaveBilling.php
@@ -40,7 +40,7 @@ public function execute()
'error' => -1,
'message' => $this->scopeConfig->getValue(
'sales/minimum_order/error_message',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$quote->getStoreId()
),
];
diff --git a/app/code/Magento/Checkout/Controller/Onepage/SaveShipping.php b/app/code/Magento/Checkout/Controller/Onepage/SaveShipping.php
index deefde7fe9ef5..540086881d182 100644
--- a/app/code/Magento/Checkout/Controller/Onepage/SaveShipping.php
+++ b/app/code/Magento/Checkout/Controller/Onepage/SaveShipping.php
@@ -29,7 +29,7 @@ public function execute()
'error' => -1,
'message' => $this->scopeConfig->getValue(
'sales/minimum_order/error_message',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$quote->getStoreId()
),
];
diff --git a/app/code/Magento/Checkout/Helper/Cart.php b/app/code/Magento/Checkout/Helper/Cart.php
index 54705d9d4d1da..ad7b2ed172168 100644
--- a/app/code/Magento/Checkout/Helper/Cart.php
+++ b/app/code/Magento/Checkout/Helper/Cart.php
@@ -49,14 +49,14 @@ class Cart extends \Magento\Core\Helper\Url
/**
* @param \Magento\Framework\App\Helper\Context $context
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param \Magento\Checkout\Model\Cart $checkoutCart
* @param \Magento\Checkout\Model\Session $checkoutSession
*/
public function __construct(
\Magento\Framework\App\Helper\Context $context,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
\Magento\Checkout\Model\Cart $checkoutCart,
\Magento\Checkout\Model\Session $checkoutSession
@@ -210,6 +210,6 @@ public function getIsVirtualQuote()
*/
public function getShouldRedirectToCart($store = null)
{
- return $this->_scopeConfig->isSetFlag(self::XML_PATH_REDIRECT_TO_CART, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
+ return $this->_scopeConfig->isSetFlag(self::XML_PATH_REDIRECT_TO_CART, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store);
}
}
diff --git a/app/code/Magento/Checkout/Helper/Data.php b/app/code/Magento/Checkout/Helper/Data.php
index 145bf276e9c7b..b7e6a243b0fc3 100644
--- a/app/code/Magento/Checkout/Helper/Data.php
+++ b/app/code/Magento/Checkout/Helper/Data.php
@@ -29,7 +29,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
protected $_scopeConfig;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -61,7 +61,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
/**
* @param \Magento\Framework\App\Helper\Context $context
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Checkout\Model\Session $checkoutSession
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
* @param \Magento\Framework\Mail\Template\TransportBuilder $transportBuilder
@@ -71,7 +71,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
public function __construct(
\Magento\Framework\App\Helper\Context $context,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Checkout\Model\Session $checkoutSession,
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
\Magento\Framework\Mail\Template\TransportBuilder $transportBuilder,
@@ -143,7 +143,7 @@ public function canOnepageCheckout()
{
return (bool)$this->_scopeConfig->getValue(
'checkout/options/onepage_checkout_enabled',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
}
@@ -217,14 +217,14 @@ public function sendPaymentFailedEmail($checkout, $message, $checkoutType = 'one
$template = $this->_scopeConfig->getValue(
'checkout/payment_failed/template',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$checkout->getStoreId()
);
$copyTo = $this->_getEmails('checkout/payment_failed/copy_to', $checkout->getStoreId());
$copyMethod = $this->_scopeConfig->getValue(
'checkout/payment_failed/copy_method',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$checkout->getStoreId()
);
$bcc = [];
@@ -234,19 +234,19 @@ public function sendPaymentFailedEmail($checkout, $message, $checkoutType = 'one
$_receiver = $this->_scopeConfig->getValue(
'checkout/payment_failed/receiver',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$checkout->getStoreId()
);
$sendTo = [
[
'email' => $this->_scopeConfig->getValue(
'trans_email/ident_' . $_receiver . '/email',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$checkout->getStoreId()
),
'name' => $this->_scopeConfig->getValue(
'trans_email/ident_' . $_receiver . '/name',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$checkout->getStoreId()
),
],
@@ -295,11 +295,11 @@ public function sendPaymentFailedEmail($checkout, $message, $checkoutType = 'one
'shippingAddress' => $checkout->getShippingAddress(),
'shippingMethod' => $this->_scopeConfig->getValue(
'carriers/' . $shippingMethod . '/title',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
),
'paymentMethod' => $this->_scopeConfig->getValue(
'payment/' . $paymentMethod . '/title',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
),
'items' => nl2br($items),
'total' => $total,
@@ -307,7 +307,7 @@ public function sendPaymentFailedEmail($checkout, $message, $checkoutType = 'one
)->setFrom(
$this->_scopeConfig->getValue(
'checkout/payment_failed/identity',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$checkout->getStoreId()
)
)->addTo(
@@ -332,7 +332,11 @@ public function sendPaymentFailedEmail($checkout, $message, $checkoutType = 'one
*/
protected function _getEmails($configPath, $storeId)
{
- $data = $this->_scopeConfig->getValue($configPath, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $storeId);
+ $data = $this->_scopeConfig->getValue(
+ $configPath,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ $storeId
+ );
if (!empty($data)) {
return explode(',', $data);
}
@@ -354,7 +358,7 @@ public function isAllowedGuestCheckout(\Magento\Quote\Model\Quote $quote, $store
}
$guestCheckout = $this->_scopeConfig->isSetFlag(
self::XML_PATH_GUEST_CHECKOUT,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
@@ -391,7 +395,7 @@ public function isCustomerMustBeLogged()
{
return $this->_scopeConfig->isSetFlag(
self::XML_PATH_CUSTOMER_MUST_BE_LOGGED,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
}
}
diff --git a/app/code/Magento/Checkout/Model/Cart.php b/app/code/Magento/Checkout/Model/Cart.php
index bc7bbb9af1298..b44a2140bc6d1 100644
--- a/app/code/Magento/Checkout/Model/Cart.php
+++ b/app/code/Magento/Checkout/Model/Cart.php
@@ -46,7 +46,7 @@ class Cart extends Object implements CartInterface
protected $_scopeConfig;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -93,7 +93,7 @@ class Cart extends Object implements CartInterface
/**
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param Resource\Cart $resourceCart
* @param Session $checkoutSession
* @param \Magento\Customer\Model\Session $customerSession
@@ -108,7 +108,7 @@ class Cart extends Object implements CartInterface
public function __construct(
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Checkout\Model\Resource\Cart $resourceCart,
Session $checkoutSession,
\Magento\Customer\Model\Session $customerSession,
@@ -623,7 +623,7 @@ public function getSummaryQty()
if ($quoteId && $this->_summaryQty === null) {
$useQty = $this->_scopeConfig->getValue(
'checkout/cart_link/use_qty',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
$this->_summaryQty = $useQty ? $this->getItemsQty() : $this->getItemsCount();
}
diff --git a/app/code/Magento/Checkout/Model/Session.php b/app/code/Magento/Checkout/Model/Session.php
index d647592240822..2e40a7bd3f55b 100644
--- a/app/code/Magento/Checkout/Model/Session.php
+++ b/app/code/Magento/Checkout/Model/Session.php
@@ -72,7 +72,7 @@ class Session extends \Magento\Framework\Session\SessionManager
protected $_eventManager;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -95,7 +95,7 @@ class Session extends \Magento\Framework\Session\SessionManager
* @param \Magento\Quote\Model\QuoteRepository $quoteRepository
* @param \Magento\Framework\HTTP\PhpEnvironment\RemoteAddress $remoteAddress
* @param \Magento\Framework\Event\ManagerInterface $eventManager
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
@@ -113,7 +113,7 @@ public function __construct(
\Magento\Quote\Model\QuoteRepository $quoteRepository,
\Magento\Framework\HTTP\PhpEnvironment\RemoteAddress $remoteAddress,
\Magento\Framework\Event\ManagerInterface $eventManager,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Customer\Api\CustomerRepositoryInterface $customerRepository
) {
$this->_orderFactory = $orderFactory;
diff --git a/app/code/Magento/Checkout/Model/Type/Onepage.php b/app/code/Magento/Checkout/Model/Type/Onepage.php
index c5ee84a6a2e75..ad547575285f7 100644
--- a/app/code/Magento/Checkout/Model/Type/Onepage.php
+++ b/app/code/Magento/Checkout/Model/Type/Onepage.php
@@ -78,7 +78,7 @@ class Onepage
protected $_eventManager = null;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -179,7 +179,7 @@ class Onepage
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Checkout\Model\Session $checkoutSession
* @param \Magento\Customer\Model\Session $customerSession
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\RequestInterface $request
* @param \Magento\Customer\Model\AddressFactory $customrAddrFactory
* @param \Magento\Customer\Model\FormFactory $customerFormFactory
@@ -209,7 +209,7 @@ public function __construct(
\Psr\Log\LoggerInterface $logger,
\Magento\Checkout\Model\Session $checkoutSession,
\Magento\Customer\Model\Session $customerSession,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\App\RequestInterface $request,
\Magento\Customer\Model\AddressFactory $customrAddrFactory,
\Magento\Customer\Model\FormFactory $customerFormFactory,
diff --git a/app/code/Magento/Checkout/etc/frontend/di.xml b/app/code/Magento/Checkout/etc/frontend/di.xml
index 5084eabb98d2f..0662312df5438 100644
--- a/app/code/Magento/Checkout/etc/frontend/di.xml
+++ b/app/code/Magento/Checkout/etc/frontend/di.xml
@@ -6,7 +6,7 @@
*/
-->
-
+
- /checkout/onepage
diff --git a/app/code/Magento/CheckoutAgreements/Block/Agreements.php b/app/code/Magento/CheckoutAgreements/Block/Agreements.php
index f43827a6b5820..1df7e59a0a358 100644
--- a/app/code/Magento/CheckoutAgreements/Block/Agreements.php
+++ b/app/code/Magento/CheckoutAgreements/Block/Agreements.php
@@ -35,7 +35,7 @@ public function __construct(
public function getAgreements()
{
if (!$this->hasAgreements()) {
- if (!$this->_scopeConfig->isSetFlag('checkout/options/enable_agreements', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)) {
+ if (!$this->_scopeConfig->isSetFlag('checkout/options/enable_agreements', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)) {
$agreements = [];
} else {
/** @var \Magento\CheckoutAgreements\Model\Resource\Agreement\Collection $agreements */
diff --git a/app/code/Magento/CheckoutAgreements/Model/AgreementsProvider.php b/app/code/Magento/CheckoutAgreements/Model/AgreementsProvider.php
index a8e88e80ff2fc..2dff3c5c82fd2 100644
--- a/app/code/Magento/CheckoutAgreements/Model/AgreementsProvider.php
+++ b/app/code/Magento/CheckoutAgreements/Model/AgreementsProvider.php
@@ -6,7 +6,7 @@
namespace Magento\CheckoutAgreements\Model;
use Magento\Checkout\Model\Agreements\AgreementsProviderInterface;
-use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\Store\ScopeInterface;
/**
* Provide Agreements stored in db
@@ -22,17 +22,17 @@ class AgreementsProvider implements AgreementsProviderInterface
/** @var \Magento\Framework\App\Config\ScopeConfigInterface */
protected $scopeConfig;
- /** @var \Magento\Store\Model\StoreManagerInterface */
+ /** @var \Magento\Framework\Store\StoreManagerInterface */
protected $storeManager;
/**
* @param Resource\Agreement\CollectionFactory $agreementCollectionFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
*/
public function __construct(
\Magento\CheckoutAgreements\Model\Resource\Agreement\CollectionFactory $agreementCollectionFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
) {
$this->agreementCollectionFactory = $agreementCollectionFactory;
diff --git a/app/code/Magento/CheckoutAgreements/Model/CheckoutAgreementsRepository.php b/app/code/Magento/CheckoutAgreements/Model/CheckoutAgreementsRepository.php
index 892e1599241f3..4df65dee190cd 100644
--- a/app/code/Magento/CheckoutAgreements/Model/CheckoutAgreementsRepository.php
+++ b/app/code/Magento/CheckoutAgreements/Model/CheckoutAgreementsRepository.php
@@ -11,8 +11,8 @@
use Magento\CheckoutAgreements\Model\Resource\Agreement\CollectionFactory as AgreementCollectionFactory;
use Magento\CheckoutAgreements\Model\Resource\Agreement\Collection as AgreementCollection;
use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Store\Model\StoreManagerInterface;
-use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Framework\Store\ScopeInterface;
use Magento\CheckoutAgreements\Api\CheckoutAgreementsRepositoryInterface;
/**
@@ -30,7 +30,7 @@ class CheckoutAgreementsRepository implements CheckoutAgreementsRepositoryInterf
/**
* Store manager.
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
private $storeManager;
@@ -45,7 +45,7 @@ class CheckoutAgreementsRepository implements CheckoutAgreementsRepositoryInterf
* Constructs a checkout agreement data object.
*
* @param AgreementCollectionFactory $collectionFactory Collection factory.
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager Store manager.
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager Store manager.
* @param ScopeConfigInterface $scopeConfig Scope config.
*/
public function __construct(
diff --git a/app/code/Magento/Cms/Block/Block.php b/app/code/Magento/Cms/Block/Block.php
index 2f8f28e4334fc..d512a2aa053a4 100644
--- a/app/code/Magento/Cms/Block/Block.php
+++ b/app/code/Magento/Cms/Block/Block.php
@@ -21,7 +21,7 @@ class Block extends \Magento\Framework\View\Element\AbstractBlock implements \Ma
/**
* Store manager
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -37,14 +37,14 @@ class Block extends \Magento\Framework\View\Element\AbstractBlock implements \Ma
*
* @param \Magento\Framework\View\Element\Context $context
* @param \Magento\Cms\Model\Template\FilterProvider $filterProvider
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Cms\Model\BlockFactory $blockFactory
* @param array $data
*/
public function __construct(
\Magento\Framework\View\Element\Context $context,
\Magento\Cms\Model\Template\FilterProvider $filterProvider,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Cms\Model\BlockFactory $blockFactory,
array $data = []
) {
diff --git a/app/code/Magento/Cms/Block/Page.php b/app/code/Magento/Cms/Block/Page.php
index 6788811a85054..0d23f9f88a382 100644
--- a/app/code/Magento/Cms/Block/Page.php
+++ b/app/code/Magento/Cms/Block/Page.php
@@ -5,7 +5,7 @@
*/
namespace Magento\Cms\Block;
-use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\Store\ScopeInterface;
/**
* Cms page content block
@@ -26,7 +26,7 @@ class Page extends \Magento\Framework\View\Element\AbstractBlock implements
/**
* Store manager
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -48,7 +48,7 @@ class Page extends \Magento\Framework\View\Element\AbstractBlock implements
* @param \Magento\Framework\View\Element\Context $context
* @param \Magento\Cms\Model\Page $page
* @param \Magento\Cms\Model\Template\FilterProvider $filterProvider
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Cms\Model\PageFactory $pageFactory
* @param \Magento\Framework\View\Page\Config $pageConfig
* @param array $data
@@ -57,7 +57,7 @@ public function __construct(
\Magento\Framework\View\Element\Context $context,
\Magento\Cms\Model\Page $page,
\Magento\Cms\Model\Template\FilterProvider $filterProvider,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Cms\Model\PageFactory $pageFactory,
\Magento\Framework\View\Page\Config $pageConfig,
array $data = []
diff --git a/app/code/Magento/Cms/Controller/Index/Index.php b/app/code/Magento/Cms/Controller/Index/Index.php
index 9fa1e103882df..35c1c3ee776fe 100644
--- a/app/code/Magento/Cms/Controller/Index/Index.php
+++ b/app/code/Magento/Cms/Controller/Index/Index.php
@@ -21,7 +21,7 @@ public function execute($coreRoute = null)
'Magento\Framework\App\Config\ScopeConfigInterface'
)->getValue(
\Magento\Cms\Helper\Page::XML_PATH_HOME_PAGE,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
if (!$this->_objectManager->get('Magento\Cms\Helper\Page')->renderPage($this, $pageId)) {
$this->_forward('defaultIndex');
diff --git a/app/code/Magento/Cms/Controller/Index/NoCookies.php b/app/code/Magento/Cms/Controller/Index/NoCookies.php
index e7908198d9abd..67be20688439f 100644
--- a/app/code/Magento/Cms/Controller/Index/NoCookies.php
+++ b/app/code/Magento/Cms/Controller/Index/NoCookies.php
@@ -17,10 +17,10 @@ public function execute()
{
$pageId = $this->_objectManager->get(
'Magento\Framework\App\Config\ScopeConfigInterface',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)->getValue(
\Magento\Cms\Helper\Page::XML_PATH_NO_COOKIES_PAGE,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
if (!$this->_objectManager->get('Magento\Cms\Helper\Page')->renderPage($this, $pageId)) {
$this->_forward('defaultNoCookies');
diff --git a/app/code/Magento/Cms/Controller/Noroute/Index.php b/app/code/Magento/Cms/Controller/Noroute/Index.php
index 33107680774ef..eb80279fef3f9 100644
--- a/app/code/Magento/Cms/Controller/Noroute/Index.php
+++ b/app/code/Magento/Cms/Controller/Noroute/Index.php
@@ -20,10 +20,10 @@ public function execute()
$pageId = $this->_objectManager->get(
'Magento\Framework\App\Config\ScopeConfigInterface',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)->getValue(
\Magento\Cms\Helper\Page::XML_PATH_NO_ROUTE_PAGE,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
/** @var \Magento\Cms\Helper\Page $pageHelper */
$pageHelper = $this->_objectManager->get('Magento\Cms\Helper\Page');
diff --git a/app/code/Magento/Cms/Controller/Router.php b/app/code/Magento/Cms/Controller/Router.php
index 669434a634247..56684456944f1 100644
--- a/app/code/Magento/Cms/Controller/Router.php
+++ b/app/code/Magento/Cms/Controller/Router.php
@@ -27,7 +27,7 @@ class Router implements \Magento\Framework\App\RouterInterface
/**
* Store manager
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -64,7 +64,7 @@ class Router implements \Magento\Framework\App\RouterInterface
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Framework\UrlInterface $url
* @param \Magento\Cms\Model\PageFactory $pageFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\ResponseInterface $response
*/
public function __construct(
@@ -72,7 +72,7 @@ public function __construct(
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Framework\UrlInterface $url,
\Magento\Cms\Model\PageFactory $pageFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\App\ResponseInterface $response
) {
$this->actionFactory = $actionFactory;
diff --git a/app/code/Magento/Cms/Helper/Page.php b/app/code/Magento/Cms/Helper/Page.php
index b6ce2979c70d2..7a6a44969f100 100644
--- a/app/code/Magento/Cms/Helper/Page.php
+++ b/app/code/Magento/Cms/Helper/Page.php
@@ -52,7 +52,7 @@ class Page extends \Magento\Framework\App\Helper\AbstractHelper
/**
* Store manager
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -88,7 +88,7 @@ class Page extends \Magento\Framework\App\Helper\AbstractHelper
* @param \Magento\Cms\Model\Page $page
* @param \Magento\Framework\View\DesignInterface $design
* @param \Magento\Cms\Model\PageFactory $pageFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
* @param \Magento\Framework\Escaper $escaper
* @param \Magento\Framework\App\ViewInterface $view
@@ -101,7 +101,7 @@ public function __construct(
\Magento\Cms\Model\Page $page,
\Magento\Framework\View\DesignInterface $design,
\Magento\Cms\Model\PageFactory $pageFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
\Magento\Framework\Escaper $escaper,
\Magento\Framework\App\ViewInterface $view,
diff --git a/app/code/Magento/Cms/Helper/Wysiwyg/Images.php b/app/code/Magento/Cms/Helper/Wysiwyg/Images.php
index 6a175852ee4f2..af9308c14f5a6 100644
--- a/app/code/Magento/Cms/Helper/Wysiwyg/Images.php
+++ b/app/code/Magento/Cms/Helper/Wysiwyg/Images.php
@@ -46,7 +46,7 @@ class Images extends \Magento\Framework\App\Helper\AbstractHelper
/**
* Store manager
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -56,13 +56,13 @@ class Images extends \Magento\Framework\App\Helper\AbstractHelper
* @param \Magento\Framework\App\Helper\Context $context
* @param \Magento\Backend\Helper\Data $backendData
* @param \Magento\Framework\Filesystem $filesystem
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
*/
public function __construct(
\Magento\Framework\App\Helper\Context $context,
\Magento\Backend\Helper\Data $backendData,
\Magento\Framework\Filesystem $filesystem,
- \Magento\Store\Model\StoreManagerInterface $storeManager
+ \Magento\Framework\Store\StoreManagerInterface $storeManager
) {
parent::__construct($context);
$this->_backendData = $backendData;
diff --git a/app/code/Magento/Cms/Model/Observer.php b/app/code/Magento/Cms/Model/Observer.php
index 5fb3efd7ca75d..9a3ef039ec9fa 100644
--- a/app/code/Magento/Cms/Model/Observer.php
+++ b/app/code/Magento/Cms/Model/Observer.php
@@ -68,7 +68,7 @@ public function noCookies(\Magento\Framework\Event\Observer $observer)
$pageId = $this->_scopeConfig->getValue(
\Magento\Cms\Helper\Page::XML_PATH_NO_COOKIES_PAGE,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
$pageUrl = $this->_cmsPage->getPageUrl($pageId);
diff --git a/app/code/Magento/Cms/Model/Resource/AbstractCollection.php b/app/code/Magento/Cms/Model/Resource/AbstractCollection.php
index f251a32c3dd1e..698cd57845824 100644
--- a/app/code/Magento/Cms/Model/Resource/AbstractCollection.php
+++ b/app/code/Magento/Cms/Model/Resource/AbstractCollection.php
@@ -6,7 +6,7 @@
namespace Magento\Cms\Model\Resource;
use Magento\Framework\Data\AbstractSearchResult;
-use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\Store\StoreManagerInterface;
use Magento\Framework\Data\SearchResultProcessorFactory;
use Magento\Framework\Data\SearchResultProcessor;
use Magento\Framework\DB\QueryInterface;
@@ -20,7 +20,7 @@
class AbstractCollection extends AbstractSearchResult
{
/**
- * @var StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $storeManager;
@@ -46,7 +46,7 @@ class AbstractCollection extends AbstractSearchResult
* @param EntityFactoryInterface $entityFactory
* @param ManagerInterface $eventManager
* @param SearchResultIteratorFactory $resultIteratorFactory
- * @param StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param SearchResultProcessorFactory $searchResultProcessorFactory
*/
public function __construct(
diff --git a/app/code/Magento/Cms/Model/Resource/Block.php b/app/code/Magento/Cms/Model/Resource/Block.php
index 894aa6d629576..2b15dcaa243f4 100644
--- a/app/code/Magento/Cms/Model/Resource/Block.php
+++ b/app/code/Magento/Cms/Model/Resource/Block.php
@@ -18,7 +18,7 @@ class Block extends \Magento\Framework\Model\Resource\Db\AbstractDb
/**
* Store manager
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -27,12 +27,12 @@ class Block extends \Magento\Framework\Model\Resource\Db\AbstractDb
*
* @param \Magento\Framework\App\Resource $resource
* @param \Magento\Framework\Stdlib\DateTime\DateTime $date
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
\Magento\Framework\Stdlib\DateTime\DateTime $date,
- \Magento\Store\Model\StoreManagerInterface $storeManager
+ \Magento\Framework\Store\StoreManagerInterface $storeManager
) {
parent::__construct($resource);
$this->_storeManager = $storeManager;
diff --git a/app/code/Magento/Cms/Model/Resource/Page.php b/app/code/Magento/Cms/Model/Resource/Page.php
index 4efe1734c056c..b5af42c81c334 100644
--- a/app/code/Magento/Cms/Model/Resource/Page.php
+++ b/app/code/Magento/Cms/Model/Resource/Page.php
@@ -28,7 +28,7 @@ class Page extends \Magento\Framework\Model\Resource\Db\AbstractDb
/**
* Store manager
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -42,13 +42,13 @@ class Page extends \Magento\Framework\Model\Resource\Db\AbstractDb
*
* @param \Magento\Framework\App\Resource $resource
* @param \Magento\Framework\Stdlib\DateTime\DateTime $date
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\Stdlib\DateTime $dateTime
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
\Magento\Framework\Stdlib\DateTime\DateTime $date,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\Stdlib\DateTime $dateTime
) {
parent::__construct($resource);
diff --git a/app/code/Magento/Cms/Model/Resource/Page/Collection.php b/app/code/Magento/Cms/Model/Resource/Page/Collection.php
index 0a37cf81d4757..491e95954d13c 100644
--- a/app/code/Magento/Cms/Model/Resource/Page/Collection.php
+++ b/app/code/Magento/Cms/Model/Resource/Page/Collection.php
@@ -10,7 +10,7 @@
use Magento\Framework\Data\SearchResultIteratorFactory;
use Magento\Framework\DB\QueryInterface;
use Magento\Framework\Event\ManagerInterface;
-use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\Store\StoreManagerInterface;
use Magento\Framework\Data\SearchResultProcessorFactory;
use Magento\Framework\Data\SearchResultProcessor;
@@ -34,7 +34,7 @@ class Collection extends AbstractSearchResult
* @param EntityFactoryInterface $entityFactory
* @param ManagerInterface $eventManager
* @param SearchResultIteratorFactory $resultIteratorFactory
- * @param StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param SearchResultProcessorFactory $searchResultProcessorFactory
*/
public function __construct(
diff --git a/app/code/Magento/Cms/Model/Resource/Page/Grid/Collection.php b/app/code/Magento/Cms/Model/Resource/Page/Grid/Collection.php
index 8b1f2c6a4ed88..3ccfe7ee83272 100644
--- a/app/code/Magento/Cms/Model/Resource/Page/Grid/Collection.php
+++ b/app/code/Magento/Cms/Model/Resource/Page/Grid/Collection.php
@@ -22,25 +22,25 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
/**
* Store manager
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param mixed $connection
* @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
$connection = null,
\Magento\Framework\Model\Resource\Db\AbstractDb $resource = null
) {
diff --git a/app/code/Magento/Cms/Model/Wysiwyg/Config.php b/app/code/Magento/Cms/Model/Wysiwyg/Config.php
index 7fd5b26290dfc..ae1e7ae9e3d21 100644
--- a/app/code/Magento/Cms/Model/Wysiwyg/Config.php
+++ b/app/code/Magento/Cms/Model/Wysiwyg/Config.php
@@ -85,7 +85,7 @@ class Config extends \Magento\Framework\Object
protected $_backendUrl;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -97,7 +97,7 @@ class Config extends \Magento\Framework\Object
* @param \Magento\Core\Model\Variable\Config $variableConfig
* @param \Magento\Widget\Model\Widget\Config $widgetConfig
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param array $windowSize
* @param array $data
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
@@ -110,7 +110,7 @@ public function __construct(
\Magento\Core\Model\Variable\Config $variableConfig,
\Magento\Widget\Model\Widget\Config $widgetConfig,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
array $windowSize = [],
array $data = []
) {
@@ -218,7 +218,7 @@ public function isEnabled()
{
$wysiwygState = $this->_scopeConfig->getValue(
self::WYSIWYG_STATUS_CONFIG_PATH,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$this->getStoreId()
);
return in_array($wysiwygState, [self::WYSIWYG_ENABLED, self::WYSIWYG_HIDDEN]);
@@ -233,7 +233,7 @@ public function isHidden()
{
$status = $this->_scopeConfig->getValue(
self::WYSIWYG_STATUS_CONFIG_PATH,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
return $status == self::WYSIWYG_HIDDEN;
}
diff --git a/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage/Collection.php b/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage/Collection.php
index 4971fd1f68fcd..79df34cffe8c9 100644
--- a/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage/Collection.php
+++ b/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage/Collection.php
@@ -21,10 +21,10 @@ class Collection extends \Magento\Framework\Data\Collection\Filesystem
protected $_filesystem;
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Magento\Framework\Filesystem $filesystem
*/
- public function __construct(\Magento\Core\Model\EntityFactory $entityFactory, \Magento\Framework\Filesystem $filesystem)
+ public function __construct(\Magento\Framework\Data\Collection\EntityFactory $entityFactory, \Magento\Framework\Filesystem $filesystem)
{
$this->_filesystem = $filesystem;
parent::__construct($entityFactory);
diff --git a/app/code/Magento/CmsUrlRewrite/Model/CmsPageUrlRewriteGenerator.php b/app/code/Magento/CmsUrlRewrite/Model/CmsPageUrlRewriteGenerator.php
index 41fd268b4dd68..119f4dfdaef47 100644
--- a/app/code/Magento/CmsUrlRewrite/Model/CmsPageUrlRewriteGenerator.php
+++ b/app/code/Magento/CmsUrlRewrite/Model/CmsPageUrlRewriteGenerator.php
@@ -5,7 +5,7 @@
*/
namespace Magento\CmsUrlRewrite\Model;
-use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\Store\StoreManagerInterface;
use Magento\UrlRewrite\Service\V1\Data\UrlRewriteBuilder;
class CmsPageUrlRewriteGenerator
diff --git a/app/code/Magento/CmsUrlRewrite/composer.json b/app/code/Magento/CmsUrlRewrite/composer.json
index 5ee6ad540c37f..d07ac3aefa381 100644
--- a/app/code/Magento/CmsUrlRewrite/composer.json
+++ b/app/code/Magento/CmsUrlRewrite/composer.json
@@ -4,7 +4,6 @@
"require": {
"php": "~5.4.11|~5.5.0|~5.6.0",
"magento/module-cms": "0.42.0-beta5",
- "magento/module-store": "0.42.0-beta5",
"magento/module-url-rewrite": "0.42.0-beta5",
"magento/framework": "0.42.0-beta5",
"magento/magento-composer-installer": "*"
diff --git a/app/code/Magento/ConfigurableProduct/Block/Cart/Item/Renderer/Configurable.php b/app/code/Magento/ConfigurableProduct/Block/Cart/Item/Renderer/Configurable.php
index 84fbb287ce22e..86070ac04922e 100644
--- a/app/code/Magento/ConfigurableProduct/Block/Cart/Item/Renderer/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Block/Cart/Item/Renderer/Configurable.php
@@ -63,7 +63,7 @@ public function getProductForThumbnail()
*/
if ($this->_scopeConfig->getValue(
self::CONFIG_THUMBNAIL_SOURCE,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
) == ThumbnailSource::OPTION_USE_PARENT_IMAGE ||
!($this->getChildProduct()->getThumbnail() && $this->getChildProduct()->getThumbnail() != 'no_selection')
) {
diff --git a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/SuggestConfigurableAttributes.php b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/SuggestConfigurableAttributes.php
index cc5151fce4135..4975ebfba871d 100644
--- a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/SuggestConfigurableAttributes.php
+++ b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/SuggestConfigurableAttributes.php
@@ -24,7 +24,7 @@ class SuggestConfigurableAttributes extends Action
/**
* Store manager
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $storeManager;
@@ -32,13 +32,13 @@ class SuggestConfigurableAttributes extends Action
* @param Action\Context $context
* @param SuggestedAttributeList $attributeList
* @param \Magento\Core\Helper\Data $coreHelper
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
*/
public function __construct(
Action\Context $context,
SuggestedAttributeList $attributeList,
\Magento\Core\Helper\Data $coreHelper,
- \Magento\Store\Model\StoreManagerInterface $storeManager
+ \Magento\Framework\Store\StoreManagerInterface $storeManager
) {
$this->attributeList = $attributeList;
$this->coreHelper = $coreHelper;
diff --git a/app/code/Magento/ConfigurableProduct/Model/OptionRepository.php b/app/code/Magento/ConfigurableProduct/Model/OptionRepository.php
index adb3c2b9bd413..cef1c44b363d0 100644
--- a/app/code/Magento/ConfigurableProduct/Model/OptionRepository.php
+++ b/app/code/Magento/ConfigurableProduct/Model/OptionRepository.php
@@ -41,7 +41,7 @@ class OptionRepository implements \Magento\ConfigurableProduct\Api\OptionReposit
protected $optionResource;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $storeManager;
@@ -60,7 +60,7 @@ class OptionRepository implements \Magento\ConfigurableProduct\Api\OptionReposit
* @param \Magento\ConfigurableProduct\Api\Data\OptionValueDataBuilder $optionValueBuilder
* @param ConfigurableType $configurableType
* @param Resource\Product\Type\Configurable\Attribute $optionResource
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Api\ProductAttributeRepositoryInterface $productAttributeRepository
* @param ConfigurableType\AttributeFactory $configurableAttributeFactory
*/
@@ -69,7 +69,7 @@ public function __construct(
\Magento\ConfigurableProduct\Api\Data\OptionValueDataBuilder $optionValueBuilder,
\Magento\ConfigurableProduct\Model\Product\Type\Configurable $configurableType,
\Magento\ConfigurableProduct\Model\Resource\Product\Type\Configurable\Attribute $optionResource,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Catalog\Api\ProductAttributeRepositoryInterface $productAttributeRepository,
\Magento\ConfigurableProduct\Model\Product\Type\Configurable\AttributeFactory $configurableAttributeFactory
) {
diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/Price.php b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/Price.php
index 55e4f4e0c3925..43d717193d13b 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/Price.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/Price.php
@@ -19,7 +19,7 @@ class Price extends \Magento\Catalog\Model\Product\Type\Price
/**
* @param \Magento\CatalogRule\Model\Resource\RuleFactory $ruleFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
* @param \Magento\Customer\Model\Session $customerSession
* @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -29,7 +29,7 @@ class Price extends \Magento\Catalog\Model\Product\Type\Price
*/
public function __construct(
\Magento\CatalogRule\Model\Resource\RuleFactory $ruleFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
\Magento\Customer\Model\Session $customerSession,
\Magento\Framework\Event\ManagerInterface $eventManager,
diff --git a/app/code/Magento/ConfigurableProduct/Model/Resource/Product/Collection/AssociatedProduct.php b/app/code/Magento/ConfigurableProduct/Model/Resource/Product/Collection/AssociatedProduct.php
index 418b5700fa995..ead1105b04a45 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Resource/Product/Collection/AssociatedProduct.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Resource/Product/Collection/AssociatedProduct.php
@@ -40,7 +40,7 @@ class AssociatedProduct extends \Magento\Catalog\Model\Resource\Product\Collecti
protected $_productTypeConfig;
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -49,7 +49,7 @@ class AssociatedProduct extends \Magento\Catalog\Model\Resource\Product\Collecti
* @param \Magento\Eav\Model\EntityFactory $eavEntityFactory
* @param \Magento\Catalog\Model\Resource\Helper $resourceHelper
* @param \Magento\Framework\Validator\UniversalFactory $universalFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\Module\Manager $moduleManager
* @param \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
@@ -67,7 +67,7 @@ class AssociatedProduct extends \Magento\Catalog\Model\Resource\Product\Collecti
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
@@ -76,7 +76,7 @@ public function __construct(
\Magento\Eav\Model\EntityFactory $eavEntityFactory,
\Magento\Catalog\Model\Resource\Helper $resourceHelper,
\Magento\Framework\Validator\UniversalFactory $universalFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\Module\Manager $moduleManager,
\Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
diff --git a/app/code/Magento/ConfigurableProduct/Model/Resource/Product/Type/Configurable/Attribute.php b/app/code/Magento/ConfigurableProduct/Model/Resource/Product/Type/Configurable/Attribute.php
index 7361db789933d..d03d2dd89ae02 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Resource/Product/Type/Configurable/Attribute.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Resource/Product/Type/Configurable/Attribute.php
@@ -35,18 +35,18 @@ class Attribute extends \Magento\Framework\Model\Resource\Db\AbstractDb
/**
* Store manager
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
/**
* @param \Magento\Framework\App\Resource $resource
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Helper\Data $catalogData
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Catalog\Helper\Data $catalogData
) {
$this->_storeManager = $storeManager;
diff --git a/app/code/Magento/ConfigurableProduct/Model/Resource/Product/Type/Configurable/Attribute/Collection.php b/app/code/Magento/ConfigurableProduct/Model/Resource/Product/Type/Configurable/Attribute/Collection.php
index cff66da37ed0d..0a955a372793e 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Resource/Product/Type/Configurable/Attribute/Collection.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Resource/Product/Type/Configurable/Attribute/Collection.php
@@ -54,7 +54,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
/**
* Store manager
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -66,11 +66,11 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
protected $priceData;
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\ConfigurableProduct\Model\Product\Type\Configurable $catalogProductTypeConfigurable
* @param \Magento\Catalog\Helper\Data $catalogData
* @param \Magento\ConfigurableProduct\Model\Resource\Product\Type\Configurable\Attribute $resource
@@ -79,11 +79,11 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\ConfigurableProduct\Model\Product\Type\Configurable $catalogProductTypeConfigurable,
\Magento\Catalog\Helper\Data $catalogData,
\Magento\ConfigurableProduct\Model\Resource\Product\Type\Configurable\Attribute $resource,
diff --git a/app/code/Magento/ConfigurableProduct/Pricing/Price/AttributePrice.php b/app/code/Magento/ConfigurableProduct/Pricing/Price/AttributePrice.php
index 706d41d867bad..8ee7d54d4518a 100644
--- a/app/code/Magento/ConfigurableProduct/Pricing/Price/AttributePrice.php
+++ b/app/code/Magento/ConfigurableProduct/Pricing/Price/AttributePrice.php
@@ -29,7 +29,7 @@ class AttributePrice extends AbstractPrice implements AttributePriceInterface
/**
* Store manager
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $storeManager;
@@ -44,7 +44,7 @@ class AttributePrice extends AbstractPrice implements AttributePriceInterface
* @param CalculatorInterface $calculator
* @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
* @param PriceModifierInterface $modifier
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
*/
public function __construct(
Product $saleableItem,
@@ -52,7 +52,7 @@ public function __construct(
CalculatorInterface $calculator,
\Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
PriceModifierInterface $modifier,
- \Magento\Store\Model\StoreManagerInterface $storeManager
+ \Magento\Framework\Store\StoreManagerInterface $storeManager
) {
$this->priceCurrency = $priceCurrency;
$this->priceModifier = $modifier;
diff --git a/app/code/Magento/Contact/Controller/Index.php b/app/code/Magento/Contact/Controller/Index.php
index c603d7482a6d6..6335cf80724f9 100644
--- a/app/code/Magento/Contact/Controller/Index.php
+++ b/app/code/Magento/Contact/Controller/Index.php
@@ -7,6 +7,7 @@
use Magento\Framework\App\Action\NotFoundException;
use Magento\Framework\App\RequestInterface;
+use Magento\Framework\Store\ScopeInterface;
/**
* Contact index controller
@@ -49,7 +50,7 @@ class Index extends \Magento\Framework\App\Action\Action
protected $scopeConfig;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $storeManager;
@@ -58,14 +59,14 @@ class Index extends \Magento\Framework\App\Action\Action
* @param \Magento\Framework\Mail\Template\TransportBuilder $transportBuilder
* @param \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
*/
public function __construct(
\Magento\Framework\App\Action\Context $context,
\Magento\Framework\Mail\Template\TransportBuilder $transportBuilder,
\Magento\Framework\Translate\Inline\StateInterface $inlineTranslation,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
- \Magento\Store\Model\StoreManagerInterface $storeManager
+ \Magento\Framework\Store\StoreManagerInterface $storeManager
) {
parent::__construct($context);
$this->_transportBuilder = $transportBuilder;
@@ -83,7 +84,7 @@ public function __construct(
*/
public function dispatch(RequestInterface $request)
{
- if (!$this->scopeConfig->isSetFlag(self::XML_PATH_ENABLED, \Magento\Store\Model\ScopeInterface::SCOPE_STORE)) {
+ if (!$this->scopeConfig->isSetFlag(self::XML_PATH_ENABLED, ScopeInterface::SCOPE_STORE)) {
throw new NotFoundException();
}
return parent::dispatch($request);
diff --git a/app/code/Magento/Contact/Controller/Index/Post.php b/app/code/Magento/Contact/Controller/Index/Post.php
index 8c4e719065080..812e7818a6627 100644
--- a/app/code/Magento/Contact/Controller/Index/Post.php
+++ b/app/code/Magento/Contact/Controller/Index/Post.php
@@ -45,7 +45,7 @@ public function execute()
throw new \Exception();
}
- $storeScope = \Magento\Store\Model\ScopeInterface::SCOPE_STORE;
+ $storeScope = \Magento\Framework\Store\ScopeInterface::SCOPE_STORE;
$transport = $this->_transportBuilder
->setTemplateIdentifier($this->scopeConfig->getValue(self::XML_PATH_EMAIL_TEMPLATE, $storeScope))
->setTemplateOptions(
diff --git a/app/code/Magento/Contact/Helper/Data.php b/app/code/Magento/Contact/Helper/Data.php
index 5e8ae0c7ab73d..c18494f3dcb68 100644
--- a/app/code/Magento/Contact/Helper/Data.php
+++ b/app/code/Magento/Contact/Helper/Data.php
@@ -60,7 +60,10 @@ public function __construct(
*/
public function isEnabled()
{
- return $this->_scopeConfig->getValue(self::XML_PATH_ENABLED, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+ return $this->_scopeConfig->getValue(
+ self::XML_PATH_ENABLED,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ );
}
/**
diff --git a/app/code/Magento/Contact/etc/frontend/di.xml b/app/code/Magento/Contact/etc/frontend/di.xml
index cad43224822d8..3bee0d4b8d918 100644
--- a/app/code/Magento/Contact/etc/frontend/di.xml
+++ b/app/code/Magento/Contact/etc/frontend/di.xml
@@ -6,7 +6,7 @@
*/
-->
-
+
- /contact/
diff --git a/app/code/Magento/Core/App/Router/Base.php b/app/code/Magento/Core/App/Router/Base.php
index fffca1867cb6e..9b84da13d6272 100644
--- a/app/code/Magento/Core/App/Router/Base.php
+++ b/app/code/Magento/Core/App/Router/Base.php
@@ -67,7 +67,7 @@ class Base implements \Magento\Framework\App\RouterInterface
protected $_url;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -115,7 +115,7 @@ class Base implements \Magento\Framework\App\RouterInterface
* @param \Magento\Framework\App\ResponseFactory $responseFactory
* @param \Magento\Framework\App\Route\ConfigInterface $routeConfig
* @param \Magento\Framework\UrlInterface $url
- * @param \Magento\Store\Model\StoreManagerInterface|\Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param \Magento\Framework\Url\SecurityInfoInterface $urlSecurityInfo
* @param string $routerId
@@ -131,7 +131,7 @@ public function __construct(
\Magento\Framework\App\ResponseFactory $responseFactory,
\Magento\Framework\App\Route\ConfigInterface $routeConfig,
\Magento\Framework\UrlInterface $url,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
\Magento\Framework\Url\SecurityInfoInterface $urlSecurityInfo,
$routerId,
@@ -330,7 +330,7 @@ protected function matchAction(\Magento\Framework\App\RequestInterface $request,
*/
protected function _getDefaultPath()
{
- return $this->_scopeConfig->getValue('web/default/front', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+ return $this->_scopeConfig->getValue('web/default/front', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
}
/**
@@ -404,13 +404,16 @@ protected function _getCurrentSecureUrl($request)
protected function _shouldBeSecure($path)
{
return parse_url(
- $this->_scopeConfig->getValue('web/unsecure/base_url', \Magento\Store\Model\ScopeInterface::SCOPE_STORE),
+ $this->_scopeConfig->getValue(
+ 'web/unsecure/base_url',
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ ),
PHP_URL_SCHEME
) === 'https' || $this->_scopeConfig->isSetFlag(
\Magento\Store\Model\Store::XML_PATH_SECURE_IN_FRONTEND,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
) && parse_url(
- $this->_scopeConfig->getValue('web/secure/base_url', \Magento\Store\Model\ScopeInterface::SCOPE_STORE),
+ $this->_scopeConfig->getValue('web/secure/base_url', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
PHP_URL_SCHEME
) == 'https' && $this->_urlSecurityInfo->isSecure(
$path
diff --git a/app/code/Magento/Core/Helper/Data.php b/app/code/Magento/Core/Helper/Data.php
index 21809fba96716..b1763205c9c89 100644
--- a/app/code/Magento/Core/Helper/Data.php
+++ b/app/code/Magento/Core/Helper/Data.php
@@ -55,7 +55,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
protected $_scopeConfig;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -77,7 +77,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
/**
* @param \Magento\Framework\App\Helper\Context $context
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\State $appState
* @param PriceCurrencyInterface $priceCurrency
* @param bool $dbCompatibleMode
@@ -85,7 +85,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
public function __construct(
\Magento\Framework\App\Helper\Context $context,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\App\State $appState,
PriceCurrencyInterface $priceCurrency,
$dbCompatibleMode = true
@@ -172,7 +172,7 @@ public function isDevAllowed($storeId = null)
$allowedIps = $this->_scopeConfig->getValue(
self::XML_PATH_DEV_ALLOW_IPS,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$storeId
);
$remoteAddr = $this->_remoteAddress->getRemoteAddress();
@@ -242,7 +242,7 @@ public function getDefaultCountry($store = null)
{
return $this->_scopeConfig->getValue(
self::XML_PATH_DEFAULT_COUNTRY,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
}
diff --git a/app/code/Magento/Core/Helper/Url.php b/app/code/Magento/Core/Helper/Url.php
index 270a8194bccd9..e3096f6839474 100644
--- a/app/code/Magento/Core/Helper/Url.php
+++ b/app/code/Magento/Core/Helper/Url.php
@@ -14,17 +14,17 @@
class Url extends \Magento\Framework\App\Helper\AbstractHelper
{
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
/**
* @param \Magento\Framework\App\Helper\Context $context
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
*/
public function __construct(
\Magento\Framework\App\Helper\Context $context,
- \Magento\Store\Model\StoreManagerInterface $storeManager
+ \Magento\Framework\Store\StoreManagerInterface $storeManager
) {
parent::__construct($context);
$this->_storeManager = $storeManager;
diff --git a/app/code/Magento/Core/Model/Asset/Config.php b/app/code/Magento/Core/Model/Asset/Config.php
index 817dd603a5f8e..4e69646e75879 100644
--- a/app/code/Magento/Core/Model/Asset/Config.php
+++ b/app/code/Magento/Core/Model/Asset/Config.php
@@ -53,7 +53,7 @@ public function __construct(\Magento\Framework\App\Config\ScopeConfigInterface $
*/
public function isMergeCssFiles()
{
- return (bool)$this->scopeConfig->isSetFlag(self::XML_PATH_MERGE_CSS_FILES, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+ return (bool)$this->scopeConfig->isSetFlag(self::XML_PATH_MERGE_CSS_FILES, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
}
/**
@@ -63,7 +63,7 @@ public function isMergeCssFiles()
*/
public function isMergeJsFiles()
{
- return (bool)$this->scopeConfig->isSetFlag(self::XML_PATH_MERGE_JS_FILES, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+ return (bool)$this->scopeConfig->isSetFlag(self::XML_PATH_MERGE_JS_FILES, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
}
/**
@@ -76,7 +76,7 @@ public function isAssetMinification($contentType)
{
return (bool)$this->scopeConfig->isSetFlag(
sprintf(self::XML_PATH_MINIFICATION_ENABLED, $contentType),
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
}
@@ -90,7 +90,7 @@ public function getAssetMinificationAdapter($contentType)
{
return (string)$this->scopeConfig->getValue(
sprintf(self::XML_PATH_MINIFICATION_ADAPTER, $contentType),
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
}
}
diff --git a/app/code/Magento/Core/Model/File/Storage.php b/app/code/Magento/Core/Model/File/Storage.php
index 540c0b8fb19a0..0d9d138c3ad96 100644
--- a/app/code/Magento/Core/Model/File/Storage.php
+++ b/app/code/Magento/Core/Model/File/Storage.php
@@ -292,7 +292,7 @@ public function getScriptConfig()
$config['allowed_resources'][] = $allowedResource;
}
- $config['update_time'] = $this->_scopeConfig->getValue(self::XML_PATH_MEDIA_UPDATE_TIME, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+ $config['update_time'] = $this->_scopeConfig->getValue(self::XML_PATH_MEDIA_UPDATE_TIME, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
return $config;
}
diff --git a/app/code/Magento/Core/Model/File/Validator/NotProtectedExtension.php b/app/code/Magento/Core/Model/File/Validator/NotProtectedExtension.php
index a4e57209398de..1f555aef0dfc2 100644
--- a/app/code/Magento/Core/Model/File/Validator/NotProtectedExtension.php
+++ b/app/code/Magento/Core/Model/File/Validator/NotProtectedExtension.php
@@ -99,7 +99,7 @@ protected function _initProtectedFileExtensions()
*/
public function getProtectedFileExtensions($store = null)
{
- return $this->_scopeConfig->getValue(self::XML_PATH_PROTECTED_FILE_EXTENSIONS, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
+ return $this->_scopeConfig->getValue(self::XML_PATH_PROTECTED_FILE_EXTENSIONS, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store);
}
/**
diff --git a/app/code/Magento/Core/Model/Layout/Merge.php b/app/code/Magento/Core/Model/Layout/Merge.php
index 7627c26dcea01..c9e81ae0953be 100644
--- a/app/code/Magento/Core/Model/Layout/Merge.php
+++ b/app/code/Magento/Core/Model/Layout/Merge.php
@@ -41,7 +41,7 @@ class Merge implements \Magento\Framework\View\Layout\ProcessorInterface
const PAGE_LAYOUT_CACHE_SUFFIX = 'page_layout';
/**
- * @var \Magento\Core\Model\Theme
+ * @var \Magento\Theme\Model\Theme
*/
private $_theme;
@@ -160,7 +160,7 @@ class Merge implements \Magento\Framework\View\Layout\ProcessorInterface
* Init merge model
*
* @param \Magento\Framework\View\DesignInterface $design
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\View\File\CollectorInterface $fileSource
* @param \Magento\Framework\View\File\CollectorInterface $pageLayoutFileSource
* @param \Magento\Core\Model\Resource\Layout\Update $resource
@@ -175,7 +175,7 @@ class Merge implements \Magento\Framework\View\Layout\ProcessorInterface
*/
public function __construct(
\Magento\Framework\View\DesignInterface $design,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\View\File\CollectorInterface $fileSource,
\Magento\Framework\View\File\CollectorInterface $pageLayoutFileSource,
\Magento\Core\Model\Resource\Layout\Update $resource,
@@ -737,7 +737,7 @@ protected function _logXmlErrors($fileName, $libXmlErrors)
* Find the closest physical theme among ancestors and a theme itself
*
* @param \Magento\Framework\View\Design\ThemeInterface $theme
- * @return \Magento\Core\Model\Theme
+ * @return \Magento\Theme\Model\Theme
* @throws \Magento\Framework\Exception
*/
protected function _getPhysicalTheme(\Magento\Framework\View\Design\ThemeInterface $theme)
diff --git a/app/code/Magento/Core/Model/Observer.php b/app/code/Magento/Core/Model/Observer.php
deleted file mode 100644
index d7f98a7af4a5d..0000000000000
--- a/app/code/Magento/Core/Model/Observer.php
+++ /dev/null
@@ -1,142 +0,0 @@
-_cacheFrontendPool = $cacheFrontendPool;
- $this->_currentTheme = $design->getDesignTheme();
- $this->_pageAssets = $assets;
- $this->_assetRepo = $assetRepo;
- $this->_registration = $registration;
- $this->_logger = $logger;
- }
-
- /**
- * Cron job method to clean old cache resources
- *
- * @param \Magento\Cron\Model\Schedule $schedule
- * @return void
- * @SuppressWarnings(PHPMD.UnusedFormalParameter)
- */
- public function cleanCache(\Magento\Cron\Model\Schedule $schedule)
- {
- /** @var $cacheFrontend \Magento\Framework\Cache\FrontendInterface */
- foreach ($this->_cacheFrontendPool as $cacheFrontend) {
- // Magento cache frontend does not support the 'old' cleaning mode, that's why backend is used directly
- $cacheFrontend->getBackend()->clean(\Zend_Cache::CLEANING_MODE_OLD);
- }
- }
-
- /**
- * Theme registration
- *
- * @param \Magento\Framework\Event\Observer $observer
- * @return $this
- */
- public function themeRegistration(\Magento\Framework\Event\Observer $observer)
- {
- $pathPattern = $observer->getEvent()->getPathPattern();
- try {
- $this->_registration->register($pathPattern);
- } catch (\Magento\Framework\Model\Exception $e) {
- $this->_logger->critical($e);
- }
- return $this;
- }
-
- /**
- * Apply customized static files to frontend
- *
- * @param \Magento\Framework\Event\Observer $observer
- * @return void
- * @SuppressWarnings(PHPMD.UnusedFormalParameter)
- */
- public function applyThemeCustomization(\Magento\Framework\Event\Observer $observer)
- {
- /** @var $themeFile \Magento\Core\Model\Theme\File */
- foreach ($this->_currentTheme->getCustomization()->getFiles() as $themeFile) {
- try {
- $service = $themeFile->getCustomizationService();
- if ($service instanceof \Magento\Framework\View\Design\Theme\Customization\FileAssetInterface) {
- $identifier = $themeFile->getData('file_path');
- $dirPath = \Magento\Framework\View\Design\Theme\Customization\Path::DIR_NAME
- . '/' . $this->_currentTheme->getId();
- $asset = $this->_assetRepo->createArbitrary(
- $identifier,
- $dirPath,
- DirectoryList::MEDIA,
- \Magento\Framework\UrlInterface::URL_TYPE_MEDIA
- );
- $this->_pageAssets->add($identifier, $asset);
- }
- } catch (\InvalidArgumentException $e) {
- $this->_logger->critical($e);
- }
- }
- }
-}
diff --git a/app/code/Magento/Core/Model/PageLayout/Config/Builder.php b/app/code/Magento/Core/Model/PageLayout/Config/Builder.php
index 2d1bbcfec3438..1b00180a709ad 100644
--- a/app/code/Magento/Core/Model/PageLayout/Config/Builder.php
+++ b/app/code/Magento/Core/Model/PageLayout/Config/Builder.php
@@ -23,19 +23,19 @@ class Builder
protected $fileCollector;
/**
- * @var \Magento\Core\Model\Resource\Theme\Collection
+ * @var \Magento\Theme\Model\Resource\Theme\Collection
*/
protected $themeCollection;
/**
* @param \Magento\Framework\ObjectManagerInterface $objectManager
* @param \Magento\Framework\View\PageLayout\File\Collector\Aggregated $fileCollector
- * @param \Magento\Core\Model\Resource\Theme\Collection $themeCollection
+ * @param \Magento\Theme\Model\Resource\Theme\Collection $themeCollection
*/
public function __construct(
\Magento\Framework\ObjectManagerInterface $objectManager,
\Magento\Framework\View\PageLayout\File\Collector\Aggregated $fileCollector,
- \Magento\Core\Model\Resource\Theme\Collection $themeCollection
+ \Magento\Theme\Model\Resource\Theme\Collection $themeCollection
) {
$this->objectManager = $objectManager;
$this->fileCollector = $fileCollector;
diff --git a/app/code/Magento/Core/Model/Resource/Layout/Link/Collection.php b/app/code/Magento/Core/Model/Resource/Layout/Link/Collection.php
index 84fd1e25a7001..4498e969f1a8c 100644
--- a/app/code/Magento/Core/Model/Resource/Layout/Link/Collection.php
+++ b/app/code/Magento/Core/Model/Resource/Layout/Link/Collection.php
@@ -22,10 +22,10 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
* @param \Magento\Framework\Stdlib\DateTime $dateTime
* @param mixed $connection
* @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
diff --git a/app/code/Magento/Core/Model/Resource/Layout/Update/Collection.php b/app/code/Magento/Core/Model/Resource/Layout/Update/Collection.php
index 2a280400e25cf..1404d2e57826c 100644
--- a/app/code/Magento/Core/Model/Resource/Layout/Update/Collection.php
+++ b/app/code/Magento/Core/Model/Resource/Layout/Update/Collection.php
@@ -30,7 +30,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
protected $_eventObject = 'layout_update_collection';
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -39,7 +39,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
* @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
diff --git a/app/code/Magento/Core/Model/Theme/Observer.php b/app/code/Magento/Core/Model/Theme/Observer.php
deleted file mode 100644
index b391769bb1dc0..0000000000000
--- a/app/code/Magento/Core/Model/Theme/Observer.php
+++ /dev/null
@@ -1,91 +0,0 @@
-_themeImageFactory = $themeImageFactory;
- $this->_updateCollection = $updateCollection;
- $this->_themeConfig = $themeConfig;
- $this->_eventDispatcher = $eventDispatcher;
- }
-
- /**
- * Clean related contents to a theme (before save)
- *
- * @param EventObserver $observer
- * @return void
- * @throws Exception
- */
- public function cleanThemeRelatedContent(EventObserver $observer)
- {
- $theme = $observer->getEvent()->getData('theme');
- if ($theme instanceof \Magento\Framework\View\Design\ThemeInterface) {
- return;
- }
- /** @var $theme \Magento\Framework\View\Design\ThemeInterface */
- if ($this->_themeConfig->isThemeAssignedToStore($theme)) {
- throw new Exception(__('Theme isn\'t deletable.'));
- }
- $this->_themeImageFactory->create(['theme' => $theme])->removePreviewImage();
- $this->_updateCollection->addThemeFilter($theme->getId())->delete();
- }
-
- /**
- * Check a theme, it's assigned to any of store
- *
- * @param EventObserver $observer
- * @return void
- */
- public function checkThemeIsAssigned(EventObserver $observer)
- {
- $theme = $observer->getEvent()->getData('theme');
- if ($theme instanceof \Magento\Framework\View\Design\ThemeInterface) {
- /** @var $theme \Magento\Framework\View\Design\ThemeInterface */
- if ($this->_themeConfig->isThemeAssignedToStore($theme)) {
- $this->_eventDispatcher->dispatch('assigned_theme_changed', ['theme' => $this]);
- }
- }
- }
-}
diff --git a/app/code/Magento/Core/composer.json b/app/code/Magento/Core/composer.json
index 3d9fb4646c9e8..c97d89c1f6b36 100644
--- a/app/code/Magento/Core/composer.json
+++ b/app/code/Magento/Core/composer.json
@@ -5,9 +5,7 @@
"php": "~5.4.11|~5.5.0|~5.6.0",
"magento/module-store": "0.42.0-beta5",
"magento/module-backend": "0.42.0-beta5",
- "magento/module-cron": "0.42.0-beta5",
"magento/module-theme": "0.42.0-beta5",
- "magento/module-eav": "0.42.0-beta5",
"magento/module-page-cache": "0.42.0-beta5",
"magento/framework": "0.42.0-beta5",
"lib-libxml": "*",
diff --git a/app/code/Magento/Core/data/core_setup/data-install-2.0.0.php b/app/code/Magento/Core/data/core_setup/data-install-2.0.0.php
index 79eed1bc072c0..f63086dd9f7af 100644
--- a/app/code/Magento/Core/data/core_setup/data-install-2.0.0.php
+++ b/app/code/Magento/Core/data/core_setup/data-install-2.0.0.php
@@ -4,7 +4,7 @@
* See COPYING.txt for license details.
*/
-/** @var $this \Magento\Core\Model\Resource\Setup */
+/** @var $this \Magento\Framework\Module\DataSetup */
$installer = $this->createMigrationSetup();
$installer->startSetup();
@@ -40,46 +40,4 @@
$installer->getConnection()->delete($tableName, ['code = ?' => 'admin_setup']);
}
-/**
- * Update rows in core_theme
- */
-$installer->getConnection()->update(
- $installer->getTable('core_theme'),
- ['area' => 'frontend'],
- ['area = ?' => '']
-);
-$installer->getEventManager()->dispatch('theme_registration_from_filesystem');
-
-/**
- * Update theme's data
- */
-$fileCollection = $this->createThemeFactory();
-$fileCollection->addDefaultPattern('*');
-$fileCollection->setItemObjectClass('Magento\Core\Model\Theme\Data');
-
-$resourceCollection = $this->createThemeResourceFactory();
-$resourceCollection->setItemObjectClass('Magento\Core\Model\Theme\Data');
-
-/** @var $theme \Magento\Framework\View\Design\ThemeInterface */
-foreach ($resourceCollection as $theme) {
- $themeType = $fileCollection->hasTheme($theme)
- ? \Magento\Framework\View\Design\ThemeInterface::TYPE_PHYSICAL
- : \Magento\Framework\View\Design\ThemeInterface::TYPE_VIRTUAL;
- $theme->setType($themeType)->save();
-}
-
-$fileCollection = $this->createThemeFactory();
-$fileCollection->addDefaultPattern('*');
-$fileCollection->setItemObjectClass('Magento\Core\Model\Theme\Data');
-
-$themeDbCollection = $this->createThemeResourceFactory();
-$themeDbCollection->setItemObjectClass('Magento\Core\Model\Theme\Data');
-
-/** @var $theme \Magento\Framework\View\Design\ThemeInterface */
-foreach ($fileCollection as $theme) {
- $dbTheme = $themeDbCollection->getThemeByFullPath($theme->getFullPath());
- $dbTheme->setCode($theme->getCode());
- $dbTheme->save();
-}
-
$installer->endSetup();
diff --git a/app/code/Magento/Core/etc/di.xml b/app/code/Magento/Core/etc/di.xml
index 3b6eb72b2b36b..d0cf94c78c5bc 100644
--- a/app/code/Magento/Core/etc/di.xml
+++ b/app/code/Magento/Core/etc/di.xml
@@ -18,30 +18,30 @@
-
+
-
-
-
+
+
+
-
+
-
+
-
-
+
+
@@ -59,14 +59,14 @@
-
+
-
+
@@ -106,7 +106,7 @@
-
+
Magento\Framework\View\Layout\File\Collector\Aggregated\Proxy
@@ -399,7 +399,7 @@
-
+
- Magento/blank
@@ -454,14 +454,6 @@
Magento\Core\Model\File\Storage\File\Proxy
-
-
-
-
- - Magento\Framework\View\TemplateEngine\Php
-
-
-
Magento\Framework\Image\Adapter\Gd2
@@ -489,7 +481,7 @@
Magento\Framework\Translate
- Magento\Core\Model\Design\Proxy
+ Magento\Theme\Model\Design\Proxy
@@ -527,7 +519,7 @@
-
+
frontend
@@ -586,19 +578,19 @@
Magento\Core\Helper\Data::XML_PATH_DEFAULT_TIMEZONE
- Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ Magento\Framework\Store\ScopeInterface::SCOPE_STORE
- Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ Magento\Framework\Store\ScopeInterface::SCOPE_STORE
Magento\Core\Helper\Data::XML_PATH_DEFAULT_LOCALE
- Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ Magento\Framework\Store\ScopeInterface::SCOPE_STORE
@@ -637,7 +629,7 @@
- - Magento\Core\Model\Resource\Setup
+ - Magento\Framework\Module\DataSetup
diff --git a/app/code/Magento/Core/etc/frontend/events.xml b/app/code/Magento/Core/etc/frontend/events.xml
index 76fe340be0164..bd20b20e09c87 100644
--- a/app/code/Magento/Core/etc/frontend/events.xml
+++ b/app/code/Magento/Core/etc/frontend/events.xml
@@ -7,6 +7,6 @@
-->
-
+
diff --git a/app/code/Magento/Core/sql/core_setup/install-2.0.0.php b/app/code/Magento/Core/sql/core_setup/install-2.0.0.php
index 1833a012e4d7c..b9ae57c745961 100644
--- a/app/code/Magento/Core/sql/core_setup/install-2.0.0.php
+++ b/app/code/Magento/Core/sql/core_setup/install-2.0.0.php
@@ -191,9 +191,9 @@
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
- $installer->getFkName('core_layout_link', 'theme_id', 'core_theme', 'theme_id'),
+ $installer->getFkName('core_layout_link', 'theme_id', 'theme', 'theme_id'),
'theme_id',
- $installer->getTable('core_theme'),
+ $installer->getTable('theme'),
'theme_id',
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
@@ -500,133 +500,4 @@
$installer->getFkName('core_cache_tag', 'cache_id', 'core_cache', 'id')
);
-/**
- * Create table 'core_theme'
- */
-$table = $connection->newTable(
- $installer->getTable('core_theme')
-)->addColumn(
- 'theme_id',
- \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
- null,
- ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
- 'Theme identifier'
-)->addColumn(
- 'parent_id',
- \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
- null,
- ['nullable' => true],
- 'Parent Id'
-)->addColumn(
- 'theme_path',
- \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
- 255,
- ['nullable' => true],
- 'Theme Path'
-)->addColumn(
- 'theme_version',
- \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
- 255,
- ['nullable' => false],
- 'Theme Version'
-)->addColumn(
- 'theme_title',
- \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
- 255,
- ['nullable' => false],
- 'Theme Title'
-)->addColumn(
- 'preview_image',
- \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
- 255,
- ['nullable' => true],
- 'Preview Image'
-)->addColumn(
- 'is_featured',
- \Magento\Framework\DB\Ddl\Table::TYPE_BOOLEAN,
- null,
- ['nullable' => false, 'default' => 0],
- 'Is Theme Featured'
-)->addColumn(
- 'area',
- \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
- 255,
- ['nullable' => false],
- 'Theme Area'
-)->addColumn(
- 'type',
- \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
- null,
- ['nullable' => false],
- 'Theme type: 0:physical, 1:virtual, 2:staging'
-)->addColumn(
- 'code',
- \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
- null,
- [],
- 'Full theme code, including package'
-)->setComment(
- 'Core theme'
-);
-$connection->createTable($table);
-
-/**
- * Create table 'core_theme_file'
- */
-$table = $connection->newTable(
- $installer->getTable('core_theme_file')
-)->addColumn(
- 'theme_files_id',
- \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
- null,
- ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
- 'Theme files identifier'
-)->addColumn(
- 'theme_id',
- \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
- null,
- ['nullable' => false, 'unsigned' => true],
- 'Theme Id'
-)->addColumn(
- 'file_path',
- \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
- 255,
- ['nullable' => true],
- 'Relative path to file'
-)->addColumn(
- 'file_type',
- \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
- 32,
- ['nullable' => false],
- 'File Type'
-)->addColumn(
- 'content',
- \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
- \Magento\Framework\DB\Ddl\Table::MAX_TEXT_SIZE,
- ['nullable' => false],
- 'File Content'
-)->addColumn(
- 'sort_order',
- \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
- null,
- ['nullable' => false, 'default' => 0],
- 'Sort Order'
-)->addColumn(
- 'is_temporary',
- \Magento\Framework\DB\Ddl\Table::TYPE_BOOLEAN,
- null,
- ['nullable' => false, 'default' => 0],
- 'Is Temporary File'
-)->addForeignKey(
- $installer->getFkName('core_theme_file', 'theme_id', 'core_theme', 'theme_id'),
- 'theme_id',
- $installer->getTable('core_theme'),
- 'theme_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-)->setComment(
- 'Core theme files'
-);
-$connection->createTable($table);
-
$installer->endSetup();
diff --git a/app/code/Magento/Cron/Model/Observer.php b/app/code/Magento/Cron/Model/Observer.php
index 2f8a1dafaa0a4..5431168a28cb0 100644
--- a/app/code/Magento/Cron/Model/Observer.php
+++ b/app/code/Magento/Cron/Model/Observer.php
@@ -136,7 +136,7 @@ public function dispatch($observer)
'group'
) === null && $this->_scopeConfig->getValue(
'system/cron/' . $groupId . '/use_separate_process',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
) == 1
) {
$this->_shell->execute(
@@ -192,7 +192,7 @@ protected function _runJob($scheduledTime, $currentTime, $jobConfig, $schedule,
{
$scheduleLifetime = (int)$this->_scopeConfig->getValue(
'system/cron/' . $groupId . '/' . self::XML_PATH_SCHEDULE_LIFETIME,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
$scheduleLifetime = $scheduleLifetime * self::SECONDS_IN_MINUTE;
if ($scheduledTime < $currentTime - $scheduleLifetime) {
@@ -250,7 +250,7 @@ protected function _generate($groupId)
$lastRun = (int)$this->_cache->load(self::CACHE_KEY_LAST_SCHEDULE_GENERATE_AT . $groupId);
$rawSchedulePeriod = (int)$this->_scopeConfig->getValue(
'system/cron/' . $groupId . '/' . self::XML_PATH_SCHEDULE_GENERATE_EVERY,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
$schedulePeriod = $rawSchedulePeriod * self::SECONDS_IN_MINUTE;
if ($lastRun > time() - $schedulePeriod) {
@@ -322,7 +322,7 @@ protected function _cleanup($groupId)
$lastCleanup = (int)$this->_cache->load(self::CACHE_KEY_LAST_HISTORY_CLEANUP_AT . $groupId);
$historyCleanUp = (int)$this->_scopeConfig->getValue(
'system/cron/' . $groupId . '/' . self::XML_PATH_HISTORY_CLEANUP_EVERY,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
if ($lastCleanup > time() - $historyCleanUp * self::SECONDS_IN_MINUTE) {
return $this;
@@ -338,11 +338,11 @@ protected function _cleanup($groupId)
$historySuccess = (int)$this->_scopeConfig->getValue(
'system/cron/' . $groupId . '/' . self::XML_PATH_HISTORY_SUCCESS,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
$historyFailure = (int)$this->_scopeConfig->getValue(
'system/cron/' . $groupId . '/' . self::XML_PATH_HISTORY_FAILURE,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
$historyLifetimes = [
Schedule::STATUS_SUCCESS => $historySuccess * self::SECONDS_IN_MINUTE,
@@ -372,7 +372,7 @@ protected function getConfigSchedule($jobConfig)
{
$cronExpr = $this->_scopeConfig->getValue(
$jobConfig['config_path'],
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
return $cronExpr;
@@ -430,7 +430,7 @@ protected function getScheduleTimeInterval($groupId)
{
$scheduleAheadFor = (int)$this->_scopeConfig->getValue(
'system/cron/' . $groupId . '/' . self::XML_PATH_SCHEDULE_AHEAD_FOR,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
$scheduleAheadFor = $scheduleAheadFor * self::SECONDS_IN_MINUTE;
diff --git a/app/code/Magento/Cron/composer.json b/app/code/Magento/Cron/composer.json
index 5acbed553baa1..dd8ceddee1dc4 100644
--- a/app/code/Magento/Cron/composer.json
+++ b/app/code/Magento/Cron/composer.json
@@ -3,7 +3,6 @@
"description": "N/A",
"require": {
"php": "~5.4.11|~5.5.0|~5.6.0",
- "magento/module-store": "0.42.0-beta5",
"magento/module-backend": "0.42.0-beta5",
"magento/framework": "0.42.0-beta5",
"magento/magento-composer-installer": "*"
diff --git a/app/code/Magento/Cron/etc/module.xml b/app/code/Magento/Cron/etc/module.xml
index a715d334b05cb..d88d54d09f131 100644
--- a/app/code/Magento/Cron/etc/module.xml
+++ b/app/code/Magento/Cron/etc/module.xml
@@ -7,8 +7,5 @@
-->
-
-
-
diff --git a/app/code/Magento/CurrencySymbol/Helper/Data.php b/app/code/Magento/CurrencySymbol/Helper/Data.php
index 690ec4b6aa523..a26fb87826f97 100644
--- a/app/code/Magento/CurrencySymbol/Helper/Data.php
+++ b/app/code/Magento/CurrencySymbol/Helper/Data.php
@@ -21,7 +21,7 @@ class Data extends \Magento\Core\Helper\Data
/**
* @param \Magento\Framework\App\Helper\Context $context
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\State $appState
* @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
* @param \Magento\CurrencySymbol\Model\System\CurrencysymbolFactory $symbolFactory
@@ -30,7 +30,7 @@ class Data extends \Magento\Core\Helper\Data
public function __construct(
\Magento\Framework\App\Helper\Context $context,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\App\State $appState,
\Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
\Magento\CurrencySymbol\Model\System\CurrencysymbolFactory $symbolFactory,
diff --git a/app/code/Magento/CurrencySymbol/Model/System/Currencysymbol.php b/app/code/Magento/CurrencySymbol/Model/System/Currencysymbol.php
index 19261b5ba0c89..89ba3f06436e4 100644
--- a/app/code/Magento/CurrencySymbol/Model/System/Currencysymbol.php
+++ b/app/code/Magento/CurrencySymbol/Model/System/Currencysymbol.php
@@ -84,7 +84,7 @@ class Currencysymbol
protected $_systemStore;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -110,7 +110,7 @@ class Currencysymbol
* @param \Magento\Framework\App\Config\ReinitableConfigInterface $coreConfig
* @param \Magento\Backend\Model\Config\Factory $configFactory
* @param \Magento\Framework\App\Cache\TypeListInterface $cacheTypeList
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\Locale\ResolverInterface $localeResolver
* @param \Magento\Store\Model\System\Store $systemStore
* @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -120,7 +120,7 @@ public function __construct(
\Magento\Framework\App\Config\ReinitableConfigInterface $coreConfig,
\Magento\Backend\Model\Config\Factory $configFactory,
\Magento\Framework\App\Cache\TypeListInterface $cacheTypeList,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\Locale\ResolverInterface $localeResolver,
\Magento\Store\Model\System\Store $systemStore,
\Magento\Framework\Event\ManagerInterface $eventManager
@@ -154,7 +154,7 @@ public function getCurrencySymbolsData()
self::ALLOWED_CURRENCIES_CONFIG_SEPARATOR,
$this->_scopeConfig->getValue(
self::XML_PATH_ALLOWED_CURRENCIES,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
null
)
);
@@ -181,7 +181,7 @@ public function getCurrencySymbolsData()
}
$storeSymbols = $this->_scopeConfig->getValue(
self::XML_PATH_ALLOWED_CURRENCIES,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
$allowedCurrencies = array_merge(
@@ -314,7 +314,7 @@ protected function _unserializeStoreConfig($configPath, $storeId = null)
$result = [];
$configData = (string)$this->_scopeConfig->getValue(
$configPath,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$storeId
);
if ($configData) {
diff --git a/app/code/Magento/Customer/Block/Address/Edit.php b/app/code/Magento/Customer/Block/Address/Edit.php
index ee58d69b96a1d..5f5e45e653ec1 100644
--- a/app/code/Magento/Customer/Block/Address/Edit.php
+++ b/app/code/Magento/Customer/Block/Address/Edit.php
@@ -340,6 +340,6 @@ public function getBackButtonUrl()
*/
public function getConfig($path)
{
- return $this->_scopeConfig->getValue($path, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+ return $this->_scopeConfig->getValue($path, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
}
}
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Renderer/Attribute/Sendemail.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Renderer/Attribute/Sendemail.php
index 6ab83f2f7d5a7..2e87ba6d8f640 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Renderer/Attribute/Sendemail.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Renderer/Attribute/Sendemail.php
@@ -18,7 +18,7 @@ class Sendemail extends Element
protected $_template = 'edit/tab/account/form/renderer/sendemail.phtml';
/**
- * @var \Magento\Store\Model\StoreManagerInterface|null
+ * @var \Magento\Framework\Store\StoreManagerInterface|null
*/
protected $_storeManager = null;
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/PersonalInfo.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/PersonalInfo.php
index 5c25e31a2667c..9a27e0dc361b8 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/PersonalInfo.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/PersonalInfo.php
@@ -141,7 +141,7 @@ public function getStoreCreateDateTimezone()
{
return $this->_scopeConfig->getValue(
$this->_localeDate->getDefaultTimezonePath(),
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$this->getCustomer()->getStoreId()
);
}
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/Sales.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/Sales.php
index 582fb3b44b92c..9c0f25d8798dc 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/Sales.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/Sales.php
@@ -98,7 +98,7 @@ public function _beforeToHtml()
$this->_currency = $this->_currencyFactory->create()->load(
$this->_scopeConfig->getValue(
Currency::XML_PATH_CURRENCY_BASE,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)
);
diff --git a/app/code/Magento/Customer/Block/Form/Register.php b/app/code/Magento/Customer/Block/Form/Register.php
index 10745089fdefe..0e8699643a973 100644
--- a/app/code/Magento/Customer/Block/Form/Register.php
+++ b/app/code/Magento/Customer/Block/Form/Register.php
@@ -74,7 +74,7 @@ public function __construct(
*/
public function getConfig($path)
{
- return $this->_scopeConfig->getValue($path, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+ return $this->_scopeConfig->getValue($path, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
}
/**
diff --git a/app/code/Magento/Customer/Controller/Account/Confirm.php b/app/code/Magento/Customer/Controller/Account/Confirm.php
index a42a81c43f858..01b1a631fc04a 100644
--- a/app/code/Magento/Customer/Controller/Account/Confirm.php
+++ b/app/code/Magento/Customer/Controller/Account/Confirm.php
@@ -12,13 +12,13 @@
use Magento\Framework\App\Config\ScopeConfigInterface;
use Magento\Framework\Controller\Result\RedirectFactory;
use Magento\Framework\View\Result\PageFactory;
-use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\Store\StoreManagerInterface;
use Magento\Customer\Api\AccountManagementInterface;
use Magento\Customer\Api\CustomerRepositoryInterface;
use Magento\Customer\Helper\Address;
use Magento\Framework\UrlFactory;
use Magento\Framework\Exception\StateException;
-use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\Store\ScopeInterface;
/**
* Class Confirm
diff --git a/app/code/Magento/Customer/Controller/Account/Confirmation.php b/app/code/Magento/Customer/Controller/Account/Confirmation.php
index ba7ee81e3eaf8..8d2f65b6f4406 100644
--- a/app/code/Magento/Customer/Controller/Account/Confirmation.php
+++ b/app/code/Magento/Customer/Controller/Account/Confirmation.php
@@ -10,13 +10,13 @@
use Magento\Customer\Model\Session;
use Magento\Framework\Controller\Result\RedirectFactory;
use Magento\Framework\View\Result\PageFactory;
-use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\Store\StoreManagerInterface;
use Magento\Customer\Api\AccountManagementInterface;
use Magento\Framework\Exception\State\InvalidTransitionException;
class Confirmation extends \Magento\Customer\Controller\Account
{
- /** @var StoreManagerInterface */
+ /** @var \Magento\Framework\Store\StoreManagerInterface */
protected $storeManager;
/** @var AccountManagementInterface */
diff --git a/app/code/Magento/Customer/Controller/Account/CreatePost.php b/app/code/Magento/Customer/Controller/Account/CreatePost.php
index 65668fdc4ed68..1a2b1d82c5a3b 100644
--- a/app/code/Magento/Customer/Controller/Account/CreatePost.php
+++ b/app/code/Magento/Customer/Controller/Account/CreatePost.php
@@ -13,7 +13,7 @@
use Magento\Framework\Controller\Result\RedirectFactory;
use Magento\Framework\View\Result\PageFactory;
use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\Store\StoreManagerInterface;
use Magento\Customer\Api\AccountManagementInterface;
use Magento\Customer\Helper\Address;
use Magento\Framework\UrlFactory;
@@ -28,7 +28,7 @@
use Magento\Customer\Model\CustomerExtractor;
use Magento\Framework\Exception\StateException;
use Magento\Framework\Exception\InputException;
-use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\Store\ScopeInterface;
/**
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Customer/Controller/Account/LoginPost.php b/app/code/Magento/Customer/Controller/Account/LoginPost.php
index b7948e9f95bee..cbefdec2ed4ca 100644
--- a/app/code/Magento/Customer/Controller/Account/LoginPost.php
+++ b/app/code/Magento/Customer/Controller/Account/LoginPost.php
@@ -11,7 +11,7 @@
use Magento\Framework\Controller\Result\RedirectFactory;
use Magento\Framework\View\Result\PageFactory;
use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\Store\StoreManagerInterface;
use Magento\Customer\Api\AccountManagementInterface;
use Magento\Framework\Url\DecoderInterface;
use Magento\Customer\Model\Url as CustomerUrl;
@@ -27,7 +27,7 @@ class LoginPost extends \Magento\Customer\Controller\Account
/** @var ScopeConfigInterface */
protected $scopeConfig;
- /** @var StoreManagerInterface */
+ /** @var \Magento\Framework\Store\StoreManagerInterface */
protected $storeManager;
/** @var AccountManagementInterface */
@@ -101,7 +101,7 @@ protected function loginPostRedirect()
if ($this->_getSession()->isLoggedIn()) {
if (!$this->scopeConfig->isSetFlag(
CustomerUrl::XML_PATH_CUSTOMER_STARTUP_REDIRECT_TO_DASHBOARD,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)
) {
$referer = $this->getRequest()->getParam(CustomerUrl::REFERER_QUERY_PARAM_NAME);
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Cart/Product/Composite/Cart.php b/app/code/Magento/Customer/Controller/Adminhtml/Cart/Product/Composite/Cart.php
index b95e9b1af53d7..591141720c71a 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Cart/Product/Composite/Cart.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Cart/Product/Composite/Cart.php
@@ -75,7 +75,7 @@ protected function _initData()
$this->_quote = $this->quoteRepository->create();
}
$this->_quote->setWebsite(
- $this->_objectManager->get('Magento\Store\Model\StoreManagerInterface')->getWebsite($websiteId)
+ $this->_objectManager->get('Magento\Framework\Store\StoreManagerInterface')->getWebsite($websiteId)
);
$this->_quoteItem = $this->_quote->getItemById($quoteItemId);
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Cart.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Cart.php
index 3050408cda037..c4a1403b87e45 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/Cart.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/Cart.php
@@ -33,7 +33,7 @@ public function execute()
$quote = $quoteRepository->create();
}
$quote->setWebsite(
- $this->_objectManager->get('Magento\Store\Model\StoreManagerInterface')->getWebsite($websiteId)
+ $this->_objectManager->get('Magento\Framework\Store\StoreManagerInterface')->getWebsite($websiteId)
);
$item = $quote->getItemById($deleteItemId);
if ($item && $item->getId()) {
diff --git a/app/code/Magento/Customer/Helper/Address.php b/app/code/Magento/Customer/Helper/Address.php
index 398522e04a458..d09f027e4bfaa 100644
--- a/app/code/Magento/Customer/Helper/Address.php
+++ b/app/code/Magento/Customer/Helper/Address.php
@@ -68,7 +68,7 @@ class Address extends \Magento\Framework\App\Helper\AbstractHelper
/** @var \Magento\Framework\View\Element\BlockFactory */
protected $_blockFactory;
- /** @var \Magento\Store\Model\StoreManagerInterface */
+ /** @var \Magento\Framework\Store\StoreManagerInterface */
protected $_storeManager;
/** @var \Magento\Framework\App\Config\ScopeConfigInterface */
@@ -86,7 +86,7 @@ class Address extends \Magento\Framework\App\Helper\AbstractHelper
/**
* @param \Magento\Framework\App\Helper\Context $context
* @param \Magento\Framework\View\Element\BlockFactory $blockFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param CustomerMetadataInterface $customerMetadataService
* @param AddressMetadataInterface $addressMetadataService
@@ -95,7 +95,7 @@ class Address extends \Magento\Framework\App\Helper\AbstractHelper
public function __construct(
\Magento\Framework\App\Helper\Context $context,
\Magento\Framework\View\Element\BlockFactory $blockFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
CustomerMetadataInterface $customerMetadataService,
AddressMetadataInterface $addressMetadataService,
@@ -167,7 +167,7 @@ public function getConfig($key, $store = null)
if (!isset($this->_config[$websiteId])) {
$this->_config[$websiteId] = $this->_scopeConfig->getValue(
'customer/address',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -319,7 +319,7 @@ public function isVatValidationEnabled($store = null)
{
return (bool)$this->_scopeConfig->getValue(
self::XML_PATH_VAT_VALIDATION_ENABLED,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -333,7 +333,7 @@ public function isDisableAutoGroupAssignDefaultValue()
{
return (bool)$this->_scopeConfig->getValue(
self::XML_PATH_VIV_DISABLE_AUTO_ASSIGN_DEFAULT,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
}
@@ -347,7 +347,7 @@ public function hasValidateOnEachTransaction($store = null)
{
return (bool)$this->_scopeConfig->getValue(
self::XML_PATH_VIV_ON_EACH_TRANSACTION,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -362,7 +362,7 @@ public function getTaxCalculationAddressType($store = null)
{
return (string)$this->_scopeConfig->getValue(
self::XML_PATH_VIV_TAX_CALCULATION_ADDRESS_TYPE,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -376,7 +376,7 @@ public function isVatAttributeVisible()
{
return (bool)$this->_scopeConfig->getValue(
self::XML_PATH_VAT_FRONTEND_VISIBILITY,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
}
}
diff --git a/app/code/Magento/Customer/Model/AccountManagement.php b/app/code/Magento/Customer/Model/AccountManagement.php
index c5c59b797fae8..8920b962af4ff 100644
--- a/app/code/Magento/Customer/Model/AccountManagement.php
+++ b/app/code/Magento/Customer/Model/AccountManagement.php
@@ -35,7 +35,7 @@
use Magento\Framework\Reflection\DataObjectProcessor;
use Magento\Framework\Stdlib\DateTime;
use Magento\Framework\Stdlib\String as StringHelper;
-use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\Store\StoreManagerInterface;
/**
* Handle various customer account actions
@@ -110,7 +110,7 @@ class AccountManagement implements AccountManagementInterface
private $eventManager;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
private $storeManager;
@@ -856,7 +856,7 @@ protected function sendPasswordResetNotificationEmail($customer)
$transport = $this->transportBuilder->setTemplateIdentifier(
$this->scopeConfig->getValue(
self::XML_PATH_RESET_PASSWORD_TEMPLATE,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$storeId
)
)->setTemplateOptions(
@@ -866,7 +866,7 @@ protected function sendPasswordResetNotificationEmail($customer)
)->setFrom(
$this->scopeConfig->getValue(
self::XML_PATH_FORGOT_EMAIL_IDENTITY,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$storeId
)
)->addTo(
@@ -927,13 +927,13 @@ protected function sendEmailTemplate($customer, $template, $sender, $templatePar
{
/** @var \Magento\Framework\Mail\TransportInterface $transport */
$transport = $this->transportBuilder->setTemplateIdentifier(
- $this->scopeConfig->getValue($template, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $storeId)
+ $this->scopeConfig->getValue($template, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $storeId)
)->setTemplateOptions(
['area' => \Magento\Framework\App\Area::AREA_FRONTEND, 'store' => $storeId]
)->setTemplateVars(
$templateParams
)->setFrom(
- $this->scopeConfig->getValue($sender, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $storeId)
+ $this->scopeConfig->getValue($sender, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $storeId)
)->addTo(
$customer->getEmail(),
$this->customerViewHelper->getCustomerName($customer)
@@ -958,7 +958,7 @@ protected function isConfirmationRequired($customer)
return (bool)$this->scopeConfig->getValue(
self::XML_PATH_IS_CONFIRM,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$storeId
);
}
diff --git a/app/code/Magento/Customer/Model/Address/Config.php b/app/code/Magento/Customer/Model/Address/Config.php
index c2cd8f0dba94b..46eef9b39e044 100644
--- a/app/code/Magento/Customer/Model/Address/Config.php
+++ b/app/code/Magento/Customer/Model/Address/Config.php
@@ -41,7 +41,7 @@ class Config extends \Magento\Framework\Config\Data
protected $_defaultTypes = [];
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -58,7 +58,7 @@ class Config extends \Magento\Framework\Config\Data
/**
* @param \Magento\Customer\Model\Address\Config\Reader $reader
* @param \Magento\Framework\Config\CacheInterface $cache
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Customer\Helper\Address $addressHelper
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param string $cacheId
@@ -66,7 +66,7 @@ class Config extends \Magento\Framework\Config\Data
public function __construct(
\Magento\Customer\Model\Address\Config\Reader $reader,
\Magento\Framework\Config\CacheInterface $cache,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Customer\Helper\Address $addressHelper,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
$cacheId = 'address_format'
@@ -130,7 +130,7 @@ public function getFormats()
)->setTitle(
(string)$typeConfig['title']
)->setDefaultFormat(
- $this->_scopeConfig->getValue($path, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store)
+ $this->_scopeConfig->getValue($path, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store)
)->setEscapeHtml(
$escapeHtml
);
diff --git a/app/code/Magento/Customer/Model/Config/Backend/Address/Street.php b/app/code/Magento/Customer/Model/Config/Backend/Address/Street.php
index fe286e314ec45..0947b65311163 100644
--- a/app/code/Magento/Customer/Model/Config/Backend/Address/Street.php
+++ b/app/code/Magento/Customer/Model/Config/Backend/Address/Street.php
@@ -17,14 +17,14 @@ class Street extends \Magento\Framework\App\Config\Value
*/
protected $_eavConfig;
- /** @var \Magento\Store\Model\StoreManagerInterface */
+ /** @var \Magento\Framework\Store\StoreManagerInterface */
protected $_storeManager;
/**
* @param \Magento\Framework\Model\Context $context
* @param \Magento\Framework\Registry $registry
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\App\Config\ScopeConfigInterface $config
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Eav\Model\Config $eavConfig
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
@@ -34,7 +34,7 @@ public function __construct(
\Magento\Framework\Model\Context $context,
\Magento\Framework\Registry $registry,
\Magento\Framework\App\Config\ScopeConfigInterface $config,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Eav\Model\Config $eavConfig,
\Magento\Framework\Model\Resource\AbstractResource $resource = null,
\Magento\Framework\Data\Collection\Db $resourceCollection = null,
@@ -55,7 +55,7 @@ public function afterSave()
$attribute = $this->_eavConfig->getAttribute('customer_address', 'street');
$value = $this->getValue();
switch ($this->getScope()) {
- case \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITES:
+ case \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITES:
$website = $this->_storeManager->getWebsite($this->getScopeCode());
$attribute->setWebsite($website);
$attribute->load($attribute->getId());
@@ -81,7 +81,7 @@ public function afterDelete()
{
$result = parent::afterDelete();
- if ($this->getScope() == \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITES) {
+ if ($this->getScope() == \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITES) {
$attribute = $this->_eavConfig->getAttribute('customer_address', 'street');
$website = $this->_storeManager->getWebsite($this->getScopeCode());
$attribute->setWebsite($website);
diff --git a/app/code/Magento/Customer/Model/Config/Backend/Show/Customer.php b/app/code/Magento/Customer/Model/Config/Backend/Show/Customer.php
index 639238500a6df..df2b0563feaf0 100644
--- a/app/code/Magento/Customer/Model/Config/Backend/Show/Customer.php
+++ b/app/code/Magento/Customer/Model/Config/Backend/Show/Customer.php
@@ -19,14 +19,14 @@ class Customer extends \Magento\Framework\App\Config\Value
*/
protected $_eavConfig;
- /** @var \Magento\Store\Model\StoreManagerInterface */
+ /** @var \Magento\Framework\Store\StoreManagerInterface */
protected $storeManager;
/**
* @param \Magento\Framework\Model\Context $context
* @param \Magento\Framework\Registry $registry
* @param \Magento\Framework\App\Config\ScopeConfigInterface $config
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Eav\Model\Config $eavConfig
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
@@ -36,7 +36,7 @@ public function __construct(
\Magento\Framework\Model\Context $context,
\Magento\Framework\Registry $registry,
\Magento\Framework\App\Config\ScopeConfigInterface $config,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Eav\Model\Config $eavConfig,
\Magento\Framework\Model\Resource\AbstractResource $resource = null,
\Magento\Framework\Data\Collection\Db $resourceCollection = null,
diff --git a/app/code/Magento/Customer/Model/Config/Share.php b/app/code/Magento/Customer/Model/Config/Share.php
index bec6a49291d68..b8961d32b50b3 100644
--- a/app/code/Magento/Customer/Model/Config/Share.php
+++ b/app/code/Magento/Customer/Model/Config/Share.php
@@ -31,7 +31,7 @@ class Share extends \Magento\Framework\App\Config\Value implements \Magento\Fram
*/
protected $_customerResource;
- /** @var \Magento\Store\Model\StoreManagerInterface */
+ /** @var \Magento\Framework\Store\StoreManagerInterface */
protected $_storeManager;
/**
@@ -40,7 +40,7 @@ class Share extends \Magento\Framework\App\Config\Value implements \Magento\Fram
* @param \Magento\Framework\Model\Context $context
* @param \Magento\Framework\Registry $registry
* @param \Magento\Framework\App\Config\ScopeConfigInterface $config
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Customer\Model\Resource\Customer $customerResource
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
@@ -50,7 +50,7 @@ public function __construct(
\Magento\Framework\Model\Context $context,
\Magento\Framework\Registry $registry,
\Magento\Framework\App\Config\ScopeConfigInterface $config,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Customer\Model\Resource\Customer $customerResource,
\Magento\Framework\Model\Resource\AbstractResource $resource = null,
\Magento\Framework\Data\Collection\Db $resourceCollection = null,
@@ -80,7 +80,7 @@ public function isWebsiteScope()
{
return $this->_config->getValue(
self::XML_PATH_CUSTOMER_ACCOUNT_SHARE,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
) == self::SHARE_WEBSITE;
}
diff --git a/app/code/Magento/Customer/Model/Customer.php b/app/code/Magento/Customer/Model/Customer.php
index 6cd272bb0c84a..9c08914a9fa25 100644
--- a/app/code/Magento/Customer/Model/Customer.php
+++ b/app/code/Magento/Customer/Model/Customer.php
@@ -133,7 +133,7 @@ class Customer extends \Magento\Framework\Model\AbstractExtensibleModel
protected $_isReadonly = false;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -207,7 +207,7 @@ class Customer extends \Magento\Framework\Model\AbstractExtensibleModel
* @param \Magento\Framework\Registry $registry
* @param \Magento\Framework\Api\MetadataServiceInterface $metadataService
* @param AttributeDataBuilder $customAttributeBuilder
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Eav\Model\Config $config
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param Resource\Customer $resource
@@ -230,7 +230,7 @@ public function __construct(
\Magento\Framework\Registry $registry,
\Magento\Framework\Api\MetadataServiceInterface $metadataService,
AttributeDataBuilder $customAttributeBuilder,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Eav\Model\Config $config,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
\Magento\Customer\Model\Resource\Customer $resource,
@@ -806,7 +806,7 @@ public function isConfirmationRequired()
return (bool)$this->_scopeConfig->getValue(
self::XML_PATH_IS_CONFIRM,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$storeId
);
}
@@ -851,13 +851,13 @@ protected function _sendEmailTemplate($template, $sender, $templateParams = [],
{
/** @var \Magento\Framework\Mail\TransportInterface $transport */
$transport = $this->_transportBuilder->setTemplateIdentifier(
- $this->_scopeConfig->getValue($template, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $storeId)
+ $this->_scopeConfig->getValue($template, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $storeId)
)->setTemplateOptions(
['area' => \Magento\Framework\App\Area::AREA_FRONTEND, 'store' => $storeId]
)->setTemplateVars(
$templateParams
)->setFrom(
- $this->_scopeConfig->getValue($sender, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $storeId)
+ $this->_scopeConfig->getValue($sender, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $storeId)
)->addTo(
$this->getEmail(),
$this->getName()
@@ -900,7 +900,7 @@ public function getGroupId()
$storeId = $this->getStoreId() ? $this->getStoreId() : $this->_storeManager->getStore()->getId();
$groupId = $this->_scopeConfig->getValue(
GroupManagement::XML_PATH_DEFAULT_ID,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$storeId
);
$this->setData('group_id', $groupId);
diff --git a/app/code/Magento/Customer/Model/Customer/Attribute/Backend/Store.php b/app/code/Magento/Customer/Model/Customer/Attribute/Backend/Store.php
index a7932d37dda58..2907ff51187ac 100644
--- a/app/code/Magento/Customer/Model/Customer/Attribute/Backend/Store.php
+++ b/app/code/Magento/Customer/Model/Customer/Attribute/Backend/Store.php
@@ -13,14 +13,14 @@
class Store extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
{
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
/**
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
*/
- public function __construct(\Magento\Store\Model\StoreManagerInterface $storeManager)
+ public function __construct(\Magento\Framework\Store\StoreManagerInterface $storeManager)
{
$this->_storeManager = $storeManager;
}
diff --git a/app/code/Magento/Customer/Model/Customer/Attribute/Backend/Website.php b/app/code/Magento/Customer/Model/Customer/Attribute/Backend/Website.php
index 688be58110744..8baa46f869d15 100644
--- a/app/code/Magento/Customer/Model/Customer/Attribute/Backend/Website.php
+++ b/app/code/Magento/Customer/Model/Customer/Attribute/Backend/Website.php
@@ -13,14 +13,14 @@
class Website extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
{
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
/**
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
*/
- public function __construct(\Magento\Store\Model\StoreManagerInterface $storeManager)
+ public function __construct(\Magento\Framework\Store\StoreManagerInterface $storeManager)
{
$this->_storeManager = $storeManager;
}
diff --git a/app/code/Magento/Customer/Model/CustomerExtractor.php b/app/code/Magento/Customer/Model/CustomerExtractor.php
index d5a2dce08aecd..ff316a9bcfd0f 100644
--- a/app/code/Magento/Customer/Model/CustomerExtractor.php
+++ b/app/code/Magento/Customer/Model/CustomerExtractor.php
@@ -22,7 +22,7 @@ class CustomerExtractor
protected $customerBuilder;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $storeManager;
@@ -34,13 +34,13 @@ class CustomerExtractor
/**
* @param Metadata\FormFactory $formFactory
* @param \Magento\Customer\Api\Data\CustomerDataBuilder $customerBuilder
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param GroupManagementInterface $customerGroupManagement
*/
public function __construct(
\Magento\Customer\Model\Metadata\FormFactory $formFactory,
\Magento\Customer\Api\Data\CustomerDataBuilder $customerBuilder,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
GroupManagementInterface $customerGroupManagement
) {
$this->formFactory = $formFactory;
diff --git a/app/code/Magento/Customer/Model/CustomerRegistry.php b/app/code/Magento/Customer/Model/CustomerRegistry.php
index cc4ea04078b95..1f33005f38d77 100644
--- a/app/code/Magento/Customer/Model/CustomerRegistry.php
+++ b/app/code/Magento/Customer/Model/CustomerRegistry.php
@@ -9,7 +9,7 @@
use Magento\Customer\Model\Data\CustomerSecure;
use Magento\Customer\Model\Data\CustomerSecureFactory;
use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\Store\StoreManagerInterface;
/**
* Registry for \Magento\Customer\Model\Customer
@@ -44,7 +44,7 @@ class CustomerRegistry
private $customerSecureRegistryById = [];
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
private $storeManager;
@@ -53,12 +53,12 @@ class CustomerRegistry
*
* @param CustomerFactory $customerFactory
* @param CustomerSecureFactory $customerSecureFactory
- * @param StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
*/
public function __construct(
CustomerFactory $customerFactory,
CustomerSecureFactory $customerSecureFactory,
- StoreManagerInterface $storeManager
+ \Magento\Framework\Store\StoreManagerInterface $storeManager
) {
$this->customerFactory = $customerFactory;
$this->customerSecureFactory = $customerSecureFactory;
diff --git a/app/code/Magento/Customer/Model/GroupManagement.php b/app/code/Magento/Customer/Model/GroupManagement.php
index d090e95592744..198223eb4677a 100644
--- a/app/code/Magento/Customer/Model/GroupManagement.php
+++ b/app/code/Magento/Customer/Model/GroupManagement.php
@@ -12,7 +12,7 @@
use Magento\Framework\App\Config\ScopeConfigInterface;
use Magento\Framework\Api\FilterBuilder;
use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\Store\StoreManagerInterface;
use Magento\Customer\Api\GroupRepositoryInterface;
use Magento\Customer\Api\Data\GroupDataBuilder;
use Magento\Customer\Model\GroupFactory;
@@ -31,7 +31,7 @@ class GroupManagement implements \Magento\Customer\Api\GroupManagementInterface
const GROUP_CODE_MAX_LENGTH = 32;
/**
- * @var StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $storeManager;
@@ -75,7 +75,7 @@ class GroupManagement implements \Magento\Customer\Api\GroupManagementInterface
* @param FilterBuilder $filterBuilder
*/
public function __construct(
- StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
ScopeConfigInterface $scopeConfig,
GroupFactory $groupFactory,
GroupRepositoryInterface $groupRepository,
@@ -117,7 +117,7 @@ public function getDefaultGroup($storeId = null)
try {
$groupId = $this->scopeConfig->getValue(
self::XML_PATH_DEFAULT_ID,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$storeId
);
} catch (\Magento\Framework\App\InitException $e) {
diff --git a/app/code/Magento/Customer/Model/Resource/Customer.php b/app/code/Magento/Customer/Model/Resource/Customer.php
index 4577a1a113bd3..451b8de3992cb 100644
--- a/app/code/Magento/Customer/Model/Resource/Customer.php
+++ b/app/code/Magento/Customer/Model/Resource/Customer.php
@@ -384,7 +384,7 @@ public function setNewIncrementId(\Magento\Framework\Object $object)
{
if ($this->_scopeConfig->getValue(
\Magento\Customer\Model\Customer::XML_PATH_GENERATE_HUMAN_FRIENDLY_ID,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)
) {
parent::setNewIncrementId($object);
diff --git a/app/code/Magento/Customer/Model/Resource/Customer/Collection.php b/app/code/Magento/Customer/Model/Resource/Customer/Collection.php
index d20c4e1c4ce21..6e0cdd7780452 100644
--- a/app/code/Magento/Customer/Model/Resource/Customer/Collection.php
+++ b/app/code/Magento/Customer/Model/Resource/Customer/Collection.php
@@ -28,7 +28,7 @@ class Collection extends \Magento\Eav\Model\Entity\Collection\AbstractCollection
protected $_modelName;
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -44,7 +44,7 @@ class Collection extends \Magento\Eav\Model\Entity\Collection\AbstractCollection
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
diff --git a/app/code/Magento/Customer/Model/Resource/Customer/Grid/ServiceCollection.php b/app/code/Magento/Customer/Model/Resource/Customer/Grid/ServiceCollection.php
index 416dffbad98e0..eaed84b4d60aa 100644
--- a/app/code/Magento/Customer/Model/Resource/Customer/Grid/ServiceCollection.php
+++ b/app/code/Magento/Customer/Model/Resource/Customer/Grid/ServiceCollection.php
@@ -5,7 +5,7 @@
*/
namespace Magento\Customer\Model\Resource\Customer\Grid;
-use Magento\Core\Model\EntityFactory;
+use Magento\Framework\Data\Collection\EntityFactory;
use Magento\Customer\Api\CustomerRepositoryInterface;
use Magento\Customer\Api\Data\CustomerInterface;
use Magento\Framework\Api\AbstractServiceCollection;
@@ -24,7 +24,7 @@ class ServiceCollection extends AbstractServiceCollection
protected $customerRepository;
/**
- * @param EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param FilterBuilder $filterBuilder
* @param SearchCriteriaBuilder $searchCriteriaBuilder
* @param CustomerRepositoryInterface $customerRepository
diff --git a/app/code/Magento/Customer/Model/Resource/CustomerRepository.php b/app/code/Magento/Customer/Model/Resource/CustomerRepository.php
index f8100f6de0373..1dac838ff5836 100644
--- a/app/code/Magento/Customer/Model/Resource/CustomerRepository.php
+++ b/app/code/Magento/Customer/Model/Resource/CustomerRepository.php
@@ -68,7 +68,7 @@ class CustomerRepository implements \Magento\Customer\Api\CustomerRepositoryInte
protected $eventManager;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $storeManager;
@@ -88,7 +88,7 @@ class CustomerRepository implements \Magento\Customer\Api\CustomerRepositoryInte
* @param \Magento\Customer\Api\Data\CustomerDataBuilder $customerBuilder
* @param \Magento\Customer\Api\Data\CustomerSearchResultsDataBuilder $searchResultsDataBuilder
* @param \Magento\Framework\Event\ManagerInterface $eventManager
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\Api\ExtensibleDataObjectConverter $extensibleDataObjectConverter
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
@@ -103,7 +103,7 @@ public function __construct(
\Magento\Customer\Api\Data\CustomerDataBuilder $customerBuilder,
\Magento\Customer\Api\Data\CustomerSearchResultsDataBuilder $searchResultsDataBuilder,
\Magento\Framework\Event\ManagerInterface $eventManager,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\Api\ExtensibleDataObjectConverter $extensibleDataObjectConverter
) {
$this->customerFactory = $customerFactory;
diff --git a/app/code/Magento/Customer/Model/Resource/Group/Grid/ServiceCollection.php b/app/code/Magento/Customer/Model/Resource/Group/Grid/ServiceCollection.php
index 04589231f0bcb..ceb01adf18dbc 100644
--- a/app/code/Magento/Customer/Model/Resource/Group/Grid/ServiceCollection.php
+++ b/app/code/Magento/Customer/Model/Resource/Group/Grid/ServiceCollection.php
@@ -8,7 +8,7 @@
namespace Magento\Customer\Model\Resource\Group\Grid;
-use Magento\Core\Model\EntityFactory;
+use Magento\Framework\Data\Collection\EntityFactory;
use Magento\Customer\Api\Data\GroupInterface;
use Magento\Customer\Api\GroupRepositoryInterface;
use Magento\Framework\Api\AbstractServiceCollection;
diff --git a/app/code/Magento/Customer/Model/Session/Storage.php b/app/code/Magento/Customer/Model/Session/Storage.php
index a29e6e55302d4..b700cde7446cb 100644
--- a/app/code/Magento/Customer/Model/Session/Storage.php
+++ b/app/code/Magento/Customer/Model/Session/Storage.php
@@ -11,13 +11,13 @@ class Storage extends \Magento\Framework\Session\Storage
{
/**
* @param \Magento\Customer\Model\Config\Share $configShare
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param string $namespace
* @param array $data
*/
public function __construct(
\Magento\Customer\Model\Config\Share $configShare,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
$namespace = 'customer',
array $data = []
) {
diff --git a/app/code/Magento/Customer/Model/Url.php b/app/code/Magento/Customer/Model/Url.php
index 1572e60414378..db980db3e36c7 100644
--- a/app/code/Magento/Customer/Model/Url.php
+++ b/app/code/Magento/Customer/Model/Url.php
@@ -9,7 +9,7 @@
use Magento\Framework\App\RequestInterface;
use Magento\Framework\Url\EncoderInterface;
use Magento\Framework\UrlInterface;
-use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\Store\ScopeInterface;
/**
* Customer url model
diff --git a/app/code/Magento/Customer/Model/Vat.php b/app/code/Magento/Customer/Model/Vat.php
index c280d6c7addf6..6462ff65732d1 100644
--- a/app/code/Magento/Customer/Model/Vat.php
+++ b/app/code/Magento/Customer/Model/Vat.php
@@ -7,7 +7,7 @@
use Magento\Framework\App\Config\ScopeConfigInterface;
use Psr\Log\LoggerInterface as Logger;
-use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\Store\ScopeInterface;
/**
* Customer VAT model
@@ -94,7 +94,7 @@ public function getMerchantCountryCode($store = null)
{
return (string)$this->scopeConfig->getValue(
self::XML_PATH_MERCHANT_COUNTRY_CODE,
- ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -109,7 +109,7 @@ public function getMerchantVatNumber($store = null)
{
return (string)$this->scopeConfig->getValue(
self::XML_PATH_MERCHANT_VAT_NUMBER,
- ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -128,7 +128,7 @@ public function getCustomerGroupIdBasedOnVatNumber($customerCountryCode, $vatVal
$isAutoGroupAssign = $this->scopeConfig->isSetFlag(
self::XML_PATH_CUSTOMER_GROUP_AUTO_ASSIGN,
- ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
if (!$isAutoGroupAssign) {
@@ -147,7 +147,7 @@ public function getCustomerGroupIdBasedOnVatNumber($customerCountryCode, $vatVal
if (isset($vatClassToGroupXmlPathMap[$vatClass])) {
$groupId = (int)$this->scopeConfig->getValue(
$vatClassToGroupXmlPathMap[$vatClass],
- ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -290,7 +290,7 @@ public function isCountryInEU($countryCode, $storeId = null)
',',
$this->scopeConfig->getValue(
self::XML_PATH_EU_COUNTRIES_LIST,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$storeId
)
);
diff --git a/app/code/Magento/Customer/Model/Visitor.php b/app/code/Magento/Customer/Model/Visitor.php
index 158a5b3c23854..130f1f2de28f0 100644
--- a/app/code/Magento/Customer/Model/Visitor.php
+++ b/app/code/Magento/Customer/Model/Visitor.php
@@ -264,7 +264,7 @@ public function getCleanTime()
{
return $this->scopeConfig->getValue(
\Magento\Framework\Session\Config::XML_PATH_COOKIE_LIFETIME,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
) + 86400;
}
diff --git a/app/code/Magento/Customer/etc/adminhtml/di.xml b/app/code/Magento/Customer/etc/adminhtml/di.xml
index c0f4433ae54f8..103a78335aa95 100644
--- a/app/code/Magento/Customer/etc/adminhtml/di.xml
+++ b/app/code/Magento/Customer/etc/adminhtml/di.xml
@@ -12,7 +12,7 @@
Magento\Customer\Model\Backend\Customer
-
+
- /customer/
diff --git a/app/code/Magento/Customer/etc/frontend/di.xml b/app/code/Magento/Customer/etc/frontend/di.xml
index 06e462279e068..8db0fb471bfb0 100644
--- a/app/code/Magento/Customer/etc/frontend/di.xml
+++ b/app/code/Magento/Customer/etc/frontend/di.xml
@@ -6,7 +6,7 @@
*/
-->
-
+
- /customer/
diff --git a/app/code/Magento/CustomerImportExport/Model/Export/Address.php b/app/code/Magento/CustomerImportExport/Model/Export/Address.php
index bfe77d3e13c45..732ff997f7749 100644
--- a/app/code/Magento/CustomerImportExport/Model/Export/Address.php
+++ b/app/code/Magento/CustomerImportExport/Model/Export/Address.php
@@ -103,7 +103,7 @@ class Address extends \Magento\ImportExport\Model\Export\Entity\AbstractEav
/**
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\ImportExport\Model\Export\Factory $collectionFactory
* @param \Magento\ImportExport\Model\Resource\CollectionByPagesIteratorFactory $resourceColFactory
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
@@ -116,7 +116,7 @@ class Address extends \Magento\ImportExport\Model\Export\Entity\AbstractEav
*/
public function __construct(
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\ImportExport\Model\Export\Factory $collectionFactory,
\Magento\ImportExport\Model\Resource\CollectionByPagesIteratorFactory $resourceColFactory,
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
diff --git a/app/code/Magento/CustomerImportExport/Model/Export/Customer.php b/app/code/Magento/CustomerImportExport/Model/Export/Customer.php
index f611129b7aa9d..3cbdb1b452cbd 100644
--- a/app/code/Magento/CustomerImportExport/Model/Export/Customer.php
+++ b/app/code/Magento/CustomerImportExport/Model/Export/Customer.php
@@ -81,7 +81,7 @@ class Customer extends \Magento\ImportExport\Model\Export\Entity\AbstractEav
/**
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\ImportExport\Model\Export\Factory $collectionFactory
* @param \Magento\ImportExport\Model\Resource\CollectionByPagesIteratorFactory $resourceColFactory
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
@@ -91,7 +91,7 @@ class Customer extends \Magento\ImportExport\Model\Export\Entity\AbstractEav
*/
public function __construct(
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\ImportExport\Model\Export\Factory $collectionFactory,
\Magento\ImportExport\Model\Resource\CollectionByPagesIteratorFactory $resourceColFactory,
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
diff --git a/app/code/Magento/CustomerImportExport/Model/Import/AbstractCustomer.php b/app/code/Magento/CustomerImportExport/Model/Import/AbstractCustomer.php
index fd577239948e5..fbf84628545a3 100644
--- a/app/code/Magento/CustomerImportExport/Model/Import/AbstractCustomer.php
+++ b/app/code/Magento/CustomerImportExport/Model/Import/AbstractCustomer.php
@@ -75,7 +75,7 @@ abstract class AbstractCustomer extends \Magento\ImportExport\Model\Import\Entit
* @param \Magento\ImportExport\Model\ImportFactory $importFactory
* @param \Magento\ImportExport\Model\Resource\Helper $resourceHelper
* @param \Magento\Framework\App\Resource $resource
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\ImportExport\Model\Export\Factory $collectionFactory
* @param \Magento\Eav\Model\Config $eavConfig
* @param \Magento\CustomerImportExport\Model\Resource\Import\Customer\StorageFactory $storageFactory
@@ -89,7 +89,7 @@ public function __construct(
\Magento\ImportExport\Model\ImportFactory $importFactory,
\Magento\ImportExport\Model\Resource\Helper $resourceHelper,
\Magento\Framework\App\Resource $resource,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\ImportExport\Model\Export\Factory $collectionFactory,
\Magento\Eav\Model\Config $eavConfig,
\Magento\CustomerImportExport\Model\Resource\Import\Customer\StorageFactory $storageFactory,
diff --git a/app/code/Magento/CustomerImportExport/Model/Import/Address.php b/app/code/Magento/CustomerImportExport/Model/Import/Address.php
index 425c3bab09f30..64b60c632b54b 100644
--- a/app/code/Magento/CustomerImportExport/Model/Import/Address.php
+++ b/app/code/Magento/CustomerImportExport/Model/Import/Address.php
@@ -219,7 +219,7 @@ class Address extends AbstractCustomer
* @param \Magento\ImportExport\Model\ImportFactory $importFactory
* @param \Magento\ImportExport\Model\Resource\Helper $resourceHelper
* @param \Magento\Framework\App\Resource $resource
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\ImportExport\Model\Export\Factory $collectionFactory
* @param \Magento\Eav\Model\Config $eavConfig
* @param \Magento\CustomerImportExport\Model\Resource\Import\Customer\StorageFactory $storageFactory
@@ -240,7 +240,7 @@ public function __construct(
\Magento\ImportExport\Model\ImportFactory $importFactory,
\Magento\ImportExport\Model\Resource\Helper $resourceHelper,
\Magento\Framework\App\Resource $resource,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\ImportExport\Model\Export\Factory $collectionFactory,
\Magento\Eav\Model\Config $eavConfig,
\Magento\CustomerImportExport\Model\Resource\Import\Customer\StorageFactory $storageFactory,
diff --git a/app/code/Magento/CustomerImportExport/Model/Import/Customer.php b/app/code/Magento/CustomerImportExport/Model/Import/Customer.php
index a498218c67381..b2dace60d35f8 100644
--- a/app/code/Magento/CustomerImportExport/Model/Import/Customer.php
+++ b/app/code/Magento/CustomerImportExport/Model/Import/Customer.php
@@ -124,7 +124,7 @@ class Customer extends AbstractCustomer
* @param \Magento\ImportExport\Model\ImportFactory $importFactory
* @param \Magento\ImportExport\Model\Resource\Helper $resourceHelper
* @param \Magento\Framework\App\Resource $resource
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\ImportExport\Model\Export\Factory $collectionFactory
* @param \Magento\Eav\Model\Config $eavConfig
* @param \Magento\CustomerImportExport\Model\Resource\Import\Customer\StorageFactory $storageFactory
@@ -140,7 +140,7 @@ public function __construct(
\Magento\ImportExport\Model\ImportFactory $importFactory,
\Magento\ImportExport\Model\Resource\Helper $resourceHelper,
\Magento\Framework\App\Resource $resource,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\ImportExport\Model\Export\Factory $collectionFactory,
\Magento\Eav\Model\Config $eavConfig,
\Magento\CustomerImportExport\Model\Resource\Import\Customer\StorageFactory $storageFactory,
diff --git a/app/code/Magento/CustomerImportExport/composer.json b/app/code/Magento/CustomerImportExport/composer.json
index 356a378a6ec36..e722a764eda31 100644
--- a/app/code/Magento/CustomerImportExport/composer.json
+++ b/app/code/Magento/CustomerImportExport/composer.json
@@ -8,7 +8,6 @@
"magento/module-customer": "0.42.0-beta5",
"magento/module-eav": "0.42.0-beta5",
"magento/module-import-export": "0.42.0-beta5",
- "magento/module-store": "0.42.0-beta5",
"magento/module-directory": "0.42.0-beta5",
"magento/framework": "0.42.0-beta5",
"magento/magento-composer-installer": "*"
diff --git a/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Form/Renderer/LogoUploader.php b/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Form/Renderer/LogoUploader.php
index 28db136b67d8f..2e7b74bca7417 100644
--- a/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Form/Renderer/LogoUploader.php
+++ b/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Form/Renderer/LogoUploader.php
@@ -96,7 +96,7 @@ public function getLogoImage($store)
{
$image = null;
if (null !== $store) {
- $image = basename($this->_scopeConfig->getValue('design/header/logo_src', \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store->getId()));
+ $image = basename($this->_scopeConfig->getValue('design/header/logo_src', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store->getId()));
}
return $image;
}
diff --git a/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Toolbar/Buttons/Save.php b/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Toolbar/Buttons/Save.php
index ad833388d9e0a..3ea6b04308ab3 100644
--- a/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Toolbar/Buttons/Save.php
+++ b/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Toolbar/Buttons/Save.php
@@ -17,7 +17,7 @@ class Save extends \Magento\Backend\Block\Widget\Button\SplitButton
/**
* Current theme used for preview
*
- * @var \Magento\Core\Model\Theme
+ * @var \Magento\Theme\Model\Theme
*/
protected $_theme;
@@ -51,7 +51,7 @@ public function init()
/**
* Get current theme
*
- * @return \Magento\Core\Model\Theme
+ * @return \Magento\Theme\Model\Theme
* @throws \InvalidArgumentException
*/
public function getTheme()
diff --git a/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Code/Js.php b/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Code/Js.php
index b7ec1a4a70966..e48e5e3df2e05 100644
--- a/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Code/Js.php
+++ b/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Code/Js.php
@@ -139,7 +139,7 @@ public function getJsDeleteUrl()
/**
* Get custom js files
*
- * @return \Magento\Core\Model\Resource\Theme\File\Collection
+ * @return \Magento\Theme\Model\Resource\Theme\File\Collection
*/
public function getFiles()
{
diff --git a/app/code/Magento/DesignEditor/Block/Adminhtml/Theme/Selector/SelectorList/AbstractSelectorList.php b/app/code/Magento/DesignEditor/Block/Adminhtml/Theme/Selector/SelectorList/AbstractSelectorList.php
index 73f6c7b37fedc..5cfccf6102c29 100644
--- a/app/code/Magento/DesignEditor/Block/Adminhtml/Theme/Selector/SelectorList/AbstractSelectorList.php
+++ b/app/code/Magento/DesignEditor/Block/Adminhtml/Theme/Selector/SelectorList/AbstractSelectorList.php
@@ -9,11 +9,11 @@
/**
* Abstract theme list
*
- * @method \Magento\Core\Model\Resource\Theme\Collection getCollection()
+ * @method \Magento\Theme\Model\Resource\Theme\Collection getCollection()
* @method bool|null getIsFirstEntrance()
* @method bool|null getHasThemeAssigned()
* @method \Magento\DesignEditor\Block\Adminhtml\Theme\Selector\SelectorList\AbstractSelectorList setHasThemeAssigned(bool $flag)
- * @method \Magento\DesignEditor\Block\Adminhtml\Theme\Selector\SelectorList\AbstractSelectorList|\Magento\DesignEditor\Block\Adminhtml\Theme\Selector\SelectorList\Available setCollection(\Magento\Core\Model\Resource\Theme\Collection $collection)
+ * @method \Magento\DesignEditor\Block\Adminhtml\Theme\Selector\SelectorList\AbstractSelectorList|\Magento\DesignEditor\Block\Adminhtml\Theme\Selector\SelectorList\Available setCollection(\Magento\Theme\Model\Resource\Theme\Collection $collection)
* @method \Magento\DesignEditor\Block\Adminhtml\Theme\Selector\SelectorList\AbstractSelectorList setIsFirstEntrance(bool $flag)
*
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor.php b/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor.php
index 3f90c2a83cae3..0ce7833ef375b 100644
--- a/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor.php
+++ b/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor.php
@@ -55,7 +55,7 @@ protected function _setTitle()
* Load theme by id
*
* @param int $themeId
- * @return \Magento\Core\Model\Theme
+ * @return \Magento\Theme\Model\Theme
* @throws CoreException
*/
protected function _loadThemeById($themeId)
@@ -87,7 +87,7 @@ protected function _isAllowed()
protected function _isFirstEntrance()
{
$isCustomized = (bool)$this->_objectManager->get(
- 'Magento\Core\Model\Resource\Theme\CollectionFactory'
+ 'Magento\Theme\Model\Resource\Theme\CollectionFactory'
)->create()->addTypeFilter(
ThemeInterface::TYPE_VIRTUAL
)->getSize();
diff --git a/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/AssignThemeToStore.php b/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/AssignThemeToStore.php
index dd512bd0c91b4..452e1efbb634e 100644
--- a/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/AssignThemeToStore.php
+++ b/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/AssignThemeToStore.php
@@ -26,8 +26,8 @@ protected function _getStores()
$defaultStore = -1;
$emptyStores = -2;
if ($stores == $defaultStore) {
- /** @var \Magento\Store\Model\StoreManagerInterface $storeManager */
- $storeManager = $this->_objectManager->get('Magento\Store\Model\StoreManagerInterface');
+ /** @var \Magento\Framework\Store\StoreManagerInterface $storeManager */
+ $storeManager = $this->_objectManager->get('Magento\Framework\Store\StoreManagerInterface');
$ids = array_keys($storeManager->getStores());
$stores = [array_shift($ids)];
} elseif ($stores == $emptyStores) {
diff --git a/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Launch.php b/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Launch.php
index 192df6badb919..f387f76e08bb3 100644
--- a/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Launch.php
+++ b/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Launch.php
@@ -29,8 +29,8 @@ protected function _configureToolsBlocks($theme, $mode)
/** @var $cssTabBlock \Magento\DesignEditor\Block\Adminhtml\Editor\Tools\Code\Css */
$cssTabBlock = $this->_view->getLayout()->getBlock('design_editor_tools_code_css');
if ($cssTabBlock) {
- /** @var $helper \Magento\Core\Helper\Theme */
- $helper = $this->_objectManager->get('Magento\Core\Helper\Theme');
+ /** @var $helper \Magento\Theme\Helper\Theme */
+ $helper = $this->_objectManager->get('Magento\Theme\Helper\Theme');
$assets = $helper->getCssAssets($theme);
$cssTabBlock->setAssets($assets)
->setThemeId($theme->getId());
diff --git a/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/LoadThemeList.php b/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/LoadThemeList.php
index cddf10e44d75c..428e1ea60288c 100644
--- a/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/LoadThemeList.php
+++ b/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/LoadThemeList.php
@@ -21,14 +21,14 @@ public function execute()
$page = $this->getRequest()->getParam('page', 1);
$pageSize = $this->getRequest()->getParam(
'page_size',
- \Magento\Core\Model\Resource\Theme\Collection::DEFAULT_PAGE_SIZE
+ \Magento\Theme\Model\Resource\Theme\Collection::DEFAULT_PAGE_SIZE
);
try {
$this->_view->loadLayout();
- /** @var $collection \Magento\Core\Model\Resource\Theme\Collection */
+ /** @var $collection \Magento\Theme\Model\Resource\Theme\Collection */
$collection = $this->_objectManager->get(
- 'Magento\Core\Model\Resource\Theme\Collection'
+ 'Magento\Theme\Model\Resource\Theme\Collection'
)->filterPhysicalThemes(
$page,
$pageSize
diff --git a/app/code/Magento/DesignEditor/Controller/Varien/Router/Standard.php b/app/code/Magento/DesignEditor/Controller/Varien/Router/Standard.php
index 9fcc813836edf..5e4e7c539a0d1 100644
--- a/app/code/Magento/DesignEditor/Controller/Varien/Router/Standard.php
+++ b/app/code/Magento/DesignEditor/Controller/Varien/Router/Standard.php
@@ -47,7 +47,7 @@ class Standard extends \Magento\Core\App\Router\Base
* @param \Magento\Framework\App\ResponseFactory $responseFactory
* @param \Magento\Framework\App\Route\Config $routeConfig
* @param \Magento\Framework\UrlInterface $url
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param \Magento\Framework\Url\SecurityInfoInterface $urlSecurityInfo
* @param string $routerId
@@ -66,7 +66,7 @@ public function __construct(
\Magento\Framework\App\ResponseFactory $responseFactory,
\Magento\Framework\App\Route\Config $routeConfig,
\Magento\Framework\UrlInterface $url,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
\Magento\Framework\Url\SecurityInfoInterface $urlSecurityInfo,
$routerId,
diff --git a/app/code/Magento/DesignEditor/Model/Editor/Tools/Controls/Configuration.php b/app/code/Magento/DesignEditor/Model/Editor/Tools/Controls/Configuration.php
index cffe437ab67f1..db37c8441d6b3 100644
--- a/app/code/Magento/DesignEditor/Model/Editor/Tools/Controls/Configuration.php
+++ b/app/code/Magento/DesignEditor/Model/Editor/Tools/Controls/Configuration.php
@@ -40,12 +40,12 @@ class Configuration
protected $_filesystem;
/**
- * @var \Magento\Core\Model\Theme
+ * @var \Magento\Theme\Model\Theme
*/
protected $_theme;
/**
- * @var \Magento\Core\Model\Theme
+ * @var \Magento\Theme\Model\Theme
*/
protected $_parentTheme;
diff --git a/app/code/Magento/DesignEditor/Model/Editor/Tools/QuickStyles/ImageUploader.php b/app/code/Magento/DesignEditor/Model/Editor/Tools/QuickStyles/ImageUploader.php
index 39d04ef8b1a44..c0352bdce60df 100644
--- a/app/code/Magento/DesignEditor/Model/Editor/Tools/QuickStyles/ImageUploader.php
+++ b/app/code/Magento/DesignEditor/Model/Editor/Tools/QuickStyles/ImageUploader.php
@@ -88,7 +88,7 @@ public function setStoragePath($path)
/**
* Get theme
*
- * @return \Magento\Core\Model\Theme
+ * @return \Magento\Theme\Model\Theme
* @throws \InvalidArgumentException
*/
protected function _getTheme()
diff --git a/app/code/Magento/DesignEditor/Model/Observer.php b/app/code/Magento/DesignEditor/Model/Observer.php
index 846f7992e8c0b..6d13c46a95ad6 100644
--- a/app/code/Magento/DesignEditor/Model/Observer.php
+++ b/app/code/Magento/DesignEditor/Model/Observer.php
@@ -114,7 +114,7 @@ public function saveQuickStyles($event)
*/
public function saveChangeTime($event)
{
- /** @var $theme \Magento\Core\Model\Theme|null */
+ /** @var $theme \Magento\Theme\Model\Theme|null */
$theme = $event->getTheme() ?: $event->getDataObject()->getTheme();
/** @var $change \Magento\DesignEditor\Model\Theme\Change */
$change = $this->objectManager->create('Magento\DesignEditor\Model\Theme\Change');
diff --git a/app/code/Magento/DesignEditor/Model/State.php b/app/code/Magento/DesignEditor/Model/State.php
index 95b2d11ccbab8..99ee39bab1922 100644
--- a/app/code/Magento/DesignEditor/Model/State.php
+++ b/app/code/Magento/DesignEditor/Model/State.php
@@ -7,6 +7,7 @@
/**
* Design editor state model
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class State
{
@@ -185,7 +186,7 @@ protected function _setTheme()
$this->_mutableConfig->setValue(
\Magento\Framework\View\DesignInterface::XML_PATH_THEME_ID,
$themeId,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
$this->_configuration->setValue(\Magento\Framework\View\DesignInterface::XML_PATH_THEME_ID, $themeId);
}
diff --git a/app/code/Magento/DesignEditor/Model/Theme/Context.php b/app/code/Magento/DesignEditor/Model/Theme/Context.php
index 728fda5d2bdb7..faa8b87c602d0 100644
--- a/app/code/Magento/DesignEditor/Model/Theme/Context.php
+++ b/app/code/Magento/DesignEditor/Model/Theme/Context.php
@@ -13,7 +13,7 @@
class Context
{
/**
- * @var \Magento\Core\Model\ThemeFactory
+ * @var \Magento\Theme\Model\ThemeFactory
*/
protected $_themeFactory;
@@ -23,23 +23,23 @@ class Context
protected $_copyService;
/**
- * @var \Magento\Core\Model\Theme
+ * @var \Magento\Theme\Model\Theme
*/
protected $_theme;
/**
- * @var \Magento\Core\Model\Theme
+ * @var \Magento\Theme\Model\Theme
*/
protected $_stagingTheme;
/**
* Initialize dependencies
*
- * @param \Magento\Core\Model\ThemeFactory $themeFactory
+ * @param \Magento\Theme\Model\ThemeFactory $themeFactory
* @param \Magento\Theme\Model\CopyService $copyService
*/
public function __construct(
- \Magento\Core\Model\ThemeFactory $themeFactory,
+ \Magento\Theme\Model\ThemeFactory $themeFactory,
\Magento\Theme\Model\CopyService $copyService
) {
$this->_themeFactory = $themeFactory;
@@ -79,7 +79,7 @@ public function setEditableThemeById($themeId)
/**
* Get current editable theme
*
- * @return \Magento\Core\Model\Theme
+ * @return \Magento\Theme\Model\Theme
* @throws CoreException
*/
public function getEditableTheme()
@@ -93,7 +93,7 @@ public function getEditableTheme()
/**
* Get staging theme
*
- * @return \Magento\Core\Model\Theme
+ * @return \Magento\Theme\Model\Theme
* @throws CoreException
*/
public function getStagingTheme()
@@ -113,7 +113,7 @@ public function getStagingTheme()
/**
* Theme which can be rendered on store designer
*
- * @return \Magento\Core\Model\Theme
+ * @return \Magento\Theme\Model\Theme
*/
public function getVisibleTheme()
{
diff --git a/app/code/Magento/DesignEditor/etc/di.xml b/app/code/Magento/DesignEditor/etc/di.xml
index 3b3824539d759..8653a423d851d 100644
--- a/app/code/Magento/DesignEditor/etc/di.xml
+++ b/app/code/Magento/DesignEditor/etc/di.xml
@@ -37,7 +37,7 @@
- Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ Magento\Framework\Store\ScopeInterface::SCOPE_STORE
diff --git a/app/code/Magento/DesignEditor/sql/designeditor_setup/install-2.0.0.php b/app/code/Magento/DesignEditor/sql/designeditor_setup/install-2.0.0.php
index 704a50c2cd8ce..bba9b808815da 100644
--- a/app/code/Magento/DesignEditor/sql/designeditor_setup/install-2.0.0.php
+++ b/app/code/Magento/DesignEditor/sql/designeditor_setup/install-2.0.0.php
@@ -34,9 +34,9 @@
['nullable' => false],
'Change Time'
)->addForeignKey(
- $installer->getFkName('vde_theme_change', 'theme_id', 'core_theme', 'theme_id'),
+ $installer->getFkName('vde_theme_change', 'theme_id', 'theme', 'theme_id'),
'theme_id',
- $installer->getTable('core_theme'),
+ $installer->getTable('theme'),
'theme_id',
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
diff --git a/app/code/Magento/Core/Model/TemplateEngine/Decorator/DebugHints.php b/app/code/Magento/Developer/Model/TemplateEngine/Decorator/DebugHints.php
similarity index 97%
rename from app/code/Magento/Core/Model/TemplateEngine/Decorator/DebugHints.php
rename to app/code/Magento/Developer/Model/TemplateEngine/Decorator/DebugHints.php
index d08a2b358f493..6f8579a0ac8d0 100644
--- a/app/code/Magento/Core/Model/TemplateEngine/Decorator/DebugHints.php
+++ b/app/code/Magento/Developer/Model/TemplateEngine/Decorator/DebugHints.php
@@ -8,7 +8,7 @@
// @codingStandardsIgnoreFile
-namespace Magento\Core\Model\TemplateEngine\Decorator;
+namespace Magento\Developer\Model\TemplateEngine\Decorator;
class DebugHints implements \Magento\Framework\View\TemplateEngineInterface
{
diff --git a/app/code/Magento/Core/Model/TemplateEngine/Plugin/DebugHints.php b/app/code/Magento/Developer/Model/TemplateEngine/Plugin/DebugHints.php
similarity index 87%
rename from app/code/Magento/Core/Model/TemplateEngine/Plugin/DebugHints.php
rename to app/code/Magento/Developer/Model/TemplateEngine/Plugin/DebugHints.php
index ee3a7e22f96c8..61683433a3eba 100644
--- a/app/code/Magento/Core/Model/TemplateEngine/Plugin/DebugHints.php
+++ b/app/code/Magento/Developer/Model/TemplateEngine/Plugin/DebugHints.php
@@ -8,7 +8,7 @@
// @codingStandardsIgnoreFile
-namespace Magento\Core\Model\TemplateEngine\Plugin;
+namespace Magento\Developer\Model\TemplateEngine\Plugin;
class DebugHints
{
@@ -64,10 +64,10 @@ public function afterCreate(
\Magento\Framework\View\TemplateEngineFactory $subject,
\Magento\Framework\View\TemplateEngineInterface $invocationResult
) {
- if ($this->_scopeConfig->getValue(self::XML_PATH_DEBUG_TEMPLATE_HINTS, \Magento\Store\Model\ScopeInterface::SCOPE_STORE) && $this->_coreData->isDevAllowed()) {
- $showBlockHints = $this->_scopeConfig->getValue(self::XML_PATH_DEBUG_TEMPLATE_HINTS_BLOCKS, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+ if ($this->_scopeConfig->getValue(self::XML_PATH_DEBUG_TEMPLATE_HINTS, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE) && $this->_coreData->isDevAllowed()) {
+ $showBlockHints = $this->_scopeConfig->getValue(self::XML_PATH_DEBUG_TEMPLATE_HINTS_BLOCKS, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
return $this->_objectManager->create(
- 'Magento\Core\Model\TemplateEngine\Decorator\DebugHints',
+ 'Magento\Developer\Model\TemplateEngine\Decorator\DebugHints',
['subject' => $invocationResult, 'showBlockHints' => $showBlockHints]
);
}
diff --git a/app/code/Magento/Developer/README.md b/app/code/Magento/Developer/README.md
new file mode 100644
index 0000000000000..c3bd8e9983561
--- /dev/null
+++ b/app/code/Magento/Developer/README.md
@@ -0,0 +1 @@
+The Magento_Developer module provides functionality to make it easier to develop in Magento 2.
diff --git a/app/code/Magento/Developer/composer.json b/app/code/Magento/Developer/composer.json
new file mode 100644
index 0000000000000..617d77eeac8a9
--- /dev/null
+++ b/app/code/Magento/Developer/composer.json
@@ -0,0 +1,24 @@
+{
+ "name": "magento/module-developer",
+ "description": "N/A",
+ "require": {
+ "php": "~5.4.11|~5.5.0|~5.6.0",
+ "magento/module-core": "0.42.0-beta5",
+ "magento/framework": "0.42.0-beta5",
+ "magento/magento-composer-installer": "*"
+ },
+ "type": "magento2-module",
+ "version": "0.42.0-beta5",
+ "license": [
+ "OSL-3.0",
+ "AFL-3.0"
+ ],
+ "extra": {
+ "map": [
+ [
+ "*",
+ "Magento/Developer"
+ ]
+ ]
+ }
+}
diff --git a/app/code/Magento/Developer/etc/di.xml b/app/code/Magento/Developer/etc/di.xml
new file mode 100644
index 0000000000000..0d2e9d804dab4
--- /dev/null
+++ b/app/code/Magento/Developer/etc/di.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+ - Magento\Framework\View\TemplateEngine\Php
+
+
+
+
diff --git a/app/code/Magento/Developer/etc/module.xml b/app/code/Magento/Developer/etc/module.xml
new file mode 100644
index 0000000000000..3b154ec40b46f
--- /dev/null
+++ b/app/code/Magento/Developer/etc/module.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Dhl/Model/Carrier.php b/app/code/Magento/Dhl/Model/Carrier.php
index 6b82978549bf8..03e53d36c5449 100644
--- a/app/code/Magento/Dhl/Model/Carrier.php
+++ b/app/code/Magento/Dhl/Model/Carrier.php
@@ -157,7 +157,7 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
protected $_coreDate;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -205,7 +205,7 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
* @param \Magento\Shipping\Helper\Carrier $carrierHelper
* @param \Magento\Framework\Stdlib\DateTime\DateTime $coreDate
* @param \Magento\Framework\Module\Dir\Reader $configReader
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\Stdlib\String $string
* @param \Magento\Framework\Math\Division $mathDivision
* @param \Magento\Framework\Filesystem $filesystem
@@ -233,7 +233,7 @@ public function __construct(
\Magento\Shipping\Helper\Carrier $carrierHelper,
\Magento\Framework\Stdlib\DateTime\DateTime $coreDate,
\Magento\Framework\Module\Dir\Reader $configReader,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\Stdlib\String $string,
\Magento\Framework\Math\Division $mathDivision,
\Magento\Framework\Filesystem $filesystem,
@@ -284,7 +284,7 @@ protected function _getDefaultValue($origValue, $pathToValue)
if (!$origValue) {
$origValue = $this->_scopeConfig->getValue(
$pathToValue,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$this->getStore()
);
}
@@ -422,7 +422,7 @@ public function setRequest(\Magento\Framework\Object $request)
->setOrigEmail(
$this->_scopeConfig->getValue(
'trans_email/ident_general/email',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$requestObject->getStoreId()
)
)
@@ -435,7 +435,7 @@ public function setRequest(\Magento\Framework\Object $request)
$originStreet2 = $this->_scopeConfig->getValue(
Shipment::XML_PATH_STORE_ADDRESS2,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$requestObject->getStoreId()
);
@@ -1265,7 +1265,7 @@ public function proccessAdditionalValidation(RateRequest $request)
$countryParams = $this->getCountryParams(
$this->_scopeConfig->getValue(
Shipment::XML_PATH_STORE_COUNTRY_ID,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$request->getStoreId()
)
);
@@ -1388,7 +1388,7 @@ protected function _doRequest()
$originRegion = $this->getCountryParams(
$this->_scopeConfig->getValue(
Shipment::XML_PATH_STORE_COUNTRY_ID,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$this->getStore()
)
)->getRegion();
diff --git a/app/code/Magento/Dhl/Model/Plugin/Checkout/Block/Cart/Shipping.php b/app/code/Magento/Dhl/Model/Plugin/Checkout/Block/Cart/Shipping.php
index 43ed90ffedcdc..0f66031a62e79 100644
--- a/app/code/Magento/Dhl/Model/Plugin/Checkout/Block/Cart/Shipping.php
+++ b/app/code/Magento/Dhl/Model/Plugin/Checkout/Block/Cart/Shipping.php
@@ -34,7 +34,7 @@ public function __construct(\Magento\Framework\App\Config\ScopeConfigInterface $
*/
public function afterGetStateActive(\Magento\Checkout\Block\Cart\Shipping $subject, $result)
{
- return (bool)$result || (bool)$this->_scopeConfig->getValue('carriers/dhl/active', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+ return (bool)$result || (bool)$this->_scopeConfig->getValue('carriers/dhl/active', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
}
/**
@@ -45,6 +45,6 @@ public function afterGetStateActive(\Magento\Checkout\Block\Cart\Shipping $subje
*/
public function afterGetCityActive(\Magento\Checkout\Block\Cart\Shipping $subject, $result)
{
- return (bool)$result || (bool)$this->_scopeConfig->getValue('carriers/dhl/active', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+ return (bool)$result || (bool)$this->_scopeConfig->getValue('carriers/dhl/active', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
}
}
diff --git a/app/code/Magento/Directory/Block/Adminhtml/Frontend/Currency/Base.php b/app/code/Magento/Directory/Block/Adminhtml/Frontend/Currency/Base.php
index c99cba86d9e1f..1f67df4a13055 100644
--- a/app/code/Magento/Directory/Block/Adminhtml/Frontend/Currency/Base.php
+++ b/app/code/Magento/Directory/Block/Adminhtml/Frontend/Currency/Base.php
@@ -20,7 +20,7 @@ public function render(\Magento\Framework\Data\Form\Element\AbstractElement $ele
if ($this->getRequest()->getParam('website') != '') {
$priceScope = $this->_scopeConfig->getValue(
\Magento\Store\Model\Store::XML_PATH_PRICE_SCOPE,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
if ($priceScope == \Magento\Store\Model\Store::PRICE_SCOPE_GLOBAL) {
return '';
diff --git a/app/code/Magento/Directory/Controller/Currency/SwitchAction.php b/app/code/Magento/Directory/Controller/Currency/SwitchAction.php
index b8aada56cf7fd..8162705c6e791 100644
--- a/app/code/Magento/Directory/Controller/Currency/SwitchAction.php
+++ b/app/code/Magento/Directory/Controller/Currency/SwitchAction.php
@@ -13,8 +13,8 @@ class SwitchAction extends \Magento\Framework\App\Action\Action
*/
public function execute()
{
- /** @var \Magento\Store\Model\StoreManagerInterface $storeManager */
- $storeManager = $this->_objectManager->get('Magento\Store\Model\StoreManagerInterface');
+ /** @var \Magento\Framework\Store\StoreManagerInterface $storeManager */
+ $storeManager = $this->_objectManager->get('Magento\Framework\Store\StoreManagerInterface');
$currency = (string)$this->getRequest()->getParam('currency');
if ($currency) {
$storeManager->getStore()->setCurrentCurrencyCode($currency);
diff --git a/app/code/Magento/Directory/Helper/Data.php b/app/code/Magento/Directory/Helper/Data.php
index 9f9f9977bef05..40b4f42406c0c 100644
--- a/app/code/Magento/Directory/Helper/Data.php
+++ b/app/code/Magento/Directory/Helper/Data.php
@@ -77,7 +77,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
protected $_coreHelper;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -97,7 +97,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
* @param \Magento\Directory\Model\Resource\Country\Collection $countryCollection
* @param \Magento\Directory\Model\Resource\Region\CollectionFactory $regCollectionFactory,
* @param \Magento\Core\Helper\Data $coreHelper
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
* @param \Magento\Framework\App\Config\ScopeConfigInterface $config
*/
@@ -107,7 +107,7 @@ public function __construct(
\Magento\Directory\Model\Resource\Country\Collection $countryCollection,
\Magento\Directory\Model\Resource\Region\CollectionFactory $regCollectionFactory,
\Magento\Core\Helper\Data $coreHelper,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Directory\Model\CurrencyFactory $currencyFactory,
\Magento\Framework\App\Config\ScopeConfigInterface $config
) {
@@ -228,7 +228,7 @@ public function getCountriesWithOptionalZip($asJson = false)
$value = trim(
$this->_config->getValue(
self::OPTIONAL_ZIP_COUNTRIES_CONFIG_PATH,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)
);
$this->_optZipCountries = preg_split('/\,/', $value, 0, PREG_SPLIT_NO_EMPTY);
@@ -260,7 +260,10 @@ public function isZipCodeOptional($countryCode)
public function getCountriesWithStatesRequired($asJson = false)
{
$value = trim(
- $this->_config->getValue(self::XML_PATH_STATES_REQUIRED, \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
+ $this->_config->getValue(
+ self::XML_PATH_STATES_REQUIRED,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ )
);
$countryList = preg_split('/\,/', $value, 0, PREG_SPLIT_NO_EMPTY);
if ($asJson) {
@@ -278,7 +281,7 @@ public function isShowNonRequiredState()
{
return (bool)$this->_config->getValue(
self::XML_PATH_DISPLAY_ALL_STATES,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
}
diff --git a/app/code/Magento/Directory/Model/Currency.php b/app/code/Magento/Directory/Model/Currency.php
index 3b5ec26325abc..129d1f976761e 100644
--- a/app/code/Magento/Directory/Model/Currency.php
+++ b/app/code/Magento/Directory/Model/Currency.php
@@ -46,7 +46,7 @@ class Currency extends \Magento\Framework\Model\AbstractModel
protected $_localeFormat;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -69,7 +69,7 @@ class Currency extends \Magento\Framework\Model\AbstractModel
* @param \Magento\Framework\Model\Context $context
* @param \Magento\Framework\Registry $registry
* @param \Magento\Framework\Locale\FormatInterface $localeFormat
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Directory\Helper\Data $directoryHelper
* @param Currency\FilterFactory $currencyFilterFactory
* @param \Magento\Framework\Locale\CurrencyInterface $localeCurrency
@@ -82,7 +82,7 @@ public function __construct(
\Magento\Framework\Model\Context $context,
\Magento\Framework\Registry $registry,
\Magento\Framework\Locale\FormatInterface $localeFormat,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Directory\Helper\Data $directoryHelper,
\Magento\Directory\Model\Currency\FilterFactory $currencyFilterFactory,
\Magento\Framework\Locale\CurrencyInterface $localeCurrency,
diff --git a/app/code/Magento/Directory/Model/Currency/DefaultLocator.php b/app/code/Magento/Directory/Model/Currency/DefaultLocator.php
index d9ccfa0b263b5..29fe6747dbbed 100644
--- a/app/code/Magento/Directory/Model/Currency/DefaultLocator.php
+++ b/app/code/Magento/Directory/Model/Currency/DefaultLocator.php
@@ -17,17 +17,17 @@ class DefaultLocator
/**
* Store manager
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
/**
* @param \Magento\Framework\App\Config\ScopeConfigInterface $configuration
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
*/
public function __construct(
\Magento\Framework\App\Config\ScopeConfigInterface $configuration,
- \Magento\Store\Model\StoreManagerInterface $storeManager
+ \Magento\Framework\Store\StoreManagerInterface $storeManager
) {
$this->_configuration = $configuration;
$this->_storeManager = $storeManager;
diff --git a/app/code/Magento/Directory/Model/Currency/Filter.php b/app/code/Magento/Directory/Model/Currency/Filter.php
index b15eee9c3aa35..7670fac88b029 100644
--- a/app/code/Magento/Directory/Model/Currency/Filter.php
+++ b/app/code/Magento/Directory/Model/Currency/Filter.php
@@ -33,7 +33,7 @@ class Filter implements \Zend_Filter_Interface
protected $_localeFormat;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -51,7 +51,7 @@ class Filter implements \Zend_Filter_Interface
/**
* @param \Magento\Framework\Locale\FormatInterface $localeFormat
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\Locale\CurrencyInterface $localeCurrency
* @param PriceCurrencyInterface $priceCurrency
* @param string $code
@@ -59,7 +59,7 @@ class Filter implements \Zend_Filter_Interface
*/
public function __construct(
\Magento\Framework\Locale\FormatInterface $localeFormat,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\Locale\CurrencyInterface $localeCurrency,
PriceCurrencyInterface $priceCurrency,
$code,
diff --git a/app/code/Magento/Directory/Model/Currency/Import/Webservicex.php b/app/code/Magento/Directory/Model/Currency/Import/Webservicex.php
index 9068c4429d792..5fd5e279bbe63 100644
--- a/app/code/Magento/Directory/Model/Currency/Import/Webservicex.php
+++ b/app/code/Magento/Directory/Model/Currency/Import/Webservicex.php
@@ -63,7 +63,7 @@ protected function _convert($currencyFrom, $currencyTo, $retry = 0)
[
'timeout' => $this->_scopeConfig->getValue(
'currency/webservicex/timeout',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
),
]
)->request(
diff --git a/app/code/Magento/Directory/Model/Observer.php b/app/code/Magento/Directory/Model/Observer.php
index 23d0b5c52f010..c1892ec452505 100644
--- a/app/code/Magento/Directory/Model/Observer.php
+++ b/app/code/Magento/Directory/Model/Observer.php
@@ -43,7 +43,7 @@ class Observer
protected $_transportBuilder;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -61,7 +61,7 @@ class Observer
* @param \Magento\Directory\Model\Currency\Import\Factory $importFactory
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param \Magento\Framework\Mail\Template\TransportBuilder $transportBuilder
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
* @param \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation
*/
@@ -69,7 +69,7 @@ public function __construct(
\Magento\Directory\Model\Currency\Import\Factory $importFactory,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
\Magento\Framework\Mail\Template\TransportBuilder $transportBuilder,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Directory\Model\CurrencyFactory $currencyFactory,
\Magento\Framework\Translate\Inline\StateInterface $inlineTranslation
) {
@@ -91,10 +91,10 @@ public function scheduledUpdateCurrencyRates($schedule)
$importWarnings = [];
if (!$this->_scopeConfig->getValue(
self::IMPORT_ENABLE,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
) || !$this->_scopeConfig->getValue(
self::CRON_STRING_PATH,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)
) {
return;
@@ -104,7 +104,7 @@ public function scheduledUpdateCurrencyRates($schedule)
$rates = [];
$service = $this->_scopeConfig->getValue(
self::IMPORT_SERVICE,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
if ($service) {
try {
@@ -132,7 +132,7 @@ public function scheduledUpdateCurrencyRates($schedule)
$this->_transportBuilder->setTemplateIdentifier(
$this->_scopeConfig->getValue(
self::XML_PATH_ERROR_TEMPLATE,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)
)->setTemplateOptions(
[
@@ -144,12 +144,12 @@ public function scheduledUpdateCurrencyRates($schedule)
)->setFrom(
$this->_scopeConfig->getValue(
self::XML_PATH_ERROR_IDENTITY,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)
)->addTo(
$this->_scopeConfig->getValue(
self::XML_PATH_ERROR_RECIPIENT,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)
);
$transport = $this->_transportBuilder->getTransport();
diff --git a/app/code/Magento/Directory/Model/PriceCurrency.php b/app/code/Magento/Directory/Model/PriceCurrency.php
index 8232d9220b412..967634c6ada66 100644
--- a/app/code/Magento/Directory/Model/PriceCurrency.php
+++ b/app/code/Magento/Directory/Model/PriceCurrency.php
@@ -6,7 +6,7 @@
namespace Magento\Directory\Model;
use Magento\Framework\App\ScopeInterface;
-use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\Store\StoreManagerInterface;
use Psr\Log\LoggerInterface as Logger;
use Magento\Store\Model\Store;
@@ -16,7 +16,7 @@
class PriceCurrency implements \Magento\Framework\Pricing\PriceCurrencyInterface
{
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $storeManager;
@@ -31,7 +31,7 @@ class PriceCurrency implements \Magento\Framework\Pricing\PriceCurrencyInterface
protected $logger;
/**
- * @param StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param CurrencyFactory $currencyFactory
* @param Logger $logger
*/
diff --git a/app/code/Magento/Directory/Model/Resource/Country/Collection.php b/app/code/Magento/Directory/Model/Resource/Country/Collection.php
index 2c188154998a6..acafaa8ff1318 100644
--- a/app/code/Magento/Directory/Model/Resource/Country/Collection.php
+++ b/app/code/Magento/Directory/Model/Resource/Country/Collection.php
@@ -45,7 +45,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
protected $_localeResolver;
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -59,7 +59,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
@@ -104,7 +104,7 @@ protected function _construct()
*/
public function loadByStore($store = null)
{
- $allowCountries = explode(',', (string)$this->_scopeConfig->getValue('general/country/allow', \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store));
+ $allowCountries = explode(',', (string)$this->_scopeConfig->getValue('general/country/allow', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store));
if (!empty($allowCountries)) {
$this->addFieldToFilter("country_id", ['in' => $allowCountries]);
}
diff --git a/app/code/Magento/Directory/Model/Resource/Region/Collection.php b/app/code/Magento/Directory/Model/Resource/Region/Collection.php
index 574ea6fbb463d..7fdb61efb5c16 100644
--- a/app/code/Magento/Directory/Model/Resource/Region/Collection.php
+++ b/app/code/Magento/Directory/Model/Resource/Region/Collection.php
@@ -31,7 +31,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
protected $_localeResolver;
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -40,7 +40,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
* @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
diff --git a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
index 50cdaebedacbc..a6e1757d635ce 100644
--- a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
+++ b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
@@ -209,7 +209,7 @@ public function getLinksTitle()
$this->getProduct()->getTypeId() ==
'downloadable' ? $this->getProduct()->getLinksTitle() : $this->_scopeConfig->getValue(
\Magento\Downloadable\Model\Link::XML_PATH_LINKS_TITLE,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
}
@@ -234,7 +234,7 @@ public function getIsPriceWebsiteScope()
{
$scope = (int)$this->_scopeConfig->getValue(
\Magento\Store\Model\Store::XML_PATH_PRICE_SCOPE,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
if ($scope == \Magento\Store\Model\Store::PRICE_SCOPE_WEBSITE) {
return true;
@@ -355,7 +355,7 @@ public function getConfigMaxDownloads()
{
return $this->_scopeConfig->getValue(
\Magento\Downloadable\Model\Link::XML_PATH_DEFAULT_DOWNLOADS_NUMBER,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
}
diff --git a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php
index 8725016bcd3eb..5ae2d6cf91ee3 100644
--- a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php
+++ b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php
@@ -207,7 +207,7 @@ public function getSamplesTitle()
&& $this->getProduct()->getTypeId() == 'downloadable' ? $this->getProduct()->getSamplesTitle() :
$this->_scopeConfig->getValue(
\Magento\Downloadable\Model\Sample::XML_PATH_SAMPLES_TITLE,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
}
diff --git a/app/code/Magento/Downloadable/Block/Adminhtml/Sales/Items/Column/Downloadable/Name.php b/app/code/Magento/Downloadable/Block/Adminhtml/Sales/Items/Column/Downloadable/Name.php
index f2724cdfbd8c6..6e0e1921643db 100644
--- a/app/code/Magento/Downloadable/Block/Adminhtml/Sales/Items/Column/Downloadable/Name.php
+++ b/app/code/Magento/Downloadable/Block/Adminhtml/Sales/Items/Column/Downloadable/Name.php
@@ -77,6 +77,6 @@ public function getLinksTitle()
if ($this->_purchased && $this->_purchased->getLinkSectionTitle()) {
return $this->_purchased->getLinkSectionTitle();
}
- return $this->_scopeConfig->getValue(\Magento\Downloadable\Model\Link::XML_PATH_LINKS_TITLE, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+ return $this->_scopeConfig->getValue(\Magento\Downloadable\Model\Link::XML_PATH_LINKS_TITLE, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
}
}
diff --git a/app/code/Magento/Downloadable/Block/Catalog/Product/Links.php b/app/code/Magento/Downloadable/Block/Catalog/Product/Links.php
index 544d9c091faf6..f380a109c61d9 100644
--- a/app/code/Magento/Downloadable/Block/Catalog/Product/Links.php
+++ b/app/code/Magento/Downloadable/Block/Catalog/Product/Links.php
@@ -131,7 +131,7 @@ public function getLinksTitle()
}
return $this->_scopeConfig->getValue(
\Magento\Downloadable\Model\Link::XML_PATH_LINKS_TITLE,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
}
@@ -145,7 +145,7 @@ public function getIsOpenInNewWindow()
{
return $this->_scopeConfig->isSetFlag(
\Magento\Downloadable\Model\Link::XML_PATH_TARGET_NEW_WINDOW,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
}
diff --git a/app/code/Magento/Downloadable/Block/Catalog/Product/Samples.php b/app/code/Magento/Downloadable/Block/Catalog/Product/Samples.php
index 179b2816b92e3..c0403fbaf81a7 100644
--- a/app/code/Magento/Downloadable/Block/Catalog/Product/Samples.php
+++ b/app/code/Magento/Downloadable/Block/Catalog/Product/Samples.php
@@ -56,7 +56,7 @@ public function getSamplesTitle()
if ($this->getProduct()->getSamplesTitle()) {
return $this->getProduct()->getSamplesTitle();
}
- return $this->_scopeConfig->getValue(\Magento\Downloadable\Model\Sample::XML_PATH_SAMPLES_TITLE, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+ return $this->_scopeConfig->getValue(\Magento\Downloadable\Model\Sample::XML_PATH_SAMPLES_TITLE, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
}
/**
@@ -67,6 +67,6 @@ public function getSamplesTitle()
*/
public function getIsOpenInNewWindow()
{
- return $this->_scopeConfig->isSetFlag(\Magento\Downloadable\Model\Link::XML_PATH_TARGET_NEW_WINDOW, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+ return $this->_scopeConfig->isSetFlag(\Magento\Downloadable\Model\Link::XML_PATH_TARGET_NEW_WINDOW, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
}
}
diff --git a/app/code/Magento/Downloadable/Block/Customer/Products/ListProducts.php b/app/code/Magento/Downloadable/Block/Customer/Products/ListProducts.php
index 66356a4b33bdc..b92deacb7a951 100644
--- a/app/code/Magento/Downloadable/Block/Customer/Products/ListProducts.php
+++ b/app/code/Magento/Downloadable/Block/Customer/Products/ListProducts.php
@@ -166,6 +166,6 @@ public function getDownloadUrl($item)
*/
public function getIsOpenInNewWindow()
{
- return $this->_scopeConfig->isSetFlag(\Magento\Downloadable\Model\Link::XML_PATH_TARGET_NEW_WINDOW, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+ return $this->_scopeConfig->isSetFlag(\Magento\Downloadable\Model\Link::XML_PATH_TARGET_NEW_WINDOW, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
}
}
diff --git a/app/code/Magento/Downloadable/Block/Sales/Order/Email/Items/Downloadable.php b/app/code/Magento/Downloadable/Block/Sales/Order/Email/Items/Downloadable.php
index 80c7998839e1f..dfceb5f25c04f 100644
--- a/app/code/Magento/Downloadable/Block/Sales/Order/Email/Items/Downloadable.php
+++ b/app/code/Magento/Downloadable/Block/Sales/Order/Email/Items/Downloadable.php
@@ -83,7 +83,7 @@ public function getLinksTitle()
if ($this->_purchased->getLinkSectionTitle()) {
return $this->_purchased->getLinkSectionTitle();
}
- return $this->_scopeConfig->getValue(\Magento\Downloadable\Model\Link::XML_PATH_LINKS_TITLE, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+ return $this->_scopeConfig->getValue(\Magento\Downloadable\Model\Link::XML_PATH_LINKS_TITLE, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
}
/**
diff --git a/app/code/Magento/Downloadable/Block/Sales/Order/Email/Items/Order/Downloadable.php b/app/code/Magento/Downloadable/Block/Sales/Order/Email/Items/Order/Downloadable.php
index 2def86d9c63e0..617cb173de3e3 100644
--- a/app/code/Magento/Downloadable/Block/Sales/Order/Email/Items/Order/Downloadable.php
+++ b/app/code/Magento/Downloadable/Block/Sales/Order/Email/Items/Order/Downloadable.php
@@ -74,7 +74,7 @@ public function getLinksTitle()
if ($this->_purchased->getLinkSectionTitle()) {
return $this->_purchased->getLinkSectionTitle();
}
- return $this->_scopeConfig->getValue(\Magento\Downloadable\Model\Link::XML_PATH_LINKS_TITLE, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+ return $this->_scopeConfig->getValue(\Magento\Downloadable\Model\Link::XML_PATH_LINKS_TITLE, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
}
/**
diff --git a/app/code/Magento/Downloadable/Block/Sales/Order/Item/Renderer/Downloadable.php b/app/code/Magento/Downloadable/Block/Sales/Order/Item/Renderer/Downloadable.php
index 7176465cae443..cea241327648f 100644
--- a/app/code/Magento/Downloadable/Block/Sales/Order/Item/Renderer/Downloadable.php
+++ b/app/code/Magento/Downloadable/Block/Sales/Order/Item/Renderer/Downloadable.php
@@ -77,6 +77,6 @@ public function getLinksTitle()
if ($this->_purchasedLinks->getLinkSectionTitle()) {
return $this->_purchasedLinks->getLinkSectionTitle();
}
- return $this->_scopeConfig->getValue(\Magento\Downloadable\Model\Link::XML_PATH_LINKS_TITLE, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+ return $this->_scopeConfig->getValue(\Magento\Downloadable\Model\Link::XML_PATH_LINKS_TITLE, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
}
}
diff --git a/app/code/Magento/Downloadable/Helper/Catalog/Product/Configuration.php b/app/code/Magento/Downloadable/Helper/Catalog/Product/Configuration.php
index 8d4df3c04791a..2beaed9036c40 100644
--- a/app/code/Magento/Downloadable/Helper/Catalog/Product/Configuration.php
+++ b/app/code/Magento/Downloadable/Helper/Catalog/Product/Configuration.php
@@ -79,7 +79,7 @@ public function getLinksTitle($product)
if (strlen($title)) {
return $title;
}
- return $this->_scopeConfig->getValue(\Magento\Downloadable\Model\Link::XML_PATH_LINKS_TITLE, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+ return $this->_scopeConfig->getValue(\Magento\Downloadable\Model\Link::XML_PATH_LINKS_TITLE, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
}
/**
diff --git a/app/code/Magento/Downloadable/Helper/Data.php b/app/code/Magento/Downloadable/Helper/Data.php
index faab224de0f9e..cbb96e9d4fb1e 100644
--- a/app/code/Magento/Downloadable/Helper/Data.php
+++ b/app/code/Magento/Downloadable/Helper/Data.php
@@ -51,7 +51,7 @@ public function getIsShareable($link)
case \Magento\Downloadable\Model\Link::LINK_SHAREABLE_CONFIG:
$shareable = (bool)$this->_scopeConfig->isSetFlag(
\Magento\Downloadable\Model\Link::XML_PATH_CONFIG_IS_SHAREABLE,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
}
return $shareable;
diff --git a/app/code/Magento/Downloadable/Helper/Download.php b/app/code/Magento/Downloadable/Helper/Download.php
index 4351cf3dccbf5..ed7200dff8e70 100644
--- a/app/code/Magento/Downloadable/Helper/Download.php
+++ b/app/code/Magento/Downloadable/Helper/Download.php
@@ -302,6 +302,6 @@ public function output()
*/
public function getContentDisposition($store = null)
{
- return $this->_scopeConfig->getValue(self::XML_PATH_CONTENT_DISPOSITION, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
+ return $this->_scopeConfig->getValue(self::XML_PATH_CONTENT_DISPOSITION, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store);
}
}
diff --git a/app/code/Magento/Downloadable/Model/Observer.php b/app/code/Magento/Downloadable/Model/Observer.php
index 87fce9c49a4dd..080630fc984fd 100644
--- a/app/code/Magento/Downloadable/Model/Observer.php
+++ b/app/code/Magento/Downloadable/Model/Observer.php
@@ -5,7 +5,7 @@
*/
namespace Magento\Downloadable\Model;
-use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\Store\ScopeInterface;
/**
* Downloadable Products Observer
@@ -158,7 +158,7 @@ public function saveDownloadableOrderItem($observer)
->_scopeConfig
->getValue(
\Magento\Downloadable\Model\Link::XML_PATH_LINKS_TITLE,
- ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
$linkPurchased->setLinkSectionTitle($linkSectionTitle)->save();
foreach ($linkIds as $linkId) {
@@ -258,7 +258,7 @@ public function setLinkStatus($observer)
$downloadableItemsStatuses = [];
$orderItemStatusToEnable = $this->_scopeConfig->getValue(
\Magento\Downloadable\Model\Link\Purchased\Item::XML_PATH_ORDER_ITEM_STATUS,
- ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$order->getStoreId()
);
@@ -351,7 +351,7 @@ public function isAllowedGuestCheckout(\Magento\Framework\Event\Observer $observ
if (!$this->_scopeConfig->isSetFlag(
self::XML_PATH_DISABLE_GUEST_CHECKOUT,
- ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
)) {
return $this;
diff --git a/app/code/Magento/Downloadable/Model/Resource/Link.php b/app/code/Magento/Downloadable/Model/Resource/Link.php
index 758401cb4b2e7..1b9da79852e18 100644
--- a/app/code/Magento/Downloadable/Model/Resource/Link.php
+++ b/app/code/Magento/Downloadable/Model/Resource/Link.php
@@ -30,7 +30,7 @@ class Link extends \Magento\Framework\Model\Resource\Db\AbstractDb
protected $_currencyFactory;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -39,14 +39,14 @@ class Link extends \Magento\Framework\Model\Resource\Db\AbstractDb
* @param \Magento\Catalog\Helper\Data $catalogData
* @param \Magento\Framework\App\Config\ScopeConfigInterface $configuration
* @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
\Magento\Catalog\Helper\Data $catalogData,
\Magento\Framework\App\Config\ScopeConfigInterface $configuration,
\Magento\Directory\Model\CurrencyFactory $currencyFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager
+ \Magento\Framework\Store\StoreManagerInterface $storeManager
) {
$this->_catalogData = $catalogData;
$this->_configuration = $configuration;
diff --git a/app/code/Magento/Downloadable/Model/Sales/Order/Pdf/Items/AbstractItems.php b/app/code/Magento/Downloadable/Model/Sales/Order/Pdf/Items/AbstractItems.php
index 913d2f31f15cf..e8bf82f84fbd0 100644
--- a/app/code/Magento/Downloadable/Model/Sales/Order/Pdf/Items/AbstractItems.php
+++ b/app/code/Magento/Downloadable/Model/Sales/Order/Pdf/Items/AbstractItems.php
@@ -107,6 +107,6 @@ public function getLinksTitle()
if ($this->_purchasedLinks->getLinkSectionTitle()) {
return $this->_purchasedLinks->getLinkSectionTitle();
}
- return $this->_scopeConfig->getValue(\Magento\Downloadable\Model\Link::XML_PATH_LINKS_TITLE, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+ return $this->_scopeConfig->getValue(\Magento\Downloadable\Model\Link::XML_PATH_LINKS_TITLE, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
}
}
diff --git a/app/code/Magento/Downloadable/etc/frontend/di.xml b/app/code/Magento/Downloadable/etc/frontend/di.xml
index 52651beea15ac..18f35c2987fcd 100644
--- a/app/code/Magento/Downloadable/etc/frontend/di.xml
+++ b/app/code/Magento/Downloadable/etc/frontend/di.xml
@@ -6,7 +6,7 @@
*/
-->
-
+
- /downloadable/customer/
diff --git a/app/code/Magento/Eav/Helper/Data.php b/app/code/Magento/Eav/Helper/Data.php
index 851c189bc9f06..92b8999be8b09 100644
--- a/app/code/Magento/Eav/Helper/Data.php
+++ b/app/code/Magento/Eav/Helper/Data.php
@@ -129,7 +129,7 @@ public function getAttributeLockedFields($entityTypeCode)
*/
public function getInputTypesValidatorData()
{
- return $this->_scopeConfig->getValue(self::XML_PATH_VALIDATOR_DATA_INPUT_TYPES, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+ return $this->_scopeConfig->getValue(self::XML_PATH_VALIDATOR_DATA_INPUT_TYPES, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
}
/**
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute.php b/app/code/Magento/Eav/Model/Entity/Attribute.php
index 681ab2a4fc092..7808574342ce5 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute.php
@@ -71,7 +71,7 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute\AbstractAttribute im
* @param \Magento\Core\Helper\Data $coreData
* @param \Magento\Eav\Model\Config $eavConfig
* @param TypeFactory $eavTypeFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Eav\Model\Resource\Helper $resourceHelper
* @param \Magento\Framework\Validator\UniversalFactory $universalFactory
* @param \Magento\Eav\Api\Data\AttributeOptionDataBuilder $optionDataBuilder
@@ -91,7 +91,7 @@ public function __construct(
\Magento\Core\Helper\Data $coreData,
\Magento\Eav\Model\Config $eavConfig,
\Magento\Eav\Model\Entity\TypeFactory $eavTypeFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Eav\Model\Resource\Helper $resourceHelper,
\Magento\Framework\Validator\UniversalFactory $universalFactory,
\Magento\Eav\Api\Data\AttributeOptionDataBuilder $optionDataBuilder,
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/AbstractAttribute.php b/app/code/Magento/Eav/Model/Entity/Attribute/AbstractAttribute.php
index 71280078353b1..6a186d7ae6b79 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/AbstractAttribute.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/AbstractAttribute.php
@@ -87,7 +87,7 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
protected $_eavTypeFactory;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -114,7 +114,7 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
* @param \Magento\Core\Helper\Data $coreData
* @param \Magento\Eav\Model\Config $eavConfig
* @param \Magento\Eav\Model\Entity\TypeFactory $eavTypeFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Eav\Model\Resource\Helper $resourceHelper
* @param \Magento\Framework\Validator\UniversalFactory $universalFactory
* @param \Magento\Eav\Api\Data\AttributeOptionDataBuilder $optionDataBuilder
@@ -131,7 +131,7 @@ public function __construct(
\Magento\Core\Helper\Data $coreData,
\Magento\Eav\Model\Config $eavConfig,
\Magento\Eav\Model\Entity\TypeFactory $eavTypeFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Eav\Model\Resource\Helper $resourceHelper,
\Magento\Framework\Validator\UniversalFactory $universalFactory,
\Magento\Eav\Api\Data\AttributeOptionDataBuilder $optionDataBuilder,
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Backend/Store.php b/app/code/Magento/Eav/Model/Entity/Attribute/Backend/Store.php
index a9f56c983ac28..386a6a26dddd5 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Backend/Store.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Backend/Store.php
@@ -8,14 +8,14 @@
class Store extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
{
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
/**
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
*/
- public function __construct(\Magento\Store\Model\StoreManagerInterface $storeManager)
+ public function __construct(\Magento\Framework\Store\StoreManagerInterface $storeManager)
{
$this->_storeManager = $storeManager;
}
diff --git a/app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php b/app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php
index 17d41237c1621..16d21764f1c2e 100644
--- a/app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php
+++ b/app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php
@@ -118,7 +118,7 @@ abstract class AbstractCollection extends \Magento\Framework\Data\Collection\Db
protected $_universalFactory;
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -131,7 +131,7 @@ abstract class AbstractCollection extends \Magento\Framework\Data\Collection\Db
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
diff --git a/app/code/Magento/Eav/Model/Form.php b/app/code/Magento/Eav/Model/Form.php
index 919985062333e..21a0b2cdb875a 100644
--- a/app/code/Magento/Eav/Model/Form.php
+++ b/app/code/Magento/Eav/Model/Form.php
@@ -106,7 +106,7 @@ abstract class Form
protected $_validator = null;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -141,7 +141,7 @@ abstract class Form
protected $_validatorConfigFactory;
/**
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Eav\Model\Config $eavConfig
* @param \Magento\Framework\Module\Dir\Reader $modulesReader
* @param \Magento\Eav\Model\AttributeDataFactory $attrDataFactory
@@ -152,7 +152,7 @@ abstract class Form
* @throws \Magento\Framework\Model\Exception
*/
public function __construct(
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Eav\Model\Config $eavConfig,
\Magento\Framework\Module\Dir\Reader $modulesReader,
\Magento\Eav\Model\AttributeDataFactory $attrDataFactory,
diff --git a/app/code/Magento/Eav/Model/Form/Fieldset.php b/app/code/Magento/Eav/Model/Form/Fieldset.php
index 61ce2fb0e3fb4..c9d91a2fae92a 100644
--- a/app/code/Magento/Eav/Model/Form/Fieldset.php
+++ b/app/code/Magento/Eav/Model/Form/Fieldset.php
@@ -28,14 +28,14 @@ class Fieldset extends \Magento\Framework\Model\AbstractModel
protected $_eventPrefix = 'eav_form_fieldset';
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
/**
* @param \Magento\Framework\Model\Context $context
* @param \Magento\Framework\Registry $registry
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
@@ -43,7 +43,7 @@ class Fieldset extends \Magento\Framework\Model\AbstractModel
public function __construct(
\Magento\Framework\Model\Context $context,
\Magento\Framework\Registry $registry,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\Model\Resource\AbstractResource $resource = null,
\Magento\Framework\Data\Collection\Db $resourceCollection = null,
array $data = []
diff --git a/app/code/Magento/Eav/Model/Resource/Attribute/Collection.php b/app/code/Magento/Eav/Model/Resource/Attribute/Collection.php
index f94e6bb919fba..466788144ce7e 100644
--- a/app/code/Magento/Eav/Model/Resource/Attribute/Collection.php
+++ b/app/code/Magento/Eav/Model/Resource/Attribute/Collection.php
@@ -34,27 +34,27 @@ abstract class Collection extends \Magento\Eav\Model\Resource\Entity\Attribute\C
protected $_entityType;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Eav\Model\Config $eavConfig
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param mixed $connection
* @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Eav\Model\Config $eavConfig,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
$connection = null,
\Magento\Framework\Model\Resource\Db\AbstractDb $resource = null
) {
@@ -213,6 +213,7 @@ protected function _initSelect()
*
* @param int $type
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function setEntityTypeFilter($type)
{
diff --git a/app/code/Magento/Eav/Model/Resource/Entity/Attribute.php b/app/code/Magento/Eav/Model/Resource/Entity/Attribute.php
index 0d10528a5ae92..66dd3594cc6b0 100644
--- a/app/code/Magento/Eav/Model/Resource/Entity/Attribute.php
+++ b/app/code/Magento/Eav/Model/Resource/Entity/Attribute.php
@@ -25,7 +25,7 @@ class Attribute extends \Magento\Framework\Model\Resource\Db\AbstractDb
protected static $_entityAttributes = [];
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -38,12 +38,12 @@ class Attribute extends \Magento\Framework\Model\Resource\Db\AbstractDb
* Class constructor
*
* @param \Magento\Framework\App\Resource $resource
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param Type $eavEntityType
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
Type $eavEntityType
) {
$this->_storeManager = $storeManager;
diff --git a/app/code/Magento/Eav/Model/Resource/Entity/Attribute/Grid/Collection.php b/app/code/Magento/Eav/Model/Resource/Entity/Attribute/Grid/Collection.php
index 8c8e12cd63ca9..70d00aec72239 100644
--- a/app/code/Magento/Eav/Model/Resource/Entity/Attribute/Grid/Collection.php
+++ b/app/code/Magento/Eav/Model/Resource/Entity/Attribute/Grid/Collection.php
@@ -20,7 +20,7 @@ class Collection extends \Magento\Eav\Model\Resource\Entity\Attribute\Set\Collec
protected $_registryManager;
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -29,7 +29,7 @@ class Collection extends \Magento\Eav\Model\Resource\Entity\Attribute\Set\Collec
* @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
diff --git a/app/code/Magento/Eav/Model/Resource/Entity/Attribute/Option/Collection.php b/app/code/Magento/Eav/Model/Resource/Entity/Attribute/Option/Collection.php
index 3fb15d2a4141d..ced22f1a4f799 100644
--- a/app/code/Magento/Eav/Model/Resource/Entity/Attribute/Option/Collection.php
+++ b/app/code/Magento/Eav/Model/Resource/Entity/Attribute/Option/Collection.php
@@ -25,27 +25,27 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
protected $_coreResource;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Framework\App\Resource $coreResource
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param mixed $connection
* @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Framework\App\Resource $coreResource,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
$connection = null,
\Magento\Framework\Model\Resource\Db\AbstractDb $resource = null
) {
diff --git a/app/code/Magento/Eav/Model/Resource/Form/Attribute/Collection.php b/app/code/Magento/Eav/Model/Resource/Form/Attribute/Collection.php
index 3774d67796361..dd521294b40fc 100644
--- a/app/code/Magento/Eav/Model/Resource/Form/Attribute/Collection.php
+++ b/app/code/Magento/Eav/Model/Resource/Form/Attribute/Collection.php
@@ -41,7 +41,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
protected $_entityType;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -51,22 +51,22 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
protected $_eavConfig;
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Eav\Model\Config $eavConfig
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param mixed $connection
* @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Eav\Model\Config $eavConfig,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
$connection = null,
\Magento\Framework\Model\Resource\Db\AbstractDb $resource = null
) {
diff --git a/app/code/Magento/Eav/Model/Resource/Form/Fieldset/Collection.php b/app/code/Magento/Eav/Model/Resource/Form/Fieldset/Collection.php
index d28f88e8851fc..824ec8712ce7b 100644
--- a/app/code/Magento/Eav/Model/Resource/Form/Fieldset/Collection.php
+++ b/app/code/Magento/Eav/Model/Resource/Form/Fieldset/Collection.php
@@ -12,13 +12,13 @@
*/
namespace Magento\Eav\Model\Resource\Form\Fieldset;
-use Magento\Core\Model\EntityFactory;
+use Magento\Framework\Data\Collection\EntityFactory;
use Magento\Eav\Model\Form\Type;
use Magento\Framework\Event\ManagerInterface;
use Magento\Framework\Data\Collection\Db\FetchStrategyInterface;
use Magento\Framework\Model\Resource\Db\AbstractDb;
use Psr\Log\LoggerInterface as Logger;
-use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\Store\StoreManagerInterface;
class Collection extends \Magento\Framework\Model\Resource\Db\Collection\AbstractCollection
{
@@ -35,11 +35,11 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
protected $_storeId;
/**
- * @param EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param Logger $logger
* @param FetchStrategyInterface $fetchStrategy
* @param ManagerInterface $eventManager
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param mixed $connection
* @param AbstractDb $resource
*/
diff --git a/app/code/Magento/Email/Model/AbstractTemplate.php b/app/code/Magento/Email/Model/AbstractTemplate.php
index dbc58086db9bc..733e8e73e4583 100644
--- a/app/code/Magento/Email/Model/AbstractTemplate.php
+++ b/app/code/Magento/Email/Model/AbstractTemplate.php
@@ -61,7 +61,7 @@ abstract class AbstractTemplate extends AbstractModel implements TemplateTypesIn
protected $_appEmulation;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -70,7 +70,7 @@ abstract class AbstractTemplate extends AbstractModel implements TemplateTypesIn
* @param \Magento\Framework\View\DesignInterface $design
* @param \Magento\Framework\Registry $registry
* @param \Magento\Store\Model\App\Emulation $appEmulation
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param array $data
*/
public function __construct(
@@ -78,7 +78,7 @@ public function __construct(
\Magento\Framework\View\DesignInterface $design,
\Magento\Framework\Registry $registry,
\Magento\Store\Model\App\Emulation $appEmulation,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
array $data = []
) {
$this->_design = $design;
diff --git a/app/code/Magento/Email/Model/BackendTemplate.php b/app/code/Magento/Email/Model/BackendTemplate.php
index 27c6084b4382f..1484e8bc8ebec 100644
--- a/app/code/Magento/Email/Model/BackendTemplate.php
+++ b/app/code/Magento/Email/Model/BackendTemplate.php
@@ -22,7 +22,7 @@ class BackendTemplate extends Template
* @param \Magento\Framework\View\DesignInterface $design
* @param \Magento\Framework\Registry $registry
* @param \Magento\Store\Model\App\Emulation $appEmulation
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\Filesystem $filesystem
* @param \Magento\Framework\View\Asset\Repository $assetRepo
* @param \Magento\Framework\View\FileSystem $viewFileSystem
@@ -39,7 +39,7 @@ public function __construct(
\Magento\Framework\View\DesignInterface $design,
\Magento\Framework\Registry $registry,
\Magento\Store\Model\App\Emulation $appEmulation,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\Filesystem $filesystem,
\Magento\Framework\View\Asset\Repository $assetRepo,
\Magento\Framework\View\FileSystem $viewFileSystem,
diff --git a/app/code/Magento/Email/Model/Template.php b/app/code/Magento/Email/Model/Template.php
index 75969ae91239b..cdedc30f72a7e 100644
--- a/app/code/Magento/Email/Model/Template.php
+++ b/app/code/Magento/Email/Model/Template.php
@@ -8,7 +8,7 @@
use Magento\Email\Model\Template\Filter;
use Magento\Framework\App\Filesystem\DirectoryList;
use Magento\Framework\Filter\Template as FilterTemplate;
-use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\Store\StoreManagerInterface;
/**
* Template model
@@ -19,7 +19,7 @@
* \Magento\Email\Model\TemplateFactory $templateFactory
* $templateFactory->create()->load($this->_scopeConfig->getValue(
* 'path_to_email_template_id_config',
- * \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ * \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
* ));
* $variables = array(
* 'someObject' => $this->_coreResourceEmailTemplate
@@ -158,7 +158,7 @@ class Template extends \Magento\Email\Model\AbstractTemplate implements \Magento
* @param \Magento\Framework\View\DesignInterface $design
* @param \Magento\Framework\Registry $registry
* @param \Magento\Store\Model\App\Emulation $appEmulation
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\Filesystem $filesystem
* @param \Magento\Framework\View\Asset\Repository $assetRepo
* @param \Magento\Framework\View\FileSystem $viewFileSystem
@@ -213,7 +213,7 @@ protected function _getLogoUrl($store)
$store = $this->_storeManager->getStore($store);
$fileName = $this->_scopeConfig->getValue(
self::XML_PATH_DESIGN_EMAIL_LOGO,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
if ($fileName) {
@@ -252,7 +252,7 @@ protected function _getLogoAlt($store)
$store = $this->_storeManager->getStore($store);
$alt = $this->_scopeConfig->getValue(
self::XML_PATH_DESIGN_EMAIL_LOGO_ALT,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
if ($alt) {
diff --git a/app/code/Magento/Email/Model/Template/Filter.php b/app/code/Magento/Email/Model/Template/Filter.php
index cb2309aadf837..47762cc92c293 100644
--- a/app/code/Magento/Email/Model/Template/Filter.php
+++ b/app/code/Magento/Email/Model/Template/Filter.php
@@ -70,7 +70,7 @@ class Filter extends \Magento\Framework\Filter\Template
protected $_variableFactory;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -117,7 +117,7 @@ class Filter extends \Magento\Framework\Filter\Template
* @param \Magento\Framework\View\Asset\Repository $assetRepo
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param \Magento\Core\Model\VariableFactory $coreVariableFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\View\LayoutInterface $layout
* @param \Magento\Framework\View\LayoutFactory $layoutFactory
* @param \Magento\Framework\App\State $appState
@@ -133,7 +133,7 @@ public function __construct(
\Magento\Framework\View\Asset\Repository $assetRepo,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
\Magento\Core\Model\VariableFactory $coreVariableFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\View\LayoutInterface $layout,
\Magento\Framework\View\LayoutFactory $layoutFactory,
\Magento\Framework\App\State $appState,
@@ -568,7 +568,7 @@ public function configDirective($construction)
if (isset($params['path'])) {
$configValue = $this->_scopeConfig->getValue(
$params['path'],
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$storeId
);
}
diff --git a/app/code/Magento/Email/Model/Template/SenderResolver.php b/app/code/Magento/Email/Model/Template/SenderResolver.php
index f1e1a4b659883..04bf336e92432 100644
--- a/app/code/Magento/Email/Model/Template/SenderResolver.php
+++ b/app/code/Magento/Email/Model/Template/SenderResolver.php
@@ -32,12 +32,12 @@ public function resolve($sender, $scopeId = null)
if (!is_array($sender)) {
$result['name'] = $this->_scopeConfig->getValue(
'trans_email/ident_' . $sender . '/name',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$scopeId
);
$result['email'] = $this->_scopeConfig->getValue(
'trans_email/ident_' . $sender . '/email',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$scopeId
);
} else {
diff --git a/app/code/Magento/Fedex/Model/Carrier.php b/app/code/Magento/Fedex/Model/Carrier.php
index e71ed00512e0c..a9a6176f5c1cd 100644
--- a/app/code/Magento/Fedex/Model/Carrier.php
+++ b/app/code/Magento/Fedex/Model/Carrier.php
@@ -108,7 +108,7 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
protected $_customizableContainerTypes = ['YOUR_PACKAGING'];
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -132,7 +132,7 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
* @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
* @param \Magento\Directory\Helper\Data $directoryData
* @param \Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\Module\Dir\Reader $configReader
* @param \Magento\Catalog\Model\Resource\Product\CollectionFactory $productCollectionFactory
* @param array $data
@@ -154,7 +154,7 @@ public function __construct(
\Magento\Directory\Model\CurrencyFactory $currencyFactory,
\Magento\Directory\Helper\Data $directoryData,
\Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\Module\Dir\Reader $configReader,
\Magento\Catalog\Model\Resource\Product\CollectionFactory $productCollectionFactory,
array $data = []
@@ -297,7 +297,7 @@ public function setRequest(RateRequest $request)
} else {
$origCountry = $this->_scopeConfig->getValue(
\Magento\Sales\Model\Order\Shipment::XML_PATH_STORE_COUNTRY_ID,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$request->getStoreId()
);
}
@@ -309,7 +309,7 @@ public function setRequest(RateRequest $request)
$r->setOrigPostal(
$this->_scopeConfig->getValue(
\Magento\Sales\Model\Order\Shipment::XML_PATH_STORE_ZIP,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$request->getStoreId()
)
);
@@ -1329,7 +1329,7 @@ protected function _formShipmentRequest(\Magento\Framework\Object $request)
'AccountNumber' => $this->getConfigData('account'),
'CountryCode' => $this->_scopeConfig->getValue(
\Magento\Sales\Model\Order\Shipment::XML_PATH_STORE_COUNTRY_ID,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$request->getStoreId()
),
],
@@ -1366,7 +1366,7 @@ protected function _formShipmentRequest(\Magento\Framework\Object $request)
'AccountNumber' => $this->getConfigData('account'),
'CountryCode' => $this->_scopeConfig->getValue(
\Magento\Sales\Model\Order\Shipment::XML_PATH_STORE_COUNTRY_ID,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$request->getStoreId()
),
],
@@ -1533,6 +1533,7 @@ public function getContainerTypesFilter()
*
* @param \Magento\Framework\Object|null $params
* @return array
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function getDeliveryConfirmationTypes(\Magento\Framework\Object $params = null)
{
diff --git a/app/code/Magento/Fedex/composer.json b/app/code/Magento/Fedex/composer.json
index d51b956ecc129..277c565c453ec 100644
--- a/app/code/Magento/Fedex/composer.json
+++ b/app/code/Magento/Fedex/composer.json
@@ -3,7 +3,6 @@
"description": "N/A",
"require": {
"php": "~5.4.11|~5.5.0|~5.6.0",
- "magento/module-store": "0.42.0-beta5",
"magento/module-shipping": "0.42.0-beta5",
"magento/module-directory": "0.42.0-beta5",
"magento/module-core": "0.42.0-beta5",
diff --git a/app/code/Magento/GiftMessage/Block/Adminhtml/Product/Helper/Form/Config.php b/app/code/Magento/GiftMessage/Block/Adminhtml/Product/Helper/Form/Config.php
index 83207d1c87424..71f9fdea4cebb 100644
--- a/app/code/Magento/GiftMessage/Block/Adminhtml/Product/Helper/Form/Config.php
+++ b/app/code/Magento/GiftMessage/Block/Adminhtml/Product/Helper/Form/Config.php
@@ -46,7 +46,7 @@ protected function _getValueFromConfig()
{
return $this->_scopeConfig->getValue(
\Magento\GiftMessage\Helper\Message::XPATH_CONFIG_GIFT_MESSAGE_ALLOW_ITEMS,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
}
}
diff --git a/app/code/Magento/GiftMessage/Helper/Message.php b/app/code/Magento/GiftMessage/Helper/Message.php
index 7672d3f08763e..3477c675ca05c 100644
--- a/app/code/Magento/GiftMessage/Helper/Message.php
+++ b/app/code/Magento/GiftMessage/Helper/Message.php
@@ -66,7 +66,7 @@ class Message extends \Magento\Core\Helper\Data
/**
* @param \Magento\Framework\App\Helper\Context $context
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\State $appState
* @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
* @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
@@ -80,7 +80,7 @@ class Message extends \Magento\Core\Helper\Data
public function __construct(
\Magento\Framework\App\Helper\Context $context,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\App\State $appState,
\Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
\Magento\Catalog\Api\ProductRepositoryInterface $productRepository,
@@ -148,7 +148,7 @@ public function isMessagesAvailable($type, \Magento\Framework\Object $entity, $s
if ($type == 'items') {
$items = $entity->getAllItems();
if (!is_array($items) || empty($items)) {
- return $this->_scopeConfig->getValue(self::XPATH_CONFIG_GIFT_MESSAGE_ALLOW_ITEMS, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
+ return $this->_scopeConfig->getValue(self::XPATH_CONFIG_GIFT_MESSAGE_ALLOW_ITEMS, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store);
}
if ($entity instanceof \Magento\Quote\Model\Quote) {
$_type = $entity->getIsMultiShipping() ? 'address_item' : 'item';
@@ -183,7 +183,7 @@ public function isMessagesAvailable($type, \Magento\Framework\Object $entity, $s
$store
);
} else {
- return $this->_scopeConfig->getValue(self::XPATH_CONFIG_GIFT_MESSAGE_ALLOW_ORDER, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
+ return $this->_scopeConfig->getValue(self::XPATH_CONFIG_GIFT_MESSAGE_ALLOW_ORDER, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store);
}
return false;
}
@@ -197,7 +197,7 @@ public function isMessagesAvailable($type, \Magento\Framework\Object $entity, $s
*/
protected function _getDependenceFromStoreConfig($productGiftMessageAllow, $store = null)
{
- $result = $this->_scopeConfig->getValue(self::XPATH_CONFIG_GIFT_MESSAGE_ALLOW_ITEMS, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
+ $result = $this->_scopeConfig->getValue(self::XPATH_CONFIG_GIFT_MESSAGE_ALLOW_ITEMS, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store);
if ($productGiftMessageAllow === '' || is_null($productGiftMessageAllow)) {
return $result;
} else {
diff --git a/app/code/Magento/GiftMessage/Model/CartRepository.php b/app/code/Magento/GiftMessage/Model/CartRepository.php
index 528ccf78320b6..505561535030c 100644
--- a/app/code/Magento/GiftMessage/Model/CartRepository.php
+++ b/app/code/Magento/GiftMessage/Model/CartRepository.php
@@ -26,7 +26,7 @@ class CartRepository implements \Magento\GiftMessage\Api\CartRepositoryInterface
/**
* Store manager interface.
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $storeManager;
@@ -53,14 +53,14 @@ class CartRepository implements \Magento\GiftMessage\Api\CartRepositoryInterface
/**
* @param \Magento\Quote\Model\QuoteRepository $quoteRepository
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param GiftMessageManager $giftMessageManager
* @param \Magento\GiftMessage\Helper\Message $helper
* @param MessageFactory $messageFactory
*/
public function __construct(
\Magento\Quote\Model\QuoteRepository $quoteRepository,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\GiftMessage\Model\GiftMessageManager $giftMessageManager,
\Magento\GiftMessage\Helper\Message $helper,
\Magento\GiftMessage\Model\MessageFactory $messageFactory
diff --git a/app/code/Magento/GiftMessage/Model/ItemRepository.php b/app/code/Magento/GiftMessage/Model/ItemRepository.php
index 90db371ca8fbd..9174a7174c140 100644
--- a/app/code/Magento/GiftMessage/Model/ItemRepository.php
+++ b/app/code/Magento/GiftMessage/Model/ItemRepository.php
@@ -27,7 +27,7 @@ class ItemRepository implements \Magento\GiftMessage\Api\ItemRepositoryInterface
/**
* Store manager interface.
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $storeManager;
@@ -54,14 +54,14 @@ class ItemRepository implements \Magento\GiftMessage\Api\ItemRepositoryInterface
/**
* @param \Magento\Quote\Model\QuoteRepository $quoteRepository
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param GiftMessageManager $giftMessageManager
* @param \Magento\GiftMessage\Helper\Message $helper
* @param MessageFactory $messageFactory
*/
public function __construct(
\Magento\Quote\Model\QuoteRepository $quoteRepository,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\GiftMessage\Model\GiftMessageManager $giftMessageManager,
\Magento\GiftMessage\Helper\Message $helper,
\Magento\GiftMessage\Model\MessageFactory $messageFactory
diff --git a/app/code/Magento/GiftMessage/composer.json b/app/code/Magento/GiftMessage/composer.json
index 1142c6bb8c34f..40cef72a6920c 100644
--- a/app/code/Magento/GiftMessage/composer.json
+++ b/app/code/Magento/GiftMessage/composer.json
@@ -3,7 +3,6 @@
"description": "N/A",
"require": {
"php": "~5.4.11|~5.5.0|~5.6.0",
- "magento/module-store": "0.42.0-beta5",
"magento/module-catalog": "0.42.0-beta5",
"magento/module-checkout": "0.42.0-beta5",
"magento/module-multishipping": "0.42.0-beta5",
diff --git a/app/code/Magento/GoogleAdwords/Helper/Data.php b/app/code/Magento/GoogleAdwords/Helper/Data.php
index f2a97d5a07b09..693ba8dfa66d6 100644
--- a/app/code/Magento/GoogleAdwords/Helper/Data.php
+++ b/app/code/Magento/GoogleAdwords/Helper/Data.php
@@ -109,7 +109,7 @@ public function isGoogleAdwordsActive()
{
return $this->_scopeConfig->isSetFlag(
self::XML_PATH_ACTIVE,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
) &&
$this->getConversionId() &&
$this->getConversionLanguage() &&
@@ -173,7 +173,7 @@ public function getConversionId()
{
return (int)$this->_scopeConfig->getValue(
self::XML_PATH_CONVERSION_ID,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
}
@@ -186,7 +186,7 @@ public function getConversionLanguage()
{
return $this->_scopeConfig->getValue(
self::XML_PATH_CONVERSION_LANGUAGE,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
}
@@ -199,7 +199,7 @@ public function getConversionFormat()
{
return $this->_scopeConfig->getValue(
self::XML_PATH_CONVERSION_FORMAT,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
}
@@ -212,7 +212,7 @@ public function getConversionColor()
{
return $this->_scopeConfig->getValue(
self::XML_PATH_CONVERSION_COLOR,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
}
@@ -225,7 +225,7 @@ public function getConversionLabel()
{
return $this->_scopeConfig->getValue(
self::XML_PATH_CONVERSION_LABEL,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
}
@@ -238,7 +238,7 @@ public function getConversionValueType()
{
return $this->_scopeConfig->getValue(
self::XML_PATH_CONVERSION_VALUE_TYPE,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
}
@@ -261,7 +261,7 @@ public function getConversionValueConstant()
{
return (double)$this->_scopeConfig->getValue(
self::XML_PATH_CONVERSION_VALUE,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
}
diff --git a/app/code/Magento/GoogleAdwords/composer.json b/app/code/Magento/GoogleAdwords/composer.json
index c452340ddba31..fb31a69c2fc44 100644
--- a/app/code/Magento/GoogleAdwords/composer.json
+++ b/app/code/Magento/GoogleAdwords/composer.json
@@ -3,7 +3,6 @@
"description": "N/A",
"require": {
"php": "~5.4.11|~5.5.0|~5.6.0",
- "magento/module-store": "0.42.0-beta5",
"magento/module-sales": "0.42.0-beta5",
"magento/framework": "0.42.0-beta5",
"magento/magento-composer-installer": "*"
diff --git a/app/code/Magento/GoogleAnalytics/Block/Ga.php b/app/code/Magento/GoogleAnalytics/Block/Ga.php
index 8236e5fac9e54..04bb7196fa61d 100644
--- a/app/code/Magento/GoogleAnalytics/Block/Ga.php
+++ b/app/code/Magento/GoogleAnalytics/Block/Ga.php
@@ -50,7 +50,7 @@ public function __construct(
*/
public function getConfig($path)
{
- return $this->_scopeConfig->getValue($path, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+ return $this->_scopeConfig->getValue($path, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
}
/**
diff --git a/app/code/Magento/GoogleAnalytics/Helper/Data.php b/app/code/Magento/GoogleAnalytics/Helper/Data.php
index 49b29bc28cf3e..9e32e1aff2526 100644
--- a/app/code/Magento/GoogleAnalytics/Helper/Data.php
+++ b/app/code/Magento/GoogleAnalytics/Helper/Data.php
@@ -50,7 +50,7 @@ public function __construct(
*/
public function isGoogleAnalyticsAvailable($store = null)
{
- $accountId = $this->_scopeConfig->getValue(self::XML_PATH_ACCOUNT, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
- return $accountId && $this->_scopeConfig->isSetFlag(self::XML_PATH_ACTIVE, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
+ $accountId = $this->_scopeConfig->getValue(self::XML_PATH_ACCOUNT, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store);
+ return $accountId && $this->_scopeConfig->isSetFlag(self::XML_PATH_ACTIVE, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store);
}
}
diff --git a/app/code/Magento/GoogleAnalytics/Model/Observer.php b/app/code/Magento/GoogleAnalytics/Model/Observer.php
index b8c916189fa2b..8bd837b511dc5 100644
--- a/app/code/Magento/GoogleAnalytics/Model/Observer.php
+++ b/app/code/Magento/GoogleAnalytics/Model/Observer.php
@@ -26,17 +26,17 @@ class Observer
protected $_layout;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
/**
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\View\LayoutInterface $layout
* @param \Magento\GoogleAnalytics\Helper\Data $googleAnalyticsData
*/
public function __construct(
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\View\LayoutInterface $layout,
\Magento\GoogleAnalytics\Helper\Data $googleAnalyticsData
) {
diff --git a/app/code/Magento/GoogleOptimizer/Helper/Data.php b/app/code/Magento/GoogleOptimizer/Helper/Data.php
index 8010a5fc27292..601c5423add16 100644
--- a/app/code/Magento/GoogleOptimizer/Helper/Data.php
+++ b/app/code/Magento/GoogleOptimizer/Helper/Data.php
@@ -55,7 +55,7 @@ public function __construct(
*/
public function isGoogleExperimentEnabled($store = null)
{
- return (bool)$this->_scopeConfig->isSetFlag(self::XML_PATH_ENABLED, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
+ return (bool)$this->_scopeConfig->isSetFlag(self::XML_PATH_ENABLED, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store);
}
/**
diff --git a/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items.php b/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items.php
index aa95f8a884c12..e3d713530184e 100644
--- a/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items.php
+++ b/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items.php
@@ -85,7 +85,7 @@ protected function _redirectToCaptcha($e)
public function _getStore()
{
$store = $this->_objectManager->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->getStore(
(int)$this->getRequest()->getParam('store', 0)
);
diff --git a/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items/Index.php b/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items/Index.php
index 56380c2148cfa..022290b7d40fc 100644
--- a/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items/Index.php
+++ b/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items/Index.php
@@ -67,7 +67,7 @@ public function execute()
'adminhtml/*/',
[
'store' => $this->_objectManager->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->getStore()->getId(),
'_current' => true
]
diff --git a/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Types.php b/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Types.php
index c22b04e12e022..755c3dc4b0844 100644
--- a/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Types.php
+++ b/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Types.php
@@ -93,7 +93,7 @@ protected function _initAction()
public function _getStore()
{
$storeId = (int)$this->getRequest()->getParam('store', 0);
- $storeManager = $this->_objectManager->get('Magento\Store\Model\StoreManagerInterface');
+ $storeManager = $this->_objectManager->get('Magento\Framework\Store\StoreManagerInterface');
if ($storeId == 0) {
$defaultStore = $storeManager->getDefaultStoreView();
if (!$defaultStore) {
diff --git a/app/code/Magento/GoogleShopping/Helper/Data.php b/app/code/Magento/GoogleShopping/Helper/Data.php
index 04f617eb913c7..31ecda5a3c65e 100644
--- a/app/code/Magento/GoogleShopping/Helper/Data.php
+++ b/app/code/Magento/GoogleShopping/Helper/Data.php
@@ -22,19 +22,19 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
/**
* Store manager
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
/**
* @param \Magento\Framework\App\Helper\Context $context
* @param \Magento\Framework\Stdlib\String $string
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
*/
public function __construct(
\Magento\Framework\App\Helper\Context $context,
\Magento\Framework\Stdlib\String $string,
- \Magento\Store\Model\StoreManagerInterface $storeManager
+ \Magento\Framework\Store\StoreManagerInterface $storeManager
) {
$this->string = $string;
$this->_storeManager = $storeManager;
diff --git a/app/code/Magento/GoogleShopping/Model/Attribute/Link.php b/app/code/Magento/GoogleShopping/Model/Attribute/Link.php
index 1e9b15cd96b55..7f63f63f7eccf 100644
--- a/app/code/Magento/GoogleShopping/Model/Attribute/Link.php
+++ b/app/code/Magento/GoogleShopping/Model/Attribute/Link.php
@@ -69,7 +69,7 @@ public function convertAttribute($product, $entry)
if ($url) {
$isStoreInUrl = $this->_scopeConfig->isSetFlag(
\Magento\Store\Model\Store::XML_PATH_STORE_IN_URL,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
if (!$isStoreInUrl) {
$urlInfo = parse_url($url);
diff --git a/app/code/Magento/GoogleShopping/Model/Attribute/Price.php b/app/code/Magento/GoogleShopping/Model/Attribute/Price.php
index a75a1f1a774fb..f6843bbabe708 100644
--- a/app/code/Magento/GoogleShopping/Model/Attribute/Price.php
+++ b/app/code/Magento/GoogleShopping/Model/Attribute/Price.php
@@ -42,7 +42,7 @@ class Price extends DefaultAttribute
/**
* Store manager
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -71,7 +71,7 @@ class Price extends DefaultAttribute
* @param \Magento\GoogleShopping\Helper\Product $gsProduct
* @param \Magento\Catalog\Model\Product\CatalogPrice $catalogPrice
* @param \Magento\GoogleShopping\Model\Resource\Attribute $resource
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Tax\Helper\Data $taxData
* @param \Magento\GoogleShopping\Model\Config $config
* @param \Magento\Catalog\Helper\Data $catalogData
@@ -90,7 +90,7 @@ public function __construct(
\Magento\GoogleShopping\Helper\Product $gsProduct,
\Magento\Catalog\Model\Product\CatalogPrice $catalogPrice,
\Magento\GoogleShopping\Model\Resource\Attribute $resource,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Tax\Helper\Data $taxData,
\Magento\GoogleShopping\Model\Config $config,
\Magento\Catalog\Helper\Data $catalogData,
diff --git a/app/code/Magento/GoogleShopping/Model/Config.php b/app/code/Magento/GoogleShopping/Model/Config.php
index 5e4ef7014d13d..7227f933f278d 100644
--- a/app/code/Magento/GoogleShopping/Model/Config.php
+++ b/app/code/Magento/GoogleShopping/Model/Config.php
@@ -32,7 +32,7 @@ class Config extends \Magento\Framework\Object
/**
* Store manager
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -43,13 +43,13 @@ class Config extends \Magento\Framework\Object
/**
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\Encryption\EncryptorInterface $encryptor
* @param array $data
*/
public function __construct(
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\Encryption\EncryptorInterface $encryptor,
array $data = []
) {
@@ -69,7 +69,7 @@ public function __construct(
public function getConfigData($key, $storeId = null)
{
if (!isset($this->_config[$key][$storeId])) {
- $value = $this->_scopeConfig->getValue('google/googleshopping/' . $key, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $storeId);
+ $value = $this->_scopeConfig->getValue('google/googleshopping/' . $key, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $storeId);
$this->_config[$key][$storeId] = $value;
}
return $this->_config[$key][$storeId];
diff --git a/app/code/Magento/GoogleShopping/Model/MassOperations.php b/app/code/Magento/GoogleShopping/Model/MassOperations.php
index 7cabe18ba1a86..143c966a8b212 100644
--- a/app/code/Magento/GoogleShopping/Model/MassOperations.php
+++ b/app/code/Magento/GoogleShopping/Model/MassOperations.php
@@ -33,7 +33,7 @@ class MassOperations
/**
* Store manager
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -70,7 +70,7 @@ class MassOperations
* @param \Magento\GoogleShopping\Model\ItemFactory $itemFactory
* @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
* @param \Magento\Framework\Notification\NotifierInterface $notifier
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\GoogleShopping\Helper\Data $gleShoppingData
* @param \Magento\GoogleShopping\Helper\Category $gleShoppingCategory
@@ -82,7 +82,7 @@ public function __construct(
\Magento\GoogleShopping\Model\ItemFactory $itemFactory,
\Magento\Catalog\Api\ProductRepositoryInterface $productRepository,
\Magento\Framework\Notification\NotifierInterface $notifier,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Psr\Log\LoggerInterface $logger,
\Magento\GoogleShopping\Helper\Data $gleShoppingData,
\Magento\GoogleShopping\Helper\Category $gleShoppingCategory,
diff --git a/app/code/Magento/GoogleShopping/Model/Observer.php b/app/code/Magento/GoogleShopping/Model/Observer.php
index 3fc97c0a8991d..19fb3d9da9305 100644
--- a/app/code/Magento/GoogleShopping/Model/Observer.php
+++ b/app/code/Magento/GoogleShopping/Model/Observer.php
@@ -130,7 +130,7 @@ protected function _getItemsCollection($product)
foreach ($items as $item) {
$flag = $this->_scopeConfig->isSetFlag(
'google/googleshopping/observed',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$item->getStoreId()
);
if (!$flag) {
diff --git a/app/code/Magento/GoogleShopping/Model/Resource/Item/Collection.php b/app/code/Magento/GoogleShopping/Model/Resource/Item/Collection.php
index e49b3af276806..9774ec12d557e 100644
--- a/app/code/Magento/GoogleShopping/Model/Resource/Item/Collection.php
+++ b/app/code/Magento/GoogleShopping/Model/Resource/Item/Collection.php
@@ -27,7 +27,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
protected $_resourceHelper;
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -37,7 +37,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
* @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
diff --git a/app/code/Magento/GroupedProduct/Block/Cart/Item/Renderer/Grouped.php b/app/code/Magento/GroupedProduct/Block/Cart/Item/Renderer/Grouped.php
index a6f28362cd08a..dc7cdbc273917 100644
--- a/app/code/Magento/GroupedProduct/Block/Cart/Item/Renderer/Grouped.php
+++ b/app/code/Magento/GroupedProduct/Block/Cart/Item/Renderer/Grouped.php
@@ -44,7 +44,7 @@ public function getProductForThumbnail()
*/
if ($this->_scopeConfig->getValue(
self::CONFIG_THUMBNAIL_SOURCE,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
) == ThumbnailSource::OPTION_USE_PARENT_IMAGE ||
!($this->getProduct()->getThumbnail() && $this->getProduct()->getThumbnail() != 'no_selection')
) {
diff --git a/app/code/Magento/GroupedProduct/Model/Product/CatalogPrice.php b/app/code/Magento/GroupedProduct/Model/Product/CatalogPrice.php
index 316e6e382e312..b879fba84643d 100644
--- a/app/code/Magento/GroupedProduct/Model/Product/CatalogPrice.php
+++ b/app/code/Magento/GroupedProduct/Model/Product/CatalogPrice.php
@@ -11,7 +11,7 @@
class CatalogPrice implements \Magento\Catalog\Model\Product\CatalogPriceInterface
{
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $storeManager;
@@ -21,11 +21,11 @@ class CatalogPrice implements \Magento\Catalog\Model\Product\CatalogPriceInterfa
protected $commonPriceModel;
/**
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Model\Product\CatalogPrice $commonPriceModel
*/
public function __construct(
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Product\CatalogPrice $commonPriceModel
) {
$this->storeManager = $storeManager;
diff --git a/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php b/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php
index f22940e785bd2..a042ef95bfb51 100644
--- a/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php
+++ b/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php
@@ -61,7 +61,7 @@ class Grouped extends \Magento\Catalog\Model\Product\Type\AbstractType
/**
* Store manager
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -92,7 +92,7 @@ class Grouped extends \Magento\Catalog\Model\Product\Type\AbstractType
* @param \Psr\Log\LoggerInterface $logger
* @param ProductRepositoryInterface $productRepository
* @param \Magento\GroupedProduct\Model\Resource\Product\Link $catalogProductLink
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Model\Product\Attribute\Source\Status $catalogProductStatus
* @param \Magento\Framework\App\State $appState
* @param \Magento\Msrp\Helper\Data $msrpData
@@ -111,7 +111,7 @@ public function __construct(
\Psr\Log\LoggerInterface $logger,
ProductRepositoryInterface $productRepository,
\Magento\GroupedProduct\Model\Resource\Product\Link $catalogProductLink,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Product\Attribute\Source\Status $catalogProductStatus,
\Magento\Framework\App\State $appState,
\Magento\Msrp\Helper\Data $msrpData
diff --git a/app/code/Magento/GroupedProduct/Model/Resource/Product/Type/Grouped/AssociatedProductsCollection.php b/app/code/Magento/GroupedProduct/Model/Resource/Product/Type/Grouped/AssociatedProductsCollection.php
index a053b54388021..0344038d8d630 100644
--- a/app/code/Magento/GroupedProduct/Model/Resource/Product/Type/Grouped/AssociatedProductsCollection.php
+++ b/app/code/Magento/GroupedProduct/Model/Resource/Product/Type/Grouped/AssociatedProductsCollection.php
@@ -27,7 +27,7 @@ class AssociatedProductsCollection extends \Magento\Catalog\Model\Resource\Produ
protected $_config;
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -36,7 +36,7 @@ class AssociatedProductsCollection extends \Magento\Catalog\Model\Resource\Produ
* @param \Magento\Eav\Model\EntityFactory $eavEntityFactory
* @param \Magento\Catalog\Model\Resource\Helper $resourceHelper
* @param \Magento\Framework\Validator\UniversalFactory $universalFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\Module\Manager $moduleManager
* @param \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
@@ -53,7 +53,7 @@ class AssociatedProductsCollection extends \Magento\Catalog\Model\Resource\Produ
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
@@ -62,7 +62,7 @@ public function __construct(
\Magento\Eav\Model\EntityFactory $eavEntityFactory,
\Magento\Catalog\Model\Resource\Helper $resourceHelper,
\Magento\Framework\Validator\UniversalFactory $universalFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\Module\Manager $moduleManager,
\Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
diff --git a/app/code/Magento/ImportExport/Helper/Data.php b/app/code/Magento/ImportExport/Helper/Data.php
index 43ec77d4f66f1..a2923476b7df3 100644
--- a/app/code/Magento/ImportExport/Helper/Data.php
+++ b/app/code/Magento/ImportExport/Helper/Data.php
@@ -32,7 +32,7 @@ class Data extends \Magento\Core\Helper\Data
/**
* @param \Magento\Framework\App\Helper\Context $context
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\State $appState
* @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
* @param \Magento\Framework\File\Size $fileSize
@@ -41,7 +41,7 @@ class Data extends \Magento\Core\Helper\Data
public function __construct(
\Magento\Framework\App\Helper\Context $context,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\App\State $appState,
\Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
\Magento\Framework\File\Size $fileSize,
@@ -81,7 +81,7 @@ public function getMaxUploadSizeMessage()
*/
public function getLocalValidPaths()
{
- $paths = $this->_scopeConfig->getValue(self::XML_PATH_EXPORT_LOCAL_VALID_PATH, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+ $paths = $this->_scopeConfig->getValue(self::XML_PATH_EXPORT_LOCAL_VALID_PATH, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
return $paths;
}
@@ -92,6 +92,6 @@ public function getLocalValidPaths()
*/
public function getBunchSize()
{
- return (int)$this->_scopeConfig->getValue(self::XML_PATH_BUNCH_SIZE, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+ return (int)$this->_scopeConfig->getValue(self::XML_PATH_BUNCH_SIZE, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
}
}
diff --git a/app/code/Magento/ImportExport/Model/Export/AbstractEntity.php b/app/code/Magento/ImportExport/Model/Export/AbstractEntity.php
index 7241c25053d9d..acf1cb9419416 100644
--- a/app/code/Magento/ImportExport/Model/Export/AbstractEntity.php
+++ b/app/code/Magento/ImportExport/Model/Export/AbstractEntity.php
@@ -34,7 +34,7 @@ abstract class AbstractEntity
/**
* Store manager
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -173,7 +173,7 @@ abstract class AbstractEntity
/**
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\ImportExport\Model\Export\Factory $collectionFactory
* @param \Magento\ImportExport\Model\Resource\CollectionByPagesIteratorFactory $resourceColFactory
* @param array $data
@@ -181,7 +181,7 @@ abstract class AbstractEntity
*/
public function __construct(
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\ImportExport\Model\Export\Factory $collectionFactory,
\Magento\ImportExport\Model\Resource\CollectionByPagesIteratorFactory $resourceColFactory,
array $data = []
@@ -197,7 +197,7 @@ public function __construct(
$data['page_size']
) ? $data['page_size'] : (static::XML_PATH_PAGE_SIZE ? (int)$this->_scopeConfig->getValue(
static::XML_PATH_PAGE_SIZE,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
) : 0);
$this->_byPagesIterator = isset(
$data['collection_by_pages_iterator']
diff --git a/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEav.php b/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEav.php
index 8803d34fc3d70..e24cbe371cbcb 100644
--- a/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEav.php
+++ b/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEav.php
@@ -46,7 +46,7 @@ abstract class AbstractEav extends \Magento\ImportExport\Model\Export\AbstractEn
/**
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\ImportExport\Model\Export\Factory $collectionFactory
* @param \Magento\ImportExport\Model\Resource\CollectionByPagesIteratorFactory $resourceColFactory
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
@@ -55,7 +55,7 @@ abstract class AbstractEav extends \Magento\ImportExport\Model\Export\AbstractEn
*/
public function __construct(
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\ImportExport\Model\Export\Factory $collectionFactory,
\Magento\ImportExport\Model\Resource\CollectionByPagesIteratorFactory $resourceColFactory,
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
diff --git a/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEntity.php b/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEntity.php
index 584b19dc90893..da249dfa425e5 100644
--- a/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEntity.php
+++ b/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEntity.php
@@ -141,7 +141,7 @@ abstract class AbstractEntity
protected $_localeDate;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -149,13 +149,13 @@ abstract class AbstractEntity
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
* @param \Magento\Eav\Model\Config $config
* @param \Magento\Framework\App\Resource $resource
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
*/
public function __construct(
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
\Magento\Eav\Model\Config $config,
\Magento\Framework\App\Resource $resource,
- \Magento\Store\Model\StoreManagerInterface $storeManager
+ \Magento\Framework\Store\StoreManagerInterface $storeManager
) {
$this->_localeDate = $localeDate;
$this->_storeManager = $storeManager;
diff --git a/app/code/Magento/ImportExport/Model/Import/AbstractEntity.php b/app/code/Magento/ImportExport/Model/Import/AbstractEntity.php
index 4285ddd422405..bcf90b1527a7f 100644
--- a/app/code/Magento/ImportExport/Model/Import/AbstractEntity.php
+++ b/app/code/Magento/ImportExport/Model/Import/AbstractEntity.php
@@ -268,7 +268,7 @@ public function __construct(
$data['page_size']
) ? $data['page_size'] : (static::XML_PATH_PAGE_SIZE ? (int)$this->_scopeConfig->getValue(
static::XML_PATH_PAGE_SIZE,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
) : 0);
$this->_maxDataSize = isset(
$data['max_data_size']
@@ -277,7 +277,7 @@ public function __construct(
$data['bunch_size']
) ? $data['bunch_size'] : (static::XML_PATH_BUNCH_SIZE ? (int)$this->_scopeConfig->getValue(
static::XML_PATH_BUNCH_SIZE,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
) : 0);
}
diff --git a/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEav.php b/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEav.php
index 1345aa9c341d2..f6a1783a08396 100644
--- a/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEav.php
+++ b/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEav.php
@@ -19,7 +19,7 @@ abstract class AbstractEav extends \Magento\ImportExport\Model\Import\AbstractEn
/**
* Store manager
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -79,7 +79,7 @@ abstract class AbstractEav extends \Magento\ImportExport\Model\Import\AbstractEn
* @param \Magento\ImportExport\Model\ImportFactory $importFactory
* @param \Magento\ImportExport\Model\Resource\Helper $resourceHelper
* @param \Magento\Framework\App\Resource $resource
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\ImportExport\Model\Export\Factory $collectionFactory
* @param \Magento\Eav\Model\Config $eavConfig
* @param array $data
@@ -92,7 +92,7 @@ public function __construct(
\Magento\ImportExport\Model\ImportFactory $importFactory,
\Magento\ImportExport\Model\Resource\Helper $resourceHelper,
\Magento\Framework\App\Resource $resource,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\ImportExport\Model\Export\Factory $collectionFactory,
\Magento\Eav\Model\Config $eavConfig,
array $data = []
diff --git a/app/code/Magento/Integration/Helper/Oauth/Data.php b/app/code/Magento/Integration/Helper/Oauth/Data.php
index 466c7ff509a4e..125ffb3ffcebc 100644
--- a/app/code/Magento/Integration/Helper/Oauth/Data.php
+++ b/app/code/Magento/Integration/Helper/Oauth/Data.php
@@ -65,7 +65,7 @@ public function isCleanupProbability()
// Safe get cleanup probability value from system configuration
$configValue = (int)$this->_scopeConfig->getValue(
self::XML_PATH_CLEANUP_PROBABILITY,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
return $configValue > 0 ? 1 == \Magento\Framework\Math\Random::getRandomNumber(1, $configValue) : false;
}
@@ -79,7 +79,7 @@ public function getCleanupExpirationPeriod()
{
$minutes = (int)$this->_scopeConfig->getValue(
self::XML_PATH_CLEANUP_EXPIRATION_PERIOD,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
return $minutes > 0 ? $minutes : self::CLEANUP_EXPIRATION_PERIOD_DEFAULT;
}
@@ -93,7 +93,7 @@ public function getConsumerExpirationPeriod()
{
$seconds = (int)$this->_scopeConfig->getValue(
self::XML_PATH_CONSUMER_EXPIRATION_PERIOD,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
return $seconds > 0 ? $seconds : self::CONSUMER_EXPIRATION_PERIOD_DEFAULT;
}
@@ -107,7 +107,7 @@ public function getConsumerPostMaxRedirects()
{
$redirects = (int)$this->_scopeConfig->getValue(
self::XML_PATH_CONSUMER_POST_MAXREDIRECTS,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
return $redirects > 0 ? $redirects : 0;
}
@@ -121,7 +121,7 @@ public function getConsumerPostTimeout()
{
$seconds = (int)$this->_scopeConfig->getValue(
self::XML_PATH_CONSUMER_POST_TIMEOUT,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
return $seconds > 0 ? $seconds : self::CONSUMER_POST_TIMEOUT_DEFAULT;
}
diff --git a/app/code/Magento/Integration/Service/V1/Oauth.php b/app/code/Magento/Integration/Service/V1/Oauth.php
index 5816700e8eb7d..442a7cd2b5d23 100644
--- a/app/code/Magento/Integration/Service/V1/Oauth.php
+++ b/app/code/Magento/Integration/Service/V1/Oauth.php
@@ -21,7 +21,7 @@
class Oauth implements OauthInterface
{
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -63,7 +63,7 @@ class Oauth implements OauthInterface
/**
* Initialize dependencies.
*
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param ConsumerFactory $consumerFactory
* @param TokenFactory $tokenFactory
* @param IntegrationOauthHelper $dataHelper
@@ -73,7 +73,7 @@ class Oauth implements OauthInterface
* @param TokenProvider $tokenProvider
*/
public function __construct(
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
ConsumerFactory $consumerFactory,
TokenFactory $tokenFactory,
IntegrationOauthHelper $dataHelper,
diff --git a/app/code/Magento/Integration/composer.json b/app/code/Magento/Integration/composer.json
index 301e687b7c36e..7a1087a668bc8 100644
--- a/app/code/Magento/Integration/composer.json
+++ b/app/code/Magento/Integration/composer.json
@@ -3,7 +3,6 @@
"description": "N/A",
"require": {
"php": "~5.4.11|~5.5.0|~5.6.0",
- "magento/module-store": "0.42.0-beta5",
"magento/module-core": "0.42.0-beta5",
"magento/module-backend": "0.42.0-beta5",
"magento/module-customer": "0.42.0-beta5",
diff --git a/app/code/Magento/Integration/etc/module.xml b/app/code/Magento/Integration/etc/module.xml
index 9266394d39487..6723cfcff2370 100644
--- a/app/code/Magento/Integration/etc/module.xml
+++ b/app/code/Magento/Integration/etc/module.xml
@@ -9,7 +9,6 @@
-
diff --git a/app/code/Magento/Log/Block/Adminhtml/Customer/Edit/Tab/View/Status.php b/app/code/Magento/Log/Block/Adminhtml/Customer/Edit/Tab/View/Status.php
index a22e398d75abf..d42b836cd4a7f 100644
--- a/app/code/Magento/Log/Block/Adminhtml/Customer/Edit/Tab/View/Status.php
+++ b/app/code/Magento/Log/Block/Adminhtml/Customer/Edit/Tab/View/Status.php
@@ -68,7 +68,7 @@ public function getStoreLastLoginDateTimezone()
{
return $this->_scopeConfig->getValue(
$this->_localeDate->getDefaultTimezonePath(),
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$this->getCustomer()->getStoreId()
);
}
diff --git a/app/code/Magento/Log/Model/Aggregation.php b/app/code/Magento/Log/Model/Aggregation.php
index 30046eeb81353..714e8d62c56c8 100644
--- a/app/code/Magento/Log/Model/Aggregation.php
+++ b/app/code/Magento/Log/Model/Aggregation.php
@@ -23,14 +23,14 @@ class Aggregation extends \Magento\Framework\Model\AbstractModel
protected $_lastRecord;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
/**
* @param \Magento\Framework\Model\Context $context
* @param \Magento\Framework\Registry $registry
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
@@ -38,7 +38,7 @@ class Aggregation extends \Magento\Framework\Model\AbstractModel
public function __construct(
\Magento\Framework\Model\Context $context,
\Magento\Framework\Registry $registry,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\Model\Resource\AbstractResource $resource = null,
\Magento\Framework\Data\Collection\Db $resourceCollection = null,
array $data = []
diff --git a/app/code/Magento/Log/Model/Cron.php b/app/code/Magento/Log/Model/Cron.php
index 80396b78c15d6..9ee04b5a31e1f 100644
--- a/app/code/Magento/Log/Model/Cron.php
+++ b/app/code/Magento/Log/Model/Cron.php
@@ -36,7 +36,7 @@ class Cron extends \Magento\Framework\Model\AbstractModel
protected $_scopeConfig;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -60,7 +60,7 @@ class Cron extends \Magento\Framework\Model\AbstractModel
* @param \Magento\Framework\Registry $registry
* @param \Magento\Framework\Mail\Template\TransportBuilder $transportBuilder
* @param \Magento\Log\Model\Log $log
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
@@ -73,7 +73,7 @@ public function __construct(
\Magento\Framework\Registry $registry,
\Magento\Framework\Mail\Template\TransportBuilder $transportBuilder,
\Magento\Log\Model\Log $log,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
\Magento\Framework\Translate\Inline\StateInterface $inlineTranslation,
\Magento\Framework\Model\Resource\AbstractResource $resource = null,
@@ -100,7 +100,7 @@ protected function _sendLogCleanEmail()
}
if (!$this->_scopeConfig->getValue(
self::XML_PATH_EMAIL_LOG_CLEAN_RECIPIENT,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)
) {
return $this;
@@ -110,7 +110,7 @@ protected function _sendLogCleanEmail()
$transport = $this->_transportBuilder->setTemplateIdentifier(
$this->_scopeConfig->getValue(
self::XML_PATH_EMAIL_LOG_CLEAN_TEMPLATE,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)
)->setTemplateOptions(
[
@@ -122,12 +122,12 @@ protected function _sendLogCleanEmail()
)->setFrom(
$this->_scopeConfig->getValue(
self::XML_PATH_EMAIL_LOG_CLEAN_IDENTITY,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)
)->addTo(
$this->_scopeConfig->getValue(
self::XML_PATH_EMAIL_LOG_CLEAN_RECIPIENT,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)
)->getTransport();
@@ -147,7 +147,7 @@ public function logClean()
{
if (!$this->_scopeConfig->isSetFlag(
self::XML_PATH_LOG_CLEAN_ENABLED,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)
) {
return $this;
diff --git a/app/code/Magento/Log/Model/Log.php b/app/code/Magento/Log/Model/Log.php
index e82acd114d341..2962878e3493a 100644
--- a/app/code/Magento/Log/Model/Log.php
+++ b/app/code/Magento/Log/Model/Log.php
@@ -73,7 +73,7 @@ public function getLogCleanTime()
{
return $this->_scopeConfig->getValue(
self::XML_LOG_CLEAN_DAYS,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
) * 60 * 60 * 24;
}
@@ -97,7 +97,7 @@ public function getOnlineMinutesInterval()
{
$configValue = $this->_scopeConfig->getValue(
'customer/online_customers/online_minutes_interval',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
return intval($configValue) > 0 ? intval($configValue) : self::DEFAULT_ONLINE_MINUTES_INTERVAL;
}
diff --git a/app/code/Magento/Log/Model/Resource/Visitor.php b/app/code/Magento/Log/Model/Resource/Visitor.php
index c11527b8462a7..0631f7db84ca2 100644
--- a/app/code/Magento/Log/Model/Resource/Visitor.php
+++ b/app/code/Magento/Log/Model/Resource/Visitor.php
@@ -30,20 +30,20 @@ class Visitor extends \Magento\Framework\Model\Resource\Db\AbstractDb
protected $_date;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
/**
* @param \Magento\Framework\App\Resource $resource
* @param \Magento\Framework\Stdlib\DateTime\DateTime $date
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\Stdlib\String $string
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
\Magento\Framework\Stdlib\DateTime\DateTime $date,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\Stdlib\String $string
) {
$this->_date = $date;
diff --git a/app/code/Magento/Log/Model/Resource/Visitor/Online/Collection.php b/app/code/Magento/Log/Model/Resource/Visitor/Online/Collection.php
index 21b748e964a6d..b81e63102bb07 100644
--- a/app/code/Magento/Log/Model/Resource/Visitor/Online/Collection.php
+++ b/app/code/Magento/Log/Model/Resource/Visitor/Online/Collection.php
@@ -25,7 +25,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
protected $_eavHelper;
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -34,7 +34,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
* @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
diff --git a/app/code/Magento/Log/Model/Resource/Visitor/Online/Grid/Collection.php b/app/code/Magento/Log/Model/Resource/Visitor/Online/Grid/Collection.php
index e6a0d729e69cd..7f6a03ade6af6 100644
--- a/app/code/Magento/Log/Model/Resource/Visitor/Online/Grid/Collection.php
+++ b/app/code/Magento/Log/Model/Resource/Visitor/Online/Grid/Collection.php
@@ -15,7 +15,7 @@ class Collection extends \Magento\Log\Model\Resource\Visitor\Online\Collection
protected $_onlineFactory;
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -25,7 +25,7 @@ class Collection extends \Magento\Log\Model\Resource\Visitor\Online\Collection
* @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
diff --git a/app/code/Magento/Log/Model/Shell/Command/Clean.php b/app/code/Magento/Log/Model/Shell/Command/Clean.php
index 65415c82f489b..4ffdc812adcda 100644
--- a/app/code/Magento/Log/Model/Shell/Command/Clean.php
+++ b/app/code/Magento/Log/Model/Shell/Command/Clean.php
@@ -54,7 +54,7 @@ public function execute()
$this->_mutableConfig->setValue(
\Magento\Log\Model\Log::XML_LOG_CLEAN_DAYS,
$this->_days,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
}
/** @var $model \Magento\Log\Model\Log */
diff --git a/app/code/Magento/Log/Model/Visitor.php b/app/code/Magento/Log/Model/Visitor.php
index ddd051f7ba5c3..6b1679a3e8cab 100644
--- a/app/code/Magento/Log/Model/Visitor.php
+++ b/app/code/Magento/Log/Model/Visitor.php
@@ -22,7 +22,7 @@
class Visitor extends \Magento\Framework\Model\AbstractModel
{
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $storeManager;
@@ -55,7 +55,7 @@ class Visitor extends \Magento\Framework\Model\AbstractModel
* @param \Magento\Framework\Model\Context $context
* @param \Magento\Framework\Registry $registry
* @param \Magento\Framework\Session\SessionManagerInterface $session
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\HTTP\Header $httpHeader
* @param \Magento\Framework\HTTP\PhpEnvironment\RemoteAddress $remoteAddress
* @param \Magento\Framework\HTTP\PhpEnvironment\ServerAddress $serverAddress
@@ -69,7 +69,7 @@ public function __construct(
\Magento\Framework\Model\Context $context,
\Magento\Framework\Registry $registry,
\Magento\Framework\Session\SessionManagerInterface $session,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\HTTP\Header $httpHeader,
\Magento\Framework\HTTP\PhpEnvironment\RemoteAddress $remoteAddress,
\Magento\Framework\HTTP\PhpEnvironment\ServerAddress $serverAddress,
diff --git a/app/code/Magento/Log/Model/Visitor/Online.php b/app/code/Magento/Log/Model/Visitor/Online.php
index ea1f7e47b0343..490b75ba616e4 100644
--- a/app/code/Magento/Log/Model/Visitor/Online.php
+++ b/app/code/Magento/Log/Model/Visitor/Online.php
@@ -122,7 +122,7 @@ public function getUpdateFrequency()
{
return $this->_scopeConfig->getValue(
self::XML_PATH_UPDATE_FREQUENCY,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
}
@@ -136,7 +136,7 @@ public function getOnlineInterval()
$value = intval(
$this->_scopeConfig->getValue(
self::XML_PATH_ONLINE_INTERVAL,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)
);
if (!$value) {
diff --git a/app/code/Magento/Log/composer.json b/app/code/Magento/Log/composer.json
index 5e633eb2806dd..5d2ce66924810 100644
--- a/app/code/Magento/Log/composer.json
+++ b/app/code/Magento/Log/composer.json
@@ -3,8 +3,6 @@
"description": "N/A",
"require": {
"php": "~5.4.11|~5.5.0|~5.6.0",
- "magento/module-store": "0.42.0-beta5",
- "magento/module-core": "0.42.0-beta5",
"magento/module-customer": "0.42.0-beta5",
"magento/module-eav": "0.42.0-beta5",
"magento/module-backend": "0.42.0-beta5",
diff --git a/app/code/Magento/Log/etc/module.xml b/app/code/Magento/Log/etc/module.xml
index 130e185bae509..6b905f3f2e358 100644
--- a/app/code/Magento/Log/etc/module.xml
+++ b/app/code/Magento/Log/etc/module.xml
@@ -8,8 +8,6 @@
-
-
diff --git a/app/code/Magento/Msrp/Block/Adminhtml/Product/Helper/Form/Type.php b/app/code/Magento/Msrp/Block/Adminhtml/Product/Helper/Form/Type.php
index b8191d6778be7..55d0dc5fb679c 100644
--- a/app/code/Magento/Msrp/Block/Adminhtml/Product/Helper/Form/Type.php
+++ b/app/code/Magento/Msrp/Block/Adminhtml/Product/Helper/Form/Type.php
@@ -17,7 +17,7 @@ class Type extends \Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Price
* @param \Magento\Framework\Data\Form\Element\Factory $factoryElement
* @param \Magento\Framework\Data\Form\Element\CollectionFactory $factoryCollection
* @param \Magento\Framework\Escaper $escaper
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\Locale\CurrencyInterface $localeCurrency
* @param \Magento\Tax\Helper\Data $taxData
* @param \Magento\Msrp\Model\Config $config
@@ -27,7 +27,7 @@ public function __construct(
\Magento\Framework\Data\Form\Element\Factory $factoryElement,
\Magento\Framework\Data\Form\Element\CollectionFactory $factoryCollection,
\Magento\Framework\Escaper $escaper,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\Locale\CurrencyInterface $localeCurrency,
\Magento\Tax\Helper\Data $taxData,
\Magento\Msrp\Model\Config $config,
diff --git a/app/code/Magento/Msrp/Helper/Data.php b/app/code/Magento/Msrp/Helper/Data.php
index e316672f2cce7..2fa8a659592f9 100644
--- a/app/code/Magento/Msrp/Helper/Data.php
+++ b/app/code/Magento/Msrp/Helper/Data.php
@@ -8,7 +8,7 @@
use Magento\Framework\App\Helper\AbstractHelper;
use Magento\Framework\App\Helper\Context;
use Magento\Msrp\Model\Product\Attribute\Source\Type;
-use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\Store\StoreManagerInterface;
use Magento\Catalog\Model\Product;
use Magento\Catalog\Api\ProductRepositoryInterface;
@@ -18,7 +18,7 @@
class Data extends AbstractHelper
{
/**
- * @var StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $storeManager;
@@ -44,7 +44,7 @@ class Data extends AbstractHelper
/**
* @param Context $context
- * @param StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Msrp\Model\Product\Options $productOptions
* @param \Magento\Msrp\Model\Msrp $msrp
* @param \Magento\Msrp\Model\Config $config
diff --git a/app/code/Magento/Msrp/Model/Config.php b/app/code/Magento/Msrp/Model/Config.php
index be5d39d56523b..b63cbd82b2ecd 100644
--- a/app/code/Magento/Msrp/Model/Config.php
+++ b/app/code/Magento/Msrp/Model/Config.php
@@ -5,9 +5,9 @@
*/
namespace Magento\Msrp\Model;
-use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\Store\ScopeInterface;
use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\Store\StoreManagerInterface;
use Magento\Framework\Escaper;
class Config
@@ -27,7 +27,7 @@ class Config
protected $scopeConfig;
/**
- * @var StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $storeManager;
@@ -43,12 +43,12 @@ class Config
/**
* @param ScopeConfigInterface $scopeConfig
- * @param StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param Escaper $escaper
*/
public function __construct(
ScopeConfigInterface $scopeConfig,
- StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
Escaper $escaper
) {
$this->scopeConfig = $scopeConfig;
@@ -77,7 +77,7 @@ public function isEnabled()
{
return (bool)$this->scopeConfig->getValue(
self::XML_PATH_MSRP_ENABLED,
- ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$this->storeId
);
}
@@ -91,7 +91,7 @@ public function getDisplayActualPriceType()
{
return $this->scopeConfig->getValue(
self::XML_PATH_MSRP_DISPLAY_ACTUAL_PRICE_TYPE,
- ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$this->storeId
);
}
@@ -106,7 +106,7 @@ public function getExplanationMessage()
return $this->escaper->escapeHtml(
$this->scopeConfig->getValue(
self::XML_PATH_MSRP_EXPLANATION_MESSAGE,
- ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$this->storeId
),
['b', 'br', 'strong', 'i', 'u', 'p', 'span']
@@ -123,7 +123,7 @@ public function getExplanationMessageWhatsThis()
return $this->escaper->escapeHtml(
$this->scopeConfig->getValue(
self::XML_PATH_MSRP_EXPLANATION_MESSAGE_WHATS_THIS,
- ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$this->storeId
),
['b', 'br', 'strong', 'i', 'u', 'p', 'span']
diff --git a/app/code/Magento/Msrp/composer.json b/app/code/Magento/Msrp/composer.json
index d31f4fdb9032a..aec5cea5ab035 100644
--- a/app/code/Magento/Msrp/composer.json
+++ b/app/code/Magento/Msrp/composer.json
@@ -9,7 +9,6 @@
"magento/module-downloadable": "0.42.0-beta5",
"magento/module-eav": "0.42.0-beta5",
"magento/module-grouped-product": "0.42.0-beta5",
- "magento/module-store": "0.42.0-beta5",
"magento/module-tax": "0.42.0-beta5",
"magento/module-quote": "0.42.0-beta5",
"magento/framework": "0.42.0-beta5",
diff --git a/app/code/Magento/Multishipping/Block/Checkout/Shipping.php b/app/code/Magento/Multishipping/Block/Checkout/Shipping.php
index 33e18d922427d..a6bd847b469c1 100644
--- a/app/code/Magento/Multishipping/Block/Checkout/Shipping.php
+++ b/app/code/Magento/Multishipping/Block/Checkout/Shipping.php
@@ -142,7 +142,7 @@ public function getCarrierName($carrierCode)
{
if ($name = $this->_scopeConfig->getValue(
'carriers/' . $carrierCode . '/title',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)
) {
return $name;
diff --git a/app/code/Magento/Multishipping/Helper/Data.php b/app/code/Magento/Multishipping/Helper/Data.php
index d7458c1e1a047..fd217c5ee95ab 100644
--- a/app/code/Magento/Multishipping/Helper/Data.php
+++ b/app/code/Magento/Multishipping/Helper/Data.php
@@ -70,7 +70,7 @@ public function getQuote()
*/
public function getMaximumQty()
{
- return (int)$this->scopeConfig->getValue(self::XML_PATH_CHECKOUT_MULTIPLE_MAXIMUM_QUANTITY, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+ return (int)$this->scopeConfig->getValue(self::XML_PATH_CHECKOUT_MULTIPLE_MAXIMUM_QUANTITY, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
}
/**
@@ -82,7 +82,7 @@ public function getMaximumQty()
public function isMultishippingCheckoutAvailable()
{
$quote = $this->getQuote();
- $isMultiShipping = $this->scopeConfig->isSetFlag(self::XML_PATH_CHECKOUT_MULTIPLE_AVAILABLE, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+ $isMultiShipping = $this->scopeConfig->isSetFlag(self::XML_PATH_CHECKOUT_MULTIPLE_AVAILABLE, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
if (!$quote || !$quote->hasItems()) {
return $isMultiShipping;
}
diff --git a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php
index 809ec11f824c0..7cf624fb5a580 100644
--- a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php
+++ b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php
@@ -47,7 +47,7 @@ class Multishipping extends \Magento\Framework\Object
protected $_session;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -146,7 +146,7 @@ class Multishipping extends \Magento\Framework\Object
* @param \Magento\Quote\Model\Quote\Address\ToOrderAddress $quoteAddressToOrderAddress
* @param \Magento\Quote\Model\Quote\Payment\ToOrderPayment $quotePaymentToOrderPayment
* @param \Magento\Quote\Model\Quote\Item\ToOrderItem $quoteItemToOrderItem
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Payment\Model\Method\SpecificationInterface $paymentSpecification
* @param \Magento\Multishipping\Helper\Data $helper
* @param OrderSender $orderSender
@@ -170,7 +170,7 @@ public function __construct(
\Magento\Quote\Model\Quote\Address\ToOrderAddress $quoteAddressToOrderAddress,
\Magento\Quote\Model\Quote\Payment\ToOrderPayment $quotePaymentToOrderPayment,
\Magento\Quote\Model\Quote\Item\ToOrderItem $quoteItemToOrderItem,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Payment\Model\Method\SpecificationInterface $paymentSpecification,
\Magento\Multishipping\Helper\Data $helper,
OrderSender $orderSender,
@@ -766,10 +766,10 @@ public function validateMinimumAmount()
{
return !($this->_scopeConfig->isSetFlag(
'sales/minimum_order/active',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
) && $this->_scopeConfig->isSetFlag(
'sales/minimum_order/multi_address',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
) && !$this->getQuote()->validateMinimumAmount());
}
@@ -782,12 +782,12 @@ public function getMinimumAmountDescription()
{
$descr = $this->_scopeConfig->getValue(
'sales/minimum_order/multi_address_description',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
if (empty($descr)) {
$descr = $this->_scopeConfig->getValue(
'sales/minimum_order/description',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
}
return $descr;
@@ -800,12 +800,12 @@ public function getMinimumAmountError()
{
$error = $this->_scopeConfig->getValue(
'sales/minimum_order/multi_address_error_message',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
if (empty($error)) {
$error = $this->_scopeConfig->getValue(
'sales/minimum_order/error_message',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
}
return $error;
diff --git a/app/code/Magento/Multishipping/Model/Payment/Method/Specification/Is3DSecure.php b/app/code/Magento/Multishipping/Model/Payment/Method/Specification/Is3DSecure.php
index 5d2045ed68e95..f9ff5b6a7302a 100644
--- a/app/code/Magento/Multishipping/Model/Payment/Method/Specification/Is3DSecure.php
+++ b/app/code/Magento/Multishipping/Model/Payment/Method/Specification/Is3DSecure.php
@@ -67,9 +67,9 @@ public function isSatisfiedBy($paymentMethod)
protected function is3DSecureEnabled($paymentMethod)
{
return $this->scopeConfig->isSetFlag(
- sprintf(self::PATH_PAYMENT_3DSECURE, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $paymentMethod)
+ sprintf(self::PATH_PAYMENT_3DSECURE, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $paymentMethod)
) || $this->scopeConfig->isSetFlag(
- sprintf(self::PATH_PAYMENT_CENTINEL, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $paymentMethod)
+ sprintf(self::PATH_PAYMENT_CENTINEL, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $paymentMethod)
);
}
}
diff --git a/app/code/Magento/Multishipping/composer.json b/app/code/Magento/Multishipping/composer.json
index 94cbf4ea1f4a1..616edc988816e 100644
--- a/app/code/Magento/Multishipping/composer.json
+++ b/app/code/Magento/Multishipping/composer.json
@@ -3,7 +3,6 @@
"description": "N/A",
"require": {
"php": "~5.4.11|~5.5.0|~5.6.0",
- "magento/module-store": "0.42.0-beta5",
"magento/module-core": "0.42.0-beta5",
"magento/module-checkout": "0.42.0-beta5",
"magento/module-sales": "0.42.0-beta5",
diff --git a/app/code/Magento/Multishipping/etc/frontend/di.xml b/app/code/Magento/Multishipping/etc/frontend/di.xml
index a61a8af4936fc..adac7cf03e70d 100644
--- a/app/code/Magento/Multishipping/etc/frontend/di.xml
+++ b/app/code/Magento/Multishipping/etc/frontend/di.xml
@@ -6,7 +6,7 @@
*/
-->
-
+
- /multishipping/checkout
diff --git a/app/code/Magento/Multishipping/etc/module.xml b/app/code/Magento/Multishipping/etc/module.xml
index 0973c6781782d..27d308c3eba56 100644
--- a/app/code/Magento/Multishipping/etc/module.xml
+++ b/app/code/Magento/Multishipping/etc/module.xml
@@ -9,7 +9,6 @@
-
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber/Grid/Filter/Website.php b/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber/Grid/Filter/Website.php
index f6abfc399c74c..d0343d4584854 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber/Grid/Filter/Website.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber/Grid/Filter/Website.php
@@ -28,7 +28,7 @@ class Website extends \Magento\Backend\Block\Widget\Grid\Column\Filter\Select
protected $_coreRegistry;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -41,7 +41,7 @@ class Website extends \Magento\Backend\Block\Widget\Grid\Column\Filter\Select
* @param \Magento\Backend\Block\Context $context
* @param \Magento\Framework\DB\Helper $resourceHelper
* @param \Magento\Store\Model\Resource\Website\CollectionFactory $websitesFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\Registry $registry
* @param array $data
*/
@@ -49,7 +49,7 @@ public function __construct(
\Magento\Backend\Block\Context $context,
\Magento\Framework\DB\Helper $resourceHelper,
\Magento\Store\Model\Resource\Website\CollectionFactory $websitesFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\Registry $registry,
array $data = []
) {
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit/Form.php b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit/Form.php
index 18de6a18d03c5..e62c103ab9829 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit/Form.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit/Form.php
@@ -58,15 +58,15 @@ protected function _prepareForm()
$model = $this->getModel();
$identity = $this->_scopeConfig->getValue(
\Magento\Newsletter\Model\Subscriber::XML_PATH_UNSUBSCRIBE_EMAIL_IDENTITY,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
$identityName = $this->_scopeConfig->getValue(
'trans_email/ident_' . $identity . '/name',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
$identityEmail = $this->_scopeConfig->getValue(
'trans_email/ident_' . $identity . '/email',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
/** @var \Magento\Framework\Data\Form $form */
diff --git a/app/code/Magento/Newsletter/Controller/Manage/Save.php b/app/code/Magento/Newsletter/Controller/Manage/Save.php
index 49fc528dfa371..e7327fea02a89 100644
--- a/app/code/Magento/Newsletter/Controller/Manage/Save.php
+++ b/app/code/Magento/Newsletter/Controller/Manage/Save.php
@@ -17,7 +17,7 @@ class Save extends \Magento\Newsletter\Controller\Manage
protected $formKeyValidator;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $storeManager;
@@ -42,7 +42,7 @@ class Save extends \Magento\Newsletter\Controller\Manage
* @param \Magento\Framework\App\Action\Context $context
* @param \Magento\Customer\Model\Session $customerSession
* @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param CustomerRepository $customerRepository
* @param CustomerDataBuilder $customerBuilder
* @param \Magento\Newsletter\Model\SubscriberFactory $subscriberFactory
@@ -51,7 +51,7 @@ public function __construct(
\Magento\Framework\App\Action\Context $context,
\Magento\Customer\Model\Session $customerSession,
\Magento\Core\App\Action\FormKeyValidator $formKeyValidator,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
CustomerRepository $customerRepository,
CustomerDataBuilder $customerBuilder,
\Magento\Newsletter\Model\SubscriberFactory $subscriberFactory
diff --git a/app/code/Magento/Newsletter/Controller/Subscriber.php b/app/code/Magento/Newsletter/Controller/Subscriber.php
index ecebc482b444e..d1fcf3f4ec174 100644
--- a/app/code/Magento/Newsletter/Controller/Subscriber.php
+++ b/app/code/Magento/Newsletter/Controller/Subscriber.php
@@ -10,7 +10,7 @@
namespace Magento\Newsletter\Controller;
use Magento\Framework\App\Action\Context;
-use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\Store\StoreManagerInterface;
use Magento\Customer\Model\Session;
use Magento\Newsletter\Model\SubscriberFactory;
use Magento\Customer\Model\Url as CustomerUrl;
@@ -32,7 +32,7 @@ class Subscriber extends \Magento\Framework\App\Action\Action
protected $_subscriberFactory;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -45,7 +45,7 @@ class Subscriber extends \Magento\Framework\App\Action\Action
* @param Context $context
* @param SubscriberFactory $subscriberFactory
* @param Session $customerSession
- * @param StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param CustomerUrl $customerUrl
*/
public function __construct(
diff --git a/app/code/Magento/Newsletter/Controller/Subscriber/NewAction.php b/app/code/Magento/Newsletter/Controller/Subscriber/NewAction.php
index 3d787c4479500..c55d26f11b5bf 100644
--- a/app/code/Magento/Newsletter/Controller/Subscriber/NewAction.php
+++ b/app/code/Magento/Newsletter/Controller/Subscriber/NewAction.php
@@ -10,7 +10,7 @@
use Magento\Customer\Model\Session;
use Magento\Customer\Model\Url as CustomerUrl;
use Magento\Framework\App\Action\Context;
-use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\Store\StoreManagerInterface;
use Magento\Newsletter\Model\SubscriberFactory;
class NewAction extends \Magento\Newsletter\Controller\Subscriber
@@ -76,7 +76,7 @@ protected function validateGuestSubscription()
if ($this->_objectManager->get('Magento\Framework\App\Config\ScopeConfigInterface')
->getValue(
\Magento\Newsletter\Model\Subscriber::XML_PATH_ALLOW_GUEST_SUBSCRIBE_FLAG,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
) != 1
&& !$this->_customerSession->isLoggedIn()
) {
diff --git a/app/code/Magento/Newsletter/Model/Queue.php b/app/code/Magento/Newsletter/Model/Queue.php
index 72239c7dcfabd..35b9305945a31 100644
--- a/app/code/Magento/Newsletter/Model/Queue.php
+++ b/app/code/Magento/Newsletter/Model/Queue.php
@@ -116,7 +116,7 @@ class Queue extends \Magento\Email\Model\AbstractTemplate
* @param \Magento\Framework\View\DesignInterface $design
* @param \Magento\Framework\Registry $registry
* @param \Magento\Store\Model\App\Emulation $appEmulation
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Newsletter\Model\Template\Filter $templateFilter
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
* @param \Magento\Framework\Stdlib\DateTime\DateTime $date
@@ -132,7 +132,7 @@ public function __construct(
\Magento\Framework\View\DesignInterface $design,
\Magento\Framework\Registry $registry,
\Magento\Store\Model\App\Emulation $appEmulation,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Newsletter\Model\Template\Filter $templateFilter,
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
\Magento\Framework\Stdlib\DateTime\DateTime $date,
diff --git a/app/code/Magento/Newsletter/Model/Resource/Problem/Collection.php b/app/code/Magento/Newsletter/Model/Resource/Problem/Collection.php
index a7992f90fde53..2b89b7cde9bbc 100644
--- a/app/code/Magento/Newsletter/Model/Resource/Problem/Collection.php
+++ b/app/code/Magento/Newsletter/Model/Resource/Problem/Collection.php
@@ -56,7 +56,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
protected $_loadCustomersDataFlag = false;
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -66,7 +66,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
* @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
diff --git a/app/code/Magento/Newsletter/Model/Resource/Queue/Collection.php b/app/code/Magento/Newsletter/Model/Resource/Queue/Collection.php
index 386950ccbd9d0..4f1d3afddbe95 100644
--- a/app/code/Magento/Newsletter/Model/Resource/Queue/Collection.php
+++ b/app/code/Magento/Newsletter/Model/Resource/Queue/Collection.php
@@ -34,7 +34,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
protected $_date;
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -43,7 +43,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
* @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
diff --git a/app/code/Magento/Newsletter/Model/Resource/Subscriber/Collection.php b/app/code/Magento/Newsletter/Model/Resource/Subscriber/Collection.php
index 9c3afee8b9da9..6cbe470b1e266 100644
--- a/app/code/Magento/Newsletter/Model/Resource/Subscriber/Collection.php
+++ b/app/code/Magento/Newsletter/Model/Resource/Subscriber/Collection.php
@@ -57,7 +57,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
protected $_customerHelperData;
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -66,7 +66,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
* @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
diff --git a/app/code/Magento/Newsletter/Model/Subscriber.php b/app/code/Magento/Newsletter/Model/Subscriber.php
index a201e88646585..0da823146252c 100644
--- a/app/code/Magento/Newsletter/Model/Subscriber.php
+++ b/app/code/Magento/Newsletter/Model/Subscriber.php
@@ -96,7 +96,7 @@ class Subscriber extends \Magento\Framework\Model\AbstractModel
/**
* Store manager
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -128,7 +128,7 @@ class Subscriber extends \Magento\Framework\Model\AbstractModel
* @param \Magento\Newsletter\Helper\Data $newsletterData
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param \Magento\Framework\Mail\Template\TransportBuilder $transportBuilder
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Customer\Model\Session $customerSession
* @param CustomerRepositoryInterface $customerRepository
* @param AccountManagementInterface $customerAccountManagement
@@ -144,7 +144,7 @@ public function __construct(
\Magento\Newsletter\Helper\Data $newsletterData,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
\Magento\Framework\Mail\Template\TransportBuilder $transportBuilder,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Customer\Model\Session $customerSession,
CustomerRepositoryInterface $customerRepository,
AccountManagementInterface $customerAccountManagement,
@@ -401,7 +401,7 @@ public function subscribe($email)
$isConfirmNeed = $this->_scopeConfig->getValue(
self::XML_PATH_CONFIRMATION_FLAG,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
) == 1 ? true : false;
$isOwnSubscribes = false;
@@ -634,10 +634,10 @@ public function sendConfirmationRequestEmail()
if (!$this->_scopeConfig->getValue(
self::XML_PATH_CONFIRM_EMAIL_TEMPLATE,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
) || !$this->_scopeConfig->getValue(
self::XML_PATH_CONFIRM_EMAIL_IDENTITY,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)
) {
return $this;
@@ -648,7 +648,7 @@ public function sendConfirmationRequestEmail()
$this->_transportBuilder->setTemplateIdentifier(
$this->_scopeConfig->getValue(
self::XML_PATH_CONFIRM_EMAIL_TEMPLATE,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)
)->setTemplateOptions(
[
@@ -660,7 +660,7 @@ public function sendConfirmationRequestEmail()
)->setFrom(
$this->_scopeConfig->getValue(
self::XML_PATH_CONFIRM_EMAIL_IDENTITY,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)
)->addTo(
$this->getEmail(),
@@ -687,10 +687,10 @@ public function sendConfirmationSuccessEmail()
if (!$this->_scopeConfig->getValue(
self::XML_PATH_SUCCESS_EMAIL_TEMPLATE,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
) || !$this->_scopeConfig->getValue(
self::XML_PATH_SUCCESS_EMAIL_IDENTITY,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)
) {
return $this;
@@ -701,7 +701,7 @@ public function sendConfirmationSuccessEmail()
$this->_transportBuilder->setTemplateIdentifier(
$this->_scopeConfig->getValue(
self::XML_PATH_SUCCESS_EMAIL_TEMPLATE,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)
)->setTemplateOptions(
[
@@ -713,7 +713,7 @@ public function sendConfirmationSuccessEmail()
)->setFrom(
$this->_scopeConfig->getValue(
self::XML_PATH_SUCCESS_EMAIL_IDENTITY,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)
)->addTo(
$this->getEmail(),
@@ -739,10 +739,10 @@ public function sendUnsubscriptionEmail()
}
if (!$this->_scopeConfig->getValue(
self::XML_PATH_UNSUBSCRIBE_EMAIL_TEMPLATE,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
) || !$this->_scopeConfig->getValue(
self::XML_PATH_UNSUBSCRIBE_EMAIL_IDENTITY,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)
) {
return $this;
@@ -753,7 +753,7 @@ public function sendUnsubscriptionEmail()
$this->_transportBuilder->setTemplateIdentifier(
$this->_scopeConfig->getValue(
self::XML_PATH_UNSUBSCRIBE_EMAIL_TEMPLATE,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)
)->setTemplateOptions(
[
@@ -765,7 +765,7 @@ public function sendUnsubscriptionEmail()
)->setFrom(
$this->_scopeConfig->getValue(
self::XML_PATH_UNSUBSCRIBE_EMAIL_IDENTITY,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)
)->addTo(
$this->getEmail(),
diff --git a/app/code/Magento/Newsletter/Model/Template.php b/app/code/Magento/Newsletter/Model/Template.php
index 4ff5e4d526c66..cc3d409ed2a47 100644
--- a/app/code/Magento/Newsletter/Model/Template.php
+++ b/app/code/Magento/Newsletter/Model/Template.php
@@ -53,7 +53,7 @@ class Template extends \Magento\Email\Model\AbstractTemplate
/**
* Store manager to emulate design
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -95,7 +95,7 @@ class Template extends \Magento\Email\Model\AbstractTemplate
* @param \Magento\Framework\View\DesignInterface $design
* @param \Magento\Framework\Registry $registry
* @param \Magento\Store\Model\App\Emulation $appEmulation
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\RequestInterface $request
* @param \Magento\Newsletter\Model\Template\Filter $filter
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
@@ -109,7 +109,7 @@ public function __construct(
\Magento\Framework\View\DesignInterface $design,
\Magento\Framework\Registry $registry,
\Magento\Store\Model\App\Emulation $appEmulation,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\App\RequestInterface $request,
\Magento\Newsletter\Model\Template\Filter $filter,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
@@ -335,7 +335,7 @@ public function isValidForSend()
{
return !$this->_scopeConfig->isSetFlag(
\Magento\Email\Model\Template::XML_PATH_SYSTEM_SMTP_DISABLE,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
) && $this->getTemplateSenderName() && $this->getTemplateSenderEmail() && $this->getTemplateSubject();
}
}
diff --git a/app/code/Magento/Newsletter/etc/frontend/di.xml b/app/code/Magento/Newsletter/etc/frontend/di.xml
index 9046e885a2c0f..a97a0f3222237 100644
--- a/app/code/Magento/Newsletter/etc/frontend/di.xml
+++ b/app/code/Magento/Newsletter/etc/frontend/di.xml
@@ -6,7 +6,7 @@
*/
-->
-
+
- /newsletter/manage/
diff --git a/app/code/Magento/OfflineShipping/Controller/Adminhtml/System/Config/ExportTablerates.php b/app/code/Magento/OfflineShipping/Controller/Adminhtml/System/Config/ExportTablerates.php
index f56fac0e30b25..b0adb7297f688 100644
--- a/app/code/Magento/OfflineShipping/Controller/Adminhtml/System/Config/ExportTablerates.php
+++ b/app/code/Magento/OfflineShipping/Controller/Adminhtml/System/Config/ExportTablerates.php
@@ -18,7 +18,7 @@ class ExportTablerates extends \Magento\Backend\Controller\Adminhtml\System\Abst
protected $_fileFactory;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -27,14 +27,14 @@ class ExportTablerates extends \Magento\Backend\Controller\Adminhtml\System\Abst
* @param \Magento\Backend\Model\Config\Structure $configStructure
* @param ConfigSectionChecker $sectionChecker
* @param \Magento\Framework\App\Response\Http\FileFactory $fileFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
*/
public function __construct(
\Magento\Backend\App\Action\Context $context,
\Magento\Backend\Model\Config\Structure $configStructure,
ConfigSectionChecker $sectionChecker,
\Magento\Framework\App\Response\Http\FileFactory $fileFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager
+ \Magento\Framework\Store\StoreManagerInterface $storeManager
) {
$this->_storeManager = $storeManager;
$this->_fileFactory = $fileFactory;
diff --git a/app/code/Magento/OfflineShipping/Model/Plugin/Checkout/Block/Cart/Shipping.php b/app/code/Magento/OfflineShipping/Model/Plugin/Checkout/Block/Cart/Shipping.php
index b3bc246030b93..55b4fc70e1f24 100644
--- a/app/code/Magento/OfflineShipping/Model/Plugin/Checkout/Block/Cart/Shipping.php
+++ b/app/code/Magento/OfflineShipping/Model/Plugin/Checkout/Block/Cart/Shipping.php
@@ -36,6 +36,6 @@ public function __construct(\Magento\Framework\App\Config\ScopeConfigInterface $
*/
public function afterGetStateActive(\Magento\Checkout\Block\Cart\Shipping $subject, $result)
{
- return (bool)$result || (bool)$this->_scopeConfig->getValue('carriers/tablerate/active', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+ return (bool)$result || (bool)$this->_scopeConfig->getValue('carriers/tablerate/active', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
}
}
diff --git a/app/code/Magento/OfflineShipping/Model/Quote/Freeshipping.php b/app/code/Magento/OfflineShipping/Model/Quote/Freeshipping.php
index efe7c7f63f406..511672f40d86d 100644
--- a/app/code/Magento/OfflineShipping/Model/Quote/Freeshipping.php
+++ b/app/code/Magento/OfflineShipping/Model/Quote/Freeshipping.php
@@ -17,16 +17,16 @@ class Freeshipping extends \Magento\Quote\Model\Quote\Address\Total\AbstractTota
protected $_calculator;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
/**
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\OfflineShipping\Model\SalesRule\Calculator $calculator
*/
public function __construct(
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\OfflineShipping\Model\SalesRule\Calculator $calculator
) {
$this->setCode('discount');
diff --git a/app/code/Magento/OfflineShipping/Model/Resource/Carrier/Tablerate.php b/app/code/Magento/OfflineShipping/Model/Resource/Carrier/Tablerate.php
index 23985af45cddc..6c5869c7bd2e0 100644
--- a/app/code/Magento/OfflineShipping/Model/Resource/Carrier/Tablerate.php
+++ b/app/code/Magento/OfflineShipping/Model/Resource/Carrier/Tablerate.php
@@ -95,7 +95,7 @@ class Tablerate extends \Magento\Framework\Model\Resource\Db\AbstractDb
protected $_logger;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -125,7 +125,7 @@ class Tablerate extends \Magento\Framework\Model\Resource\Db\AbstractDb
* @param \Magento\Framework\App\Resource $resource
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\App\Config\ScopeConfigInterface $coreConfig
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\OfflineShipping\Model\Carrier\Tablerate $carrierTablerate
* @param \Magento\Directory\Model\Resource\Country\CollectionFactory $countryCollectionFactory
* @param \Magento\Directory\Model\Resource\Region\CollectionFactory $regionCollectionFactory
@@ -135,7 +135,7 @@ public function __construct(
\Magento\Framework\App\Resource $resource,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\App\Config\ScopeConfigInterface $coreConfig,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\OfflineShipping\Model\Carrier\Tablerate $carrierTablerate,
\Magento\Directory\Model\Resource\Country\CollectionFactory $countryCollectionFactory,
\Magento\Directory\Model\Resource\Region\CollectionFactory $regionCollectionFactory,
diff --git a/app/code/Magento/OfflineShipping/composer.json b/app/code/Magento/OfflineShipping/composer.json
index c721f1f83eddd..12b3b1ba7f4ab 100644
--- a/app/code/Magento/OfflineShipping/composer.json
+++ b/app/code/Magento/OfflineShipping/composer.json
@@ -3,7 +3,6 @@
"description": "N/A",
"require": {
"php": "~5.4.11|~5.5.0|~5.6.0",
- "magento/module-store": "0.42.0-beta5",
"magento/module-backend": "0.42.0-beta5",
"magento/module-shipping": "0.42.0-beta5",
"magento/module-catalog": "0.42.0-beta5",
diff --git a/app/code/Magento/OfflineShipping/etc/module.xml b/app/code/Magento/OfflineShipping/etc/module.xml
index 84e7bb228b473..fa87ce91d4ecb 100644
--- a/app/code/Magento/OfflineShipping/etc/module.xml
+++ b/app/code/Magento/OfflineShipping/etc/module.xml
@@ -8,7 +8,6 @@
-
diff --git a/app/code/Magento/PageCache/Model/Config.php b/app/code/Magento/PageCache/Model/Config.php
index 6fd1938c39467..c72b8d93ba647 100644
--- a/app/code/Magento/PageCache/Model/Config.php
+++ b/app/code/Magento/PageCache/Model/Config.php
@@ -119,11 +119,11 @@ protected function _getReplacements()
return [
'{{ host }}' => $this->_scopeConfig->getValue(
self::XML_VARNISH_PAGECACHE_BACKEND_HOST,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
),
'{{ port }}' => $this->_scopeConfig->getValue(
self::XML_VARNISH_PAGECACHE_BACKEND_PORT,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
),
'{{ ips }}' => $this->_getAccessList(),
'{{ design_exceptions_code }}' => $this->_getDesignExceptions()
@@ -146,7 +146,7 @@ protected function _getAccessList()
$tpl = " \"%s\";";
$accessList = $this->_scopeConfig->getValue(
self::XML_VARNISH_PAGECACHE_ACCESS_LIST,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
if (!empty($accessList)) {
$ips = explode(', ', $accessList);
@@ -173,7 +173,7 @@ protected function _getDesignExceptions()
$expressions = $this->_scopeConfig->getValue(
self::XML_VARNISH_PAGECACHE_DESIGN_THEME_REGEX,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
if ($expressions) {
$rules = array_values(unserialize($expressions));
diff --git a/app/code/Magento/PageCache/composer.json b/app/code/Magento/PageCache/composer.json
index 3840361a003b4..44848afa0123a 100644
--- a/app/code/Magento/PageCache/composer.json
+++ b/app/code/Magento/PageCache/composer.json
@@ -3,7 +3,6 @@
"description": "N/A",
"require": {
"php": "~5.4.11|~5.5.0|~5.6.0",
- "magento/module-store": "0.42.0-beta5",
"magento/module-backend": "0.42.0-beta5",
"magento/framework": "0.42.0-beta5",
"magento/magento-composer-installer": "*"
diff --git a/app/code/Magento/PageCache/etc/module.xml b/app/code/Magento/PageCache/etc/module.xml
index a94c5335ea937..a6f9421bc9311 100644
--- a/app/code/Magento/PageCache/etc/module.xml
+++ b/app/code/Magento/PageCache/etc/module.xml
@@ -9,7 +9,6 @@
-
diff --git a/app/code/Magento/Payment/Helper/Data.php b/app/code/Magento/Payment/Helper/Data.php
index 6f77f919472e8..f4a4812ac77c3 100644
--- a/app/code/Magento/Payment/Helper/Data.php
+++ b/app/code/Magento/Payment/Helper/Data.php
@@ -112,7 +112,7 @@ public function getMethodInstance($code)
{
$class = $this->_scopeConfig->getValue(
$this->getMethodModelConfigName($code),
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
if (!$class) {
@@ -137,7 +137,7 @@ public function getStoreMethods($store = null, $quote = null)
foreach (array_keys($methods) as $code) {
$model = $this->_scopeConfig->getValue(
$this->getMethodModelConfigName($code),
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
if (!$model) {
@@ -325,7 +325,7 @@ public function isZeroSubTotal($store = null)
{
return $this->_scopeConfig->getValue(
\Magento\Payment\Model\Method\Free::XML_PATH_PAYMENT_FREE_ACTIVE,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -340,7 +340,7 @@ public function getZeroSubTotalOrderStatus($store = null)
{
return $this->_scopeConfig->getValue(
\Magento\Payment\Model\Method\Free::XML_PATH_PAYMENT_FREE_ORDER_STATUS,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -355,7 +355,7 @@ public function getZeroSubTotalPaymentAutomaticInvoice($store = null)
{
return $this->_scopeConfig->getValue(
\Magento\Payment\Model\Method\Free::XML_PATH_PAYMENT_FREE_PAYMENT_ACTION,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
}
diff --git a/app/code/Magento/Payment/Model/Config.php b/app/code/Magento/Payment/Model/Config.php
index a36c3dff9ec97..6acbd23ab21df 100644
--- a/app/code/Magento/Payment/Model/Config.php
+++ b/app/code/Magento/Payment/Model/Config.php
@@ -6,7 +6,7 @@
namespace Magento\Payment\Model;
use Magento\Payment\Model\Method\AbstractMethod;
-use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\Store\ScopeInterface;
/**
* Payment configuration model
diff --git a/app/code/Magento/Payment/Model/Method/AbstractMethod.php b/app/code/Magento/Payment/Model/Method/AbstractMethod.php
index ca6dd62a7c585..d701809a14d46 100644
--- a/app/code/Magento/Payment/Model/Method/AbstractMethod.php
+++ b/app/code/Magento/Payment/Model/Method/AbstractMethod.php
@@ -736,7 +736,7 @@ public function getConfigData($field, $storeId = null)
$storeId = $this->getStore();
}
$path = 'payment/' . $this->getCode() . '/' . $field;
- return $this->_scopeConfig->getValue($path, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $storeId);
+ return $this->_scopeConfig->getValue($path, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $storeId);
}
/**
diff --git a/app/code/Magento/Persistent/Helper/Data.php b/app/code/Magento/Persistent/Helper/Data.php
index b5b23229d7270..6f88ed3e21339 100644
--- a/app/code/Magento/Persistent/Helper/Data.php
+++ b/app/code/Magento/Persistent/Helper/Data.php
@@ -9,7 +9,7 @@
*/
namespace Magento\Persistent\Helper;
-use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\Store\ScopeInterface;
class Data extends \Magento\Core\Helper\Data
{
@@ -45,7 +45,7 @@ class Data extends \Magento\Core\Helper\Data
/**
* @param \Magento\Framework\App\Helper\Context $context
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\State $appState
* @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
* @param \Magento\Framework\Module\Dir\Reader $modulesReader
@@ -55,7 +55,7 @@ class Data extends \Magento\Core\Helper\Data
public function __construct(
\Magento\Framework\App\Helper\Context $context,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\App\State $appState,
\Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
\Magento\Framework\Module\Dir\Reader $modulesReader,
diff --git a/app/code/Magento/Persistent/Helper/Session.php b/app/code/Magento/Persistent/Helper/Session.php
index 57a880e30f431..ab25d9913eaae 100644
--- a/app/code/Magento/Persistent/Helper/Session.php
+++ b/app/code/Magento/Persistent/Helper/Session.php
@@ -48,7 +48,7 @@ class Session extends \Magento\Core\Helper\Data
/**
* @param \Magento\Framework\App\Helper\Context $context
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\State $appState
* @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
* @param Data $persistentData
@@ -59,7 +59,7 @@ class Session extends \Magento\Core\Helper\Data
public function __construct(
\Magento\Framework\App\Helper\Context $context,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\App\State $appState,
\Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
\Magento\Persistent\Helper\Data $persistentData,
diff --git a/app/code/Magento/Persistent/Model/Session.php b/app/code/Magento/Persistent/Model/Session.php
index afd932a75f714..2e1e18e3fad72 100644
--- a/app/code/Magento/Persistent/Model/Session.php
+++ b/app/code/Magento/Persistent/Model/Session.php
@@ -66,7 +66,7 @@ class Session extends \Magento\Framework\Model\AbstractModel
/**
* Store manager
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -104,7 +104,7 @@ class Session extends \Magento\Framework\Model\AbstractModel
* @param \Magento\Persistent\Helper\Data $persistentData
* @param \Magento\Framework\Stdlib\CookieManagerInterface $cookieManager
* @param \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory $cookieMetadataFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\Math\Random $mathRandom
* @param \Magento\Framework\Session\Config\ConfigInterface $sessionConfig
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
@@ -120,7 +120,7 @@ public function __construct(
\Magento\Persistent\Helper\Data $persistentData,
\Magento\Framework\Stdlib\CookieManagerInterface $cookieManager,
\Magento\Framework\Stdlib\Cookie\CookieMetadataFactory $cookieMetadataFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\Math\Random $mathRandom,
\Magento\Framework\Session\Config\ConfigInterface $sessionConfig,
\Magento\Framework\Model\Resource\AbstractResource $resource = null,
diff --git a/app/code/Magento/Persistent/etc/frontend/di.xml b/app/code/Magento/Persistent/etc/frontend/di.xml
index 686f8b735d052..c9574570e304f 100644
--- a/app/code/Magento/Persistent/etc/frontend/di.xml
+++ b/app/code/Magento/Persistent/etc/frontend/di.xml
@@ -6,7 +6,7 @@
*/
-->
-
+
- /persistent/index/saveMethod
diff --git a/app/code/Magento/ProductAlert/Controller/Add/Price.php b/app/code/Magento/ProductAlert/Controller/Add/Price.php
index 5a9fdd0e38d1d..ebb601f68bd9f 100644
--- a/app/code/Magento/ProductAlert/Controller/Add/Price.php
+++ b/app/code/Magento/ProductAlert/Controller/Add/Price.php
@@ -12,7 +12,7 @@
class Price extends \Magento\ProductAlert\Controller\Add
{
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -22,13 +22,13 @@ class Price extends \Magento\ProductAlert\Controller\Add
/**
* @param Context $context
* @param \Magento\Customer\Model\Session $customerSession
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
*/
public function __construct(
Context $context,
\Magento\Customer\Model\Session $customerSession,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Catalog\Api\ProductRepositoryInterface $productRepository
) {
parent::__construct($context, $customerSession);
@@ -81,7 +81,7 @@ public function execute()
)->setPrice(
$product->getFinalPrice()
)->setWebsiteId(
- $this->_objectManager->get('Magento\Store\Model\StoreManagerInterface')->getStore()->getWebsiteId()
+ $this->_objectManager->get('Magento\Framework\Store\StoreManagerInterface')->getStore()->getWebsiteId()
);
$model->save();
$this->messageManager->addSuccess(__('You saved the alert subscription.'));
diff --git a/app/code/Magento/ProductAlert/Controller/Add/Stock.php b/app/code/Magento/ProductAlert/Controller/Add/Stock.php
index 3e47cd66b2527..62bfac2e92845 100644
--- a/app/code/Magento/ProductAlert/Controller/Add/Stock.php
+++ b/app/code/Magento/ProductAlert/Controller/Add/Stock.php
@@ -49,7 +49,7 @@ public function execute()
)->setProductId(
$product->getId()
)->setWebsiteId(
- $this->_objectManager->get('Magento\Store\Model\StoreManagerInterface')->getStore()->getWebsiteId()
+ $this->_objectManager->get('Magento\Framework\Store\StoreManagerInterface')->getStore()->getWebsiteId()
);
$model->save();
$this->messageManager->addSuccess(__('Alert subscription has been saved.'));
diff --git a/app/code/Magento/ProductAlert/Controller/Unsubscribe/Price.php b/app/code/Magento/ProductAlert/Controller/Unsubscribe/Price.php
index 8d6b92fd56fc2..338021740a776 100644
--- a/app/code/Magento/ProductAlert/Controller/Unsubscribe/Price.php
+++ b/app/code/Magento/ProductAlert/Controller/Unsubscribe/Price.php
@@ -52,7 +52,7 @@ public function execute()
)->setProductId(
$product->getId()
)->setWebsiteId(
- $this->_objectManager->get('Magento\Store\Model\StoreManagerInterface')->getStore()->getWebsiteId()
+ $this->_objectManager->get('Magento\Framework\Store\StoreManagerInterface')->getStore()->getWebsiteId()
)->loadByParam();
if ($model->getId()) {
$model->delete();
diff --git a/app/code/Magento/ProductAlert/Controller/Unsubscribe/PriceAll.php b/app/code/Magento/ProductAlert/Controller/Unsubscribe/PriceAll.php
index aacabec010c73..5cf0a186da5f1 100644
--- a/app/code/Magento/ProductAlert/Controller/Unsubscribe/PriceAll.php
+++ b/app/code/Magento/ProductAlert/Controller/Unsubscribe/PriceAll.php
@@ -18,7 +18,7 @@ public function execute()
'Magento\ProductAlert\Model\Price'
)->deleteCustomer(
$this->_customerSession->getCustomerId(),
- $this->_objectManager->get('Magento\Store\Model\StoreManagerInterface')->getStore()->getWebsiteId()
+ $this->_objectManager->get('Magento\Framework\Store\StoreManagerInterface')->getStore()->getWebsiteId()
);
$this->messageManager->addSuccess(__('You will no longer receive price alerts for this product.'));
} catch (\Exception $e) {
diff --git a/app/code/Magento/ProductAlert/Controller/Unsubscribe/Stock.php b/app/code/Magento/ProductAlert/Controller/Unsubscribe/Stock.php
index 2d29c9993fc18..65e8695bb3f82 100644
--- a/app/code/Magento/ProductAlert/Controller/Unsubscribe/Stock.php
+++ b/app/code/Magento/ProductAlert/Controller/Unsubscribe/Stock.php
@@ -52,7 +52,7 @@ public function execute()
)->setProductId(
$product->getId()
)->setWebsiteId(
- $this->_objectManager->get('Magento\Store\Model\StoreManagerInterface')->getStore()->getWebsiteId()
+ $this->_objectManager->get('Magento\Framework\Store\StoreManagerInterface')->getStore()->getWebsiteId()
)->loadByParam();
if ($model->getId()) {
$model->delete();
diff --git a/app/code/Magento/ProductAlert/Controller/Unsubscribe/StockAll.php b/app/code/Magento/ProductAlert/Controller/Unsubscribe/StockAll.php
index 3d9b989cdbb8c..8688ccf698055 100644
--- a/app/code/Magento/ProductAlert/Controller/Unsubscribe/StockAll.php
+++ b/app/code/Magento/ProductAlert/Controller/Unsubscribe/StockAll.php
@@ -18,7 +18,7 @@ public function execute()
'Magento\ProductAlert\Model\Stock'
)->deleteCustomer(
$this->_customerSession->getCustomerId(),
- $this->_objectManager->get('Magento\Store\Model\StoreManagerInterface')->getStore()->getWebsiteId()
+ $this->_objectManager->get('Magento\Framework\Store\StoreManagerInterface')->getStore()->getWebsiteId()
);
$this->messageManager->addSuccess(__('You will no longer receive stock alerts.'));
} catch (\Exception $e) {
diff --git a/app/code/Magento/ProductAlert/Helper/Data.php b/app/code/Magento/ProductAlert/Helper/Data.php
index 4ffb1cae8b9ea..d2cac1b0b48ca 100644
--- a/app/code/Magento/ProductAlert/Helper/Data.php
+++ b/app/code/Magento/ProductAlert/Helper/Data.php
@@ -42,14 +42,14 @@ class Data extends \Magento\Core\Helper\Url
/**
* @param \Magento\Framework\App\Helper\Context $context
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\Registry $coreRegistry
* @param \Magento\Framework\View\LayoutInterface $layout
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
*/
public function __construct(
\Magento\Framework\App\Helper\Context $context,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\Registry $coreRegistry,
\Magento\Framework\View\LayoutInterface $layout,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
@@ -137,7 +137,7 @@ public function isStockAlertAllowed()
{
return $this->_scopeConfig->isSetFlag(
\Magento\ProductAlert\Model\Observer::XML_PATH_STOCK_ALLOW,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
}
@@ -150,7 +150,7 @@ public function isPriceAlertAllowed()
{
return $this->_scopeConfig->isSetFlag(
\Magento\ProductAlert\Model\Observer::XML_PATH_PRICE_ALLOW,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
}
}
diff --git a/app/code/Magento/ProductAlert/Model/Email.php b/app/code/Magento/ProductAlert/Model/Email.php
index 395d2d9bef141..3f75ca489f935 100644
--- a/app/code/Magento/ProductAlert/Model/Email.php
+++ b/app/code/Magento/ProductAlert/Model/Email.php
@@ -83,7 +83,7 @@ class Email extends \Magento\Framework\Model\AbstractModel
protected $_scopeConfig;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -112,7 +112,7 @@ class Email extends \Magento\Framework\Model\AbstractModel
* @param \Magento\Framework\Registry $registry
* @param \Magento\ProductAlert\Helper\Data $productAlertData
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository
* @param \Magento\Customer\Helper\View $customerHelper
* @param \Magento\Store\Model\App\Emulation $appEmulation
@@ -127,7 +127,7 @@ public function __construct(
\Magento\Framework\Registry $registry,
\Magento\ProductAlert\Helper\Data $productAlertData,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Customer\Api\CustomerRepositoryInterface $customerRepository,
\Magento\Customer\Helper\View $customerHelper,
\Magento\Store\Model\App\Emulation $appEmulation,
@@ -313,14 +313,14 @@ public function send()
if ($this->_type == 'price' && !$this->_scopeConfig->getValue(
self::XML_PATH_EMAIL_PRICE_TEMPLATE,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$storeId
)
) {
return false;
} elseif ($this->_type == 'stock' && !$this->_scopeConfig->getValue(
self::XML_PATH_EMAIL_STOCK_TEMPLATE,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$storeId
)
) {
@@ -342,7 +342,7 @@ public function send()
$block = $this->_getPriceBlock();
$templateId = $this->_scopeConfig->getValue(
self::XML_PATH_EMAIL_PRICE_TEMPLATE,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$storeId
);
} else {
@@ -354,7 +354,7 @@ public function send()
$block = $this->_getStockBlock();
$templateId = $this->_scopeConfig->getValue(
self::XML_PATH_EMAIL_STOCK_TEMPLATE,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$storeId
);
}
@@ -377,7 +377,7 @@ public function send()
)->setFrom(
$this->_scopeConfig->getValue(
self::XML_PATH_EMAIL_IDENTITY,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$storeId
)
)->addTo(
diff --git a/app/code/Magento/ProductAlert/Model/Observer.php b/app/code/Magento/ProductAlert/Model/Observer.php
index 3a601e4518b66..5d2211ae48d6f 100644
--- a/app/code/Magento/ProductAlert/Model/Observer.php
+++ b/app/code/Magento/ProductAlert/Model/Observer.php
@@ -69,7 +69,7 @@ class Observer
protected $_scopeConfig;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -116,7 +116,7 @@ class Observer
/**
* @param \Magento\Catalog\Helper\Data $catalogData
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\ProductAlert\Model\Resource\Price\CollectionFactory $priceColFactory
* @param \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository
* @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
@@ -130,7 +130,7 @@ class Observer
public function __construct(
\Magento\Catalog\Helper\Data $catalogData,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\ProductAlert\Model\Resource\Price\CollectionFactory $priceColFactory,
\Magento\Customer\Api\CustomerRepositoryInterface $customerRepository,
\Magento\Catalog\Api\ProductRepositoryInterface $productRepository,
@@ -189,7 +189,7 @@ protected function _processPrice(\Magento\ProductAlert\Model\Email $email)
}
if (!$this->_scopeConfig->getValue(
self::XML_PATH_PRICE_ALLOW,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$website->getDefaultGroup()->getDefaultStore()->getId()
)
) {
@@ -277,7 +277,7 @@ protected function _processStock(\Magento\ProductAlert\Model\Email $email)
}
if (!$this->_scopeConfig->getValue(
self::XML_PATH_STOCK_ALLOW,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$website->getDefaultGroup()->getDefaultStore()->getId()
)
) {
@@ -356,7 +356,7 @@ protected function _sendErrorEmail()
if (count($this->_errors)) {
if (!$this->_scopeConfig->getValue(
self::XML_PATH_ERROR_TEMPLATE,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)
) {
return $this;
@@ -367,7 +367,7 @@ protected function _sendErrorEmail()
$transport = $this->_transportBuilder->setTemplateIdentifier(
$this->_scopeConfig->getValue(
self::XML_PATH_ERROR_TEMPLATE,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)
)->setTemplateOptions(
[
@@ -379,12 +379,12 @@ protected function _sendErrorEmail()
)->setFrom(
$this->_scopeConfig->getValue(
self::XML_PATH_ERROR_IDENTITY,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)
)->addTo(
$this->_scopeConfig->getValue(
self::XML_PATH_ERROR_RECIPIENT,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)
)->getTransport();
diff --git a/app/code/Magento/Quote/Model/Cart/ShippingMethodConverter.php b/app/code/Magento/Quote/Model/Cart/ShippingMethodConverter.php
index 6a41f4a20ab26..5d787e4296885 100644
--- a/app/code/Magento/Quote/Model/Cart/ShippingMethodConverter.php
+++ b/app/code/Magento/Quote/Model/Cart/ShippingMethodConverter.php
@@ -22,11 +22,11 @@ class ShippingMethodConverter
* Constructs a shipping method builder object.
*
* @param \Magento\Quote\Api\Data\ShippingMethodDataBuilder $builder Shipping method builder.
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager Store manager interface.
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager Store manager interface.
*/
public function __construct(
\Magento\Quote\Api\Data\ShippingMethodDataBuilder $builder,
- \Magento\Store\Model\StoreManagerInterface $storeManager
+ \Magento\Framework\Store\StoreManagerInterface $storeManager
) {
$this->builder = $builder;
$this->storeManager = $storeManager;
diff --git a/app/code/Magento/Quote/Model/Observer/Backend/CustomerQuote.php b/app/code/Magento/Quote/Model/Observer/Backend/CustomerQuote.php
index f5221834db63d..e93079c972b78 100644
--- a/app/code/Magento/Quote/Model/Observer/Backend/CustomerQuote.php
+++ b/app/code/Magento/Quote/Model/Observer/Backend/CustomerQuote.php
@@ -5,7 +5,7 @@
*/
namespace Magento\Quote\Model\Observer\Backend;
-use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\Store\StoreManagerInterface;
use Magento\Customer\Model\Config\Share as ShareConfig;
use Magento\Quote\Model\QuoteRepository;
use Magento\Framework\Event\Observer;
diff --git a/app/code/Magento/Quote/Model/Quote.php b/app/code/Magento/Quote/Model/Quote.php
index 9b46dff721101..c702fc8a06daa 100644
--- a/app/code/Magento/Quote/Model/Quote.php
+++ b/app/code/Magento/Quote/Model/Quote.php
@@ -203,7 +203,7 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
protected $_scopeConfig;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -338,7 +338,7 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
* @param QuoteValidator $quoteValidator
* @param \Magento\Catalog\Helper\Product $catalogProduct
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\Config\ScopeConfigInterface $config
* @param Quote\AddressFactory $quoteAddressFactory
* @param \Magento\Customer\Model\CustomerFactory $customerFactory
@@ -375,7 +375,7 @@ public function __construct(
\Magento\Quote\Model\QuoteValidator $quoteValidator,
\Magento\Catalog\Helper\Product $catalogProduct,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\App\Config\ScopeConfigInterface $config,
\Magento\Quote\Model\Quote\AddressFactory $quoteAddressFactory,
\Magento\Customer\Model\CustomerFactory $customerFactory,
@@ -2159,7 +2159,7 @@ public function validateMinimumAmount($multishipping = false)
$storeId = $this->getStoreId();
$minOrderActive = $this->_scopeConfig->isSetFlag(
'sales/minimum_order/active',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$storeId
);
if (!$minOrderActive) {
@@ -2167,17 +2167,17 @@ public function validateMinimumAmount($multishipping = false)
}
$minOrderMulti = $this->_scopeConfig->isSetFlag(
'sales/minimum_order/multi_address',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$storeId
);
$minAmount = $this->_scopeConfig->getValue(
'sales/minimum_order/amount',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$storeId
);
$taxInclude = $this->_scopeConfig->getValue(
'sales/minimum_order/tax_including',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$storeId
);
diff --git a/app/code/Magento/Quote/Model/Quote/Address.php b/app/code/Magento/Quote/Model/Quote/Address.php
index b05e8b9cc7135..9af19670b03da 100644
--- a/app/code/Magento/Quote/Model/Quote/Address.php
+++ b/app/code/Magento/Quote/Model/Quote/Address.php
@@ -1134,7 +1134,7 @@ public function validateMinimumAmount()
$storeId = $this->getQuote()->getStoreId();
$validateEnabled = $this->_scopeConfig->isSetFlag(
'sales/minimum_order/active',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$storeId
);
if (!$validateEnabled) {
@@ -1147,12 +1147,12 @@ public function validateMinimumAmount()
$amount = $this->_scopeConfig->getValue(
'sales/minimum_order/amount',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$storeId
);
$taxInclude = $this->_scopeConfig->getValue(
'sales/minimum_order/tax_including',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$storeId
);
$taxes = $taxInclude ? $this->getBaseTaxAmount() : 0;
diff --git a/app/code/Magento/Quote/Model/Quote/Address/Total/Collector.php b/app/code/Magento/Quote/Model/Quote/Address/Total/Collector.php
index bc19616dd902f..8399e7e95151f 100644
--- a/app/code/Magento/Quote/Model/Quote/Address/Total/Collector.php
+++ b/app/code/Magento/Quote/Model/Quote/Address/Total/Collector.php
@@ -68,7 +68,7 @@ class Collector extends \Magento\Sales\Model\Config\Ordered
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Sales\Model\Config $salesConfig
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Quote\Model\Quote\Address\TotalFactory $totalFactory
* @param mixed $sourceData
* @param mixed $store
@@ -78,7 +78,7 @@ public function __construct(
\Psr\Log\LoggerInterface $logger,
\Magento\Sales\Model\Config $salesConfig,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Quote\Model\Quote\Address\TotalFactory $totalFactory,
$sourceData = null,
$store = null
@@ -147,7 +147,7 @@ private function _initRetrievers()
{
$sorts = $this->_scopeConfig->getValue(
self::XML_PATH_SALES_TOTALS_SORT,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$this->_store
);
foreach ($sorts as $code => $sortOrder) {
diff --git a/app/code/Magento/Quote/Model/Quote/Address/Total/Discount.php b/app/code/Magento/Quote/Model/Quote/Address/Total/Discount.php
index aa50ef3fbe822..6d4216c30b9ad 100644
--- a/app/code/Magento/Quote/Model/Quote/Address/Total/Discount.php
+++ b/app/code/Magento/Quote/Model/Quote/Address/Total/Discount.php
@@ -15,17 +15,17 @@ class Discount extends \Magento\Quote\Model\Quote\Address\Total\AbstractTotal
protected $_eventManager = null;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
/**
* @param \Magento\Framework\Event\ManagerInterface $eventManager
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
*/
public function __construct(
\Magento\Framework\Event\ManagerInterface $eventManager,
- \Magento\Store\Model\StoreManagerInterface $storeManager
+ \Magento\Framework\Store\StoreManagerInterface $storeManager
) {
$this->_eventManager = $eventManager;
$this->_storeManager = $storeManager;
diff --git a/app/code/Magento/Quote/Model/Quote/Address/Total/Tax.php b/app/code/Magento/Quote/Model/Quote/Address/Total/Tax.php
index d2ed16c319f8f..4fb37eff461a3 100644
--- a/app/code/Magento/Quote/Model/Quote/Address/Total/Tax.php
+++ b/app/code/Magento/Quote/Model/Quote/Address/Total/Tax.php
@@ -177,7 +177,7 @@ public function collect(\Magento\Quote\Model\Quote\Address $address)
$shippingTaxClass = $this->_scopeConfig->getValue(
\Magento\Tax\Model\Config::CONFIG_XML_PATH_SHIPPING_TAX_CLASS,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
diff --git a/app/code/Magento/Quote/Model/Quote/Item/Processor.php b/app/code/Magento/Quote/Model/Quote/Item/Processor.php
index 3e62bc5cc8c49..8c7a3205db46d 100644
--- a/app/code/Magento/Quote/Model/Quote/Item/Processor.php
+++ b/app/code/Magento/Quote/Model/Quote/Item/Processor.php
@@ -8,7 +8,7 @@
use \Magento\Catalog\Model\Product;
use Magento\Quote\Model\Quote\ItemFactory;
use Magento\Quote\Model\Quote\Item;
-use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\Store\StoreManagerInterface;
use Magento\Framework\App\State;
use Magento\Framework\Object;
@@ -25,7 +25,7 @@ class Processor
protected $quoteItemFactory;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $storeManager;
@@ -36,7 +36,7 @@ class Processor
/**
* @param ItemFactory $quoteItemFactory
- * @param StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param State $appState
*/
public function __construct(
diff --git a/app/code/Magento/Quote/Model/QuoteRepository.php b/app/code/Magento/Quote/Model/QuoteRepository.php
index 82c02292af678..97a25fe47a8cf 100644
--- a/app/code/Magento/Quote/Model/QuoteRepository.php
+++ b/app/code/Magento/Quote/Model/QuoteRepository.php
@@ -7,7 +7,7 @@
use Magento\Framework\Exception\NoSuchEntityException;
use Magento\Quote\Model\Quote;
-use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\Store\StoreManagerInterface;
use Magento\Framework\Api\SearchCriteria;
use Magento\Framework\Api\Search\FilterGroup;
use Magento\Quote\Model\Resource\Quote\Collection as QuoteCollection;
@@ -31,7 +31,7 @@ class QuoteRepository implements \Magento\Quote\Api\CartRepositoryInterface
protected $quoteFactory;
/**
- * @var StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $storeManager;
diff --git a/app/code/Magento/Quote/Model/Resource/Quote/Address/Rate/Collection.php b/app/code/Magento/Quote/Model/Resource/Quote/Address/Rate/Collection.php
index 4818003861ede..6801bb83f5e43 100644
--- a/app/code/Magento/Quote/Model/Resource/Quote/Address/Rate/Collection.php
+++ b/app/code/Magento/Quote/Model/Resource/Quote/Address/Rate/Collection.php
@@ -20,7 +20,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
protected $_allowFixedOnly = false;
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -29,7 +29,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
* @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
diff --git a/app/code/Magento/Quote/Model/Resource/Quote/Item/Collection.php b/app/code/Magento/Quote/Model/Resource/Quote/Item/Collection.php
index 3de177e2915b4..8f90d54345050 100644
--- a/app/code/Magento/Quote/Model/Resource/Quote/Item/Collection.php
+++ b/app/code/Magento/Quote/Model/Resource/Quote/Item/Collection.php
@@ -40,7 +40,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
protected $_quoteConfig;
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -51,7 +51,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
* @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
diff --git a/app/code/Magento/Quote/Model/Resource/Quote/Payment/Collection.php b/app/code/Magento/Quote/Model/Resource/Quote/Payment/Collection.php
index c1a5fdc4fbf32..b1f14b76e7a53 100644
--- a/app/code/Magento/Quote/Model/Resource/Quote/Payment/Collection.php
+++ b/app/code/Magento/Quote/Model/Resource/Quote/Payment/Collection.php
@@ -11,7 +11,7 @@
class Collection extends \Magento\Framework\Model\Resource\Db\Collection\AbstractCollection
{
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -19,7 +19,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
* @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
diff --git a/app/code/Magento/Quote/composer.json b/app/code/Magento/Quote/composer.json
index b01897f371404..1637e14dbeada 100644
--- a/app/code/Magento/Quote/composer.json
+++ b/app/code/Magento/Quote/composer.json
@@ -8,7 +8,6 @@
"magento/module-customer": "0.42.0-beta5",
"magento/module-authorization": "0.42.0-beta5",
"magento/module-payment": "0.42.0-beta5",
- "magento/module-core": "0.42.0-beta5",
"magento/module-sales": "0.42.0-beta5",
"magento/module-backend": "0.42.0-beta5",
"magento/module-directory": "0.42.0-beta5",
diff --git a/app/code/Magento/Reports/Block/Product/Compared.php b/app/code/Magento/Reports/Block/Product/Compared.php
index 6693d0053ea87..c25678aa360d7 100644
--- a/app/code/Magento/Reports/Block/Product/Compared.php
+++ b/app/code/Magento/Reports/Block/Product/Compared.php
@@ -34,7 +34,7 @@ public function getPageSize()
if ($this->hasData('page_size')) {
return $this->getData('page_size');
}
- return $this->_scopeConfig->getValue(self::XML_PATH_RECENTLY_COMPARED_COUNT, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+ return $this->_scopeConfig->getValue(self::XML_PATH_RECENTLY_COMPARED_COUNT, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
}
/**
diff --git a/app/code/Magento/Reports/Block/Product/Viewed.php b/app/code/Magento/Reports/Block/Product/Viewed.php
index addfa8cafd53a..e3b5460eb79e9 100644
--- a/app/code/Magento/Reports/Block/Product/Viewed.php
+++ b/app/code/Magento/Reports/Block/Product/Viewed.php
@@ -34,7 +34,7 @@ public function getPageSize()
if ($this->hasData('page_size')) {
return $this->getData('page_size');
}
- return $this->_scopeConfig->getValue(self::XML_PATH_RECENTLY_VIEWED_COUNT, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+ return $this->_scopeConfig->getValue(self::XML_PATH_RECENTLY_VIEWED_COUNT, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
}
/**
diff --git a/app/code/Magento/Reports/Model/Config.php b/app/code/Magento/Reports/Model/Config.php
index 12fa3befcf7a0..5d82666c16b2e 100644
--- a/app/code/Magento/Reports/Model/Config.php
+++ b/app/code/Magento/Reports/Model/Config.php
@@ -16,18 +16,18 @@ class Config extends \Magento\Framework\Object
protected $_moduleReader;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
/**
* @param \Magento\Framework\Module\Dir\Reader $moduleReader
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param array $data
*/
public function __construct(
\Magento\Framework\Module\Dir\Reader $moduleReader,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
array $data = []
) {
parent::__construct($data);
diff --git a/app/code/Magento/Reports/Model/Event/Observer.php b/app/code/Magento/Reports/Model/Event/Observer.php
index 0283cf6e15df5..89ffef07ff9d3 100644
--- a/app/code/Magento/Reports/Model/Event/Observer.php
+++ b/app/code/Magento/Reports/Model/Event/Observer.php
@@ -11,7 +11,7 @@
class Observer
{
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -41,7 +41,7 @@ class Observer
protected $_customerVisitor;
/**
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Reports\Model\EventFactory $event
* @param \Magento\Reports\Model\Product\Index\ComparedFactory $productCompFactory
* @param \Magento\Reports\Model\Product\Index\ViewedFactory $productIndxFactory
@@ -49,7 +49,7 @@ class Observer
* @param \Magento\Customer\Model\Visitor $customerVisitor
*/
public function __construct(
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Reports\Model\EventFactory $event,
\Magento\Reports\Model\Product\Index\ComparedFactory $productCompFactory,
\Magento\Reports\Model\Product\Index\ViewedFactory $productIndxFactory,
diff --git a/app/code/Magento/Reports/Model/Product/Index/AbstractIndex.php b/app/code/Magento/Reports/Model/Product/Index/AbstractIndex.php
index 4d3ca4716833f..59250994238a5 100644
--- a/app/code/Magento/Reports/Model/Product/Index/AbstractIndex.php
+++ b/app/code/Magento/Reports/Model/Product/Index/AbstractIndex.php
@@ -18,7 +18,7 @@ abstract class AbstractIndex extends \Magento\Framework\Model\AbstractModel
protected $_countCacheKey;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -50,7 +50,7 @@ abstract class AbstractIndex extends \Magento\Framework\Model\AbstractModel
/**
* @param \Magento\Framework\Model\Context $context
* @param \Magento\Framework\Registry $registry
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Customer\Model\Visitor $customerVisitor
* @param \Magento\Customer\Model\Session $customerSession
* @param \Magento\Framework\Session\Generic $reportSession
@@ -64,7 +64,7 @@ abstract class AbstractIndex extends \Magento\Framework\Model\AbstractModel
public function __construct(
\Magento\Framework\Model\Context $context,
\Magento\Framework\Registry $registry,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Customer\Model\Visitor $customerVisitor,
\Magento\Customer\Model\Session $customerSession,
\Magento\Framework\Session\Generic $reportSession,
diff --git a/app/code/Magento/Reports/Model/Product/Index/Compared.php b/app/code/Magento/Reports/Model/Product/Index/Compared.php
index 2bf6917f34878..1d8a7b4fd0df6 100644
--- a/app/code/Magento/Reports/Model/Product/Index/Compared.php
+++ b/app/code/Magento/Reports/Model/Product/Index/Compared.php
@@ -39,7 +39,7 @@ class Compared extends \Magento\Reports\Model\Product\Index\AbstractIndex
/**
* @param \Magento\Framework\Model\Context $context
* @param \Magento\Framework\Registry $registry
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Customer\Model\Visitor $customerVisitor
* @param \Magento\Customer\Model\Session $customerSession
* @param \Magento\Framework\Session\Generic $reportSession
@@ -54,7 +54,7 @@ class Compared extends \Magento\Reports\Model\Product\Index\AbstractIndex
public function __construct(
\Magento\Framework\Model\Context $context,
\Magento\Framework\Registry $registry,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Customer\Model\Visitor $customerVisitor,
\Magento\Customer\Model\Session $customerSession,
\Magento\Framework\Session\Generic $reportSession,
diff --git a/app/code/Magento/Reports/Model/Resource/Customer/Collection.php b/app/code/Magento/Reports/Model/Resource/Customer/Collection.php
index 75e1aa39641d0..a4b9fee5599ca 100644
--- a/app/code/Magento/Reports/Model/Resource/Customer/Collection.php
+++ b/app/code/Magento/Reports/Model/Resource/Customer/Collection.php
@@ -67,7 +67,7 @@ class Collection extends \Magento\Customer\Model\Resource\Customer\Collection
protected $_quoteItemFactory;
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -85,7 +85,7 @@ class Collection extends \Magento\Customer\Model\Resource\Customer\Collection
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
diff --git a/app/code/Magento/Reports/Model/Resource/Entity/Summary/Collection/AbstractCollection.php b/app/code/Magento/Reports/Model/Resource/Entity/Summary/Collection/AbstractCollection.php
index 0e8ca1d37f81a..5da4e2f6b1efd 100644
--- a/app/code/Magento/Reports/Model/Resource/Entity/Summary/Collection/AbstractCollection.php
+++ b/app/code/Magento/Reports/Model/Resource/Entity/Summary/Collection/AbstractCollection.php
@@ -28,10 +28,10 @@ class AbstractCollection extends \Magento\Framework\Data\Collection
protected $dateTime;
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Magento\Framework\Stdlib\DateTime $dateTime
*/
- public function __construct(\Magento\Core\Model\EntityFactory $entityFactory, \Magento\Framework\Stdlib\DateTime $dateTime)
+ public function __construct(\Magento\Framework\Data\Collection\EntityFactory $entityFactory, \Magento\Framework\Stdlib\DateTime $dateTime)
{
$this->dateTime = $dateTime;
parent::__construct($entityFactory);
diff --git a/app/code/Magento/Reports/Model/Resource/Event.php b/app/code/Magento/Reports/Model/Resource/Event.php
index 313876eb8d89a..0897d524090db 100644
--- a/app/code/Magento/Reports/Model/Resource/Event.php
+++ b/app/code/Magento/Reports/Model/Resource/Event.php
@@ -18,19 +18,19 @@ class Event extends \Magento\Framework\Model\Resource\Db\AbstractDb
protected $_scopeConfig;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
/**
* @param \Magento\Framework\App\Resource $resource
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
- \Magento\Store\Model\StoreManagerInterface $storeManager
+ \Magento\Framework\Store\StoreManagerInterface $storeManager
) {
parent::__construct($resource);
$this->_scopeConfig = $scopeConfig;
@@ -140,7 +140,7 @@ public function getCurrentStoreIds(array $predefinedStoreIds = null)
// get all stores, required by configuration in current store scope
$productsScope = $this->_scopeConfig->getValue(
'catalog/recently_products/scope',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
switch ($productsScope) {
case 'website':
diff --git a/app/code/Magento/Reports/Model/Resource/Order/Collection.php b/app/code/Magento/Reports/Model/Resource/Order/Collection.php
index bc04bbe5a5c58..d767bb8d539e7 100644
--- a/app/code/Magento/Reports/Model/Resource/Order/Collection.php
+++ b/app/code/Magento/Reports/Model/Resource/Order/Collection.php
@@ -40,7 +40,7 @@ class Collection extends \Magento\Sales\Model\Resource\Order\Collection
protected $_scopeConfig;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -60,13 +60,13 @@ class Collection extends \Magento\Sales\Model\Resource\Order\Collection
protected $_reportOrderFactory;
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Framework\DB\Helper $coreResourceHelper
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
* @param \Magento\Sales\Model\Order\Config $orderConfig
* @param \Magento\Sales\Model\Resource\Report\OrderFactory $reportOrderFactory
@@ -76,13 +76,13 @@ class Collection extends \Magento\Sales\Model\Resource\Order\Collection
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Framework\DB\Helper $coreResourceHelper,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
\Magento\Sales\Model\Order\Config $orderConfig,
\Magento\Sales\Model\Resource\Report\OrderFactory $reportOrderFactory,
@@ -116,7 +116,7 @@ public function checkIsLive($range)
{
$this->_isLive = (bool)(!$this->_scopeConfig->getValue(
'sales/dashboard/use_aggregated_data',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
));
return $this;
}
@@ -424,7 +424,7 @@ public function getDateRange($range, $customStart, $customEnd, $returnObjects =
$dateStart->setDay(
$this->_scopeConfig->getValue(
'reports/dashboard/mtd_start',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)
);
break;
@@ -440,7 +440,7 @@ public function getDateRange($range, $customStart, $customEnd, $returnObjects =
',',
$this->_scopeConfig->getValue(
'reports/dashboard/ytd_start',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)
);
$startMonth = isset($startMonthDay[0]) ? (int)$startMonthDay[0] : 1;
@@ -591,7 +591,7 @@ public function calculateSales($isFilter = 0)
if ($this->_scopeConfig->getValue(
'sales/dashboard/use_aggregated_data',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)
) {
$this->setMainTable('sales_order_aggregated_created');
diff --git a/app/code/Magento/Reports/Model/Resource/Product/Collection.php b/app/code/Magento/Reports/Model/Resource/Product/Collection.php
index 0ebba9cca35cf..32865c968cf4d 100644
--- a/app/code/Magento/Reports/Model/Resource/Product/Collection.php
+++ b/app/code/Magento/Reports/Model/Resource/Product/Collection.php
@@ -57,7 +57,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection
protected $_productType;
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -66,7 +66,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection
* @param \Magento\Eav\Model\EntityFactory $eavEntityFactory
* @param \Magento\Catalog\Model\Resource\Helper $resourceHelper
* @param \Magento\Framework\Validator\UniversalFactory $universalFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\Module\Manager $moduleManager
* @param \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
@@ -84,7 +84,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
@@ -93,7 +93,7 @@ public function __construct(
\Magento\Eav\Model\EntityFactory $eavEntityFactory,
\Magento\Catalog\Model\Resource\Helper $resourceHelper,
\Magento\Framework\Validator\UniversalFactory $universalFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\Module\Manager $moduleManager,
\Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
diff --git a/app/code/Magento/Reports/Model/Resource/Product/Index/Collection/AbstractCollection.php b/app/code/Magento/Reports/Model/Resource/Product/Index/Collection/AbstractCollection.php
index 0da793945459b..318f7d88f3a24 100644
--- a/app/code/Magento/Reports/Model/Resource/Product/Index/Collection/AbstractCollection.php
+++ b/app/code/Magento/Reports/Model/Resource/Product/Index/Collection/AbstractCollection.php
@@ -29,7 +29,7 @@ abstract class AbstractCollection extends \Magento\Catalog\Model\Resource\Produc
protected $_customerVisitor;
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -38,7 +38,7 @@ abstract class AbstractCollection extends \Magento\Catalog\Model\Resource\Produc
* @param \Magento\Eav\Model\EntityFactory $eavEntityFactory
* @param \Magento\Catalog\Model\Resource\Helper $resourceHelper
* @param \Magento\Framework\Validator\UniversalFactory $universalFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\Module\Manager $moduleManager
* @param \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
@@ -54,7 +54,7 @@ abstract class AbstractCollection extends \Magento\Catalog\Model\Resource\Produc
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
@@ -63,7 +63,7 @@ public function __construct(
\Magento\Eav\Model\EntityFactory $eavEntityFactory,
\Magento\Catalog\Model\Resource\Helper $resourceHelper,
\Magento\Framework\Validator\UniversalFactory $universalFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\Module\Manager $moduleManager,
\Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
diff --git a/app/code/Magento/Reports/Model/Resource/Product/Lowstock/Collection.php b/app/code/Magento/Reports/Model/Resource/Product/Lowstock/Collection.php
index 891dbabb61f92..4e904c051ca83 100644
--- a/app/code/Magento/Reports/Model/Resource/Product/Lowstock/Collection.php
+++ b/app/code/Magento/Reports/Model/Resource/Product/Lowstock/Collection.php
@@ -46,7 +46,7 @@ class Collection extends \Magento\Reports\Model\Resource\Product\Collection
protected $_itemResource;
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -55,7 +55,7 @@ class Collection extends \Magento\Reports\Model\Resource\Product\Collection
* @param \Magento\Eav\Model\EntityFactory $eavEntityFactory
* @param \Magento\Catalog\Model\Resource\Helper $resourceHelper
* @param \Magento\Framework\Validator\UniversalFactory $universalFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\Module\Manager $moduleManager
* @param \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
@@ -76,7 +76,7 @@ class Collection extends \Magento\Reports\Model\Resource\Product\Collection
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
@@ -85,7 +85,7 @@ public function __construct(
\Magento\Eav\Model\EntityFactory $eavEntityFactory,
\Magento\Catalog\Model\Resource\Helper $resourceHelper,
\Magento\Framework\Validator\UniversalFactory $universalFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\Module\Manager $moduleManager,
\Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
diff --git a/app/code/Magento/Reports/Model/Resource/Quote/Collection.php b/app/code/Magento/Reports/Model/Resource/Quote/Collection.php
index 6ff03c604e1ce..a2deabc2d008f 100644
--- a/app/code/Magento/Reports/Model/Resource/Quote/Collection.php
+++ b/app/code/Magento/Reports/Model/Resource/Quote/Collection.php
@@ -47,7 +47,7 @@ class Collection extends \Magento\Quote\Model\Resource\Quote\Collection
protected $_customerResource;
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -57,7 +57,7 @@ class Collection extends \Magento\Quote\Model\Resource\Quote\Collection
* @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
diff --git a/app/code/Magento/Reports/Model/Resource/Refresh/Collection.php b/app/code/Magento/Reports/Model/Resource/Refresh/Collection.php
index 6af0d4b052a99..930dbf4ce444e 100644
--- a/app/code/Magento/Reports/Model/Resource/Refresh/Collection.php
+++ b/app/code/Magento/Reports/Model/Resource/Refresh/Collection.php
@@ -24,12 +24,12 @@ class Collection extends \Magento\Framework\Data\Collection
protected $_reportsFlagFactory;
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
* @param \Magento\Reports\Model\FlagFactory $reportsFlagFactory
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
\Magento\Reports\Model\FlagFactory $reportsFlagFactory
) {
@@ -63,6 +63,7 @@ protected function _getUpdatedAt($reportCode)
* @param bool $printQuery
* @param bool $logQuery
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function loadData($printQuery = false, $logQuery = false)
{
diff --git a/app/code/Magento/Reports/Model/Resource/Report/Collection.php b/app/code/Magento/Reports/Model/Resource/Report/Collection.php
index 78a217f68536d..79968a4d34d05 100644
--- a/app/code/Magento/Reports/Model/Resource/Report/Collection.php
+++ b/app/code/Magento/Reports/Model/Resource/Report/Collection.php
@@ -85,13 +85,13 @@ class Collection extends \Magento\Framework\Data\Collection
protected $_collectionFactory;
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
* @param \Magento\Reports\Model\DateFactory $dateFactory
* @param \Magento\Reports\Model\Resource\Report\Collection\Factory $collectionFactory
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
\Magento\Reports\Model\DateFactory $dateFactory,
\Magento\Reports\Model\Resource\Report\Collection\Factory $collectionFactory
diff --git a/app/code/Magento/Reports/Model/Resource/Report/Product/Viewed/Collection.php b/app/code/Magento/Reports/Model/Resource/Report/Product/Viewed/Collection.php
index 2f06240e07d10..1a3f120b6df89 100644
--- a/app/code/Magento/Reports/Model/Resource/Report/Product/Viewed/Collection.php
+++ b/app/code/Magento/Reports/Model/Resource/Report/Product/Viewed/Collection.php
@@ -31,7 +31,7 @@ class Collection extends \Magento\Reports\Model\Resource\Report\Collection\Abstr
protected $_selectedColumns = [];
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -39,7 +39,7 @@ class Collection extends \Magento\Reports\Model\Resource\Report\Collection\Abstr
* @param mixed $connection
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
diff --git a/app/code/Magento/Reports/Model/Resource/Review/Customer/Collection.php b/app/code/Magento/Reports/Model/Resource/Review/Customer/Collection.php
index c2abe745e0a17..5a2993bcb919e 100644
--- a/app/code/Magento/Reports/Model/Resource/Review/Customer/Collection.php
+++ b/app/code/Magento/Reports/Model/Resource/Review/Customer/Collection.php
@@ -19,26 +19,26 @@ class Collection extends \Magento\Review\Model\Resource\Review\Collection
protected $_customerResource;
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Review\Helper\Data $reviewData
* @param \Magento\Review\Model\Rating\Option\VoteFactory $voteFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Customer\Model\Resource\Customer $customerResource
* @param mixed $connection
* @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Review\Helper\Data $reviewData,
\Magento\Review\Model\Rating\Option\VoteFactory $voteFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Customer\Model\Resource\Customer $customerResource,
$connection = null,
\Magento\Framework\Model\Resource\Db\AbstractDb $resource = null
diff --git a/app/code/Magento/Reports/Model/Resource/Wishlist/Collection.php b/app/code/Magento/Reports/Model/Resource/Wishlist/Collection.php
index ff4878a683a7d..797b20da85551 100644
--- a/app/code/Magento/Reports/Model/Resource/Wishlist/Collection.php
+++ b/app/code/Magento/Reports/Model/Resource/Wishlist/Collection.php
@@ -26,7 +26,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
protected $_customerResFactory;
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -35,7 +35,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
* @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
diff --git a/app/code/Magento/Review/Block/Adminhtml/Rss.php b/app/code/Magento/Review/Block/Adminhtml/Rss.php
index 42f9ef5583d60..b8ab6c14ed6bc 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Rss.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Rss.php
@@ -14,7 +14,7 @@
class Rss extends \Magento\Backend\Block\AbstractBlock implements DataProviderInterface
{
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $storeManager;
@@ -25,13 +25,13 @@ class Rss extends \Magento\Backend\Block\AbstractBlock implements DataProviderIn
/**
* @param \Magento\Backend\Block\Context $context
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Review\Model\Rss $rssModel
* @param array $data
*/
public function __construct(
\Magento\Backend\Block\Context $context,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Review\Model\Rss $rssModel,
array $data = []
) {
diff --git a/app/code/Magento/Review/Block/Product/Compare/ListCompare/Plugin/Review.php b/app/code/Magento/Review/Block/Product/Compare/ListCompare/Plugin/Review.php
index a473acf9c5990..f7eb4d6239373 100644
--- a/app/code/Magento/Review/Block/Product/Compare/ListCompare/Plugin/Review.php
+++ b/app/code/Magento/Review/Block/Product/Compare/ListCompare/Plugin/Review.php
@@ -18,16 +18,16 @@ class Review
/**
* Store manager
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $storeManager;
/**
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Review\Model\ReviewFactory $reviewFactory
*/
public function __construct(
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Review\Model\ReviewFactory $reviewFactory
) {
$this->storeManager = $storeManager;
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/Post.php b/app/code/Magento/Review/Controller/Adminhtml/Product/Post.php
index e5d81e63f7729..70af771ccc330 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Product/Post.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/Post.php
@@ -16,8 +16,8 @@ public function execute()
$productId = $this->getRequest()->getParam('product_id', false);
if ($data = $this->getRequest()->getPost()) {
- /** @var \Magento\Store\Model\StoreManagerInterface $storeManagerInterface */
- $storeManager = $this->_objectManager->get('Magento\Store\Model\StoreManagerInterface');
+ /** @var \Magento\Framework\Store\StoreManagerInterface $storeManagerInterface */
+ $storeManager = $this->_objectManager->get('Magento\Framework\Store\StoreManagerInterface');
if ($storeManager->hasSingleStore()) {
$data['stores'] = [
$storeManager->getStore(true)->getId(),
diff --git a/app/code/Magento/Review/Controller/Product.php b/app/code/Magento/Review/Controller/Product.php
index b44a29ec6c42f..41ef48198fa57 100644
--- a/app/code/Magento/Review/Controller/Product.php
+++ b/app/code/Magento/Review/Controller/Product.php
@@ -84,7 +84,7 @@ class Product extends \Magento\Framework\App\Action\Action
/**
* Core model store manager interface
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -106,7 +106,7 @@ class Product extends \Magento\Framework\App\Action\Action
* @param \Magento\Review\Model\RatingFactory $ratingFactory
* @param \Magento\Catalog\Model\Design $catalogDesign
* @param \Magento\Framework\Session\Generic $reviewSession
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
@@ -121,7 +121,7 @@ public function __construct(
\Magento\Review\Model\RatingFactory $ratingFactory,
\Magento\Catalog\Model\Design $catalogDesign,
\Magento\Framework\Session\Generic $reviewSession,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Core\App\Action\FormKeyValidator $formKeyValidator
) {
$this->_storeManager = $storeManager;
diff --git a/app/code/Magento/Review/Helper/Data.php b/app/code/Magento/Review/Helper/Data.php
index a514519405b27..ed72aea2966b2 100644
--- a/app/code/Magento/Review/Helper/Data.php
+++ b/app/code/Magento/Review/Helper/Data.php
@@ -84,7 +84,7 @@ public function getDetailHtml($origDetail)
*/
public function getIsGuestAllowToWrite()
{
- return $this->_scopeConfig->isSetFlag(self::XML_REVIEW_GUETS_ALLOW, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+ return $this->_scopeConfig->isSetFlag(self::XML_REVIEW_GUETS_ALLOW, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
}
/**
diff --git a/app/code/Magento/Review/Model/Resource/Rating.php b/app/code/Magento/Review/Model/Resource/Rating.php
index ffe552b3c104d..6d067d4167ddc 100644
--- a/app/code/Magento/Review/Model/Resource/Rating.php
+++ b/app/code/Magento/Review/Model/Resource/Rating.php
@@ -17,7 +17,7 @@ class Rating extends \Magento\Framework\Model\Resource\Db\AbstractDb
/**
* Store manager
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -35,16 +35,14 @@ class Rating extends \Magento\Framework\Model\Resource\Db\AbstractDb
* @param \Magento\Framework\App\Resource $resource
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Module\Manager $moduleManager
- * @param \Magento\Review\Helper\Data $ratingData
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Review\Model\Resource\Review\Summary $reviewSummary
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Module\Manager $moduleManager,
- \Magento\Review\Helper\Data $ratingData,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Review\Model\Resource\Review\Summary $reviewSummary
) {
$this->moduleManager = $moduleManager;
diff --git a/app/code/Magento/Review/Model/Resource/Rating/Collection.php b/app/code/Magento/Review/Model/Resource/Rating/Collection.php
index 28b7d11de7787..bdb6821cc6c0b 100644
--- a/app/code/Magento/Review/Model/Resource/Rating/Collection.php
+++ b/app/code/Magento/Review/Model/Resource/Rating/Collection.php
@@ -13,7 +13,7 @@
class Collection extends \Magento\Framework\Model\Resource\Db\Collection\AbstractCollection
{
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -29,21 +29,21 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
protected $_addStoreDataFlag = false;
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Review\Model\Resource\Rating\Option\CollectionFactory $ratingCollectionF
* @param mixed $connection
* @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Review\Model\Resource\Rating\Option\CollectionFactory $ratingCollectionF,
$connection = null,
\Magento\Framework\Model\Resource\Db\AbstractDb $resource = null
diff --git a/app/code/Magento/Review/Model/Resource/Rating/Grid/Collection.php b/app/code/Magento/Review/Model/Resource/Rating/Grid/Collection.php
index c962ff50e390e..993e7307d4d70 100644
--- a/app/code/Magento/Review/Model/Resource/Rating/Grid/Collection.php
+++ b/app/code/Magento/Review/Model/Resource/Rating/Grid/Collection.php
@@ -20,22 +20,22 @@ class Collection extends \Magento\Review\Model\Resource\Rating\Collection
protected $_coreRegistry = null;
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Review\Model\Resource\Rating\Option\CollectionFactory $ratingCollectionF
* @param \Magento\Framework\Registry $coreRegistry
* @param mixed $connection
* @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Review\Model\Resource\Rating\Option\CollectionFactory $ratingCollectionF,
\Magento\Framework\Registry $coreRegistry,
$connection = null,
diff --git a/app/code/Magento/Review/Model/Resource/Rating/Option/Vote/Collection.php b/app/code/Magento/Review/Model/Resource/Rating/Option/Vote/Collection.php
index ab359f1f57387..d2db4048b8d1f 100644
--- a/app/code/Magento/Review/Model/Resource/Rating/Option/Vote/Collection.php
+++ b/app/code/Magento/Review/Model/Resource/Rating/Option/Vote/Collection.php
@@ -15,7 +15,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
/**
* Store list manager
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -25,21 +25,21 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
protected $_ratingCollectionF;
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Review\Model\Resource\Rating\Option\CollectionFactory $ratingCollectionF
* @param mixed $connection
* @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Review\Model\Resource\Rating\Option\CollectionFactory $ratingCollectionF,
$connection = null,
\Magento\Framework\Model\Resource\Db\AbstractDb $resource = null
diff --git a/app/code/Magento/Review/Model/Resource/Review.php b/app/code/Magento/Review/Model/Resource/Review.php
index c6383852b817b..3060a7072f747 100644
--- a/app/code/Magento/Review/Model/Resource/Review.php
+++ b/app/code/Magento/Review/Model/Resource/Review.php
@@ -71,7 +71,7 @@ class Review extends \Magento\Framework\Model\Resource\Db\AbstractDb
/**
* Core model store manager interface
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -92,14 +92,14 @@ class Review extends \Magento\Framework\Model\Resource\Db\AbstractDb
/**
* @param \Magento\Framework\App\Resource $resource
* @param \Magento\Framework\Stdlib\DateTime\DateTime $date
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Review\Model\RatingFactory $ratingFactory
* @param \Magento\Review\Model\Resource\Rating\Option $ratingOptions
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
\Magento\Framework\Stdlib\DateTime\DateTime $date,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Review\Model\RatingFactory $ratingFactory,
Rating\Option $ratingOptions
) {
diff --git a/app/code/Magento/Review/Model/Resource/Review/Collection.php b/app/code/Magento/Review/Model/Resource/Review/Collection.php
index efc9813a7eec4..9fbdcecf2026c 100644
--- a/app/code/Magento/Review/Model/Resource/Review/Collection.php
+++ b/app/code/Magento/Review/Model/Resource/Review/Collection.php
@@ -70,29 +70,29 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
/**
* Core model store manager interface
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Review\Helper\Data $reviewData
* @param \Magento\Review\Model\Rating\Option\VoteFactory $voteFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param mixed $connection
* @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Review\Helper\Data $reviewData,
\Magento\Review\Model\Rating\Option\VoteFactory $voteFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
$connection = null,
\Magento\Framework\Model\Resource\Db\AbstractDb $resource = null
) {
diff --git a/app/code/Magento/Review/Model/Resource/Review/Product/Collection.php b/app/code/Magento/Review/Model/Resource/Review/Product/Collection.php
index d6c65b46c43e2..0c5d9e603fb94 100644
--- a/app/code/Magento/Review/Model/Resource/Review/Product/Collection.php
+++ b/app/code/Magento/Review/Model/Resource/Review/Product/Collection.php
@@ -58,7 +58,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection
protected $_voteFactory;
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -67,7 +67,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection
* @param \Magento\Eav\Model\EntityFactory $eavEntityFactory
* @param \Magento\Catalog\Model\Resource\Helper $resourceHelper
* @param \Magento\Framework\Validator\UniversalFactory $universalFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\Module\Manager $moduleManager
* @param \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
@@ -84,7 +84,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
@@ -93,7 +93,7 @@ public function __construct(
\Magento\Eav\Model\EntityFactory $eavEntityFactory,
\Magento\Catalog\Model\Resource\Helper $resourceHelper,
\Magento\Framework\Validator\UniversalFactory $universalFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\Module\Manager $moduleManager,
\Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
diff --git a/app/code/Magento/Review/Model/Resource/Review/Summary/Collection.php b/app/code/Magento/Review/Model/Resource/Review/Summary/Collection.php
index 27e88fcd1d78b..c87dbe996c5db 100644
--- a/app/code/Magento/Review/Model/Resource/Review/Summary/Collection.php
+++ b/app/code/Magento/Review/Model/Resource/Review/Summary/Collection.php
@@ -20,13 +20,13 @@ class Collection extends \Magento\Framework\Data\Collection\Db
protected $_summaryTable;
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\App\Resource $resource
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\App\Resource $resource
diff --git a/app/code/Magento/Review/Model/Review.php b/app/code/Magento/Review/Model/Review.php
index 3660815cf0249..e7658eb8a5a5b 100644
--- a/app/code/Magento/Review/Model/Review.php
+++ b/app/code/Magento/Review/Model/Review.php
@@ -98,7 +98,7 @@ class Review extends \Magento\Framework\Model\AbstractModel
/**
* Core model store manager interface
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -117,7 +117,7 @@ class Review extends \Magento\Framework\Model\AbstractModel
* @param \Magento\Review\Model\Resource\Review\Summary\CollectionFactory $summaryFactory
* @param \Magento\Review\Model\Review\SummaryFactory $summaryModFactory
* @param \Magento\Review\Model\Review\Summary $reviewSummary
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\UrlInterface $urlModel
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
@@ -132,7 +132,7 @@ public function __construct(
\Magento\Review\Model\Resource\Review\Summary\CollectionFactory $summaryFactory,
\Magento\Review\Model\Review\SummaryFactory $summaryModFactory,
\Magento\Review\Model\Review\Summary $reviewSummary,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\UrlInterface $urlModel,
\Magento\Framework\Model\Resource\AbstractResource $resource = null,
\Magento\Framework\Data\Collection\Db $resourceCollection = null,
diff --git a/app/code/Magento/Review/etc/frontend/di.xml b/app/code/Magento/Review/etc/frontend/di.xml
index aabcc11868b9d..dae34ec8e9c5c 100644
--- a/app/code/Magento/Review/etc/frontend/di.xml
+++ b/app/code/Magento/Review/etc/frontend/di.xml
@@ -26,7 +26,7 @@
Magento\Review\Model\Session
-
+
- /review/customer/
diff --git a/app/code/Magento/Rss/Controller/Adminhtml/Feed/Index.php b/app/code/Magento/Rss/Controller/Adminhtml/Feed/Index.php
index ee2379d4e143c..d2a1572b19919 100644
--- a/app/code/Magento/Rss/Controller/Adminhtml/Feed/Index.php
+++ b/app/code/Magento/Rss/Controller/Adminhtml/Feed/Index.php
@@ -22,7 +22,7 @@ class Index extends \Magento\Rss\Controller\Adminhtml\Feed
*/
public function execute()
{
- if (!$this->scopeConfig->getValue('rss/config/active', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)) {
+ if (!$this->scopeConfig->getValue('rss/config/active', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)) {
throw new NotFoundException();
}
diff --git a/app/code/Magento/Rss/Controller/Feed/Index.php b/app/code/Magento/Rss/Controller/Feed/Index.php
index e6bba8d7424c4..86bceaedc1b03 100644
--- a/app/code/Magento/Rss/Controller/Feed/Index.php
+++ b/app/code/Magento/Rss/Controller/Feed/Index.php
@@ -22,7 +22,7 @@ class Index extends \Magento\Rss\Controller\Feed
*/
public function execute()
{
- if (!$this->scopeConfig->getValue('rss/config/active', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)) {
+ if (!$this->scopeConfig->getValue('rss/config/active', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)) {
throw new NotFoundException();
}
diff --git a/app/code/Magento/Rss/Controller/Index/Index.php b/app/code/Magento/Rss/Controller/Index/Index.php
index 4df5440a1700a..1c38af252a541 100644
--- a/app/code/Magento/Rss/Controller/Index/Index.php
+++ b/app/code/Magento/Rss/Controller/Index/Index.php
@@ -18,7 +18,7 @@ class Index extends \Magento\Rss\Controller\Index
*/
public function execute()
{
- if ($this->_scopeConfig->getValue('rss/config/active', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)) {
+ if ($this->_scopeConfig->getValue('rss/config/active', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)) {
$this->_view->loadLayout();
$this->_view->renderLayout();
} else {
diff --git a/app/code/Magento/Rss/Model/UrlBuilder.php b/app/code/Magento/Rss/Model/UrlBuilder.php
index 42c7aa502bde2..4d6174093a8cb 100644
--- a/app/code/Magento/Rss/Model/UrlBuilder.php
+++ b/app/code/Magento/Rss/Model/UrlBuilder.php
@@ -41,7 +41,7 @@ public function __construct(
*/
public function getUrl(array $queryParams = [])
{
- if (!$this->config->getValue('rss/config/active', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)) {
+ if (!$this->config->getValue('rss/config/active', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)) {
return '';
}
diff --git a/app/code/Magento/Rss/composer.json b/app/code/Magento/Rss/composer.json
index d4674385ee638..2bb239729adfe 100644
--- a/app/code/Magento/Rss/composer.json
+++ b/app/code/Magento/Rss/composer.json
@@ -3,7 +3,6 @@
"description": "N/A",
"require": {
"php": "~5.4.11|~5.5.0|~5.6.0",
- "magento/module-store": "0.42.0-beta5",
"magento/module-backend": "0.42.0-beta5",
"magento/framework": "0.42.0-beta5",
"magento/module-customer": "0.42.0-beta5",
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Address.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Address.php
index b139f03143526..1b0d6bbc4fe6d 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Address.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Address.php
@@ -144,7 +144,7 @@ public function __construct(
*/
public function getConfig($path)
{
- return $this->_scopeConfig->getValue($path, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+ return $this->_scopeConfig->getValue($path, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
}
/**
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/Method/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/Method/Form.php
index 8d448af893d0e..b3a7c1a15355b 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/Method/Form.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/Method/Form.php
@@ -97,7 +97,7 @@ public function getCarrierName($carrierCode)
{
if ($name = $this->_scopeConfig->getValue(
'carriers/' . $carrierCode . '/title',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$this->getStore()->getId()
)
) {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Info.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Info.php
index 9994c1b8b3d86..20e2d6732c0c8 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Info.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Info.php
@@ -228,7 +228,7 @@ public function shouldDisplayCustomerIp()
{
return !$this->_scopeConfig->isSetFlag(
'sales/general/hide_customer_ip',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$this->getOrder()->getStoreId()
);
}
diff --git a/app/code/Magento/Sales/Block/Order/Info/Buttons/Rss.php b/app/code/Magento/Sales/Block/Order/Info/Buttons/Rss.php
index be7427e45e143..f22e8621595cc 100644
--- a/app/code/Magento/Sales/Block/Order/Info/Buttons/Rss.php
+++ b/app/code/Magento/Sales/Block/Order/Info/Buttons/Rss.php
@@ -67,7 +67,7 @@ public function isRssAllowed()
{
return $this->_scopeConfig->isSetFlag(
'rss/order/status',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
}
diff --git a/app/code/Magento/Sales/Helper/Admin.php b/app/code/Magento/Sales/Helper/Admin.php
index 3aca5adcd8320..97b717690f250 100644
--- a/app/code/Magento/Sales/Helper/Admin.php
+++ b/app/code/Magento/Sales/Helper/Admin.php
@@ -13,7 +13,7 @@ class Admin extends \Magento\Framework\App\Helper\AbstractHelper
protected $_salesConfig;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -24,13 +24,13 @@ class Admin extends \Magento\Framework\App\Helper\AbstractHelper
/**
* @param \Magento\Framework\App\Helper\Context $context
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Sales\Model\Config $salesConfig
* @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
*/
public function __construct(
\Magento\Framework\App\Helper\Context $context,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Sales\Model\Config $salesConfig,
\Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
) {
diff --git a/app/code/Magento/Sales/Helper/Data.php b/app/code/Magento/Sales/Helper/Data.php
index 80a5f59a03e2c..c03ef874107cd 100644
--- a/app/code/Magento/Sales/Helper/Data.php
+++ b/app/code/Magento/Sales/Helper/Data.php
@@ -24,7 +24,7 @@ public function canSendNewOrderConfirmationEmail($store = null)
{
return $this->_scopeConfig->isSetFlag(
\Magento\Sales\Model\Order\Email\Container\OrderIdentity::XML_PATH_EMAIL_ENABLED,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -50,7 +50,7 @@ public function canSendOrderCommentEmail($store = null)
{
return $this->_scopeConfig->isSetFlag(
\Magento\Sales\Model\Order\Email\Container\OrderCommentIdentity::XML_PATH_EMAIL_ENABLED,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -65,7 +65,7 @@ public function canSendNewShipmentEmail($store = null)
{
return $this->_scopeConfig->isSetFlag(
\Magento\Sales\Model\Order\Email\Container\ShipmentIdentity::XML_PATH_EMAIL_ENABLED,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -80,7 +80,7 @@ public function canSendShipmentCommentEmail($store = null)
{
return $this->_scopeConfig->isSetFlag(
\Magento\Sales\Model\Order\Email\Container\ShipmentCommentIdentity::XML_PATH_EMAIL_ENABLED,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -95,7 +95,7 @@ public function canSendNewInvoiceEmail($store = null)
{
return $this->_scopeConfig->isSetFlag(
\Magento\Sales\Model\Order\Email\Container\InvoiceIdentity::XML_PATH_EMAIL_ENABLED,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -110,7 +110,7 @@ public function canSendInvoiceCommentEmail($store = null)
{
return $this->_scopeConfig->isSetFlag(
\Magento\Sales\Model\Order\Email\Container\InvoiceCommentIdentity::XML_PATH_EMAIL_ENABLED,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -125,7 +125,7 @@ public function canSendNewCreditmemoEmail($store = null)
{
return $this->_scopeConfig->isSetFlag(
\Magento\Sales\Model\Order\Email\Container\CreditmemoIdentity::XML_PATH_EMAIL_ENABLED,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -140,7 +140,7 @@ public function canSendCreditmemoCommentEmail($store = null)
{
return $this->_scopeConfig->isSetFlag(
\Magento\Sales\Model\Order\Email\Container\CreditmemoCommentIdentity::XML_PATH_EMAIL_ENABLED,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
}
diff --git a/app/code/Magento/Sales/Helper/Guest.php b/app/code/Magento/Sales/Helper/Guest.php
index 48424133a1981..c88aed402b8aa 100644
--- a/app/code/Magento/Sales/Helper/Guest.php
+++ b/app/code/Magento/Sales/Helper/Guest.php
@@ -69,7 +69,7 @@ class Guest extends \Magento\Core\Helper\Data
/**
* @param App\Helper\Context $context
* @param App\Config\ScopeConfigInterface $scopeConfig
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\State $appState
* @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
* @param \Magento\Framework\Registry $coreRegistry
@@ -86,7 +86,7 @@ class Guest extends \Magento\Core\Helper\Data
public function __construct(
App\Helper\Context $context,
App\Config\ScopeConfigInterface $scopeConfig,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\App\State $appState,
\Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
\Magento\Framework\Registry $coreRegistry,
diff --git a/app/code/Magento/Sales/Helper/Reorder.php b/app/code/Magento/Sales/Helper/Reorder.php
index f93c02fccdef0..b8430c7ac8459 100644
--- a/app/code/Magento/Sales/Helper/Reorder.php
+++ b/app/code/Magento/Sales/Helper/Reorder.php
@@ -23,7 +23,7 @@ class Reorder extends \Magento\Core\Helper\Data
/**
* @param \Magento\Framework\App\Helper\Context $context
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\State $appState
* @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
* @param \Magento\Customer\Model\Session $customerSession
@@ -32,7 +32,7 @@ class Reorder extends \Magento\Core\Helper\Data
public function __construct(
\Magento\Framework\App\Helper\Context $context,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\App\State $appState,
\Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
\Magento\Customer\Model\Session $customerSession,
@@ -65,7 +65,7 @@ public function isAllow()
*/
public function isAllowed($store = null)
{
- if ($this->_scopeConfig->getValue(self::XML_PATH_SALES_REORDER_ALLOW, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store)) {
+ if ($this->_scopeConfig->getValue(self::XML_PATH_SALES_REORDER_ALLOW, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store)) {
return true;
}
return false;
diff --git a/app/code/Magento/Sales/Model/AdminOrder/Create.php b/app/code/Magento/Sales/Model/AdminOrder/Create.php
index fd4ec66b5e13c..dffd953ca3382 100644
--- a/app/code/Magento/Sales/Model/AdminOrder/Create.php
+++ b/app/code/Magento/Sales/Model/AdminOrder/Create.php
@@ -1926,7 +1926,7 @@ protected function _getNewCustomerEmail()
if (empty($email)) {
$host = $this->_scopeConfig->getValue(
self::XML_PATH_DEFAULT_EMAIL_DOMAIN,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
$account = time();
$email = $account . '@' . $host;
diff --git a/app/code/Magento/Sales/Model/Order.php b/app/code/Magento/Sales/Model/Order.php
index d2269ca8a1b7b..ad2637f98cb8f 100644
--- a/app/code/Magento/Sales/Model/Order.php
+++ b/app/code/Magento/Sales/Model/Order.php
@@ -304,7 +304,7 @@ class Order extends AbstractModel implements EntityInterface, ApiOrderInterface
protected $entityType = 'order';
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -395,7 +395,7 @@ class Order extends AbstractModel implements EntityInterface, ApiOrderInterface
* @param AttributeDataBuilder $customAttributeBuilder
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
* @param \Magento\Framework\Stdlib\DateTime $dateTime
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param Order\Config $orderConfig
* @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
* @param Resource\Order\Item\CollectionFactory $orderItemCollectionFactory
@@ -425,7 +425,7 @@ public function __construct(
AttributeDataBuilder $customAttributeBuilder,
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
\Magento\Framework\Stdlib\DateTime $dateTime,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Sales\Model\Order\Config $orderConfig,
\Magento\Catalog\Api\ProductRepositoryInterface $productRepository,
\Magento\Sales\Model\Resource\Order\Item\CollectionFactory $orderItemCollectionFactory,
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo.php b/app/code/Magento/Sales/Model/Order/Creditmemo.php
index b9a2aea4780d6..c38b280dcb62d 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo.php
@@ -134,7 +134,7 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
protected $_calculatorFactory;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -164,7 +164,7 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
* @param \Magento\Sales\Model\OrderFactory $orderFactory
* @param \Magento\Sales\Model\Resource\Order\Creditmemo\Item\CollectionFactory $cmItemCollectionFactory
* @param \Magento\Framework\Math\CalculatorFactory $calculatorFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param Creditmemo\CommentFactory $commentFactory
* @param \Magento\Sales\Model\Resource\Order\Creditmemo\Comment\CollectionFactory $commentCollectionFactory
* @param PriceCurrencyInterface $priceCurrency
@@ -184,7 +184,7 @@ public function __construct(
\Magento\Sales\Model\OrderFactory $orderFactory,
\Magento\Sales\Model\Resource\Order\Creditmemo\Item\CollectionFactory $cmItemCollectionFactory,
\Magento\Framework\Math\CalculatorFactory $calculatorFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Sales\Model\Order\Creditmemo\CommentFactory $commentFactory,
\Magento\Sales\Model\Resource\Order\Creditmemo\Comment\CollectionFactory $commentCollectionFactory,
PriceCurrencyInterface $priceCurrency,
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/Comment.php b/app/code/Magento/Sales/Model/Order/Creditmemo/Comment.php
index e3b00c1136294..76259edec8aa2 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo/Comment.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo/Comment.php
@@ -28,7 +28,7 @@ class Comment extends AbstractModel implements CreditmemoCommentInterface
protected $_creditmemo;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -39,7 +39,7 @@ class Comment extends AbstractModel implements CreditmemoCommentInterface
* @param AttributeDataBuilder $customAttributeBuilder
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
* @param \Magento\Framework\Stdlib\DateTime $dateTime
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
@@ -52,7 +52,7 @@ public function __construct(
AttributeDataBuilder $customAttributeBuilder,
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
\Magento\Framework\Stdlib\DateTime $dateTime,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\Model\Resource\AbstractResource $resource = null,
\Magento\Framework\Data\Collection\Db $resourceCollection = null,
array $data = []
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Shipping.php b/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Shipping.php
index 23d7edf6dfc18..a4849a4644a33 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Shipping.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Shipping.php
@@ -13,7 +13,7 @@
class Shipping extends AbstractTotal
{
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -28,13 +28,13 @@ class Shipping extends AbstractTotal
protected $priceCurrency;
/**
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Tax\Model\Config $taxConfig
* @param PriceCurrencyInterface $priceCurrency
* @param array $data
*/
public function __construct(
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Tax\Model\Config $taxConfig,
PriceCurrencyInterface $priceCurrency,
array $data = []
diff --git a/app/code/Magento/Sales/Model/Order/Email/Container/Container.php b/app/code/Magento/Sales/Model/Order/Email/Container/Container.php
index bb6c98f151975..e3c49b6b4a587 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Container/Container.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Container/Container.php
@@ -5,7 +5,7 @@
*/
namespace Magento\Sales\Model\Order\Email\Container;
-use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\Store\StoreManagerInterface;
use Magento\Store\Model\Store;
use Magento\Framework\App\Config\ScopeConfigInterface;
@@ -60,7 +60,7 @@ protected function getConfigValue($path, $storeId)
{
return $this->scopeConfig->getValue(
$path,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$storeId
);
}
diff --git a/app/code/Magento/Sales/Model/Order/Email/Container/CreditmemoCommentIdentity.php b/app/code/Magento/Sales/Model/Order/Email/Container/CreditmemoCommentIdentity.php
index dbcfd57d968c9..9e9258bc0e1a3 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Container/CreditmemoCommentIdentity.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Container/CreditmemoCommentIdentity.php
@@ -21,7 +21,7 @@ public function isEnabled()
{
return $this->scopeConfig->isSetFlag(
self::XML_PATH_EMAIL_ENABLED,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$this->getStore()->getStoreId()
);
}
diff --git a/app/code/Magento/Sales/Model/Order/Email/Container/CreditmemoIdentity.php b/app/code/Magento/Sales/Model/Order/Email/Container/CreditmemoIdentity.php
index adb032dc1c864..a0734f725bc07 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Container/CreditmemoIdentity.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Container/CreditmemoIdentity.php
@@ -21,7 +21,7 @@ public function isEnabled()
{
return $this->scopeConfig->isSetFlag(
self::XML_PATH_EMAIL_ENABLED,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$this->getStore()->getStoreId()
);
}
diff --git a/app/code/Magento/Sales/Model/Order/Email/Container/InvoiceCommentIdentity.php b/app/code/Magento/Sales/Model/Order/Email/Container/InvoiceCommentIdentity.php
index 650b6a74db806..2b8d5f9dda298 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Container/InvoiceCommentIdentity.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Container/InvoiceCommentIdentity.php
@@ -21,7 +21,7 @@ public function isEnabled()
{
return $this->scopeConfig->isSetFlag(
self::XML_PATH_EMAIL_ENABLED,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$this->getStore()->getStoreId()
);
}
diff --git a/app/code/Magento/Sales/Model/Order/Email/Container/InvoiceIdentity.php b/app/code/Magento/Sales/Model/Order/Email/Container/InvoiceIdentity.php
index c233cb397e5a3..6553b32dc9591 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Container/InvoiceIdentity.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Container/InvoiceIdentity.php
@@ -21,7 +21,7 @@ public function isEnabled()
{
return $this->scopeConfig->isSetFlag(
self::XML_PATH_EMAIL_ENABLED,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$this->getStore()->getStoreId()
);
}
diff --git a/app/code/Magento/Sales/Model/Order/Email/Container/OrderCommentIdentity.php b/app/code/Magento/Sales/Model/Order/Email/Container/OrderCommentIdentity.php
index d965f8eb5b126..ea8f8e92b3649 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Container/OrderCommentIdentity.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Container/OrderCommentIdentity.php
@@ -21,7 +21,7 @@ public function isEnabled()
{
return $this->scopeConfig->isSetFlag(
self::XML_PATH_EMAIL_ENABLED,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$this->getStore()->getStoreId()
);
}
diff --git a/app/code/Magento/Sales/Model/Order/Email/Container/OrderIdentity.php b/app/code/Magento/Sales/Model/Order/Email/Container/OrderIdentity.php
index 13b31fe6265b5..ed5464cdf5a29 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Container/OrderIdentity.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Container/OrderIdentity.php
@@ -24,7 +24,7 @@ public function isEnabled()
{
return $this->scopeConfig->isSetFlag(
self::XML_PATH_EMAIL_ENABLED,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$this->getStore()->getStoreId()
);
}
diff --git a/app/code/Magento/Sales/Model/Order/Email/Container/ShipmentCommentIdentity.php b/app/code/Magento/Sales/Model/Order/Email/Container/ShipmentCommentIdentity.php
index 4bef0bf311b97..1390ad69027b9 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Container/ShipmentCommentIdentity.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Container/ShipmentCommentIdentity.php
@@ -21,7 +21,7 @@ public function isEnabled()
{
return $this->scopeConfig->isSetFlag(
self::XML_PATH_EMAIL_ENABLED,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$this->getStore()->getStoreId()
);
}
diff --git a/app/code/Magento/Sales/Model/Order/Email/Container/ShipmentIdentity.php b/app/code/Magento/Sales/Model/Order/Email/Container/ShipmentIdentity.php
index e70d5963c596d..287f07c08623b 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Container/ShipmentIdentity.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Container/ShipmentIdentity.php
@@ -27,7 +27,7 @@ public function isEnabled()
{
return $this->scopeConfig->isSetFlag(
self::XML_PATH_EMAIL_ENABLED,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$this->getStore()->getStoreId()
);
}
diff --git a/app/code/Magento/Sales/Model/Order/Invoice/Comment.php b/app/code/Magento/Sales/Model/Order/Invoice/Comment.php
index 3b4f4787f70c8..b14b793e83a57 100644
--- a/app/code/Magento/Sales/Model/Order/Invoice/Comment.php
+++ b/app/code/Magento/Sales/Model/Order/Invoice/Comment.php
@@ -28,7 +28,7 @@ class Comment extends AbstractModel implements InvoiceCommentInterface
protected $_invoice;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -39,7 +39,7 @@ class Comment extends AbstractModel implements InvoiceCommentInterface
* @param AttributeDataBuilder $customAttributeBuilder
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
* @param \Magento\Framework\Stdlib\DateTime $dateTime
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
@@ -52,7 +52,7 @@ public function __construct(
AttributeDataBuilder $customAttributeBuilder,
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
\Magento\Framework\Stdlib\DateTime $dateTime,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\Model\Resource\AbstractResource $resource = null,
\Magento\Framework\Data\Collection\Db $resourceCollection = null,
array $data = []
diff --git a/app/code/Magento/Sales/Model/Order/Item.php b/app/code/Magento/Sales/Model/Order/Item.php
index fcc9aa7959fb3..f297513122592 100644
--- a/app/code/Magento/Sales/Model/Order/Item.php
+++ b/app/code/Magento/Sales/Model/Order/Item.php
@@ -167,7 +167,7 @@ class Item extends AbstractExtensibleModel implements OrderItemInterface
protected $productRepository;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -182,7 +182,7 @@ class Item extends AbstractExtensibleModel implements OrderItemInterface
* @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param array $data
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
@@ -192,7 +192,7 @@ public function __construct(
\Magento\Framework\Api\MetadataServiceInterface $metadataService,
AttributeDataBuilder $customAttributeBuilder,
\Magento\Sales\Model\OrderFactory $orderFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Catalog\Api\ProductRepositoryInterface $productRepository,
\Magento\Framework\Model\Resource\AbstractResource $resource = null,
\Magento\Framework\Data\Collection\Db $resourceCollection = null,
diff --git a/app/code/Magento/Sales/Model/Order/Payment.php b/app/code/Magento/Sales/Model/Order/Payment.php
index 0ada9c295824b..7886dd042b581 100644
--- a/app/code/Magento/Sales/Model/Order/Payment.php
+++ b/app/code/Magento/Sales/Model/Order/Payment.php
@@ -141,7 +141,7 @@ class Payment extends Info implements OrderPaymentInterface
protected $_transactionCollectionFactory;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -160,7 +160,7 @@ class Payment extends Info implements OrderPaymentInterface
* @param \Magento\Sales\Model\Service\OrderFactory $serviceOrderFactory
* @param Payment\TransactionFactory $transactionFactory
* @param \Magento\Sales\Model\Resource\Order\Payment\Transaction\CollectionFactory $transactionCollectionFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param PriceCurrencyInterface $priceCurrency
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
@@ -177,7 +177,7 @@ public function __construct(
\Magento\Sales\Model\Service\OrderFactory $serviceOrderFactory,
\Magento\Sales\Model\Order\Payment\TransactionFactory $transactionFactory,
\Magento\Sales\Model\Resource\Order\Payment\Transaction\CollectionFactory $transactionCollectionFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
PriceCurrencyInterface $priceCurrency,
\Magento\Framework\Model\Resource\AbstractResource $resource = null,
\Magento\Framework\Data\Collection\Db $resourceCollection = null,
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php b/app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php
index a2c0b3de2f296..2dce8244dc739 100644
--- a/app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php
+++ b/app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php
@@ -231,7 +231,7 @@ protected function insertLogo(&$page, $store = null)
$this->y = $this->y ? $this->y : 815;
$image = $this->_scopeConfig->getValue(
'sales/identity/logo',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
if ($image) {
@@ -291,7 +291,7 @@ protected function insertAddress(&$page, $store = null)
"\n",
$this->_scopeConfig->getValue(
'sales/identity/address',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
)
) as $value) {
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Creditmemo.php b/app/code/Magento/Sales/Model/Order/Pdf/Creditmemo.php
index acd8d3f9b6d78..9340fd423d1c7 100644
--- a/app/code/Magento/Sales/Model/Order/Pdf/Creditmemo.php
+++ b/app/code/Magento/Sales/Model/Order/Pdf/Creditmemo.php
@@ -12,7 +12,7 @@
class Creditmemo extends AbstractPdf
{
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -26,7 +26,7 @@ class Creditmemo extends AbstractPdf
* @param \Magento\Sales\Model\Order\Pdf\ItemsFactory $pdfItemsFactory
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
* @param \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\Locale\ResolverInterface $localeResolver
* @param array $data
*
@@ -43,7 +43,7 @@ public function __construct(
\Magento\Sales\Model\Order\Pdf\ItemsFactory $pdfItemsFactory,
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
\Magento\Framework\Translate\Inline\StateInterface $inlineTranslation,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\Locale\ResolverInterface $localeResolver,
array $data = []
) {
@@ -158,7 +158,7 @@ public function getPdf($creditmemos = [])
$order,
$this->_scopeConfig->isSetFlag(
self::XML_PATH_SALES_PDF_CREDITMEMO_PUT_ORDER_ID,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$order->getStoreId()
)
);
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Invoice.php b/app/code/Magento/Sales/Model/Order/Pdf/Invoice.php
index 79b3130b68449..e260c2b044d74 100644
--- a/app/code/Magento/Sales/Model/Order/Pdf/Invoice.php
+++ b/app/code/Magento/Sales/Model/Order/Pdf/Invoice.php
@@ -12,7 +12,7 @@
class Invoice extends AbstractPdf
{
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -30,7 +30,7 @@ class Invoice extends AbstractPdf
* @param \Magento\Sales\Model\Order\Pdf\Total\Factory $pdfTotalFactory
* @param \Magento\Sales\Model\Order\Pdf\ItemsFactory $pdfItemsFactory
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation
* @param \Magento\Framework\Locale\ResolverInterface $localeResolver
* @param array $data
@@ -47,7 +47,7 @@ public function __construct(
\Magento\Sales\Model\Order\Pdf\ItemsFactory $pdfItemsFactory,
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
\Magento\Framework\Translate\Inline\StateInterface $inlineTranslation,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\Locale\ResolverInterface $localeResolver,
array $data = []
) {
@@ -137,7 +137,7 @@ public function getPdf($invoices = [])
$order,
$this->_scopeConfig->isSetFlag(
self::XML_PATH_SALES_PDF_INVOICE_PUT_ORDER_ID,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$order->getStoreId()
)
);
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Shipment.php b/app/code/Magento/Sales/Model/Order/Pdf/Shipment.php
index 46594554ba69d..a7a2d4a03259a 100644
--- a/app/code/Magento/Sales/Model/Order/Pdf/Shipment.php
+++ b/app/code/Magento/Sales/Model/Order/Pdf/Shipment.php
@@ -12,7 +12,7 @@
class Shipment extends AbstractPdf
{
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -31,7 +31,7 @@ class Shipment extends AbstractPdf
* @param \Magento\Sales\Model\Order\Pdf\ItemsFactory $pdfItemsFactory
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
* @param \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\Locale\ResolverInterface $localeResolver
* @param array $data
*
@@ -47,7 +47,7 @@ public function __construct(
\Magento\Sales\Model\Order\Pdf\ItemsFactory $pdfItemsFactory,
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
\Magento\Framework\Translate\Inline\StateInterface $inlineTranslation,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\Locale\ResolverInterface $localeResolver,
array $data = []
) {
@@ -130,7 +130,7 @@ public function getPdf($shipments = [])
$shipment,
$this->_scopeConfig->isSetFlag(
self::XML_PATH_SALES_PDF_SHIPMENT_PUT_ORDER_ID,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$order->getStoreId()
)
);
diff --git a/app/code/Magento/Sales/Model/Order/Shipment/Comment.php b/app/code/Magento/Sales/Model/Order/Shipment/Comment.php
index bec79910266e9..f6c917a3f43a7 100644
--- a/app/code/Magento/Sales/Model/Order/Shipment/Comment.php
+++ b/app/code/Magento/Sales/Model/Order/Shipment/Comment.php
@@ -28,7 +28,7 @@ class Comment extends AbstractModel implements ShipmentCommentInterface
protected $_shipment;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -39,7 +39,7 @@ class Comment extends AbstractModel implements ShipmentCommentInterface
* @param AttributeDataBuilder $customAttributeBuilder
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
* @param \Magento\Framework\Stdlib\DateTime $dateTime
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
@@ -52,7 +52,7 @@ public function __construct(
AttributeDataBuilder $customAttributeBuilder,
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
\Magento\Framework\Stdlib\DateTime $dateTime,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\Model\Resource\AbstractResource $resource = null,
\Magento\Framework\Data\Collection\Db $resourceCollection = null,
array $data = []
diff --git a/app/code/Magento/Sales/Model/Order/Shipment/Track.php b/app/code/Magento/Sales/Model/Order/Shipment/Track.php
index 41c4c2521d963..6a3a1f83d7032 100644
--- a/app/code/Magento/Sales/Model/Order/Shipment/Track.php
+++ b/app/code/Magento/Sales/Model/Order/Shipment/Track.php
@@ -48,7 +48,7 @@ class Track extends AbstractModel implements ShipmentTrackInterface
protected $_eventObject = 'track';
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -64,7 +64,7 @@ class Track extends AbstractModel implements ShipmentTrackInterface
* @param AttributeDataBuilder $customAttributeBuilder
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
* @param \Magento\Framework\Stdlib\DateTime $dateTime
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Sales\Model\Order\ShipmentFactory $shipmentFactory
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
@@ -78,7 +78,7 @@ public function __construct(
AttributeDataBuilder $customAttributeBuilder,
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
\Magento\Framework\Stdlib\DateTime $dateTime,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Sales\Model\Order\ShipmentFactory $shipmentFactory,
\Magento\Framework\Model\Resource\AbstractResource $resource = null,
\Magento\Framework\Data\Collection\Db $resourceCollection = null,
diff --git a/app/code/Magento/Sales/Model/Order/Status.php b/app/code/Magento/Sales/Model/Order/Status.php
index ccd42956507f4..756a8063cab3f 100644
--- a/app/code/Magento/Sales/Model/Order/Status.php
+++ b/app/code/Magento/Sales/Model/Order/Status.php
@@ -16,14 +16,14 @@
class Status extends \Magento\Framework\Model\AbstractModel
{
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
/**
* @param \Magento\Framework\Model\Context $context
* @param \Magento\Framework\Registry $registry
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
@@ -31,7 +31,7 @@ class Status extends \Magento\Framework\Model\AbstractModel
public function __construct(
\Magento\Framework\Model\Context $context,
\Magento\Framework\Registry $registry,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\Model\Resource\AbstractResource $resource = null,
\Magento\Framework\Data\Collection\Db $resourceCollection = null,
array $data = []
diff --git a/app/code/Magento/Sales/Model/Order/Status/History.php b/app/code/Magento/Sales/Model/Order/Status/History.php
index 306ba2715f4cd..2a2060d4c57cc 100644
--- a/app/code/Magento/Sales/Model/Order/Status/History.php
+++ b/app/code/Magento/Sales/Model/Order/Status/History.php
@@ -42,7 +42,7 @@ class History extends AbstractModel implements OrderStatusHistoryInterface
protected $_eventObject = 'status_history';
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -53,7 +53,7 @@ class History extends AbstractModel implements OrderStatusHistoryInterface
* @param AttributeDataBuilder $customAttributeBuilder
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
* @param \Magento\Framework\Stdlib\DateTime $dateTime
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
@@ -66,7 +66,7 @@ public function __construct(
AttributeDataBuilder $customAttributeBuilder,
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
\Magento\Framework\Stdlib\DateTime $dateTime,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\Model\Resource\AbstractResource $resource = null,
\Magento\Framework\Data\Collection\Db $resourceCollection = null,
array $data = []
diff --git a/app/code/Magento/Sales/Model/Resource/Order/Collection.php b/app/code/Magento/Sales/Model/Resource/Order/Collection.php
index d4b82b27fa7ba..15f6a053039b3 100644
--- a/app/code/Magento/Sales/Model/Resource/Order/Collection.php
+++ b/app/code/Magento/Sales/Model/Resource/Order/Collection.php
@@ -35,7 +35,7 @@ class Collection extends AbstractCollection implements OrderSearchResultInterfac
protected $_coreResourceHelper;
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -44,7 +44,7 @@ class Collection extends AbstractCollection implements OrderSearchResultInterfac
* @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
diff --git a/app/code/Magento/Sales/Model/Resource/Order/Payment/Collection.php b/app/code/Magento/Sales/Model/Resource/Order/Payment/Collection.php
index 564402814f927..4dccf8d02cbf2 100644
--- a/app/code/Magento/Sales/Model/Resource/Order/Payment/Collection.php
+++ b/app/code/Magento/Sales/Model/Resource/Order/Payment/Collection.php
@@ -28,7 +28,7 @@ class Collection extends AbstractCollection implements OrderPaymentSearchResultI
protected $_eventObject = 'order_payment_collection';
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -36,7 +36,7 @@ class Collection extends AbstractCollection implements OrderPaymentSearchResultI
* @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
diff --git a/app/code/Magento/Sales/Model/Resource/Report/Bestsellers/Collection.php b/app/code/Magento/Sales/Model/Resource/Report/Bestsellers/Collection.php
index 3ea1cfc8bae97..1b4f298b38dfb 100644
--- a/app/code/Magento/Sales/Model/Resource/Report/Bestsellers/Collection.php
+++ b/app/code/Magento/Sales/Model/Resource/Report/Bestsellers/Collection.php
@@ -30,7 +30,7 @@ class Collection extends \Magento\Sales\Model\Resource\Report\Collection\Abstrac
protected $_selectedColumns = [];
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -38,7 +38,7 @@ class Collection extends \Magento\Sales\Model\Resource\Report\Collection\Abstrac
* @param \Zend_Db_Adapter_Abstract $connection
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
diff --git a/app/code/Magento/Sales/Model/Resource/Report/Collection/AbstractCollection.php b/app/code/Magento/Sales/Model/Resource/Report/Collection/AbstractCollection.php
index 33fad434db3e3..8aac1910ca9c3 100644
--- a/app/code/Magento/Sales/Model/Resource/Report/Collection/AbstractCollection.php
+++ b/app/code/Magento/Sales/Model/Resource/Report/Collection/AbstractCollection.php
@@ -20,7 +20,7 @@ class AbstractCollection extends \Magento\Reports\Model\Resource\Report\Collecti
protected $_orderStatus = null;
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -28,7 +28,7 @@ class AbstractCollection extends \Magento\Reports\Model\Resource\Report\Collecti
* @param \Zend_Db_Adapter_Abstract $connection
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
diff --git a/app/code/Magento/Sales/Model/Resource/Report/Invoiced/Collection/Invoiced.php b/app/code/Magento/Sales/Model/Resource/Report/Invoiced/Collection/Invoiced.php
index 3f5af5c91fc89..e37d60cdc8742 100644
--- a/app/code/Magento/Sales/Model/Resource/Report/Invoiced/Collection/Invoiced.php
+++ b/app/code/Magento/Sales/Model/Resource/Report/Invoiced/Collection/Invoiced.php
@@ -13,7 +13,7 @@
class Invoiced extends Order
{
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -21,7 +21,7 @@ class Invoiced extends Order
* @param \Zend_Db_Adapter_Abstract $connection
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
diff --git a/app/code/Magento/Sales/Model/Resource/Report/Invoiced/Collection/Order.php b/app/code/Magento/Sales/Model/Resource/Report/Invoiced/Collection/Order.php
index eba2921ee11e7..46b628a17009e 100644
--- a/app/code/Magento/Sales/Model/Resource/Report/Invoiced/Collection/Order.php
+++ b/app/code/Magento/Sales/Model/Resource/Report/Invoiced/Collection/Order.php
@@ -27,7 +27,7 @@ class Order extends \Magento\Sales\Model\Resource\Report\Collection\AbstractColl
protected $_selectedColumns = [];
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -35,7 +35,7 @@ class Order extends \Magento\Sales\Model\Resource\Report\Collection\AbstractColl
* @param \Zend_Db_Adapter_Abstract $connection
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
diff --git a/app/code/Magento/Sales/Model/Resource/Report/Order/Collection.php b/app/code/Magento/Sales/Model/Resource/Report/Order/Collection.php
index 72f5489e01335..8db7fbe8b1b70 100644
--- a/app/code/Magento/Sales/Model/Resource/Report/Order/Collection.php
+++ b/app/code/Magento/Sales/Model/Resource/Report/Order/Collection.php
@@ -34,7 +34,7 @@ class Collection extends \Magento\Sales\Model\Resource\Report\Collection\Abstrac
protected $_selectedColumns = [];
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -42,7 +42,7 @@ class Collection extends \Magento\Sales\Model\Resource\Report\Collection\Abstrac
* @param \Zend_Db_Adapter_Abstract $connection
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
diff --git a/app/code/Magento/Sales/Model/Resource/Report/Refunded/Collection/Order.php b/app/code/Magento/Sales/Model/Resource/Report/Refunded/Collection/Order.php
index c6a766a63f3f1..14d4d4baa1ed7 100644
--- a/app/code/Magento/Sales/Model/Resource/Report/Refunded/Collection/Order.php
+++ b/app/code/Magento/Sales/Model/Resource/Report/Refunded/Collection/Order.php
@@ -27,7 +27,7 @@ class Order extends \Magento\Sales\Model\Resource\Report\Collection\AbstractColl
protected $_selectedColumns = [];
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -35,7 +35,7 @@ class Order extends \Magento\Sales\Model\Resource\Report\Collection\AbstractColl
* @param \Zend_Db_Adapter_Abstract $connection
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
diff --git a/app/code/Magento/Sales/Model/Resource/Report/Refunded/Collection/Refunded.php b/app/code/Magento/Sales/Model/Resource/Report/Refunded/Collection/Refunded.php
index e2234705d3faf..90ee7574a9c7e 100644
--- a/app/code/Magento/Sales/Model/Resource/Report/Refunded/Collection/Refunded.php
+++ b/app/code/Magento/Sales/Model/Resource/Report/Refunded/Collection/Refunded.php
@@ -13,7 +13,7 @@
class Refunded extends Order
{
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -21,7 +21,7 @@ class Refunded extends Order
* @param \Zend_Db_Adapter_Abstract $connection
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
diff --git a/app/code/Magento/Sales/Model/Resource/Report/Shipping/Collection/Order.php b/app/code/Magento/Sales/Model/Resource/Report/Shipping/Collection/Order.php
index 458c32354466e..bd41d3a18a7ae 100644
--- a/app/code/Magento/Sales/Model/Resource/Report/Shipping/Collection/Order.php
+++ b/app/code/Magento/Sales/Model/Resource/Report/Shipping/Collection/Order.php
@@ -27,7 +27,7 @@ class Order extends \Magento\Sales\Model\Resource\Report\Collection\AbstractColl
protected $_selectedColumns = [];
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -35,7 +35,7 @@ class Order extends \Magento\Sales\Model\Resource\Report\Collection\AbstractColl
* @param \Zend_Db_Adapter_Abstract $connection
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
diff --git a/app/code/Magento/Sales/Model/Resource/Report/Shipping/Collection/Shipment.php b/app/code/Magento/Sales/Model/Resource/Report/Shipping/Collection/Shipment.php
index 0f4cada25ad3f..9cf3db612e5e0 100644
--- a/app/code/Magento/Sales/Model/Resource/Report/Shipping/Collection/Shipment.php
+++ b/app/code/Magento/Sales/Model/Resource/Report/Shipping/Collection/Shipment.php
@@ -13,7 +13,7 @@
class Shipment extends Order
{
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -21,7 +21,7 @@ class Shipment extends Order
* @param \Zend_Db_Adapter_Abstract $connection
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
diff --git a/app/code/Magento/Sales/Model/Resource/Sale/Collection.php b/app/code/Magento/Sales/Model/Resource/Sale/Collection.php
index 393d916aa0ab7..84f01cc9e9404 100644
--- a/app/code/Magento/Sales/Model/Resource/Sale/Collection.php
+++ b/app/code/Magento/Sales/Model/Resource/Sale/Collection.php
@@ -5,8 +5,8 @@
*/
namespace Magento\Sales\Model\Resource\Sale;
-use Magento\Core\Model\EntityFactory;
-use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\Data\Collection\EntityFactory;
+use Magento\Framework\Store\StoreManagerInterface;
use Magento\Framework\Data\Collection\Db\FetchStrategyInterface;
use Magento\Framework\Event\ManagerInterface;
use Psr\Log\LoggerInterface as Logger;
@@ -74,7 +74,7 @@ class Collection extends \Magento\Framework\Data\Collection\Db
* @param ManagerInterface $eventManager
* @param Order $resource
* @param \Magento\Store\Model\Resource\Store\CollectionFactory $storeCollectionFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
*/
public function __construct(
EntityFactory $entityFactory,
diff --git a/app/code/Magento/Sales/Model/Resource/Transaction/Grid/Collection.php b/app/code/Magento/Sales/Model/Resource/Transaction/Grid/Collection.php
index 317c86a506fa6..e6e5ac0812861 100644
--- a/app/code/Magento/Sales/Model/Resource/Transaction/Grid/Collection.php
+++ b/app/code/Magento/Sales/Model/Resource/Transaction/Grid/Collection.php
@@ -16,7 +16,7 @@ class Collection extends \Magento\Sales\Model\Resource\Order\Payment\Transaction
protected $registryManager = null;
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -25,7 +25,7 @@ class Collection extends \Magento\Sales\Model\Resource\Order\Payment\Transaction
* @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
diff --git a/app/code/Magento/Sales/Model/Rss/OrderStatus.php b/app/code/Magento/Sales/Model/Rss/OrderStatus.php
index a7ae287c8bf48..ae0eed109f1d3 100644
--- a/app/code/Magento/Sales/Model/Rss/OrderStatus.php
+++ b/app/code/Magento/Sales/Model/Rss/OrderStatus.php
@@ -89,7 +89,7 @@ public function __construct(
*/
public function isAllowed()
{
- if ($this->config->getValue('rss/order/status', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)) {
+ if ($this->config->getValue('rss/order/status', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)) {
return true;
}
return false;
diff --git a/app/code/Magento/Sales/etc/frontend/di.xml b/app/code/Magento/Sales/etc/frontend/di.xml
index 8bf3f8f410d52..7abf1a3fe1373 100644
--- a/app/code/Magento/Sales/etc/frontend/di.xml
+++ b/app/code/Magento/Sales/etc/frontend/di.xml
@@ -8,7 +8,7 @@
-
+
- /sales/
diff --git a/app/code/Magento/SalesRule/Block/Rss/Discounts.php b/app/code/Magento/SalesRule/Block/Rss/Discounts.php
index 8227baf46e6a1..fb6558e7992a2 100644
--- a/app/code/Magento/SalesRule/Block/Rss/Discounts.php
+++ b/app/code/Magento/SalesRule/Block/Rss/Discounts.php
@@ -14,7 +14,7 @@
class Discounts extends \Magento\Framework\View\Element\AbstractBlock implements DataProviderInterface
{
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $storeManager;
@@ -76,7 +76,7 @@ public function getRssData()
$title = __('%1 - Discounts and Coupons', $storeModel->getFrontendName());
$lang = $this->_scopeConfig->getValue(
'general/locale/code',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$storeModel
);
@@ -150,7 +150,7 @@ public function isAllowed()
{
return $this->_scopeConfig->isSetFlag(
'rss/catalog/discounts',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
}
diff --git a/app/code/Magento/SalesRule/Helper/Coupon.php b/app/code/Magento/SalesRule/Helper/Coupon.php
index 2b3282ae12e64..6724f2f9768bc 100644
--- a/app/code/Magento/SalesRule/Helper/Coupon.php
+++ b/app/code/Magento/SalesRule/Helper/Coupon.php
@@ -90,7 +90,7 @@ public function getFormatsList()
*/
public function getDefaultLength()
{
- return (int)$this->_scopeConfig->getValue(self::XML_PATH_SALES_RULE_COUPON_LENGTH, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+ return (int)$this->_scopeConfig->getValue(self::XML_PATH_SALES_RULE_COUPON_LENGTH, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
}
/**
@@ -100,7 +100,7 @@ public function getDefaultLength()
*/
public function getDefaultFormat()
{
- return $this->_scopeConfig->getValue(self::XML_PATH_SALES_RULE_COUPON_FORMAT, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+ return $this->_scopeConfig->getValue(self::XML_PATH_SALES_RULE_COUPON_FORMAT, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
}
/**
@@ -110,7 +110,7 @@ public function getDefaultFormat()
*/
public function getDefaultPrefix()
{
- return $this->_scopeConfig->getValue(self::XML_PATH_SALES_RULE_COUPON_PREFIX, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+ return $this->_scopeConfig->getValue(self::XML_PATH_SALES_RULE_COUPON_PREFIX, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
}
/**
@@ -120,7 +120,7 @@ public function getDefaultPrefix()
*/
public function getDefaultSuffix()
{
- return $this->_scopeConfig->getValue(self::XML_PATH_SALES_RULE_COUPON_SUFFIX, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+ return $this->_scopeConfig->getValue(self::XML_PATH_SALES_RULE_COUPON_SUFFIX, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
}
/**
@@ -130,7 +130,7 @@ public function getDefaultSuffix()
*/
public function getDefaultDashInterval()
{
- return (int)$this->_scopeConfig->getValue(self::XML_PATH_SALES_RULE_COUPON_DASH_INTERVAL, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+ return (int)$this->_scopeConfig->getValue(self::XML_PATH_SALES_RULE_COUPON_DASH_INTERVAL, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
}
/**
diff --git a/app/code/Magento/SalesRule/Model/Plugin/QuoteConfigProductAttributes.php b/app/code/Magento/SalesRule/Model/Plugin/QuoteConfigProductAttributes.php
index 7ad693c280c26..0f59da5f8ceda 100644
--- a/app/code/Magento/SalesRule/Model/Plugin/QuoteConfigProductAttributes.php
+++ b/app/code/Magento/SalesRule/Model/Plugin/QuoteConfigProductAttributes.php
@@ -5,7 +5,7 @@
*/
namespace Magento\SalesRule\Model\Plugin;
-use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\Store\StoreManagerInterface;
use Magento\Customer\Model\Session;
use Magento\SalesRule\Model\Resource\Rule;
diff --git a/app/code/Magento/SalesRule/Model/Quote/Discount.php b/app/code/Magento/SalesRule/Model/Quote/Discount.php
index d108bb891e6ec..19900252c073d 100644
--- a/app/code/Magento/SalesRule/Model/Quote/Discount.php
+++ b/app/code/Magento/SalesRule/Model/Quote/Discount.php
@@ -26,7 +26,7 @@ class Discount extends \Magento\Quote\Model\Quote\Address\Total\AbstractTotal
protected $_eventManager = null;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -37,13 +37,13 @@ class Discount extends \Magento\Quote\Model\Quote\Address\Total\AbstractTotal
/**
* @param \Magento\Framework\Event\ManagerInterface $eventManager
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\SalesRule\Model\Validator $validator
* @param PriceCurrencyInterface $priceCurrency
*/
public function __construct(
\Magento\Framework\Event\ManagerInterface $eventManager,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\SalesRule\Model\Validator $validator,
PriceCurrencyInterface $priceCurrency
) {
diff --git a/app/code/Magento/SalesRule/Model/Resource/Report/Collection.php b/app/code/Magento/SalesRule/Model/Resource/Report/Collection.php
index ee0f47140fd20..4c8dc6f056004 100644
--- a/app/code/Magento/SalesRule/Model/Resource/Report/Collection.php
+++ b/app/code/Magento/SalesRule/Model/Resource/Report/Collection.php
@@ -46,7 +46,7 @@ class Collection extends \Magento\Sales\Model\Resource\Report\Collection\Abstrac
protected $_ruleFactory;
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -55,7 +55,7 @@ class Collection extends \Magento\Sales\Model\Resource\Report\Collection\Abstrac
* @param mixed $connection
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
diff --git a/app/code/Magento/SalesRule/Model/Resource/Rule/Collection.php b/app/code/Magento/SalesRule/Model/Resource/Rule/Collection.php
index a3d49f61e3946..4f6b86c9850b1 100644
--- a/app/code/Magento/SalesRule/Model/Resource/Rule/Collection.php
+++ b/app/code/Magento/SalesRule/Model/Resource/Rule/Collection.php
@@ -39,7 +39,7 @@ class Collection extends \Magento\Rule\Model\Resource\Rule\Collection\AbstractCo
protected $_date;
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -48,7 +48,7 @@ class Collection extends \Magento\Rule\Model\Resource\Rule\Collection\AbstractCo
* @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
diff --git a/app/code/Magento/SalesRule/Model/Rule.php b/app/code/Magento/SalesRule/Model/Rule.php
index 66dd6c7f054fc..669ab16528b83 100644
--- a/app/code/Magento/SalesRule/Model/Rule.php
+++ b/app/code/Magento/SalesRule/Model/Rule.php
@@ -168,7 +168,7 @@ class Rule extends \Magento\Rule\Model\AbstractModel
protected $_couponCollection;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -182,7 +182,7 @@ class Rule extends \Magento\Rule\Model\AbstractModel
* @param \Magento\SalesRule\Model\Rule\Condition\CombineFactory $condCombineFactory
* @param \Magento\SalesRule\Model\Rule\Condition\Product\CombineFactory $condProdCombineF
* @param \Magento\SalesRule\Model\Resource\Coupon\Collection $couponCollection
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
@@ -198,7 +198,7 @@ public function __construct(
\Magento\SalesRule\Model\Rule\Condition\CombineFactory $condCombineFactory,
\Magento\SalesRule\Model\Rule\Condition\Product\CombineFactory $condProdCombineF,
\Magento\SalesRule\Model\Resource\Coupon\Collection $couponCollection,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\Model\Resource\AbstractResource $resource = null,
\Magento\Framework\Data\Collection\Db $resourceCollection = null,
array $data = []
diff --git a/app/code/Magento/Search/Controller/Term/Popular.php b/app/code/Magento/Search/Controller/Term/Popular.php
index 8e4687542e2ff..32a3e0d41aab1 100644
--- a/app/code/Magento/Search/Controller/Term/Popular.php
+++ b/app/code/Magento/Search/Controller/Term/Popular.php
@@ -36,7 +36,7 @@ public function dispatch(RequestInterface $request)
{
$searchTerms = $this->scopeConfig->getValue(
'catalog/seo/search_terms',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
if (!$searchTerms) {
$this->_redirect('noroute');
diff --git a/app/code/Magento/Search/Helper/Data.php b/app/code/Magento/Search/Helper/Data.php
index 603f9317fe2b3..378b5bb168346 100644
--- a/app/code/Magento/Search/Helper/Data.php
+++ b/app/code/Magento/Search/Helper/Data.php
@@ -11,7 +11,7 @@
use Magento\Framework\Escaper;
use Magento\Framework\Filter\FilterManager;
use Magento\Framework\Stdlib\String;
-use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\Store\StoreManagerInterface;
use Magento\Search\Model\Query as SearchQuery;
use Magento\Search\Model\QueryFactory;
use Magento\Search\Model\Resource\Query\Collection;
@@ -79,7 +79,7 @@ class Data extends AbstractHelper
protected $filter;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -92,7 +92,7 @@ class Data extends AbstractHelper
* @param QueryFactory $queryFactory
* @param Escaper $escaper
* @param FilterManager $filter
- * @param StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
*/
public function __construct(
Context $context,
@@ -192,7 +192,7 @@ public function getMinQueryLength($store = null)
{
return $this->_scopeConfig->getValue(
SearchQuery::XML_PATH_MIN_QUERY_LENGTH,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -207,7 +207,7 @@ public function getMaxQueryLength($store = null)
{
return $this->_scopeConfig->getValue(
SearchQuery::XML_PATH_MAX_QUERY_LENGTH,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
}
diff --git a/app/code/Magento/Search/Model/Query.php b/app/code/Magento/Search/Model/Query.php
index 917abf841a7da..7da98d6eaec79 100644
--- a/app/code/Magento/Search/Model/Query.php
+++ b/app/code/Magento/Search/Model/Query.php
@@ -14,7 +14,7 @@
use Magento\Framework\Model\AbstractModel;
use Magento\Framework\Model\Resource\AbstractResource;
use Magento\Framework\Registry;
-use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\Store\StoreManagerInterface;
/**
* Search query model
@@ -74,7 +74,7 @@ class Query extends AbstractModel implements QueryInterface
/**
* Store manager
*
- * @var StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -99,7 +99,7 @@ class Query extends AbstractModel implements QueryInterface
* @param Registry $registry
* @param QueryCollectionFactory $queryCollectionFactory
* @param CollectionFactory $searchCollectionFactory
- * @param StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param Config $scopeConfig
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param Db $resourceCollection
@@ -110,7 +110,7 @@ public function __construct(
Registry $registry,
QueryCollectionFactory $queryCollectionFactory,
CollectionFactory $searchCollectionFactory,
- StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
ScopeConfigInterface $scopeConfig,
AbstractResource $resource = null,
Db $resourceCollection = null,
@@ -240,7 +240,7 @@ public function getMinQueryLength()
{
return $this->_scopeConfig->getValue(
self::XML_PATH_MIN_QUERY_LENGTH,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$this->getStoreId()
);
}
@@ -254,7 +254,7 @@ public function getMaxQueryLength()
{
return $this->_scopeConfig->getValue(
self::XML_PATH_MAX_QUERY_LENGTH,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$this->getStoreId()
);
}
diff --git a/app/code/Magento/Search/Model/QueryFactory.php b/app/code/Magento/Search/Model/QueryFactory.php
index 0a68112d86f64..4aeb2208139d1 100644
--- a/app/code/Magento/Search/Model/QueryFactory.php
+++ b/app/code/Magento/Search/Model/QueryFactory.php
@@ -9,7 +9,7 @@
use Magento\Framework\App\Helper\Context;
use Magento\Framework\ObjectManagerInterface;
use Magento\Framework\Stdlib\String as StdlibString;
-use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\Store\ScopeInterface;
class QueryFactory implements QueryFactoryInterface
{
diff --git a/app/code/Magento/Search/Model/Resource/Query/Collection.php b/app/code/Magento/Search/Model/Resource/Query/Collection.php
index c685da2f45aa7..a7f3a12d99f82 100644
--- a/app/code/Magento/Search/Model/Resource/Query/Collection.php
+++ b/app/code/Magento/Search/Model/Resource/Query/Collection.php
@@ -23,7 +23,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
/**
* Store manager
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -35,11 +35,11 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
protected $_resourceHelper;
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Search\Model\Resource\Helper $resourceHelper
* @param \Zend_Db_Adapter_Abstract $connection
* @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource
@@ -49,7 +49,7 @@ public function __construct(
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Search\Model\Resource\Helper $resourceHelper,
$connection = null,
\Magento\Framework\Model\Resource\Db\AbstractDb $resource = null
diff --git a/app/code/Magento/Sendfriend/Helper/Data.php b/app/code/Magento/Sendfriend/Helper/Data.php
index e7befbc90105f..e1a4248f7486f 100644
--- a/app/code/Magento/Sendfriend/Helper/Data.php
+++ b/app/code/Magento/Sendfriend/Helper/Data.php
@@ -60,7 +60,7 @@ public function __construct(
*/
public function isEnabled($store = null)
{
- return $this->_scopeConfig->isSetFlag(self::XML_PATH_ENABLED, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
+ return $this->_scopeConfig->isSetFlag(self::XML_PATH_ENABLED, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store);
}
/**
@@ -71,7 +71,7 @@ public function isEnabled($store = null)
*/
public function isAllowForGuest($store = null)
{
- return $this->_scopeConfig->isSetFlag(self::XML_PATH_ALLOW_FOR_GUEST, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
+ return $this->_scopeConfig->isSetFlag(self::XML_PATH_ALLOW_FOR_GUEST, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store);
}
/**
@@ -82,7 +82,7 @@ public function isAllowForGuest($store = null)
*/
public function getMaxRecipients($store = null)
{
- return (int)$this->_scopeConfig->getValue(self::XML_PATH_MAX_RECIPIENTS, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
+ return (int)$this->_scopeConfig->getValue(self::XML_PATH_MAX_RECIPIENTS, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store);
}
/**
@@ -93,7 +93,7 @@ public function getMaxRecipients($store = null)
*/
public function getMaxEmailPerPeriod($store = null)
{
- return (int)$this->_scopeConfig->getValue(self::XML_PATH_MAX_PER_HOUR, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
+ return (int)$this->_scopeConfig->getValue(self::XML_PATH_MAX_PER_HOUR, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store);
}
/**
@@ -114,7 +114,7 @@ public function getPeriod()
*/
public function getLimitBy($store = null)
{
- return (int)$this->_scopeConfig->getValue(self::XML_PATH_LIMIT_BY, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
+ return (int)$this->_scopeConfig->getValue(self::XML_PATH_LIMIT_BY, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store);
}
/**
@@ -125,7 +125,7 @@ public function getLimitBy($store = null)
*/
public function getEmailTemplate($store = null)
{
- return $this->_scopeConfig->getValue(self::XML_PATH_EMAIL_TEMPLATE, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
+ return $this->_scopeConfig->getValue(self::XML_PATH_EMAIL_TEMPLATE, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store);
}
/**
diff --git a/app/code/Magento/Sendfriend/Model/Sendfriend.php b/app/code/Magento/Sendfriend/Model/Sendfriend.php
index fc91a198568da..b221a4e0f2355 100644
--- a/app/code/Magento/Sendfriend/Model/Sendfriend.php
+++ b/app/code/Magento/Sendfriend/Model/Sendfriend.php
@@ -84,7 +84,7 @@ class Sendfriend extends \Magento\Framework\Model\AbstractModel
protected $_transportBuilder;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -111,7 +111,7 @@ class Sendfriend extends \Magento\Framework\Model\AbstractModel
/**
* @param \Magento\Framework\Model\Context $context
* @param \Magento\Framework\Registry $registry
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\Mail\Template\TransportBuilder $transportBuilder
* @param \Magento\Catalog\Helper\Image $catalogImage
* @param \Magento\Sendfriend\Helper\Data $sendfriendData
@@ -127,7 +127,7 @@ class Sendfriend extends \Magento\Framework\Model\AbstractModel
public function __construct(
\Magento\Framework\Model\Context $context,
\Magento\Framework\Registry $registry,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\Mail\Template\TransportBuilder $transportBuilder,
\Magento\Catalog\Helper\Image $catalogImage,
\Magento\Sendfriend\Helper\Data $sendfriendData,
diff --git a/app/code/Magento/Sendfriend/composer.json b/app/code/Magento/Sendfriend/composer.json
index 565943993ff4d..8108b56b26828 100644
--- a/app/code/Magento/Sendfriend/composer.json
+++ b/app/code/Magento/Sendfriend/composer.json
@@ -3,7 +3,6 @@
"description": "N/A",
"require": {
"php": "~5.4.11|~5.5.0|~5.6.0",
- "magento/module-store": "0.42.0-beta5",
"magento/module-catalog": "0.42.0-beta5",
"magento/module-core": "0.42.0-beta5",
"magento/module-customer": "0.42.0-beta5",
diff --git a/app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging.php b/app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging.php
index 1a32585197863..74cbd5e918853 100644
--- a/app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging.php
+++ b/app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging.php
@@ -144,7 +144,7 @@ public function getContainers()
$carrier = $this->_carrierFactory->create($order->getShippingMethod(true)->getCarrierCode());
$countryShipper = $this->_scopeConfig->getValue(
\Magento\Sales\Model\Order\Shipment::XML_PATH_STORE_COUNTRY_ID,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$storeId
);
if ($carrier) {
@@ -272,7 +272,7 @@ public function displayCustomsValue()
$address = $order->getShippingAddress();
$shipperAddressCountryCode = $this->_scopeConfig->getValue(
\Magento\Sales\Model\Order\Shipment::XML_PATH_STORE_COUNTRY_ID,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$storeId
);
$recipientAddressCountryCode = $address->getCountryId();
@@ -350,7 +350,7 @@ public function getContentTypes()
$carrier = $this->_carrierFactory->create($order->getShippingMethod(true)->getCarrierCode());
$countryShipper = $this->_scopeConfig->getValue(
\Magento\Sales\Model\Order\Shipment::XML_PATH_STORE_COUNTRY_ID,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$storeId
);
if ($carrier) {
diff --git a/app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging/Grid.php b/app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging/Grid.php
index 6167bc0292a1c..913e4ce36dfd1 100644
--- a/app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging/Grid.php
+++ b/app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging/Grid.php
@@ -80,7 +80,7 @@ public function displayCustomsValue()
$address = $order->getShippingAddress();
$shipperAddressCountryCode = $this->_scopeConfig->getValue(
\Magento\Sales\Model\Order\Shipment::XML_PATH_STORE_COUNTRY_ID,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$storeId
);
$recipientAddressCountryCode = $address->getCountryId();
diff --git a/app/code/Magento/Shipping/Block/Tracking/Popup.php b/app/code/Magento/Shipping/Block/Tracking/Popup.php
index 2959384a80acd..66559ec405fb0 100644
--- a/app/code/Magento/Shipping/Block/Tracking/Popup.php
+++ b/app/code/Magento/Shipping/Block/Tracking/Popup.php
@@ -95,7 +95,7 @@ public function getContactUsEnabled()
{
return (bool)$this->_scopeConfig->getValue(
'contacts/contacts/enabled',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
}
@@ -106,7 +106,7 @@ public function getStoreSupportEmail()
{
return $this->_scopeConfig->getValue(
'trans_email/ident_support/email',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
}
diff --git a/app/code/Magento/Shipping/Helper/Carrier.php b/app/code/Magento/Shipping/Helper/Carrier.php
index 370c083fbe0c8..72a107fbe2d9e 100644
--- a/app/code/Magento/Shipping/Helper/Carrier.php
+++ b/app/code/Magento/Shipping/Helper/Carrier.php
@@ -55,7 +55,7 @@ public function getOnlineCarrierCodes($store = null)
$carriersCodes = [];
foreach ($this->scopeConfig->getValue(
self::XML_PATH_CARRIERS_ROOT,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
) as $carrierCode => $carrier) {
if (isset($carrier['is_online']) && $carrier['is_online']) {
@@ -77,7 +77,7 @@ public function getCarrierConfigValue($carrierCode, $configPath, $store = null)
{
return $this->scopeConfig->getValue(
sprintf('%s/%s/%s', self::XML_PATH_CARRIERS_ROOT, $carrierCode, $configPath),
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
}
diff --git a/app/code/Magento/Shipping/Helper/Data.php b/app/code/Magento/Shipping/Helper/Data.php
index c7cddf2cab81c..cf252a35c37b9 100644
--- a/app/code/Magento/Shipping/Helper/Data.php
+++ b/app/code/Magento/Shipping/Helper/Data.php
@@ -35,7 +35,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
protected $_scopeConfig;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -43,13 +43,13 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
* @param \Magento\Framework\App\Helper\Context $context
* @param \Magento\Core\Helper\Data $coreData
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
*/
public function __construct(
\Magento\Framework\App\Helper\Context $context,
\Magento\Core\Helper\Data $coreData,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
- \Magento\Store\Model\StoreManagerInterface $storeManager
+ \Magento\Framework\Store\StoreManagerInterface $storeManager
) {
$this->_coreData = $coreData;
$this->_scopeConfig = $scopeConfig;
diff --git a/app/code/Magento/Shipping/Model/Carrier/AbstractCarrier.php b/app/code/Magento/Shipping/Model/Carrier/AbstractCarrier.php
index 147f50e0ba15b..51a3d4ec259e8 100644
--- a/app/code/Magento/Shipping/Model/Carrier/AbstractCarrier.php
+++ b/app/code/Magento/Shipping/Model/Carrier/AbstractCarrier.php
@@ -126,7 +126,7 @@ public function getConfigData($field)
$path = 'carriers/' . $this->_code . '/' . $field;
return $this->_scopeConfig->getValue(
$path,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$this->getStore()
);
}
@@ -146,7 +146,7 @@ public function getConfigFlag($field)
$path = 'carriers/' . $this->_code . '/' . $field;
return $this->_scopeConfig->isSetFlag(
$path,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$this->getStore()
);
}
diff --git a/app/code/Magento/Shipping/Model/CarrierFactory.php b/app/code/Magento/Shipping/Model/CarrierFactory.php
index ac7dcc2514634..9f7e9d45ae003 100644
--- a/app/code/Magento/Shipping/Model/CarrierFactory.php
+++ b/app/code/Magento/Shipping/Model/CarrierFactory.php
@@ -43,7 +43,7 @@ public function get($carrierCode)
{
$className = $this->_scopeConfig->getValue(
'carriers/' . $carrierCode . '/model',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
if (!$className) {
return false;
@@ -64,7 +64,7 @@ public function create($carrierCode, $storeId = null)
{
$className = $this->_scopeConfig->getValue(
'carriers/' . $carrierCode . '/model',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$storeId
);
if (!$className) {
@@ -88,7 +88,7 @@ public function getIfActive($carrierCode)
{
return $this->_scopeConfig->isSetFlag(
'carriers/' . $carrierCode . '/active',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
) ? $this->get(
$carrierCode
) : false;
@@ -105,7 +105,7 @@ public function createIfActive($carrierCode, $storeId = null)
{
return $this->_scopeConfig->isSetFlag(
'carriers/' . $carrierCode . '/active',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
) ? $this->create(
$carrierCode,
$storeId
diff --git a/app/code/Magento/Shipping/Model/Config.php b/app/code/Magento/Shipping/Model/Config.php
index c5ac94f1ef5b3..409d5b0ed551a 100644
--- a/app/code/Magento/Shipping/Model/Config.php
+++ b/app/code/Magento/Shipping/Model/Config.php
@@ -59,9 +59,9 @@ public function __construct(
public function getActiveCarriers($store = null)
{
$carriers = [];
- $config = $this->_scopeConfig->getValue('carriers', \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
+ $config = $this->_scopeConfig->getValue('carriers', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store);
foreach (array_keys($config) as $carrierCode) {
- if ($this->_scopeConfig->isSetFlag('carriers/' . $carrierCode . '/active', \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store)) {
+ if ($this->_scopeConfig->isSetFlag('carriers/' . $carrierCode . '/active', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store)) {
$carrierModel = $this->_carrierFactory->create($carrierCode, $store);
if ($carrierModel) {
$carriers[$carrierCode] = $carrierModel;
@@ -80,7 +80,7 @@ public function getActiveCarriers($store = null)
public function getAllCarriers($store = null)
{
$carriers = [];
- $config = $this->_scopeConfig->getValue('carriers', \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
+ $config = $this->_scopeConfig->getValue('carriers', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store);
foreach (array_keys($config) as $carrierCode) {
$model = $this->_carrierFactory->create($carrierCode, $store);
if ($model) {
diff --git a/app/code/Magento/Shipping/Model/Config/Source/Allmethods.php b/app/code/Magento/Shipping/Model/Config/Source/Allmethods.php
index 00a7689b3ab4a..865607c0b5d38 100644
--- a/app/code/Magento/Shipping/Model/Config/Source/Allmethods.php
+++ b/app/code/Magento/Shipping/Model/Config/Source/Allmethods.php
@@ -52,7 +52,7 @@ public function toOptionArray($isActiveOnlyFlag = false)
}
$carrierTitle = $this->_scopeConfig->getValue(
'carriers/' . $carrierCode . '/title',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
$methods[$carrierCode] = ['label' => $carrierTitle, 'value' => []];
foreach ($carrierMethods as $methodCode => $methodTitle) {
diff --git a/app/code/Magento/Shipping/Model/Order/Pdf/Packaging.php b/app/code/Magento/Shipping/Model/Order/Pdf/Packaging.php
index 2e481201d7f10..149a44bea9b23 100644
--- a/app/code/Magento/Shipping/Model/Order/Pdf/Packaging.php
+++ b/app/code/Magento/Shipping/Model/Order/Pdf/Packaging.php
@@ -20,7 +20,7 @@ class Packaging extends \Magento\Sales\Model\Order\Pdf\AbstractPdf
protected $_carrierHelper;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -45,7 +45,7 @@ class Packaging extends \Magento\Sales\Model\Order\Pdf\AbstractPdf
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
* @param \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation
* @param \Magento\Shipping\Helper\Carrier $carrierHelper
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\View\LayoutInterface $layout
* @param \Magento\Framework\Locale\ResolverInterface $localeResolver
* @param array $data
@@ -63,7 +63,7 @@ public function __construct(
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
\Magento\Framework\Translate\Inline\StateInterface $inlineTranslation,
Carrier $carrierHelper,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\View\LayoutInterface $layout,
\Magento\Framework\Locale\ResolverInterface $localeResolver,
array $data = []
diff --git a/app/code/Magento/Shipping/Model/Order/Track.php b/app/code/Magento/Shipping/Model/Order/Track.php
index ad9b5d7383834..33a3483019261 100644
--- a/app/code/Magento/Shipping/Model/Order/Track.php
+++ b/app/code/Magento/Shipping/Model/Order/Track.php
@@ -45,7 +45,7 @@ class Track extends \Magento\Sales\Model\Order\Shipment\Track
* @param AttributeDataBuilder $customAttributeBuilder
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
* @param \Magento\Framework\Stdlib\DateTime $dateTime
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Sales\Model\Order\ShipmentFactory $shipmentFactory
* @param \Magento\Shipping\Model\CarrierFactory $carrierFactory
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
@@ -61,7 +61,7 @@ public function __construct(
AttributeDataBuilder $customAttributeBuilder,
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
\Magento\Framework\Stdlib\DateTime $dateTime,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Sales\Model\Order\ShipmentFactory $shipmentFactory,
\Magento\Shipping\Model\CarrierFactory $carrierFactory,
\Magento\Framework\Model\Resource\AbstractResource $resource = null,
diff --git a/app/code/Magento/Shipping/Model/Rate/Result.php b/app/code/Magento/Shipping/Model/Rate/Result.php
index 697b91b4d5941..1d851271b3289 100644
--- a/app/code/Magento/Shipping/Model/Rate/Result.php
+++ b/app/code/Magento/Shipping/Model/Rate/Result.php
@@ -22,14 +22,14 @@ class Result
protected $_error = null;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
/**
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
*/
- public function __construct(\Magento\Store\Model\StoreManagerInterface $storeManager)
+ public function __construct(\Magento\Framework\Store\StoreManagerInterface $storeManager)
{
$this->_storeManager = $storeManager;
}
diff --git a/app/code/Magento/Shipping/Model/Shipping.php b/app/code/Magento/Shipping/Model/Shipping.php
index bcb067aba82ed..a1345b2c49bb7 100644
--- a/app/code/Magento/Shipping/Model/Shipping.php
+++ b/app/code/Magento/Shipping/Model/Shipping.php
@@ -42,7 +42,7 @@ class Shipping implements RateCollectorInterface
protected $_scopeConfig;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -84,7 +84,7 @@ class Shipping implements RateCollectorInterface
/**
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param \Magento\Shipping\Model\Config $shippingConfig
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Shipping\Model\CarrierFactory $carrierFactory
* @param \Magento\Shipping\Model\Rate\ResultFactory $rateResultFactory
* @param \Magento\Shipping\Model\Shipment\RequestFactory $shipmentRequestFactory
@@ -95,7 +95,7 @@ class Shipping implements RateCollectorInterface
public function __construct(
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
\Magento\Shipping\Model\Config $shippingConfig,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Shipping\Model\CarrierFactory $carrierFactory,
\Magento\Shipping\Model\Rate\ResultFactory $rateResultFactory,
\Magento\Shipping\Model\Shipment\RequestFactory $shipmentRequestFactory,
@@ -173,25 +173,25 @@ public function collectRates(\Magento\Quote\Model\Quote\Address\RateRequest $req
$request->setCountryId(
$this->_scopeConfig->getValue(
Shipment::XML_PATH_STORE_COUNTRY_ID,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$request->getStore()
)
)->setRegionId(
$this->_scopeConfig->getValue(
Shipment::XML_PATH_STORE_REGION_ID,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$request->getStore()
)
)->setCity(
$this->_scopeConfig->getValue(
Shipment::XML_PATH_STORE_CITY,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$request->getStore()
)
)->setPostcode(
$this->_scopeConfig->getValue(
Shipment::XML_PATH_STORE_ZIP,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$request->getStore()
)
);
@@ -201,7 +201,7 @@ public function collectRates(\Magento\Quote\Model\Quote\Address\RateRequest $req
if (!$limitCarrier) {
$carriers = $this->_scopeConfig->getValue(
'carriers',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$storeId
);
@@ -215,7 +215,7 @@ public function collectRates(\Magento\Quote\Model\Quote\Address\RateRequest $req
foreach ($limitCarrier as $carrierCode) {
$carrierConfig = $this->_scopeConfig->getValue(
'carriers/' . $carrierCode,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$storeId
);
if (!$carrierConfig) {
diff --git a/app/code/Magento/Shipping/Model/Shipping/LabelGenerator.php b/app/code/Magento/Shipping/Model/Shipping/LabelGenerator.php
index e51a5eb891f07..a8c01d74f9930 100644
--- a/app/code/Magento/Shipping/Model/Shipping/LabelGenerator.php
+++ b/app/code/Magento/Shipping/Model/Shipping/LabelGenerator.php
@@ -95,7 +95,7 @@ public function create(\Magento\Sales\Model\Order\Shipment $shipment, RequestInt
$carrierCode = $carrier->getCarrierCode();
$carrierTitle = $this->scopeConfig->getValue(
'carriers/' . $carrierCode . '/title',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$shipment->getStoreId()
);
if (!empty($trackingNumbers)) {
diff --git a/app/code/Magento/Shipping/Model/Shipping/Labels.php b/app/code/Magento/Shipping/Model/Shipping/Labels.php
index 40b7add661e01..aae0b8c863dfc 100644
--- a/app/code/Magento/Shipping/Model/Shipping/Labels.php
+++ b/app/code/Magento/Shipping/Model/Shipping/Labels.php
@@ -29,7 +29,7 @@ class Labels extends \Magento\Shipping\Model\Shipping
/**
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param \Magento\Shipping\Model\Config $shippingConfig
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Shipping\Model\CarrierFactory $carrierFactory
* @param \Magento\Shipping\Model\Rate\ResultFactory $rateResultFactory
* @param \Magento\Shipping\Model\Shipment\RequestFactory $shipmentRequestFactory
@@ -43,7 +43,7 @@ class Labels extends \Magento\Shipping\Model\Shipping
public function __construct(
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
\Magento\Shipping\Model\Config $shippingConfig,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Shipping\Model\CarrierFactory $carrierFactory,
\Magento\Shipping\Model\Rate\ResultFactory $rateResultFactory,
\Magento\Shipping\Model\Shipment\RequestFactory $shipmentRequestFactory,
@@ -91,7 +91,7 @@ public function requestToShipment(Shipment $orderShipment)
}
$shipperRegionCode = $this->_scopeConfig->getValue(
Shipment::XML_PATH_STORE_REGION_ID,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$shipmentStoreId
);
if (is_numeric($shipperRegionCode)) {
@@ -102,18 +102,18 @@ public function requestToShipment(Shipment $orderShipment)
$originStreet1 = $this->_scopeConfig->getValue(
Shipment::XML_PATH_STORE_ADDRESS1,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$shipmentStoreId
);
$originStreet2 = $this->_scopeConfig->getValue(
Shipment::XML_PATH_STORE_ADDRESS2,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$shipmentStoreId
);
$storeInfo = new \Magento\Framework\Object(
(array)$this->_scopeConfig->getValue(
'general/store_information',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$shipmentStoreId
)
);
@@ -126,17 +126,17 @@ public function requestToShipment(Shipment $orderShipment)
|| !$shipperRegionCode
|| !$this->_scopeConfig->getValue(
Shipment::XML_PATH_STORE_CITY,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$shipmentStoreId
)
|| !$this->_scopeConfig->getValue(
Shipment::XML_PATH_STORE_ZIP,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$shipmentStoreId
)
|| !$this->_scopeConfig->getValue(
Shipment::XML_PATH_STORE_COUNTRY_ID,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$shipmentStoreId
)
) {
@@ -162,7 +162,7 @@ public function requestToShipment(Shipment $orderShipment)
$request->setShipperAddressCity(
$this->_scopeConfig->getValue(
Shipment::XML_PATH_STORE_CITY,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$shipmentStoreId
)
);
@@ -170,14 +170,14 @@ public function requestToShipment(Shipment $orderShipment)
$request->setShipperAddressPostalCode(
$this->_scopeConfig->getValue(
Shipment::XML_PATH_STORE_ZIP,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$shipmentStoreId
)
);
$request->setShipperAddressCountryCode(
$this->_scopeConfig->getValue(
Shipment::XML_PATH_STORE_COUNTRY_ID,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$shipmentStoreId
)
);
diff --git a/app/code/Magento/Shipping/composer.json b/app/code/Magento/Shipping/composer.json
index 8b6a5d9857372..eb6774ae198f5 100644
--- a/app/code/Magento/Shipping/composer.json
+++ b/app/code/Magento/Shipping/composer.json
@@ -3,7 +3,6 @@
"description": "N/A",
"require": {
"php": "~5.4.11|~5.5.0|~5.6.0",
- "magento/module-store": "0.42.0-beta5",
"magento/module-core": "0.42.0-beta5",
"magento/module-catalog": "0.42.0-beta5",
"magento/module-sales": "0.42.0-beta5",
diff --git a/app/code/Magento/Shipping/etc/module.xml b/app/code/Magento/Shipping/etc/module.xml
index f5eded9375898..866bf77d0bb5e 100644
--- a/app/code/Magento/Shipping/etc/module.xml
+++ b/app/code/Magento/Shipping/etc/module.xml
@@ -9,7 +9,6 @@
-
diff --git a/app/code/Magento/Sitemap/Helper/Data.php b/app/code/Magento/Sitemap/Helper/Data.php
index 2f12675550375..f0797809c1c07 100644
--- a/app/code/Magento/Sitemap/Helper/Data.php
+++ b/app/code/Magento/Sitemap/Helper/Data.php
@@ -10,7 +10,7 @@
*/
namespace Magento\Sitemap\Helper;
-use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\Store\ScopeInterface;
class Data extends \Magento\Framework\App\Helper\AbstractHelper
{
diff --git a/app/code/Magento/Sitemap/Model/Observer.php b/app/code/Magento/Sitemap/Model/Observer.php
index f0f7066e7091e..42b33a2aebc33 100644
--- a/app/code/Magento/Sitemap/Model/Observer.php
+++ b/app/code/Magento/Sitemap/Model/Observer.php
@@ -55,7 +55,7 @@ class Observer
protected $_transportBuilder;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -67,14 +67,14 @@ class Observer
/**
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param Resource\Sitemap\CollectionFactory $collectionFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\Mail\Template\TransportBuilder $transportBuilder
* @param \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation
*/
public function __construct(
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
\Magento\Sitemap\Model\Resource\Sitemap\CollectionFactory $collectionFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\Mail\Template\TransportBuilder $transportBuilder,
\Magento\Framework\Translate\Inline\StateInterface $inlineTranslation
) {
@@ -100,7 +100,7 @@ public function scheduledGenerateSitemaps($schedule)
// check if scheduled generation enabled
if (!$this->_scopeConfig->isSetFlag(
self::XML_PATH_GENERATION_ENABLED,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)
) {
return;
@@ -120,7 +120,7 @@ public function scheduledGenerateSitemaps($schedule)
if ($errors && $this->_scopeConfig->getValue(
self::XML_PATH_ERROR_RECIPIENT,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)
) {
$translate = $this->_translateModel->getTranslateInline();
@@ -129,7 +129,7 @@ public function scheduledGenerateSitemaps($schedule)
$this->_transportBuilder->setTemplateIdentifier(
$this->_scopeConfig->getValue(
self::XML_PATH_ERROR_TEMPLATE,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)
)->setTemplateOptions(
[
@@ -141,12 +141,12 @@ public function scheduledGenerateSitemaps($schedule)
)->setFrom(
$this->_scopeConfig->getValue(
self::XML_PATH_ERROR_IDENTITY,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)
)->addTo(
$this->_scopeConfig->getValue(
self::XML_PATH_ERROR_RECIPIENT,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)
);
$transport = $this->_transportBuilder->getTransport();
diff --git a/app/code/Magento/Sitemap/Model/Resource/Catalog/Category.php b/app/code/Magento/Sitemap/Model/Resource/Catalog/Category.php
index acb50839e3132..5b617eb4be1a3 100644
--- a/app/code/Magento/Sitemap/Model/Resource/Catalog/Category.php
+++ b/app/code/Magento/Sitemap/Model/Resource/Catalog/Category.php
@@ -29,7 +29,7 @@ class Category extends \Magento\Framework\Model\Resource\Db\AbstractDb
protected $_attributesCache = [];
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -40,12 +40,12 @@ class Category extends \Magento\Framework\Model\Resource\Db\AbstractDb
/**
* @param \Magento\Framework\App\Resource $resource
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Model\Resource\Category $categoryResource
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Resource\Category $categoryResource
) {
$this->_storeManager = $storeManager;
diff --git a/app/code/Magento/Sitemap/Model/Resource/Catalog/Product.php b/app/code/Magento/Sitemap/Model/Resource/Catalog/Product.php
index bd3741d3f5f41..3e6f958844a9c 100644
--- a/app/code/Magento/Sitemap/Model/Resource/Catalog/Product.php
+++ b/app/code/Magento/Sitemap/Model/Resource/Catalog/Product.php
@@ -53,7 +53,7 @@ class Product extends \Magento\Framework\Model\Resource\Db\AbstractDb
protected $_productResource;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -86,7 +86,7 @@ class Product extends \Magento\Framework\Model\Resource\Db\AbstractDb
* @param \Magento\Framework\App\Resource $resource
* @param \Magento\Sitemap\Helper\Data $sitemapData
* @param \Magento\Catalog\Model\Resource\Product $productResource
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Model\Product\Visibility $productVisibility
* @param \Magento\Catalog\Model\Product\Attribute\Source\Status $productStatus
* @param \Magento\Catalog\Model\Resource\Product\Attribute\Backend\Media $mediaAttribute
@@ -97,7 +97,7 @@ public function __construct(
\Magento\Framework\App\Resource $resource,
\Magento\Sitemap\Helper\Data $sitemapData,
\Magento\Catalog\Model\Resource\Product $productResource,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Product\Visibility $productVisibility,
\Magento\Catalog\Model\Product\Attribute\Source\Status $productStatus,
\Magento\Catalog\Model\Resource\Product\Attribute\Backend\Media $mediaAttribute,
diff --git a/app/code/Magento/Sitemap/Model/Sitemap.php b/app/code/Magento/Sitemap/Model/Sitemap.php
index 4baabe60a907e..40647aa6460a1 100644
--- a/app/code/Magento/Sitemap/Model/Sitemap.php
+++ b/app/code/Magento/Sitemap/Model/Sitemap.php
@@ -132,7 +132,7 @@ class Sitemap extends \Magento\Framework\Model\AbstractModel
protected $_dateModel;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -156,7 +156,7 @@ class Sitemap extends \Magento\Framework\Model\AbstractModel
* @param \Magento\Sitemap\Model\Resource\Catalog\ProductFactory $productFactory
* @param \Magento\Sitemap\Model\Resource\Cms\PageFactory $cmsFactory
* @param \Magento\Framework\Stdlib\DateTime\DateTime $modelDate
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\RequestInterface $request
* @param \Magento\Framework\Stdlib\DateTime $dateTime
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
@@ -174,7 +174,7 @@ public function __construct(
\Magento\Sitemap\Model\Resource\Catalog\ProductFactory $productFactory,
\Magento\Sitemap\Model\Resource\Cms\PageFactory $cmsFactory,
\Magento\Framework\Stdlib\DateTime\DateTime $modelDate,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\App\RequestInterface $request,
\Magento\Framework\Stdlib\DateTime $dateTime,
\Magento\Framework\Model\Resource\AbstractResource $resource = null,
diff --git a/app/code/Magento/Store/App/Action/Plugin/Context.php b/app/code/Magento/Store/App/Action/Plugin/Context.php
index 9ac06a3058ba9..072b69c077e61 100644
--- a/app/code/Magento/Store/App/Action/Plugin/Context.php
+++ b/app/code/Magento/Store/App/Action/Plugin/Context.php
@@ -27,7 +27,7 @@ class Context
protected $httpRequest;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $storeManager;
@@ -35,13 +35,13 @@ class Context
* @param \Magento\Framework\Session\SessionManagerInterface $session
* @param \Magento\Framework\App\Http\Context $httpContext
* @param \Magento\Framework\App\Request\Http $httpRequest
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
*/
public function __construct(
\Magento\Framework\Session\SessionManagerInterface $session,
\Magento\Framework\App\Http\Context $httpContext,
\Magento\Framework\App\Request\Http $httpRequest,
- \Magento\Store\Model\StoreManagerInterface $storeManager
+ \Magento\Framework\Store\StoreManagerInterface $storeManager
) {
$this->session = $session;
$this->httpContext = $httpContext;
diff --git a/app/code/Magento/Store/App/Action/Plugin/StoreCheck.php b/app/code/Magento/Store/App/Action/Plugin/StoreCheck.php
index 048f66b3a1451..fef3ede112218 100644
--- a/app/code/Magento/Store/App/Action/Plugin/StoreCheck.php
+++ b/app/code/Magento/Store/App/Action/Plugin/StoreCheck.php
@@ -9,15 +9,15 @@
class StoreCheck
{
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
/**
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
*/
public function __construct(
- \Magento\Store\Model\StoreManagerInterface $storeManager
+ \Magento\Framework\Store\StoreManagerInterface $storeManager
) {
$this->_storeManager = $storeManager;
}
diff --git a/app/code/Magento/Store/App/FrontController/Plugin/RequestPreprocessor.php b/app/code/Magento/Store/App/FrontController/Plugin/RequestPreprocessor.php
index 57307c083d012..629a9fba8c317 100644
--- a/app/code/Magento/Store/App/FrontController/Plugin/RequestPreprocessor.php
+++ b/app/code/Magento/Store/App/FrontController/Plugin/RequestPreprocessor.php
@@ -23,18 +23,18 @@ class RequestPreprocessor
protected $_url;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
/**
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\UrlInterface $url
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param \Magento\Framework\App\ResponseFactory $responseFactory
*/
public function __construct(
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\UrlInterface $url,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
\Magento\Framework\App\ResponseFactory $responseFactory
@@ -74,7 +74,7 @@ public function aroundDispatch(
);
$redirectCode = (int)$this->_scopeConfig->getValue(
'web/url/redirect_to_base',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
) !== 301 ? 302 : 301;
$response = $this->_responseFactory->create();
@@ -97,7 +97,7 @@ protected function _isBaseUrlCheckEnabled()
{
return (bool)$this->_scopeConfig->getValue(
'web/url/redirect_to_base',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
}
diff --git a/app/code/Magento/Store/App/Request/PathInfoProcessor.php b/app/code/Magento/Store/App/Request/PathInfoProcessor.php
index 2868f27a9dd7a..1a9491e3f60fe 100644
--- a/app/code/Magento/Store/App/Request/PathInfoProcessor.php
+++ b/app/code/Magento/Store/App/Request/PathInfoProcessor.php
@@ -8,14 +8,14 @@
class PathInfoProcessor implements \Magento\Framework\App\Request\PathInfoProcessorInterface
{
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
private $_storeManager;
/**
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
*/
- public function __construct(\Magento\Store\Model\StoreManagerInterface $storeManager)
+ public function __construct(\Magento\Framework\Store\StoreManagerInterface $storeManager)
{
$this->_storeManager = $storeManager;
}
diff --git a/app/code/Magento/Store/App/Response/Redirect.php b/app/code/Magento/Store/App/Response/Redirect.php
index 6c156523c881a..3254ec7f20656 100644
--- a/app/code/Magento/Store/App/Response/Redirect.php
+++ b/app/code/Magento/Store/App/Response/Redirect.php
@@ -15,7 +15,7 @@ class Redirect implements \Magento\Framework\App\Response\RedirectInterface
protected $_request;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -48,7 +48,7 @@ class Redirect implements \Magento\Framework\App\Response\RedirectInterface
* Constructor
*
* @param \Magento\Framework\App\RequestInterface $request
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\Encryption\UrlCoder $urlCoder
* @param \Magento\Framework\Session\SessionManagerInterface $session
* @param \Magento\Framework\Session\SidResolverInterface $sidResolver
@@ -57,7 +57,7 @@ class Redirect implements \Magento\Framework\App\Response\RedirectInterface
*/
public function __construct(
\Magento\Framework\App\RequestInterface $request,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\Encryption\UrlCoder $urlCoder,
\Magento\Framework\Session\SessionManagerInterface $session,
\Magento\Framework\Session\SidResolverInterface $sidResolver,
diff --git a/app/code/Magento/Store/Block/Store/Switcher.php b/app/code/Magento/Store/Block/Store/Switcher.php
index 81cba0a463f18..9c76ffce01670 100644
--- a/app/code/Magento/Store/Block/Store/Switcher.php
+++ b/app/code/Magento/Store/Block/Store/Switcher.php
@@ -89,7 +89,7 @@ protected function _loadData()
}
$store->setLocaleCode($this->_scopeConfig->getValue(
\Magento\Core\Helper\Data::XML_PATH_DEFAULT_LOCALE,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store->getId()
));
$this->_stores[$store->getGroupId()][$store->getId()] = $store;
@@ -108,7 +108,7 @@ public function getStoreCount()
$stores = [];
$localeCode = $this->_scopeConfig->getValue(
\Magento\Core\Helper\Data::XML_PATH_DEFAULT_LOCALE,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
foreach ($this->_groups as $group) {
if (!isset($this->_stores[$group->getId()])) {
diff --git a/app/code/Magento/Store/Block/Switcher.php b/app/code/Magento/Store/Block/Switcher.php
index ffbcfec3868b8..4e0afa2811524 100644
--- a/app/code/Magento/Store/Block/Switcher.php
+++ b/app/code/Magento/Store/Block/Switcher.php
@@ -95,7 +95,7 @@ public function getRawStores()
}
$localeCode = $this->_scopeConfig->getValue(
\Magento\Core\Helper\Data::XML_PATH_DEFAULT_LOCALE,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
$store->setLocaleCode($localeCode);
@@ -127,7 +127,7 @@ public function getGroups()
$groups = [];
$localeCode = $this->_scopeConfig->getValue(
\Magento\Core\Helper\Data::XML_PATH_DEFAULT_LOCALE,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
foreach ($rawGroups as $group) {
/* @var $group Group */
diff --git a/app/code/Magento/Store/Helper/Cookie.php b/app/code/Magento/Store/Helper/Cookie.php
index eb0099bef54ae..9bf3266ad2a6c 100644
--- a/app/code/Magento/Store/Helper/Cookie.php
+++ b/app/code/Magento/Store/Helper/Cookie.php
@@ -42,7 +42,7 @@ class Cookie extends \Magento\Framework\App\Helper\AbstractHelper
/**
* @param \Magento\Framework\App\Helper\Context $context
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param array $data
*
@@ -50,7 +50,7 @@ class Cookie extends \Magento\Framework\App\Helper\AbstractHelper
*/
public function __construct(
\Magento\Framework\App\Helper\Context $context,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
array $data = []
) {
@@ -79,7 +79,7 @@ public function isUserNotAllowSaveCookie()
$acceptedSaveCookiesWebsites = $this->_getAcceptedSaveCookiesWebsites();
return $this->_scopeConfig->getValue(
self::XML_PATH_COOKIE_RESTRICTION,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$this->_currentStore
) && empty($acceptedSaveCookiesWebsites[$this->_website->getId()]);
}
@@ -117,7 +117,7 @@ public function getCookieRestrictionLifetime()
{
return (int)$this->_scopeConfig->getValue(
self::XML_PATH_COOKIE_RESTRICTION_LIFETIME,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$this->_currentStore
);
}
diff --git a/app/code/Magento/Store/Model/App/Emulation.php b/app/code/Magento/Store/Model/App/Emulation.php
index 5b64511218ac2..131a7a270db2c 100644
--- a/app/code/Magento/Store/Model/App/Emulation.php
+++ b/app/code/Magento/Store/Model/App/Emulation.php
@@ -17,7 +17,7 @@
class Emulation extends \Magento\Framework\Object
{
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -61,7 +61,7 @@ class Emulation extends \Magento\Framework\Object
private $initialEnvironmentInfo;
/**
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\View\DesignInterface $viewDesign
* @param \Magento\Framework\App\DesignInterface $design
* @param \Magento\Framework\TranslateInterface $translate
@@ -72,7 +72,7 @@ class Emulation extends \Magento\Framework\Object
* @param array $data
*/
public function __construct(
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\View\DesignInterface $viewDesign,
\Magento\Framework\App\DesignInterface $design,
\Magento\Framework\TranslateInterface $translate,
@@ -131,7 +131,7 @@ public function startEnvironmentEmulation(
// emulate locale
$newLocaleCode = $this->_scopeConfig->getValue(
$this->_localeResolver->getDefaultLocalePath(),
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$storeId
);
$this->_localeResolver->setLocaleCode($newLocaleCode);
diff --git a/app/code/Magento/Store/Model/Config/Reader/Store.php b/app/code/Magento/Store/Model/Config/Reader/Store.php
index c5456bcb102f9..d505a38b7820b 100644
--- a/app/code/Magento/Store/Model/Config/Reader/Store.php
+++ b/app/code/Magento/Store/Model/Config/Reader/Store.php
@@ -35,7 +35,7 @@ class Store implements \Magento\Framework\App\Config\Scope\ReaderInterface
protected $_storeFactory;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -45,7 +45,7 @@ class Store implements \Magento\Framework\App\Config\Scope\ReaderInterface
* @param \Magento\Store\Model\Config\Converter $converter
* @param \Magento\Store\Model\Resource\Config\Collection\ScopedFactory $collectionFactory
* @param \Magento\Store\Model\StoreFactory $storeFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
*/
public function __construct(
\Magento\Framework\App\Config\Initial $initialConfig,
@@ -53,7 +53,7 @@ public function __construct(
\Magento\Store\Model\Config\Converter $converter,
\Magento\Store\Model\Resource\Config\Collection\ScopedFactory $collectionFactory,
\Magento\Store\Model\StoreFactory $storeFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager
+ \Magento\Framework\Store\StoreManagerInterface $storeManager
) {
$this->_initialConfig = $initialConfig;
$this->_scopePool = $scopePool;
@@ -85,13 +85,13 @@ public function read($code = null)
throw NoSuchEntityException::singleField('storeCode', $code);
}
$websiteConfig = $this->_scopePool->getScope(
- \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE,
$store->getWebsite()->getCode()
)->getSource();
$config = array_replace_recursive($websiteConfig, $this->_initialConfig->getData("stores|{$code}"));
$collection = $this->_collectionFactory->create(
- ['scope' => \Magento\Store\Model\ScopeInterface::SCOPE_STORES, 'scopeId' => $store->getId()]
+ ['scope' => \Magento\Framework\Store\ScopeInterface::SCOPE_STORES, 'scopeId' => $store->getId()]
);
$dbStoreConfig = [];
foreach ($collection as $item) {
diff --git a/app/code/Magento/Store/Model/Config/Reader/Website.php b/app/code/Magento/Store/Model/Config/Reader/Website.php
index 1448b04bf9afb..1f67c4276b79e 100644
--- a/app/code/Magento/Store/Model/Config/Reader/Website.php
+++ b/app/code/Magento/Store/Model/Config/Reader/Website.php
@@ -69,7 +69,7 @@ public function read($code = null)
$website = $this->_websiteFactory->create();
$website->load($code);
$collection = $this->_collectionFactory->create(
- ['scope' => \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITES, 'scopeId' => $website->getId()]
+ ['scope' => \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITES, 'scopeId' => $website->getId()]
);
$dbWebsiteConfig = [];
foreach ($collection as $configValue) {
diff --git a/app/code/Magento/Store/Model/Group.php b/app/code/Magento/Store/Model/Group.php
index 03c7fdfd4206a..4cc2707ee3bb8 100644
--- a/app/code/Magento/Store/Model/Group.php
+++ b/app/code/Magento/Store/Model/Group.php
@@ -90,7 +90,7 @@ class Group extends \Magento\Framework\Model\AbstractModel implements \Magento\F
protected $_storeListFactory;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -99,7 +99,7 @@ class Group extends \Magento\Framework\Model\AbstractModel implements \Magento\F
* @param \Magento\Framework\Registry $registry
* @param \Magento\Core\Model\Resource\Config\Data $configDataResource
* @param \Magento\Store\Model\Store $store
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
@@ -109,7 +109,7 @@ public function __construct(
\Magento\Framework\Registry $registry,
\Magento\Core\Model\Resource\Config\Data $configDataResource,
\Magento\Store\Model\Resource\Store\CollectionFactory $storeListFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\Model\Resource\AbstractResource $resource = null,
\Magento\Framework\Data\Collection\Db $resourceCollection = null,
array $data = []
@@ -355,7 +355,7 @@ public function getWebsiteId()
public function beforeDelete()
{
$this->_configDataResource->clearScopeData(
- \Magento\Store\Model\ScopeInterface::SCOPE_STORES,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORES,
$this->getStoreIds()
);
return parent::beforeDelete();
diff --git a/app/code/Magento/Store/Model/Resolver/Store.php b/app/code/Magento/Store/Model/Resolver/Store.php
index a1ad0d3a6d426..39f285b914b5c 100644
--- a/app/code/Magento/Store/Model/Resolver/Store.php
+++ b/app/code/Magento/Store/Model/Resolver/Store.php
@@ -8,14 +8,14 @@
class Store implements \Magento\Framework\App\ScopeResolverInterface
{
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
/**
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
*/
- public function __construct(\Magento\Store\Model\StoreManagerInterface $storeManager)
+ public function __construct(\Magento\Framework\Store\StoreManagerInterface $storeManager)
{
$this->_storeManager = $storeManager;
}
diff --git a/app/code/Magento/Store/Model/Resolver/Website.php b/app/code/Magento/Store/Model/Resolver/Website.php
index f728777003429..3fd696712b028 100644
--- a/app/code/Magento/Store/Model/Resolver/Website.php
+++ b/app/code/Magento/Store/Model/Resolver/Website.php
@@ -8,15 +8,15 @@
class Website implements \Magento\Framework\App\ScopeResolverInterface
{
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
/**
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
*/
public function __construct(
- \Magento\Store\Model\StoreManagerInterface $storeManager
+ \Magento\Framework\Store\StoreManagerInterface $storeManager
) {
$this->_storeManager = $storeManager;
}
diff --git a/app/code/Magento/Store/Model/Resource/Config/Collection/Scoped.php b/app/code/Magento/Store/Model/Resource/Config/Collection/Scoped.php
index 12d89e86575e4..7baa705ec82be 100644
--- a/app/code/Magento/Store/Model/Resource/Config/Collection/Scoped.php
+++ b/app/code/Magento/Store/Model/Resource/Config/Collection/Scoped.php
@@ -24,7 +24,7 @@ class Scoped extends \Magento\Framework\Model\Resource\Db\Collection\AbstractCol
protected $_scopeId;
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -34,7 +34,7 @@ class Scoped extends \Magento\Framework\Model\Resource\Db\Collection\AbstractCol
* @param mixed $scopeId
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
diff --git a/app/code/Magento/Store/Model/Resource/Store.php b/app/code/Magento/Store/Model/Resource/Store.php
index 6add5aff1e660..e7c3a0336ddfb 100644
--- a/app/code/Magento/Store/Model/Resource/Store.php
+++ b/app/code/Magento/Store/Model/Resource/Store.php
@@ -73,7 +73,7 @@ protected function _afterSave(\Magento\Framework\Model\AbstractModel $object)
protected function _afterDelete(\Magento\Framework\Model\AbstractModel $model)
{
$where = [
- 'scope = ?' => \Magento\Store\Model\ScopeInterface::SCOPE_STORES,
+ 'scope = ?' => \Magento\Framework\Store\ScopeInterface::SCOPE_STORES,
'scope_id = ?' => $model->getStoreId(),
];
diff --git a/app/code/Magento/Store/Model/Resource/Website.php b/app/code/Magento/Store/Model/Resource/Website.php
index 1213b6c8de7eb..82bd6f6ce9b2b 100644
--- a/app/code/Magento/Store/Model/Resource/Website.php
+++ b/app/code/Magento/Store/Model/Resource/Website.php
@@ -79,7 +79,7 @@ protected function _afterSave(\Magento\Framework\Model\AbstractModel $object)
protected function _afterDelete(\Magento\Framework\Model\AbstractModel $model)
{
$where = [
- 'scope = ?' => \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITES,
+ 'scope = ?' => \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITES,
'scope_id = ?' => $model->getWebsiteId(),
];
diff --git a/app/code/Magento/Store/Model/Storage/Db.php b/app/code/Magento/Store/Model/Storage/Db.php
index f9cd545b5b1e7..c6713738d2459 100644
--- a/app/code/Magento/Store/Model/Storage/Db.php
+++ b/app/code/Magento/Store/Model/Storage/Db.php
@@ -18,7 +18,7 @@
* @SuppressWarnings(PHPMD.TooManyFields)
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
-class Db implements \Magento\Store\Model\StoreManagerInterface
+class Db implements \Magento\Framework\Store\StoreManagerInterface
{
/**
* Flag that shows that system has only one store view
@@ -534,7 +534,7 @@ protected function isSingleStoreModeEnabled()
{
return (bool)$this->_scopeConfig->getValue(
\Magento\Store\Model\StoreManager::XML_PATH_SINGLE_STORE_MODE_ENABLED,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
}
}
diff --git a/app/code/Magento/Store/Model/Storage/DefaultStorage.php b/app/code/Magento/Store/Model/Storage/DefaultStorage.php
index 1a55f0eef7cd3..5afca24a7086f 100644
--- a/app/code/Magento/Store/Model/Storage/DefaultStorage.php
+++ b/app/code/Magento/Store/Model/Storage/DefaultStorage.php
@@ -7,7 +7,7 @@
*/
namespace Magento\Store\Model\Storage;
-class DefaultStorage implements \Magento\Store\Model\StoreManagerInterface
+class DefaultStorage implements \Magento\Framework\Store\StoreManagerInterface
{
/**
* Application store object
diff --git a/app/code/Magento/Store/Model/StorageFactory.php b/app/code/Magento/Store/Model/StorageFactory.php
index cf53216bd169c..a8ade74ca0bc1 100644
--- a/app/code/Magento/Store/Model/StorageFactory.php
+++ b/app/code/Magento/Store/Model/StorageFactory.php
@@ -6,6 +6,8 @@
namespace Magento\Store\Model;
use Magento\Framework\Profiler;
+use Magento\Framework\Store\ScopeInterface;
+use Magento\Framework\Store\StoreManagerInterface;
/**
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -25,7 +27,7 @@ class StorageFactory
protected $_storageClassName;
/**
- * @var \Magento\Store\Model\StoreManagerInterface[]
+ * @var \Magento\Framework\Store\StoreManagerInterface[]
*/
protected $_cache = [];
@@ -96,7 +98,7 @@ public function __construct(
* Get storage instance
*
* @param array $arguments
- * @return \Magento\Store\Model\StoreManagerInterface
+ * @return \Magento\Framework\Store\StoreManagerInterface
* @throws \InvalidArgumentException
*/
public function get(array $arguments = [])
@@ -104,12 +106,12 @@ public function get(array $arguments = [])
$className = $this->_storageClassName;
if (false == isset($this->_cache[$className])) {
- /** @var $storage \Magento\Store\Model\StoreManagerInterface */
+ /** @var $storage \Magento\Framework\Store\StoreManagerInterface */
$storage = $this->_objectManager->create($className, $arguments);
- if (false === ($storage instanceof \Magento\Store\Model\StoreManagerInterface)) {
+ if (false === ($storage instanceof \Magento\Framework\Store\StoreManagerInterface)) {
throw new \InvalidArgumentException(
- $className . ' doesn\'t implement \Magento\Store\Model\StoreManagerInterface'
+ $className . ' doesn\'t implement \Magento\Framework\Store\StoreManagerInterface'
);
}
$this->_cache[$className] = $storage;
@@ -117,7 +119,7 @@ public function get(array $arguments = [])
$this->_reinitStores($storage, $arguments);
$useSid = $this->_scopeConfig->isSetFlag(
\Magento\Framework\Session\SidResolver::XML_PATH_USE_FRONTEND_SID,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$storage->getStore()
);
$this->_sidResolver->setUseSessionInUrl($useSid);
@@ -131,12 +133,12 @@ public function get(array $arguments = [])
/**
* Initialize currently ran store
*
- * @param \Magento\Store\Model\StoreManagerInterface $storage
+ * @param \Magento\Framework\Store\StoreManagerInterface $storage
* @param array $arguments
* @return void
* @throws \Magento\Framework\App\InitException
*/
- protected function _reinitStores(\Magento\Store\Model\StoreManagerInterface $storage, $arguments)
+ protected function _reinitStores(\Magento\Framework\Store\StoreManagerInterface $storage, $arguments)
{
Profiler::start('init_stores');
$storage->reinitStores();
@@ -172,11 +174,11 @@ protected function _reinitStores(\Magento\Store\Model\StoreManagerInterface $sto
}
/**
- * @param \Magento\Store\Model\StoreManagerInterface $storage
+ * @param \Magento\Framework\Store\StoreManagerInterface $storage
* @param string $scopeCode
* @return null|string
*/
- protected function _getStoreByGroup(\Magento\Store\Model\StoreManagerInterface $storage, $scopeCode)
+ protected function _getStoreByGroup(\Magento\Framework\Store\StoreManagerInterface $storage, $scopeCode)
{
$groups = $storage->getGroups(true);
$stores = $storage->getStores(true);
@@ -190,11 +192,11 @@ protected function _getStoreByGroup(\Magento\Store\Model\StoreManagerInterface $
}
/**
- * @param \Magento\Store\Model\StoreManagerInterface $storage
+ * @param \Magento\Framework\Store\StoreManagerInterface $storage
* @param string $scopeCode
* @return null|string
*/
- protected function _getStoreByWebsite(\Magento\Store\Model\StoreManagerInterface $storage, $scopeCode)
+ protected function _getStoreByWebsite(\Magento\Framework\Store\StoreManagerInterface $storage, $scopeCode)
{
$websites = $storage->getWebsites(true, true);
if (!isset($websites[$scopeCode])) {
@@ -207,11 +209,11 @@ protected function _getStoreByWebsite(\Magento\Store\Model\StoreManagerInterface
}
/**
- * @param \Magento\Store\Model\StoreManagerInterface $storage
+ * @param \Magento\Framework\Store\StoreManagerInterface $storage
* @param string $scopeType
* @return void
*/
- protected function _checkCookieStore(\Magento\Store\Model\StoreManagerInterface $storage, $scopeType)
+ protected function _checkCookieStore(\Magento\Framework\Store\StoreManagerInterface $storage, $scopeType)
{
$storeCode = $storage->getStore()->getStoreCodeFromCookie();
if (null != $storeCode) {
@@ -220,11 +222,11 @@ protected function _checkCookieStore(\Magento\Store\Model\StoreManagerInterface
}
/**
- * @param \Magento\Store\Model\StoreManagerInterface $storage
+ * @param \Magento\Framework\Store\StoreManagerInterface $storage
* @param string $scopeType
* @return void
*/
- protected function _checkRequestStore(\Magento\Store\Model\StoreManagerInterface $storage, $scopeType)
+ protected function _checkRequestStore(\Magento\Framework\Store\StoreManagerInterface $storage, $scopeType)
{
$storeCode = $this->request->getParam('___store');
if (empty($storeCode)) {
@@ -259,7 +261,7 @@ protected function _checkRequestStore(\Magento\Store\Model\StoreManagerInterface
* @param string $scopeCode
* @return bool|Store
*/
- protected function getActiveStoreByCode(\Magento\Store\Model\StoreManagerInterface $storage, $scopeCode)
+ protected function getActiveStoreByCode(\Magento\Framework\Store\StoreManagerInterface $storage, $scopeCode)
{
$stores = $storage->getStores(true, true);
if ($scopeCode && isset($stores[$scopeCode])
@@ -274,12 +276,12 @@ protected function getActiveStoreByCode(\Magento\Store\Model\StoreManagerInterfa
/**
* Set current store
*
- * @param \Magento\Store\Model\StoreManagerInterface $storage
+ * @param \Magento\Framework\Store\StoreManagerInterface $storage
* @param string $scopeCode
* @param string $scopeType
* @return bool
*/
- protected function setCurrentStore(\Magento\Store\Model\StoreManagerInterface $storage, $scopeCode, $scopeType)
+ protected function setCurrentStore(\Magento\Framework\Store\StoreManagerInterface $storage, $scopeCode, $scopeType)
{
$store = $this->getActiveStoreByCode($storage, $scopeCode);
if (!$store) {
@@ -293,13 +295,13 @@ protected function setCurrentStore(\Magento\Store\Model\StoreManagerInterface $s
*/
$setStore = false;
switch ($scopeType) {
- case \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE:
+ case \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE:
$setStore = $store->getWebsiteId() == $curStoreObj->getWebsiteId();
break;
- case \Magento\Store\Model\ScopeInterface::SCOPE_GROUP:
+ case \Magento\Framework\Store\ScopeInterface::SCOPE_GROUP:
$setStore = $store->getGroupId() == $curStoreObj->getGroupId();
break;
- case \Magento\Store\Model\ScopeInterface::SCOPE_STORE:
+ case \Magento\Framework\Store\ScopeInterface::SCOPE_STORE:
$setStore = true;
break;
}
diff --git a/app/code/Magento/Store/Model/Store.php b/app/code/Magento/Store/Model/Store.php
index 442347f72b5f1..89beeac16ebd1 100644
--- a/app/code/Magento/Store/Model/Store.php
+++ b/app/code/Magento/Store/Model/Store.php
@@ -7,6 +7,7 @@
use Magento\Framework\App\Filesystem\DirectoryList;
use Magento\Framework\Model\AbstractModel;
+use Magento\Framework\Store\ScopeInterface;
/**
* Store model
@@ -310,7 +311,7 @@ class Store extends AbstractModel implements
* @param \Magento\Core\Model\Resource\Config\Data $configDataResource
* @param \Magento\Framework\Filesystem $filesystem
* @param \Magento\Framework\App\Config\ReinitableConfigInterface $config
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\Session\SidResolverInterface $sidResolver
* @param \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory $cookieMetadataFactory
* @param \Magento\Framework\Stdlib\CookieManagerInterface $cookieManager,
@@ -334,7 +335,7 @@ public function __construct(
\Magento\Core\Model\Resource\Config\Data $configDataResource,
\Magento\Framework\Filesystem $filesystem,
\Magento\Framework\App\Config\ReinitableConfigInterface $config,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\Session\SidResolverInterface $sidResolver,
\Magento\Framework\Stdlib\Cookie\CookieMetadataFactory $cookieMetadataFactory,
\Magento\Framework\Stdlib\CookieManagerInterface $cookieManager,
@@ -720,7 +721,7 @@ public function isFrontUrlSecure()
if ($this->_isFrontSecure === null) {
$this->_isFrontSecure = $this->_config->isSetFlag(
self::XML_PATH_SECURE_IN_FRONTEND,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$this->getId()
);
}
@@ -748,7 +749,7 @@ public function isCurrentlySecure()
$secureBaseUrl = $this->_config->getValue(
self::XML_PATH_SECURE_BASE_URL,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
if (!$secureBaseUrl) {
@@ -1124,7 +1125,10 @@ public function getName()
*/
public function beforeDelete()
{
- $this->_configDataResource->clearScopeData(\Magento\Store\Model\ScopeInterface::SCOPE_STORES, $this->getId());
+ $this->_configDataResource->clearScopeData(
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORES,
+ $this->getId()
+ );
return parent::beforeDelete();
}
@@ -1180,7 +1184,7 @@ public function getFrontendName()
if (null === $this->_frontendName) {
$storeGroupName = (string)$this->_config->getValue(
'general/store_information/name',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$this
);
$this->_frontendName = !empty($storeGroupName) ? $storeGroupName : $this->getGroup()->getName();
diff --git a/app/code/Magento/Store/Model/StoreManager.php b/app/code/Magento/Store/Model/StoreManager.php
index 44e953feb8469..bc3184809baaa 100644
--- a/app/code/Magento/Store/Model/StoreManager.php
+++ b/app/code/Magento/Store/Model/StoreManager.php
@@ -5,7 +5,9 @@
*/
namespace Magento\Store\Model;
-class StoreManager implements \Magento\Store\Model\StoreManagerInterface
+use Magento\Framework\Store\ScopeInterface;
+
+class StoreManager implements \Magento\Framework\Store\StoreManagerInterface
{
/**
* Application run code
@@ -79,7 +81,7 @@ class StoreManager implements \Magento\Store\Model\StoreManagerInterface
protected $_scopeConfig;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storage;
@@ -107,11 +109,11 @@ public function __construct(
/**
* Get storage instance
*
- * @return \Magento\Store\Model\StoreManagerInterface
+ * @return \Magento\Framework\Store\StoreManagerInterface
*/
protected function _getStorage()
{
- if (!$this->_storage instanceof \Magento\Store\Model\StoreManagerInterface) {
+ if (!$this->_storage instanceof \Magento\Framework\Store\StoreManagerInterface) {
$arguments = [
'isSingleStoreAllowed' => $this->_isSingleStoreAllowed,
'currentStore' => $this->_currentStore,
@@ -276,7 +278,7 @@ protected function isSingleStoreModeEnabled()
{
return (bool)$this->_scopeConfig->getValue(
self::XML_PATH_SINGLE_STORE_MODE_ENABLED,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
}
}
diff --git a/app/code/Magento/Store/Model/StoresConfig.php b/app/code/Magento/Store/Model/StoresConfig.php
index 139c2ad56522a..d5b9ce046574e 100644
--- a/app/code/Magento/Store/Model/StoresConfig.php
+++ b/app/code/Magento/Store/Model/StoresConfig.php
@@ -7,11 +7,12 @@
namespace Magento\Store\Model;
use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Store\ScopeInterface;
class StoresConfig
{
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -21,11 +22,11 @@ class StoresConfig
protected $_config;
/**
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\Config\ScopeConfigInterface $config
*/
public function __construct(
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\App\Config\ScopeConfigInterface $config
) {
$this->_storeManager = $storeManager;
diff --git a/app/code/Magento/Store/Model/System/Store.php b/app/code/Magento/Store/Model/System/Store.php
index d12f4d791e310..9cc19538e0c70 100644
--- a/app/code/Magento/Store/Model/System/Store.php
+++ b/app/code/Magento/Store/Model/System/Store.php
@@ -40,7 +40,7 @@ class Store extends \Magento\Framework\Object
private $_isAdminScopeAllowed = true;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -48,9 +48,9 @@ class Store extends \Magento\Framework\Object
* Init model
* Load Website, Group and Store collections
*
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
*/
- public function __construct(\Magento\Store\Model\StoreManagerInterface $storeManager)
+ public function __construct(\Magento\Framework\Store\StoreManagerInterface $storeManager)
{
$this->_storeManager = $storeManager;
return $this->reload();
@@ -406,13 +406,13 @@ public function reload($type = null)
$this->_loadStoreCollection();
} else {
switch ($type) {
- case \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE:
+ case \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE:
$this->_loadWebsiteCollection();
break;
- case \Magento\Store\Model\ScopeInterface::SCOPE_GROUP:
+ case \Magento\Framework\Store\ScopeInterface::SCOPE_GROUP:
$this->_loadGroupCollection();
break;
- case \Magento\Store\Model\ScopeInterface::SCOPE_STORE:
+ case \Magento\Framework\Store\ScopeInterface::SCOPE_STORE:
$this->_loadStoreCollection();
break;
default:
diff --git a/app/code/Magento/Store/Model/Website.php b/app/code/Magento/Store/Model/Website.php
index 6299b99237f20..458d0d84e6f19 100644
--- a/app/code/Magento/Store/Model/Website.php
+++ b/app/code/Magento/Store/Model/Website.php
@@ -5,7 +5,7 @@
*/
namespace Magento\Store\Model;
-use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\Store\StoreManagerInterface;
/**
* Core Website model
@@ -172,7 +172,7 @@ class Website extends \Magento\Framework\Model\AbstractModel implements
* @param \Magento\Store\Model\StoreFactory $storeFactory
* @param \Magento\Store\Model\GroupFactory $storeGroupFactory
* @param \Magento\Store\Model\WebsiteFactory $websiteFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
@@ -187,7 +187,7 @@ public function __construct(
\Magento\Store\Model\StoreFactory $storeFactory,
\Magento\Store\Model\GroupFactory $storeGroupFactory,
\Magento\Store\Model\WebsiteFactory $websiteFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Directory\Model\CurrencyFactory $currencyFactory,
\Magento\Framework\Model\Resource\AbstractResource $resource = null,
\Magento\Framework\Data\Collection\Db $resourceCollection = null,
@@ -240,7 +240,7 @@ public function getConfig($path)
if (!isset($this->_configCache[$path])) {
$config = $this->_coreConfig->getValue(
$path,
- \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE,
$this->getCode()
);
if (!$config) {
@@ -508,11 +508,11 @@ public function getCode()
public function beforeDelete()
{
$this->_configDataResource->clearScopeData(
- \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITES,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITES,
$this->getId()
);
$this->_configDataResource->clearScopeData(
- \Magento\Store\Model\ScopeInterface::SCOPE_STORES,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORES,
$this->getStoreIds()
);
return parent::beforeDelete();
diff --git a/app/code/Magento/Store/etc/di.xml b/app/code/Magento/Store/etc/di.xml
index 71640d0ea8f06..1e7d35bfe57b4 100644
--- a/app/code/Magento/Store/etc/di.xml
+++ b/app/code/Magento/Store/etc/di.xml
@@ -9,7 +9,7 @@
- - Magento\Core\Model\Resource\Setup
+ - Magento\Framework\Module\DataSetup
@@ -26,17 +26,17 @@
Magento\Framework\App\Config\ScopePool\Proxy
- Magento\Store\Model\StoreManagerInterface\Proxy
+ Magento\Framework\Store\StoreManagerInterface\Proxy
- Magento\Store\Model\StoreManagerInterface\Proxy
+ Magento\Framework\Store\StoreManagerInterface\Proxy
- Magento\Store\Model\StoreManagerInterface\Proxy
+ Magento\Framework\Store\StoreManagerInterface\Proxy
@@ -126,33 +126,33 @@
- Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ Magento\Framework\Store\ScopeInterface::SCOPE_STORE
- Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ Magento\Framework\Store\ScopeInterface::SCOPE_STORE
- Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ Magento\Framework\Store\ScopeInterface::SCOPE_STORE
- Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ Magento\Framework\Store\ScopeInterface::SCOPE_STORE
- Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ Magento\Framework\Store\ScopeInterface::SCOPE_STORE
design/theme/ua_regexp
- Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ Magento\Framework\Store\ScopeInterface::SCOPE_STORE
diff --git a/app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php b/app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php
index 7886702d51034..8acd7cc3591f8 100644
--- a/app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php
+++ b/app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php
@@ -143,14 +143,14 @@ protected function _prepareForm()
if (!isset($formData['tax_country_id'])) {
$formData['tax_country_id'] = $this->_scopeConfig->getValue(
\Magento\Tax\Model\Config::CONFIG_XML_PATH_DEFAULT_COUNTRY,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
}
if (!isset($formData['tax_region_id'])) {
$formData['tax_region_id'] = $this->_scopeConfig->getValue(
\Magento\Tax\Model\Config::CONFIG_XML_PATH_DEFAULT_REGION,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
}
@@ -197,7 +197,7 @@ protected function _prepareForm()
if (!isset($formData['tax_postcode'])) {
$formData['tax_postcode'] = $this->_scopeConfig->getValue(
\Magento\Tax\Model\Config::CONFIG_XML_PATH_DEFAULT_POSTCODE,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
}
diff --git a/app/code/Magento/Tax/Helper/Data.php b/app/code/Magento/Tax/Helper/Data.php
index 580aacd2f63ab..2d07bede17840 100644
--- a/app/code/Magento/Tax/Helper/Data.php
+++ b/app/code/Magento/Tax/Helper/Data.php
@@ -76,7 +76,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
protected $_scopeConfig;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -161,7 +161,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
* @param \Magento\Framework\Registry $coreRegistry
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param Config $taxConfig
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\Locale\FormatInterface $localeFormat
* @param \Magento\Eav\Model\Entity\AttributeFactory $attributeFactory
* @param \Magento\Tax\Model\Resource\Sales\Order\Tax\ItemFactory $taxItemFactory
@@ -183,7 +183,7 @@ public function __construct(
\Magento\Framework\Registry $coreRegistry,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
Config $taxConfig,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\Locale\FormatInterface $localeFormat,
\Magento\Eav\Model\Entity\AttributeFactory $attributeFactory,
\Magento\Tax\Model\Resource\Sales\Order\Tax\ItemFactory $taxItemFactory,
@@ -580,7 +580,7 @@ public function getTaxBasedOn($store = null)
{
return $this->_scopeConfig->getValue(
Config::CONFIG_XML_PATH_BASED_ON,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -595,7 +595,7 @@ public function applyTaxOnCustomPrice($store = null)
{
return (int) $this->_scopeConfig->getValue(
Config::CONFIG_XML_PATH_APPLY_ON,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
) == 0;
}
@@ -610,7 +610,7 @@ public function applyTaxOnOriginalPrice($store = null)
{
return (int) $this->_scopeConfig->getValue(
Config::CONFIG_XML_PATH_APPLY_ON,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
) == 1;
}
@@ -743,7 +743,7 @@ public function getDefaultCustomerTaxClass()
{
return $this->_scopeConfig->getValue(
self::CONFIG_DEFAULT_CUSTOMER_TAX_CLASS,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
}
@@ -756,7 +756,7 @@ public function getDefaultProductTaxClass()
{
return $this->_scopeConfig->getValue(
self::CONFIG_DEFAULT_PRODUCT_TAX_CLASS,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
}
diff --git a/app/code/Magento/Tax/Model/Calculation.php b/app/code/Magento/Tax/Model/Calculation.php
index 8be6f10337d39..de1513773f333 100644
--- a/app/code/Magento/Tax/Model/Calculation.php
+++ b/app/code/Magento/Tax/Model/Calculation.php
@@ -115,7 +115,7 @@ class Calculation extends \Magento\Framework\Model\AbstractModel
protected $_scopeConfig;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -176,7 +176,7 @@ class Calculation extends \Magento\Framework\Model\AbstractModel
* @param \Magento\Framework\Registry $registry
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param Config $taxConfig
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Customer\Model\Session $customerSession
* @param \Magento\Customer\Model\CustomerFactory $customerFactory
* @param Resource\TaxClass\CollectionFactory $classesFactory
@@ -196,7 +196,7 @@ public function __construct(
\Magento\Framework\Registry $registry,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
Config $taxConfig,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Customer\Model\Session $customerSession,
\Magento\Customer\Model\CustomerFactory $customerFactory,
\Magento\Tax\Model\Resource\TaxClass\CollectionFactory $classesFactory,
@@ -406,19 +406,19 @@ protected function getRateOriginRequest($store = null)
$request->setCountryId(
$this->_scopeConfig->getValue(
\Magento\Shipping\Model\Config::XML_PATH_ORIGIN_COUNTRY_ID,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
)
)->setRegionId(
$this->_scopeConfig->getValue(
\Magento\Shipping\Model\Config::XML_PATH_ORIGIN_REGION_ID,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
)
)->setPostcode(
$this->_scopeConfig->getValue(
\Magento\Shipping\Model\Config::XML_PATH_ORIGIN_POSTCODE,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
)
)->setCustomerClassId(
@@ -490,7 +490,7 @@ public function getRateRequest(
$address = new \Magento\Framework\Object();
$basedOn = $this->_scopeConfig->getValue(
\Magento\Tax\Model\Config::CONFIG_XML_PATH_BASED_ON,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
@@ -542,19 +542,19 @@ public function getRateRequest(
$address->setCountryId(
$this->_scopeConfig->getValue(
\Magento\Tax\Model\Config::CONFIG_XML_PATH_DEFAULT_COUNTRY,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
)
)->setRegionId(
$this->_scopeConfig->getValue(
\Magento\Tax\Model\Config::CONFIG_XML_PATH_DEFAULT_REGION,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
)
)->setPostcode(
$this->_scopeConfig->getValue(
\Magento\Tax\Model\Config::CONFIG_XML_PATH_DEFAULT_POSTCODE,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
)
);
diff --git a/app/code/Magento/Tax/Model/Config.php b/app/code/Magento/Tax/Model/Config.php
index 116529a13b551..3c19011bd328a 100644
--- a/app/code/Magento/Tax/Model/Config.php
+++ b/app/code/Magento/Tax/Model/Config.php
@@ -156,7 +156,7 @@ public function priceIncludesTax($store = null)
}
return (bool)$this->_scopeConfig->getValue(
self::CONFIG_XML_PATH_PRICE_INCLUDES_TAX,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -187,7 +187,7 @@ public function applyTaxAfterDiscount($store = null)
{
return (bool)$this->_scopeConfig->getValue(
self::CONFIG_XML_PATH_APPLY_AFTER_DISCOUNT,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -205,7 +205,7 @@ public function getPriceDisplayType($store = null)
{
return (int)$this->_scopeConfig->getValue(
self::CONFIG_XML_PATH_PRICE_DISPLAY_TYPE,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -220,7 +220,7 @@ public function discountTax($store = null)
{
return (int)$this->_scopeConfig->getValue(
self::CONFIG_XML_PATH_DISCOUNT_TAX,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
) == 1;
}
@@ -283,7 +283,7 @@ public function getAlgorithm($store = null)
{
return $this->_scopeConfig->getValue(
self::XML_PATH_ALGORITHM,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -298,7 +298,7 @@ public function getShippingTaxClass($store = null)
{
return (int)$this->_scopeConfig->getValue(
self::CONFIG_XML_PATH_SHIPPING_TAX_CLASS,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -313,7 +313,7 @@ public function getShippingPriceDisplayType($store = null)
{
return (int)$this->_scopeConfig->getValue(
self::CONFIG_XML_PATH_DISPLAY_SHIPPING,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -329,7 +329,7 @@ public function shippingPriceIncludesTax($store = null)
if ($this->_shippingPriceIncludeTax === null) {
$this->_shippingPriceIncludeTax = (bool)$this->_scopeConfig->getValue(
self::CONFIG_XML_PATH_SHIPPING_INCLUDES_TAX,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -356,7 +356,7 @@ public function displayCartPricesInclTax($store = null)
{
return $this->_scopeConfig->getValue(
self::XML_PATH_DISPLAY_CART_PRICE,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
) == self::DISPLAY_TYPE_INCLUDING_TAX;
}
@@ -369,7 +369,7 @@ public function displayCartPricesExclTax($store = null)
{
return $this->_scopeConfig->getValue(
self::XML_PATH_DISPLAY_CART_PRICE,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
) == self::DISPLAY_TYPE_EXCLUDING_TAX;
}
@@ -382,7 +382,7 @@ public function displayCartPricesBoth($store = null)
{
return $this->_scopeConfig->getValue(
self::XML_PATH_DISPLAY_CART_PRICE,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
) == self::DISPLAY_TYPE_BOTH;
}
@@ -395,7 +395,7 @@ public function displayCartSubtotalInclTax($store = null)
{
return $this->_scopeConfig->getValue(
self::XML_PATH_DISPLAY_CART_SUBTOTAL,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
) == self::DISPLAY_TYPE_INCLUDING_TAX;
}
@@ -408,7 +408,7 @@ public function displayCartSubtotalExclTax($store = null)
{
return $this->_scopeConfig->getValue(
self::XML_PATH_DISPLAY_CART_SUBTOTAL,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
) == self::DISPLAY_TYPE_EXCLUDING_TAX;
}
@@ -421,7 +421,7 @@ public function displayCartSubtotalBoth($store = null)
{
return $this->_scopeConfig->getValue(
self::XML_PATH_DISPLAY_CART_SUBTOTAL,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
) == self::DISPLAY_TYPE_BOTH;
}
@@ -434,7 +434,7 @@ public function displayCartShippingInclTax($store = null)
{
return $this->_scopeConfig->getValue(
self::XML_PATH_DISPLAY_CART_SHIPPING,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
) == self::DISPLAY_TYPE_INCLUDING_TAX;
}
@@ -447,7 +447,7 @@ public function displayCartShippingExclTax($store = null)
{
return $this->_scopeConfig->getValue(
self::XML_PATH_DISPLAY_CART_SHIPPING,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
) == self::DISPLAY_TYPE_EXCLUDING_TAX;
}
@@ -460,7 +460,7 @@ public function displayCartShippingBoth($store = null)
{
return $this->_scopeConfig->getValue(
self::XML_PATH_DISPLAY_CART_SHIPPING,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
) == self::DISPLAY_TYPE_BOTH;
}
@@ -473,7 +473,7 @@ public function displayCartDiscountInclTax($store = null)
{
return $this->_scopeConfig->getValue(
self::XML_PATH_DISPLAY_CART_DISCOUNT,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
) == self::DISPLAY_TYPE_INCLUDING_TAX;
}
@@ -486,7 +486,7 @@ public function displayCartDiscountExclTax($store = null)
{
return $this->_scopeConfig->getValue(
self::XML_PATH_DISPLAY_CART_DISCOUNT,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
) == self::DISPLAY_TYPE_EXCLUDING_TAX;
}
@@ -499,7 +499,7 @@ public function displayCartDiscountBoth($store = null)
{
return $this->_scopeConfig->getValue(
self::XML_PATH_DISPLAY_CART_DISCOUNT,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
) == self::DISPLAY_TYPE_BOTH;
}
@@ -512,7 +512,7 @@ public function displayCartTaxWithGrandTotal($store = null)
{
return (bool)$this->_scopeConfig->getValue(
self::XML_PATH_DISPLAY_CART_GRANDTOTAL,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -525,7 +525,7 @@ public function displayCartFullSummary($store = null)
{
return (bool)$this->_scopeConfig->getValue(
self::XML_PATH_DISPLAY_CART_FULL_SUMMARY,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -538,7 +538,7 @@ public function displayCartZeroTax($store = null)
{
return (bool)$this->_scopeConfig->getValue(
self::XML_PATH_DISPLAY_CART_ZERO_TAX,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -551,7 +551,7 @@ public function displaySalesPricesInclTax($store = null)
{
return $this->_scopeConfig->getValue(
self::XML_PATH_DISPLAY_SALES_PRICE,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
) == self::DISPLAY_TYPE_INCLUDING_TAX;
}
@@ -564,7 +564,7 @@ public function displaySalesPricesExclTax($store = null)
{
return $this->_scopeConfig->getValue(
self::XML_PATH_DISPLAY_SALES_PRICE,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
) == self::DISPLAY_TYPE_EXCLUDING_TAX;
}
@@ -577,7 +577,7 @@ public function displaySalesPricesBoth($store = null)
{
return $this->_scopeConfig->getValue(
self::XML_PATH_DISPLAY_SALES_PRICE,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
) == self::DISPLAY_TYPE_BOTH;
}
@@ -590,7 +590,7 @@ public function displaySalesSubtotalInclTax($store = null)
{
return $this->_scopeConfig->getValue(
self::XML_PATH_DISPLAY_SALES_SUBTOTAL,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
) == self::DISPLAY_TYPE_INCLUDING_TAX;
}
@@ -603,7 +603,7 @@ public function displaySalesSubtotalExclTax($store = null)
{
return $this->_scopeConfig->getValue(
self::XML_PATH_DISPLAY_SALES_SUBTOTAL,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
) == self::DISPLAY_TYPE_EXCLUDING_TAX;
}
@@ -616,7 +616,7 @@ public function displaySalesSubtotalBoth($store = null)
{
return $this->_scopeConfig->getValue(
self::XML_PATH_DISPLAY_SALES_SUBTOTAL,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
) == self::DISPLAY_TYPE_BOTH;
}
@@ -629,7 +629,7 @@ public function displaySalesShippingInclTax($store = null)
{
return $this->_scopeConfig->getValue(
self::XML_PATH_DISPLAY_SALES_SHIPPING,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
) == self::DISPLAY_TYPE_INCLUDING_TAX;
}
@@ -642,7 +642,7 @@ public function displaySalesShippingExclTax($store = null)
{
return $this->_scopeConfig->getValue(
self::XML_PATH_DISPLAY_SALES_SHIPPING,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
) == self::DISPLAY_TYPE_EXCLUDING_TAX;
}
@@ -655,7 +655,7 @@ public function displaySalesShippingBoth($store = null)
{
return $this->_scopeConfig->getValue(
self::XML_PATH_DISPLAY_SALES_SHIPPING,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
) == self::DISPLAY_TYPE_BOTH;
}
@@ -668,7 +668,7 @@ public function displaySalesDiscountInclTax($store = null)
{
return $this->_scopeConfig->getValue(
self::XML_PATH_DISPLAY_SALES_DISCOUNT,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
) == self::DISPLAY_TYPE_INCLUDING_TAX;
}
@@ -681,7 +681,7 @@ public function displaySalesDiscountExclTax($store = null)
{
return $this->_scopeConfig->getValue(
self::XML_PATH_DISPLAY_SALES_DISCOUNT,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
) == self::DISPLAY_TYPE_EXCLUDING_TAX;
}
@@ -694,7 +694,7 @@ public function displaySalesDiscountBoth($store = null)
{
return $this->_scopeConfig->getValue(
self::XML_PATH_DISPLAY_SALES_DISCOUNT,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
) == self::DISPLAY_TYPE_BOTH;
}
@@ -707,7 +707,7 @@ public function displaySalesTaxWithGrandTotal($store = null)
{
return (bool)$this->_scopeConfig->getValue(
self::XML_PATH_DISPLAY_SALES_GRANDTOTAL,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -720,7 +720,7 @@ public function displaySalesFullSummary($store = null)
{
return (bool)$this->_scopeConfig->getValue(
self::XML_PATH_DISPLAY_SALES_FULL_SUMMARY,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -733,7 +733,7 @@ public function displaySalesZeroTax($store = null)
{
return (bool)$this->_scopeConfig->getValue(
self::XML_PATH_DISPLAY_SALES_ZERO_TAX,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -748,7 +748,7 @@ public function crossBorderTradeEnabled($store = null)
{
return (bool)$this->_scopeConfig->getValue(
self::CONFIG_XML_PATH_CROSS_BORDER_TRADE_ENABLED,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -763,7 +763,7 @@ public function isWrongDisplaySettingsIgnored($store = null)
{
return (bool)$this->_scopeConfig->getValue(
self::XML_PATH_TAX_NOTIFICATION_IGNORE_PRICE_DISPLAY,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -778,7 +778,7 @@ public function isWrongDiscountSettingsIgnored($store = null)
{
return (bool)$this->_scopeConfig->getValue(
self::XML_PATH_TAX_NOTIFICATION_IGNORE_DISCOUNT,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -794,7 +794,7 @@ public function getInfoUrl($store = null)
{
return (bool)$this->_scopeConfig->getValue(
self::XML_PATH_TAX_NOTIFICATION_INFO_URL,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
}
diff --git a/app/code/Magento/Tax/Model/Resource/Calculation.php b/app/code/Magento/Tax/Model/Resource/Calculation.php
index 160bea26fe1f9..bbaf80242bfd4 100644
--- a/app/code/Magento/Tax/Model/Resource/Calculation.php
+++ b/app/code/Magento/Tax/Model/Resource/Calculation.php
@@ -39,19 +39,19 @@ class Calculation extends \Magento\Framework\Model\Resource\Db\AbstractDb
protected $_taxData;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
/**
* @param \Magento\Framework\App\Resource $resource
* @param \Magento\Tax\Helper\Data $taxData
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
\Magento\Tax\Helper\Data $taxData,
- \Magento\Store\Model\StoreManagerInterface $storeManager
+ \Magento\Framework\Store\StoreManagerInterface $storeManager
) {
$this->_taxData = $taxData;
$this->_storeManager = $storeManager;
diff --git a/app/code/Magento/Tax/Model/Resource/Calculation/Rate/Collection.php b/app/code/Magento/Tax/Model/Resource/Calculation/Rate/Collection.php
index 0ce3c2c4b1f8c..67cbe339981ea 100644
--- a/app/code/Magento/Tax/Model/Resource/Calculation/Rate/Collection.php
+++ b/app/code/Magento/Tax/Model/Resource/Calculation/Rate/Collection.php
@@ -17,25 +17,25 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
const TAX_RULES_CHUNK_SIZE = 1000;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param mixed $connection
* @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
$connection = null,
\Magento\Framework\Model\Resource\Db\AbstractDb $resource = null
) {
diff --git a/app/code/Magento/Tax/Model/Resource/Report/Collection.php b/app/code/Magento/Tax/Model/Resource/Report/Collection.php
index 207ba93fe92aa..34ec4551e8dd4 100644
--- a/app/code/Magento/Tax/Model/Resource/Report/Collection.php
+++ b/app/code/Magento/Tax/Model/Resource/Report/Collection.php
@@ -31,7 +31,7 @@ class Collection extends \Magento\Sales\Model\Resource\Report\Collection\Abstrac
protected $_selectedColumns = [];
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -39,7 +39,7 @@ class Collection extends \Magento\Sales\Model\Resource\Report\Collection\Abstrac
* @param mixed $connection
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
diff --git a/app/code/Magento/Tax/Model/System/Message/Notifications.php b/app/code/Magento/Tax/Model/System/Message/Notifications.php
index ae214839b1171..5ce6b7dea38af 100644
--- a/app/code/Magento/Tax/Model/System/Message/Notifications.php
+++ b/app/code/Magento/Tax/Model/System/Message/Notifications.php
@@ -13,7 +13,7 @@ class Notifications implements \Magento\Framework\Notification\MessageInterface
/**
* Store manager object
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $storeManager;
@@ -44,12 +44,12 @@ class Notifications implements \Magento\Framework\Notification\MessageInterface
protected $storesWithInvalidDiscountSettings;
/**
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\UrlInterface $urlBuilder
* @param \Magento\Tax\Model\Config $taxConfig
*/
public function __construct(
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\UrlInterface $urlBuilder,
\Magento\Tax\Model\Config $taxConfig
) {
diff --git a/app/code/Magento/Tax/Model/TaxCalculation.php b/app/code/Magento/Tax/Model/TaxCalculation.php
index ae2017ce90c6f..39b0c717a8416 100644
--- a/app/code/Magento/Tax/Model/TaxCalculation.php
+++ b/app/code/Magento/Tax/Model/TaxCalculation.php
@@ -17,7 +17,7 @@
use Magento\Tax\Model\Calculation\CalculatorFactory;
use Magento\Tax\Model\Config;
use Magento\Tax\Model\Calculation\AbstractCalculator;
-use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\Store\StoreManagerInterface;
use Magento\Tax\Api\TaxCalculationInterface;
/**
@@ -61,7 +61,7 @@ class TaxCalculation implements TaxCalculationInterface
protected $taxDetailsItemBuilder;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $storeManager;
@@ -99,7 +99,7 @@ class TaxCalculation implements TaxCalculationInterface
* @param Config $config
* @param TaxDetailsDataBuilder $taxDetailsBuilder
* @param TaxDetailsItemDataBuilder $taxDetailsItemBuilder
- * @param StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param TaxClassManagementInterface $taxClassManagement
*/
public function __construct(
@@ -108,7 +108,7 @@ public function __construct(
Config $config,
TaxDetailsDataBuilder $taxDetailsBuilder,
TaxDetailsItemDataBuilder $taxDetailsItemBuilder,
- StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
TaxClassManagementInterface $taxClassManagement
) {
$this->calculationTool = $calculation;
diff --git a/app/code/Magento/Tax/Model/TaxRateCollection.php b/app/code/Magento/Tax/Model/TaxRateCollection.php
index 5d37b0421895d..ca5b8c4863032 100644
--- a/app/code/Magento/Tax/Model/TaxRateCollection.php
+++ b/app/code/Magento/Tax/Model/TaxRateCollection.php
@@ -7,7 +7,7 @@
namespace Magento\Tax\Model;
use Magento\Tax\Api\TaxRateRepositoryInterface;
-use Magento\Core\Model\EntityFactory;
+use Magento\Framework\Data\Collection\EntityFactory;
use Magento\Framework\Api\AbstractServiceCollection;
use Magento\Framework\Api\FilterBuilder;
use Magento\Framework\Api\SearchCriteriaBuilder;
diff --git a/app/code/Magento/Tax/Model/TaxRuleCollection.php b/app/code/Magento/Tax/Model/TaxRuleCollection.php
index a1497a2db6a75..10b215fc61203 100644
--- a/app/code/Magento/Tax/Model/TaxRuleCollection.php
+++ b/app/code/Magento/Tax/Model/TaxRuleCollection.php
@@ -6,7 +6,7 @@
namespace Magento\Tax\Model;
-use Magento\Core\Model\EntityFactory;
+use Magento\Framework\Data\Collection\EntityFactory;
use Magento\Framework\Api\AbstractServiceCollection;
use Magento\Framework\Api\FilterBuilder;
use Magento\Framework\Api\SearchCriteriaBuilder;
@@ -27,14 +27,14 @@ class TaxRuleCollection extends AbstractServiceCollection
/**
* Initialize dependencies.
*
- * @param EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param FilterBuilder $filterBuilder
* @param SearchCriteriaBuilder $searchCriteriaBuilder
* @param SortOrderBuilder $sortOrderBuilder
* @param TaxRuleRepositoryInterface $ruleService
*/
public function __construct(
- EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
FilterBuilder $filterBuilder,
SearchCriteriaBuilder $searchCriteriaBuilder,
SortOrderBuilder $sortOrderBuilder,
diff --git a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit.php b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit.php
index 2f25a2b26a1dc..01fe8ab2ec584 100644
--- a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit.php
+++ b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit.php
@@ -107,7 +107,7 @@ public function getHeaderText()
/**
* Get current theme
*
- * @return \Magento\Core\Model\Theme
+ * @return \Magento\Theme\Model\Theme
*/
protected function _getCurrentTheme()
{
diff --git a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/AbstractTab.php b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/AbstractTab.php
index 2b770fc57bd87..b91e364f710da 100644
--- a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/AbstractTab.php
+++ b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/AbstractTab.php
@@ -47,7 +47,7 @@ public function __construct(
/**
* Get theme that is edited currently
*
- * @return \Magento\Core\Model\Theme
+ * @return \Magento\Theme\Model\Theme
*/
protected function _getCurrentTheme()
{
diff --git a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Form/Element/Image.php b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Form/Element/Image.php
index 95cd403306ab0..e0457fb1a2b5e 100644
--- a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Form/Element/Image.php
+++ b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Form/Element/Image.php
@@ -9,7 +9,7 @@
/**
* Image form element that generates correct thumbnail image URL for theme preview image
*
- * @method \Magento\Core\Model\Theme getTheme()
+ * @method \Magento\Theme\Model\Theme getTheme()
*/
class Image extends \Magento\Framework\Data\Form\Element\Image
{
diff --git a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/Css.php b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/Css.php
index 9d584eb8a1d0f..6fcc083b3af15 100644
--- a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/Css.php
+++ b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/Css.php
@@ -28,7 +28,7 @@ class Css extends \Magento\Theme\Block\Adminhtml\System\Design\Theme\Edit\Abstra
/**
* Theme custom css file
*
- * @var \Magento\Core\Model\Theme\File
+ * @var \Magento\Theme\Model\Theme\File
*/
protected $_customCssFile;
diff --git a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/General.php b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/General.php
index cf8ff3cb90a26..9301643c54f82 100644
--- a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/General.php
+++ b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/General.php
@@ -55,11 +55,11 @@ public function __construct(
*/
protected function _prepareForm()
{
- /** @var $session \Magento\Backend\Model\Session */
+ /** @var \Magento\Backend\Model\Session $session */
$session = $this->_objectManager->get('Magento\Backend\Model\Session');
$formDataFromSession = $session->getThemeData();
$this->_isThemeEditable = $this->_getCurrentTheme()->isEditable();
- /** @var $currentTheme ThemeInterface */
+ /** @var ThemeInterface $currentTheme */
$currentTheme = $this->_getCurrentTheme();
$formData = $currentTheme->getData();
if ($formDataFromSession && isset($formData['theme_id'])) {
@@ -86,7 +86,7 @@ protected function _prepareForm()
*
* @param \Magento\Framework\Data\Form $form
* @param array $formData
- * @param \Magento\Core\Model\Theme|ThemeInterface $theme
+ * @param ThemeInterface $theme
* @return $this
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
@@ -99,10 +99,10 @@ protected function _addThemeFieldset($form, $formData, ThemeInterface $theme)
$themeFieldset->addField('theme_id', 'hidden', ['name' => 'theme_id']);
}
- /** @var $themesCollections \Magento\Core\Model\Theme\Collection */
- $themesCollections = $this->_objectManager->create('Magento\Core\Model\Theme\Collection');
+ /** @var \Magento\Theme\Model\Theme\Collection $themesCollections */
+ $themesCollections = $this->_objectManager->create('Magento\Theme\Model\Theme\Collection');
- /** @var $helper \Magento\Core\Helper\Data */
+ /** @var \Magento\Core\Helper\Data $helper */
$helper = $this->_objectManager->get('Magento\Core\Helper\Data');
$onChangeScript = sprintf(
@@ -114,7 +114,7 @@ protected function _addThemeFieldset($form, $formData, ThemeInterface $theme)
)
);
- /** @var $parentTheme \Magento\Framework\View\Design\ThemeInterface */
+ /** @var ThemeInterface $parentTheme */
$parentTheme = $this->_objectManager->create('Magento\Framework\View\Design\ThemeInterface');
if (!empty($formData['parent_id'])) {
$parentTheme->load($formData['parent_id']);
@@ -285,7 +285,7 @@ protected function _getDefaultsInherited($themesCollections)
{
$data = ['' => $this->_getDefaults()];
- /** @var $theme \Magento\Framework\View\Design\ThemeInterface */
+ /** @var ThemeInterface $theme */
foreach ($themesCollections as $theme) {
$theme->load($theme->getThemePath(), 'theme_path');
if (!$theme->getId()) {
diff --git a/app/code/Magento/Theme/Block/Html/Footer.php b/app/code/Magento/Theme/Block/Html/Footer.php
index f5dac383b3a8f..86ecbf7177c7d 100644
--- a/app/code/Magento/Theme/Block/Html/Footer.php
+++ b/app/code/Magento/Theme/Block/Html/Footer.php
@@ -79,7 +79,7 @@ public function getCopyright()
if (!$this->_copyright) {
$this->_copyright = $this->_scopeConfig->getValue(
'design/footer/copyright',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
}
return $this->_copyright;
diff --git a/app/code/Magento/Theme/Block/Html/Header.php b/app/code/Magento/Theme/Block/Html/Header.php
index dd74a7e49e8bc..b880ea217ae6d 100644
--- a/app/code/Magento/Theme/Block/Html/Header.php
+++ b/app/code/Magento/Theme/Block/Html/Header.php
@@ -76,7 +76,7 @@ public function getWelcome()
} else {
$this->_data['welcome'] = $this->_scopeConfig->getValue(
'design/header/welcome',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
}
}
diff --git a/app/code/Magento/Theme/Block/Html/Header/Logo.php b/app/code/Magento/Theme/Block/Html/Header/Logo.php
index 2956d9426b197..4610f2bb1973a 100644
--- a/app/code/Magento/Theme/Block/Html/Header/Logo.php
+++ b/app/code/Magento/Theme/Block/Html/Header/Logo.php
@@ -72,7 +72,7 @@ public function getLogoAlt()
if (empty($this->_data['logo_alt'])) {
$this->_data['logo_alt'] = $this->_scopeConfig->getValue(
'design/header/logo_alt',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
}
return $this->_data['logo_alt'];
@@ -88,7 +88,7 @@ protected function _getLogoUrl()
$folderName = \Magento\Backend\Model\Config\Backend\Image\Logo::UPLOAD_DIR;
$storeLogoPath = $this->_scopeConfig->getValue(
'design/header/logo_src',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
$path = $folderName . '/' . $storeLogoPath;
$logoUrl = $this->_urlBuilder
diff --git a/app/code/Magento/Theme/Block/Html/Notices.php b/app/code/Magento/Theme/Block/Html/Notices.php
index ee6eae03f06b1..12d1812fba204 100644
--- a/app/code/Magento/Theme/Block/Html/Notices.php
+++ b/app/code/Magento/Theme/Block/Html/Notices.php
@@ -28,7 +28,7 @@ public function displayNoscriptNotice()
{
return $this->_scopeConfig->getValue(
'web/browser_capabilities/javascript',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
}
@@ -41,7 +41,7 @@ public function displayNoLocalStorageNotice()
{
return $this->_scopeConfig->getValue(
'web/browser_capabilities/local_storage',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
}
@@ -54,7 +54,7 @@ public function displayDemoNotice()
{
return $this->_scopeConfig->getValue(
'design/head/demonotice',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
}
diff --git a/app/code/Magento/Theme/Block/Html/Pager.php b/app/code/Magento/Theme/Block/Html/Pager.php
index fffb176d74b09..bb67af11ba6ca 100644
--- a/app/code/Magento/Theme/Block/Html/Pager.php
+++ b/app/code/Magento/Theme/Block/Html/Pager.php
@@ -699,7 +699,7 @@ public function getAnchorTextForPrevious()
{
return $this->_scopeConfig->getValue(
'design/pagination/anchor_text_for_previous',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
}
@@ -712,7 +712,7 @@ public function getAnchorTextForNext()
{
return $this->_scopeConfig->getValue(
'design/pagination/anchor_text_for_next',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
}
diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Edit.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Edit.php
index c3e127629de6d..c892d62c3f1af 100644
--- a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Edit.php
+++ b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Edit.php
@@ -29,8 +29,8 @@ public function execute()
/** @var $tab \Magento\Theme\Block\Adminhtml\System\Design\Theme\Edit\Tab\Css */
$tab = $this->_view->getLayout()->getBlock('theme_edit_tabs_tab_css_tab');
if ($tab && $tab->canShowTab()) {
- /** @var $helper \Magento\Core\Helper\Theme */
- $helper = $this->_objectManager->get('Magento\Core\Helper\Theme');
+ /** @var $helper \Magento\Theme\Helper\Theme */
+ $helper = $this->_objectManager->get('Magento\Theme\Helper\Theme');
$files = $helper->getCssAssets($theme);
$tab->setFiles($files);
}
diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Save.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Save.php
index 8547587d785a1..0fa6e75f7a034 100644
--- a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Save.php
+++ b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Save.php
@@ -33,7 +33,7 @@ public function execute()
);
try {
if ($this->getRequest()->getPost()) {
- /** @var $theme \Magento\Core\Model\Theme */
+ /** @var $theme \Magento\Theme\Model\Theme */
if (!empty($themeData['theme_id'])) {
$theme = $themeFactory->create($themeData['theme_id']);
} else {
diff --git a/app/code/Magento/Theme/Helper/Storage.php b/app/code/Magento/Theme/Helper/Storage.php
index ae57bbc5b9f59..7bc986ee5262b 100644
--- a/app/code/Magento/Theme/Helper/Storage.php
+++ b/app/code/Magento/Theme/Helper/Storage.php
@@ -162,7 +162,7 @@ public function getStorageRoot()
/**
* Get theme module for custom static files
*
- * @return \Magento\Core\Model\Theme
+ * @return \Magento\Theme\Model\Theme
* @throws \InvalidArgumentException
*/
protected function _getTheme()
diff --git a/app/code/Magento/Core/Helper/Theme.php b/app/code/Magento/Theme/Helper/Theme.php
similarity index 98%
rename from app/code/Magento/Core/Helper/Theme.php
rename to app/code/Magento/Theme/Helper/Theme.php
index 7c1a749a05728..9f7150b414952 100644
--- a/app/code/Magento/Core/Helper/Theme.php
+++ b/app/code/Magento/Theme/Helper/Theme.php
@@ -7,7 +7,7 @@
/**
* Theme data helper
*/
-namespace Magento\Core\Helper;
+namespace Magento\Theme\Helper;
class Theme extends \Magento\Framework\App\Helper\AbstractHelper
{
diff --git a/app/code/Magento/Theme/Model/Config.php b/app/code/Magento/Theme/Model/Config.php
index 5d7c6cab55f37..d6204807af117 100644
--- a/app/code/Magento/Theme/Model/Config.php
+++ b/app/code/Magento/Theme/Model/Config.php
@@ -22,7 +22,7 @@ class Config
protected $_configData;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -46,7 +46,7 @@ class Config
/**
* @param \Magento\Framework\App\Config\ValueInterface $configData
* @param \Magento\Framework\App\Config\Storage\WriterInterface $configWriter
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Framework\Cache\FrontendInterface $configCache
* @param \Magento\Framework\Cache\FrontendInterface $layoutCache
@@ -54,7 +54,7 @@ class Config
public function __construct(
\Magento\Framework\App\Config\ValueInterface $configData,
\Magento\Framework\App\Config\Storage\WriterInterface $configWriter,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Framework\Cache\FrontendInterface $configCache,
\Magento\Framework\Cache\FrontendInterface $layoutCache
@@ -78,7 +78,7 @@ public function __construct(
public function assignToStore(
$theme,
array $stores = [],
- $scope = \Magento\Store\Model\ScopeInterface::SCOPE_STORES
+ $scope = \Magento\Framework\Store\ScopeInterface::SCOPE_STORES
) {
$isReassigned = false;
diff --git a/app/code/Magento/Theme/Model/Config/Customization.php b/app/code/Magento/Theme/Model/Config/Customization.php
index c5a32bc768374..f3c2b4888c4f2 100644
--- a/app/code/Magento/Theme/Model/Config/Customization.php
+++ b/app/code/Magento/Theme/Model/Config/Customization.php
@@ -11,7 +11,7 @@
class Customization
{
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -42,12 +42,12 @@ class Customization
protected $_unassignedTheme;
/**
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\View\DesignInterface $design
* @param \Magento\Framework\View\Design\Theme\ThemeProviderInterface $themeProvider
*/
public function __construct(
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\View\DesignInterface $design,
\Magento\Framework\View\Design\Theme\ThemeProviderInterface $themeProvider
) {
@@ -167,7 +167,7 @@ protected function _getConfigurationThemeId($store)
*/
protected function _prepareThemeCustomizations()
{
- /** @var \Magento\Core\Model\Resource\Theme\Collection $themeCollection */
+ /** @var \Magento\Theme\Model\Resource\Theme\Collection $themeCollection */
$themeCollection = $this->themeProvider->getThemeCustomizations(\Magento\Framework\App\Area::AREA_FRONTEND);
$assignedThemes = $this->getStoresByThemes();
diff --git a/app/code/Magento/Theme/Model/CopyService.php b/app/code/Magento/Theme/Model/CopyService.php
index 3fd2b2ba29f55..be128b44af1fe 100644
--- a/app/code/Magento/Theme/Model/CopyService.php
+++ b/app/code/Magento/Theme/Model/CopyService.php
@@ -91,13 +91,13 @@ public function copy(ThemeInterface $source, ThemeInterface $target)
*/
protected function _copyDatabaseCustomization(ThemeInterface $source, ThemeInterface $target)
{
- /** @var $themeFile \Magento\Core\Model\Theme\File */
+ /** @var $themeFile \Magento\Theme\Model\Theme\File */
foreach ($target->getCustomization()->getFiles() as $themeFile) {
$themeFile->delete();
}
- /** @var $newFile \Magento\Core\Model\Theme\File */
+ /** @var $newFile \Magento\Theme\Model\Theme\File */
foreach ($source->getCustomization()->getFiles() as $themeFile) {
- /** @var $newThemeFile \Magento\Core\Model\Theme\File */
+ /** @var $newThemeFile \Magento\Theme\Model\Theme\File */
$newThemeFile = $this->_fileFactory->create();
$newThemeFile->setData(
[
diff --git a/app/code/Magento/Core/Model/Design.php b/app/code/Magento/Theme/Model/Design.php
similarity index 91%
rename from app/code/Magento/Core/Model/Design.php
rename to app/code/Magento/Theme/Model/Design.php
index 5cbf386058614..c7ccbb68ba4ac 100644
--- a/app/code/Magento/Core/Model/Design.php
+++ b/app/code/Magento/Theme/Model/Design.php
@@ -3,7 +3,7 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Core\Model;
+namespace Magento\Theme\Model;
use Magento\Framework\App\DesignInterface;
use Magento\Framework\Model\AbstractModel;
@@ -14,13 +14,13 @@
* Design settings change model
*
* @method int getStoreId()
- * @method \Magento\Core\Model\Design setStoreId(int $value)
+ * @method \Magento\Theme\Model\Design setStoreId(int $value)
* @method string getDesign()
- * @method \Magento\Core\Model\Design setDesign(string $value)
+ * @method \Magento\Theme\Model\Design setDesign(string $value)
* @method string getDateFrom()
- * @method \Magento\Core\Model\Design setDateFrom(string $value)
+ * @method \Magento\Theme\Model\Design setDateFrom(string $value)
* @method string getDateTo()
- * @method \Magento\Core\Model\Design setDateTo(string $value)
+ * @method \Magento\Theme\Model\Design setDateTo(string $value)
*/
class Design extends AbstractModel implements IdentityInterface, DesignInterface
{
@@ -85,7 +85,7 @@ public function __construct(
*/
protected function _construct()
{
- $this->_init('Magento\Core\Model\Resource\Design');
+ $this->_init('Magento\Theme\Model\Resource\Design');
}
/**
diff --git a/app/code/Magento/Core/Model/Design/Backend/Exceptions.php b/app/code/Magento/Theme/Model/Design/Backend/Exceptions.php
similarity index 95%
rename from app/code/Magento/Core/Model/Design/Backend/Exceptions.php
rename to app/code/Magento/Theme/Model/Design/Backend/Exceptions.php
index acbc402012a66..5d601e7222bf7 100644
--- a/app/code/Magento/Core/Model/Design/Backend/Exceptions.php
+++ b/app/code/Magento/Theme/Model/Design/Backend/Exceptions.php
@@ -3,9 +3,11 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Core\Model\Design\Backend;
+namespace Magento\Theme\Model\Design\Backend;
-class Exceptions extends \Magento\Backend\Model\Config\Backend\Serialized\ArraySerialized
+use Magento\Backend\Model\Config\Backend\Serialized\ArraySerialized;
+
+class Exceptions extends ArraySerialized
{
/**
* Design package instance
@@ -15,6 +17,8 @@ class Exceptions extends \Magento\Backend\Model\Config\Backend\Serialized\ArrayS
protected $_design = null;
/**
+ * Initialize dependencies
+ *
* @param \Magento\Framework\Model\Context $context
* @param \Magento\Framework\Registry $registry
* @param \Magento\Framework\App\Config\ScopeConfigInterface $config
diff --git a/app/code/Magento/Core/Model/Design/Backend/Theme.php b/app/code/Magento/Theme/Model/Design/Backend/Theme.php
similarity index 91%
rename from app/code/Magento/Core/Model/Design/Backend/Theme.php
rename to app/code/Magento/Theme/Model/Design/Backend/Theme.php
index 84e13dc80e935..aede175c8312f 100644
--- a/app/code/Magento/Core/Model/Design/Backend/Theme.php
+++ b/app/code/Magento/Theme/Model/Design/Backend/Theme.php
@@ -3,9 +3,11 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Core\Model\Design\Backend;
+namespace Magento\Theme\Model\Design\Backend;
-class Theme extends \Magento\Framework\App\Config\Value
+use Magento\Framework\App\Config\Value;
+
+class Theme extends Value
{
/**
* Design package instance
@@ -15,6 +17,8 @@ class Theme extends \Magento\Framework\App\Config\Value
protected $_design = null;
/**
+ * Initialize dependencies
+ *
* @param \Magento\Framework\Model\Context $context
* @param \Magento\Framework\Registry $registry
* @param \Magento\Framework\App\Config\ScopeConfigInterface $config
diff --git a/app/code/Magento/Theme/Model/Favicon/Favicon.php b/app/code/Magento/Theme/Model/Favicon/Favicon.php
index 38b655cad853b..b4536ca8a59fd 100644
--- a/app/code/Magento/Theme/Model/Favicon/Favicon.php
+++ b/app/code/Magento/Theme/Model/Favicon/Favicon.php
@@ -18,7 +18,7 @@ class Favicon implements \Magento\Framework\View\Page\FaviconInterface
protected $faviconFile;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $storeManager;
@@ -38,13 +38,13 @@ class Favicon implements \Magento\Framework\View\Page\FaviconInterface
protected $mediaDirectory;
/**
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param \Magento\Core\Helper\File\Storage\Database $fileStorageDatabase
* @param \Magento\Framework\Filesystem $filesystem
*/
public function __construct(
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
\Magento\Core\Helper\File\Storage\Database $fileStorageDatabase,
\Magento\Framework\Filesystem $filesystem
@@ -82,7 +82,7 @@ protected function prepareFaviconFile()
$folderName = \Magento\Backend\Model\Config\Backend\Image\Favicon::UPLOAD_DIR;
$scopeConfig = $this->scopeConfig->getValue(
'design/head/shortcut_icon',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
$path = $folderName . '/' . $scopeConfig;
$faviconUrl = $this->storeManager->getStore()
diff --git a/app/code/Magento/Theme/Model/Observer.php b/app/code/Magento/Theme/Model/Observer.php
new file mode 100644
index 0000000000000..6a471d81b69a0
--- /dev/null
+++ b/app/code/Magento/Theme/Model/Observer.php
@@ -0,0 +1,185 @@
+themeImageFactory = $themeImageFactory;
+ $this->updateCollection = $updateCollection;
+ $this->themeConfig = $themeConfig;
+ $this->eventDispatcher = $eventDispatcher;
+ $this->currentTheme = $design->getDesignTheme();
+ $this->pageAssets = $assets;
+ $this->assetRepo = $assetRepo;
+ $this->registration = $registration;
+ $this->logger = $logger;
+ }
+
+ /**
+ * Clean related contents to a theme (before save)
+ *
+ * @param EventObserver $observer
+ * @return void
+ * @throws Exception
+ */
+ public function cleanThemeRelatedContent(EventObserver $observer)
+ {
+ $theme = $observer->getEvent()->getData('theme');
+ if (!($theme instanceof \Magento\Framework\View\Design\ThemeInterface)) {
+ return;
+ }
+ /** @var $theme \Magento\Framework\View\Design\ThemeInterface */
+ if ($this->themeConfig->isThemeAssignedToStore($theme)) {
+ throw new Exception(__('Theme isn\'t deletable.'));
+ }
+ $this->themeImageFactory->create(['theme' => $theme])->removePreviewImage();
+ $this->updateCollection->addThemeFilter($theme->getId())->delete();
+ }
+
+ /**
+ * Check a theme, it's assigned to any of store
+ *
+ * @param EventObserver $observer
+ * @return void
+ */
+ public function checkThemeIsAssigned(EventObserver $observer)
+ {
+ $theme = $observer->getEvent()->getData('theme');
+ if ($theme instanceof \Magento\Framework\View\Design\ThemeInterface) {
+ /** @var $theme \Magento\Framework\View\Design\ThemeInterface */
+ if ($this->themeConfig->isThemeAssignedToStore($theme)) {
+ $this->eventDispatcher->dispatch('assigned_theme_changed', ['theme' => $theme]);
+ }
+ }
+ }
+
+ /**
+ * Theme registration
+ *
+ * @param \Magento\Framework\Event\Observer $observer
+ * @return $this
+ */
+ public function themeRegistration(\Magento\Framework\Event\Observer $observer)
+ {
+ $pathPattern = $observer->getEvent()->getPathPattern();
+ try {
+ $this->registration->register($pathPattern);
+ } catch (\Magento\Framework\Model\Exception $e) {
+ $this->logger->critical($e);
+ }
+ return $this;
+ }
+
+ /**
+ * Apply customized static files to frontend
+ *
+ * @param \Magento\Framework\Event\Observer $observer
+ * @return void
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ */
+ public function applyThemeCustomization(\Magento\Framework\Event\Observer $observer)
+ {
+ /** @var $themeFile \Magento\Theme\Model\Theme\File */
+ foreach ($this->currentTheme->getCustomization()->getFiles() as $themeFile) {
+ try {
+ $service = $themeFile->getCustomizationService();
+ if ($service instanceof \Magento\Framework\View\Design\Theme\Customization\FileAssetInterface) {
+ $identifier = $themeFile->getData('file_path');
+ $dirPath = \Magento\Framework\View\Design\Theme\Customization\Path::DIR_NAME
+ . '/' . $this->currentTheme->getId();
+ $asset = $this->assetRepo->createArbitrary(
+ $identifier,
+ $dirPath,
+ DirectoryList::MEDIA,
+ \Magento\Framework\UrlInterface::URL_TYPE_MEDIA
+ );
+ $this->pageAssets->add($identifier, $asset);
+ }
+ } catch (\InvalidArgumentException $e) {
+ $this->logger->critical($e);
+ }
+ }
+ }
+}
diff --git a/app/code/Magento/Core/Model/Resource/Design.php b/app/code/Magento/Theme/Model/Resource/Design.php
similarity index 97%
rename from app/code/Magento/Core/Model/Resource/Design.php
rename to app/code/Magento/Theme/Model/Resource/Design.php
index cc46d6be28404..169e5eae8b641 100644
--- a/app/code/Magento/Core/Model/Resource/Design.php
+++ b/app/code/Magento/Theme/Model/Resource/Design.php
@@ -5,8 +5,7 @@
*/
// @codingStandardsIgnoreFile
-
-namespace Magento\Core\Model\Resource;
+namespace Magento\Theme\Model\Resource;
use Magento\Framework\Stdlib\DateTime;
@@ -86,7 +85,8 @@ public function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
if ($check) {
throw new \Magento\Framework\Model\Exception(
__(
- 'Your design change for the specified store intersects with another one, please specify another date range.'
+ 'Your design change for the specified store intersects with another one, please specify another
+ date range.'
)
);
}
@@ -109,6 +109,7 @@ public function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
* @param string $dateTo
* @param int $currentId
* @return string
+ *
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
* @SuppressWarnings(PHPMD.NPathComplexity)
*/
diff --git a/app/code/Magento/Core/Model/Resource/Design/Collection.php b/app/code/Magento/Theme/Model/Resource/Design/Collection.php
similarity index 84%
rename from app/code/Magento/Core/Model/Resource/Design/Collection.php
rename to app/code/Magento/Theme/Model/Resource/Design/Collection.php
index 8640fd46cf146..82b97096f8d68 100644
--- a/app/code/Magento/Core/Model/Resource/Design/Collection.php
+++ b/app/code/Magento/Theme/Model/Resource/Design/Collection.php
@@ -3,7 +3,7 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Core\Model\Resource\Design;
+namespace Magento\Theme\Model\Resource\Design;
/**
* Core Design resource collection
@@ -16,7 +16,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
protected $dateTime;
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -25,7 +25,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
* @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
@@ -44,13 +44,13 @@ public function __construct(
*/
protected function _construct()
{
- $this->_init('Magento\Core\Model\Design', 'Magento\Core\Model\Resource\Design');
+ $this->_init('Magento\Theme\Model\Design', 'Magento\Theme\Model\Resource\Design');
}
/**
* Join store data to collection
*
- * @return \Magento\Core\Model\Resource\Design\Collection
+ * @return \Magento\Theme\Model\Resource\Design\Collection
*/
public function joinStore()
{
@@ -80,7 +80,7 @@ public function addDateFilter($date = null)
* Add store filter to collection
*
* @param int|array $storeId
- * @return \Magento\Core\Model\Resource\Design\Collection
+ * @return \Magento\Theme\Model\Resource\Design\Collection
*/
public function addStoreFilter($storeId)
{
diff --git a/app/code/Magento/Core/Model/Resource/Setup.php b/app/code/Magento/Theme/Model/Resource/Setup.php
similarity index 66%
rename from app/code/Magento/Core/Model/Resource/Setup.php
rename to app/code/Magento/Theme/Model/Resource/Setup.php
index b3d9544fb50fe..7b275cb803a4e 100644
--- a/app/code/Magento/Core/Model/Resource/Setup.php
+++ b/app/code/Magento/Theme/Model/Resource/Setup.php
@@ -3,7 +3,7 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Core\Model\Resource;
+namespace Magento\Theme\Model\Resource;
/**
* Core resource setup
@@ -11,28 +11,28 @@
class Setup extends \Magento\Framework\Module\DataSetup
{
/**
- * @var \Magento\Core\Model\Resource\Theme\CollectionFactory
+ * @var \Magento\Theme\Model\Resource\Theme\CollectionFactory
*/
protected $_themeResourceFactory;
/**
- * @var \Magento\Core\Model\Theme\CollectionFactory
+ * @var \Magento\Theme\Model\Theme\CollectionFactory
*/
protected $_themeFactory;
/**
* @param \Magento\Framework\Module\Setup\Context $context
* @param string $resourceName
- * @param \Magento\Core\Model\Resource\Theme\CollectionFactory $themeResourceFactory
- * @param \Magento\Core\Model\Theme\CollectionFactory $themeFactory
+ * @param \Magento\Theme\Model\Resource\Theme\CollectionFactory $themeResourceFactory
+ * @param \Magento\Theme\Model\Theme\CollectionFactory $themeFactory
* @param string $moduleName
* @param string $connectionName
*/
public function __construct(
\Magento\Framework\Module\Setup\Context $context,
$resourceName,
- \Magento\Core\Model\Resource\Theme\CollectionFactory $themeResourceFactory,
- \Magento\Core\Model\Theme\CollectionFactory $themeFactory,
+ \Magento\Theme\Model\Resource\Theme\CollectionFactory $themeResourceFactory,
+ \Magento\Theme\Model\Theme\CollectionFactory $themeFactory,
$moduleName = 'Magento_Core',
$connectionName = \Magento\Framework\Module\Updater\SetupInterface::DEFAULT_SETUP_CONNECTION
) {
@@ -42,7 +42,7 @@ public function __construct(
}
/**
- * @return \Magento\Core\Model\Resource\Theme\Collection
+ * @return \Magento\Theme\Model\Resource\Theme\Collection
*/
public function createThemeResourceFactory()
{
@@ -50,7 +50,7 @@ public function createThemeResourceFactory()
}
/**
- * @return \Magento\Core\Model\Theme\Collection
+ * @return \Magento\Theme\Model\Theme\Collection
*/
public function createThemeFactory()
{
diff --git a/app/code/Magento/Core/Model/Resource/Theme.php b/app/code/Magento/Theme/Model/Resource/Theme.php
similarity index 79%
rename from app/code/Magento/Core/Model/Resource/Theme.php
rename to app/code/Magento/Theme/Model/Resource/Theme.php
index f12b64e9ccd3a..c5f48d003365c 100644
--- a/app/code/Magento/Core/Model/Resource/Theme.php
+++ b/app/code/Magento/Theme/Model/Resource/Theme.php
@@ -3,7 +3,7 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Core\Model\Resource;
+namespace Magento\Theme\Model\Resource;
/**
* Theme resource model
@@ -17,6 +17,6 @@ class Theme extends \Magento\Framework\Model\Resource\Db\AbstractDb
*/
protected function _construct()
{
- $this->_init('core_theme', 'theme_id');
+ $this->_init('theme', 'theme_id');
}
}
diff --git a/app/code/Magento/Core/Model/Resource/Theme/Collection.php b/app/code/Magento/Theme/Model/Resource/Theme/Collection.php
similarity index 95%
rename from app/code/Magento/Core/Model/Resource/Theme/Collection.php
rename to app/code/Magento/Theme/Model/Resource/Theme/Collection.php
index 6d694d198566c..035c031732b0a 100644
--- a/app/code/Magento/Core/Model/Resource/Theme/Collection.php
+++ b/app/code/Magento/Theme/Model/Resource/Theme/Collection.php
@@ -3,7 +3,7 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Core\Model\Resource\Theme;
+namespace Magento\Theme\Model\Resource\Theme;
/**
* Theme collection
@@ -24,7 +24,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
*/
protected function _construct()
{
- $this->_init('Magento\Core\Model\Theme', 'Magento\Core\Model\Resource\Theme');
+ $this->_init('Magento\Theme\Model\Theme', 'Magento\Theme\Model\Resource\Theme');
}
/**
@@ -129,7 +129,7 @@ public function toOptionHash()
* Get theme from DB by area and theme_path
*
* @param string $fullPath
- * @return \Magento\Core\Model\Theme
+ * @return \Magento\Theme\Model\Theme
*/
public function getThemeByFullPath($fullPath)
{
@@ -180,7 +180,7 @@ public function updateChildRelations(\Magento\Framework\View\Design\ThemeInterfa
*/
public function filterPhysicalThemes(
$page = null,
- $pageSize = \Magento\Core\Model\Resource\Theme\Collection::DEFAULT_PAGE_SIZE
+ $pageSize = \Magento\Theme\Model\Resource\Theme\Collection::DEFAULT_PAGE_SIZE
) {
$this->addAreaFilter(
\Magento\Framework\App\Area::AREA_FRONTEND
diff --git a/app/code/Magento/Core/Model/Resource/Theme/Customization/Update.php b/app/code/Magento/Theme/Model/Resource/Theme/Customization/Update.php
similarity index 73%
rename from app/code/Magento/Core/Model/Resource/Theme/Customization/Update.php
rename to app/code/Magento/Theme/Model/Resource/Theme/Customization/Update.php
index 60ea801e4d9b7..b023dd7a4a474 100644
--- a/app/code/Magento/Core/Model/Resource/Theme/Customization/Update.php
+++ b/app/code/Magento/Theme/Model/Resource/Theme/Customization/Update.php
@@ -3,7 +3,7 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Core\Model\Resource\Theme\Customization;
+namespace Magento\Theme\Model\Resource\Theme\Customization;
/**
* Theme customization link resource model
@@ -17,6 +17,6 @@ class Update extends \Magento\Framework\Model\Resource\Db\AbstractDb
*/
protected function _construct()
{
- $this->_init('core_theme_file_update', 'file_update_id');
+ $this->_init('theme_file_update', 'file_update_id');
}
}
diff --git a/app/code/Magento/Core/Model/Resource/Theme/Data/Collection.php b/app/code/Magento/Theme/Model/Resource/Theme/Data/Collection.php
similarity index 60%
rename from app/code/Magento/Core/Model/Resource/Theme/Data/Collection.php
rename to app/code/Magento/Theme/Model/Resource/Theme/Data/Collection.php
index 40acd4e53d56b..f8e95038d9dd1 100644
--- a/app/code/Magento/Core/Model/Resource/Theme/Data/Collection.php
+++ b/app/code/Magento/Theme/Model/Resource/Theme/Data/Collection.php
@@ -3,12 +3,12 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Core\Model\Resource\Theme\Data;
+namespace Magento\Theme\Model\Resource\Theme\Data;
/**
* Theme data collection
*/
-class Collection extends \Magento\Core\Model\Resource\Theme\Collection implements
+class Collection extends \Magento\Theme\Model\Resource\Theme\Collection implements
\Magento\Framework\View\Design\Theme\Label\ListInterface,
\Magento\Framework\View\Design\Theme\ListInterface
{
@@ -17,6 +17,6 @@ class Collection extends \Magento\Core\Model\Resource\Theme\Collection implement
*/
protected function _construct()
{
- $this->_init('Magento\Core\Model\Theme\Data', 'Magento\Core\Model\Resource\Theme');
+ $this->_init('Magento\Theme\Model\Theme\Data', 'Magento\Theme\Model\Resource\Theme');
}
}
diff --git a/app/code/Magento/Core/Model/Resource/Theme/File.php b/app/code/Magento/Theme/Model/Resource/Theme/File.php
similarity index 76%
rename from app/code/Magento/Core/Model/Resource/Theme/File.php
rename to app/code/Magento/Theme/Model/Resource/Theme/File.php
index 22b33f0d09f10..6d5767e8ca119 100644
--- a/app/code/Magento/Core/Model/Resource/Theme/File.php
+++ b/app/code/Magento/Theme/Model/Resource/Theme/File.php
@@ -3,7 +3,7 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Core\Model\Resource\Theme;
+namespace Magento\Theme\Model\Resource\Theme;
/**
* Theme files resource model
@@ -17,6 +17,6 @@ class File extends \Magento\Framework\Model\Resource\Db\AbstractDb
*/
protected function _construct()
{
- $this->_init('core_theme_file', 'theme_files_id');
+ $this->_init('theme_file', 'theme_files_id');
}
}
diff --git a/app/code/Magento/Core/Model/Resource/Theme/File/Collection.php b/app/code/Magento/Theme/Model/Resource/Theme/File/Collection.php
similarity index 90%
rename from app/code/Magento/Core/Model/Resource/Theme/File/Collection.php
rename to app/code/Magento/Theme/Model/Resource/Theme/File/Collection.php
index ce26c901d38e4..ce9908786885c 100644
--- a/app/code/Magento/Core/Model/Resource/Theme/File/Collection.php
+++ b/app/code/Magento/Theme/Model/Resource/Theme/File/Collection.php
@@ -3,7 +3,7 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Core\Model\Resource\Theme\File;
+namespace Magento\Theme\Model\Resource\Theme\File;
/**
* Theme files collection
@@ -18,7 +18,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
*/
protected function _construct()
{
- $this->_init('Magento\Core\Model\Theme\File', 'Magento\Core\Model\Resource\Theme\File');
+ $this->_init('Magento\Theme\Model\Theme\File', 'Magento\Theme\Model\Resource\Theme\File');
}
/**
diff --git a/app/code/Magento/Core/Model/Resource/Theme/Grid/Collection.php b/app/code/Magento/Theme/Model/Resource/Theme/Grid/Collection.php
similarity index 59%
rename from app/code/Magento/Core/Model/Resource/Theme/Grid/Collection.php
rename to app/code/Magento/Theme/Model/Resource/Theme/Grid/Collection.php
index 8bb5254181232..1faa3b855be81 100644
--- a/app/code/Magento/Core/Model/Resource/Theme/Grid/Collection.php
+++ b/app/code/Magento/Theme/Model/Resource/Theme/Grid/Collection.php
@@ -3,21 +3,21 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Core\Model\Resource\Theme\Grid;
+namespace Magento\Theme\Model\Resource\Theme\Grid;
/**
* Theme grid collection
*/
-class Collection extends \Magento\Core\Model\Resource\Theme\Collection
+class Collection extends \Magento\Theme\Model\Resource\Theme\Collection
{
/**
* Add area filter
*
- * @return $this
+ * @return \Magento\Theme\Model\Resource\Theme\Collection
*/
protected function _initSelect()
{
- parent::_initSelect();
+ \Magento\Theme\Model\Resource\Theme\Collection::_initSelect();
$this->filterVisibleThemes()->addAreaFilter(\Magento\Framework\App\Area::AREA_FRONTEND)->addParentTitle();
return $this;
}
diff --git a/app/code/Magento/Core/Model/Theme.php b/app/code/Magento/Theme/Model/Theme.php
similarity index 95%
rename from app/code/Magento/Core/Model/Theme.php
rename to app/code/Magento/Theme/Model/Theme.php
index be9ecc5ad6f53..14b6824e960b8 100644
--- a/app/code/Magento/Core/Model/Theme.php
+++ b/app/code/Magento/Theme/Model/Theme.php
@@ -3,7 +3,7 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Core\Model;
+namespace Magento\Theme\Model;
use Magento\Framework\View\Design\ThemeInterface;
@@ -92,8 +92,8 @@ class Theme extends \Magento\Framework\Model\AbstractModel implements ThemeInter
* @param \Magento\Framework\View\Design\Theme\ImageFactory $imageFactory
* @param \Magento\Framework\View\Design\Theme\Validator $validator
* @param \Magento\Framework\View\Design\Theme\CustomizationFactory $customizationFactory
- * @param \Magento\Core\Model\Resource\Theme $resource
- * @param \Magento\Core\Model\Resource\Theme\Collection $resourceCollection
+ * @param \Magento\Theme\Model\Resource\Theme $resource
+ * @param \Magento\Theme\Model\Resource\Theme\Collection $resourceCollection
* @param array $data
*
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
@@ -106,8 +106,8 @@ public function __construct(
\Magento\Framework\View\Design\Theme\ImageFactory $imageFactory,
\Magento\Framework\View\Design\Theme\Validator $validator,
\Magento\Framework\View\Design\Theme\CustomizationFactory $customizationFactory,
- \Magento\Core\Model\Resource\Theme $resource = null,
- \Magento\Core\Model\Resource\Theme\Collection $resourceCollection = null,
+ Resource\Theme $resource = null,
+ Resource\Theme\Collection $resourceCollection = null,
array $data = []
) {
parent::__construct($context, $registry, $resource, $resourceCollection, $data);
@@ -126,7 +126,7 @@ public function __construct(
*/
protected function _construct()
{
- $this->_init('Magento\Core\Model\Resource\Theme');
+ $this->_init('Magento\Theme\Model\Resource\Theme');
}
/**
@@ -292,7 +292,7 @@ public function getCode()
* Get one of theme domain models
*
* @param int|null $type
- * @return \Magento\Core\Model\Theme\Domain\Virtual|\Magento\Core\Model\Theme\Domain\Staging
+ * @return \Magento\Theme\Model\Theme\Domain\Virtual|\Magento\Theme\Model\Theme\Domain\Staging
* @throws \InvalidArgumentException
*/
public function getDomainModel($type = null)
diff --git a/app/code/Magento/Core/Model/Theme/Collection.php b/app/code/Magento/Theme/Model/Theme/Collection.php
similarity index 97%
rename from app/code/Magento/Core/Model/Theme/Collection.php
rename to app/code/Magento/Theme/Model/Theme/Collection.php
index 9974d466ed906..0418a9172a7db 100644
--- a/app/code/Magento/Core/Model/Theme/Collection.php
+++ b/app/code/Magento/Theme/Model/Theme/Collection.php
@@ -3,7 +3,7 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Core\Model\Theme;
+namespace Magento\Theme\Model\Theme;
use Magento\Framework\App\Filesystem\DirectoryList;
use Magento\Framework\View\Design\Theme\ListInterface;
@@ -24,7 +24,7 @@ class Collection extends \Magento\Framework\Data\Collection implements ListInter
*
* @var string
*/
- protected $_itemObjectClass = 'Magento\Core\Model\Theme';
+ protected $_itemObjectClass = 'Magento\Theme\Model\Theme';
/**
* Target directory
@@ -39,12 +39,12 @@ class Collection extends \Magento\Framework\Data\Collection implements ListInter
protected $themeConfigFactory;
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Magento\Framework\Filesystem $filesystem
* @param \Magento\Framework\Config\ThemeFactory $themeConfigFactory
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Magento\Framework\Filesystem $filesystem,
\Magento\Framework\Config\ThemeFactory $themeConfigFactory
) {
diff --git a/app/code/Magento/Core/Model/Theme/Customization/Config.php b/app/code/Magento/Theme/Model/Theme/Customization/Config.php
similarity index 95%
rename from app/code/Magento/Core/Model/Theme/Customization/Config.php
rename to app/code/Magento/Theme/Model/Theme/Customization/Config.php
index 0eeb2585ce9ea..2f6c2dc519211 100644
--- a/app/code/Magento/Core/Model/Theme/Customization/Config.php
+++ b/app/code/Magento/Theme/Model/Theme/Customization/Config.php
@@ -7,7 +7,7 @@
/**
* {@inheritdoc}
*/
-namespace Magento\Core\Model\Theme\Customization;
+namespace Magento\Theme\Model\Theme\Customization;
class Config implements \Magento\Framework\View\Design\Theme\Customization\ConfigInterface
{
diff --git a/app/code/Magento/Core/Model/Theme/Data.php b/app/code/Magento/Theme/Model/Theme/Data.php
similarity index 80%
rename from app/code/Magento/Core/Model/Theme/Data.php
rename to app/code/Magento/Theme/Model/Theme/Data.php
index fa5bb45373487..afcd32e262e6b 100644
--- a/app/code/Magento/Core/Model/Theme/Data.php
+++ b/app/code/Magento/Theme/Model/Theme/Data.php
@@ -3,14 +3,14 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Core\Model\Theme;
+namespace Magento\Theme\Model\Theme;
/**
* Data model for themes
*
* @method \Magento\Framework\View\Design\ThemeInterface setArea(string $area)
*/
-class Data extends \Magento\Core\Model\Theme
+class Data extends \Magento\Theme\Model\Theme
{
/**
* {@inheritdoc}
diff --git a/app/code/Magento/Core/Model/Theme/Data/Collection.php b/app/code/Magento/Theme/Model/Theme/Data/Collection.php
similarity index 58%
rename from app/code/Magento/Core/Model/Theme/Data/Collection.php
rename to app/code/Magento/Theme/Model/Theme/Data/Collection.php
index 1cd1d67304a01..4077a04743071 100644
--- a/app/code/Magento/Core/Model/Theme/Data/Collection.php
+++ b/app/code/Magento/Theme/Model/Theme/Data/Collection.php
@@ -3,19 +3,19 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Core\Model\Theme\Data;
+namespace Magento\Theme\Model\Theme\Data;
use Magento\Framework\View\Design\Theme\ListInterface;
/**
* Theme filesystem data collection
*/
-class Collection extends \Magento\Core\Model\Theme\Collection implements ListInterface
+class Collection extends \Magento\Theme\Model\Theme\Collection implements ListInterface
{
/**
* Model of collection item
*
* @var string
*/
- protected $_itemObjectClass = 'Magento\Core\Model\Theme\Data';
+ protected $_itemObjectClass = 'Magento\Theme\Model\Theme\Data';
}
diff --git a/app/code/Magento/Core/Model/Theme/Domain/Physical.php b/app/code/Magento/Theme/Model/Theme/Domain/Physical.php
similarity index 86%
rename from app/code/Magento/Core/Model/Theme/Domain/Physical.php
rename to app/code/Magento/Theme/Model/Theme/Domain/Physical.php
index 57670630272a6..5dc321191990d 100644
--- a/app/code/Magento/Core/Model/Theme/Domain/Physical.php
+++ b/app/code/Magento/Theme/Model/Theme/Domain/Physical.php
@@ -7,7 +7,7 @@
/**
* Physical theme model class
*/
-namespace Magento\Core\Model\Theme\Domain;
+namespace Magento\Theme\Model\Theme\Domain;
class Physical implements \Magento\Framework\View\Design\Theme\Domain\PhysicalInterface
{
@@ -19,7 +19,7 @@ class Physical implements \Magento\Framework\View\Design\Theme\Domain\PhysicalIn
protected $_theme;
/**
- * @var \Magento\Core\Model\ThemeFactory
+ * @var \Magento\Theme\Model\ThemeFactory
*/
protected $_themeFactory;
@@ -29,21 +29,21 @@ class Physical implements \Magento\Framework\View\Design\Theme\Domain\PhysicalIn
protected $_themeCopyService;
/**
- * @var \Magento\Core\Model\Resource\Theme\Collection
+ * @var \Magento\Theme\Model\Resource\Theme\Collection
*/
protected $_themeCollection;
/**
* @param \Magento\Framework\View\Design\ThemeInterface $theme
- * @param \Magento\Core\Model\ThemeFactory $themeFactory
+ * @param \Magento\Theme\Model\ThemeFactory $themeFactory
* @param \Magento\Theme\Model\CopyService $themeCopyService
- * @param \Magento\Core\Model\Resource\Theme\Collection $themeCollection
+ * @param \Magento\Theme\Model\Resource\Theme\Collection $themeCollection
*/
public function __construct(
\Magento\Framework\View\Design\ThemeInterface $theme,
- \Magento\Core\Model\ThemeFactory $themeFactory,
+ \Magento\Theme\Model\ThemeFactory $themeFactory,
\Magento\Theme\Model\CopyService $themeCopyService,
- \Magento\Core\Model\Resource\Theme\Collection $themeCollection
+ \Magento\Theme\Model\Resource\Theme\Collection $themeCollection
) {
$this->_theme = $theme;
$this->_themeFactory = $themeFactory;
diff --git a/app/code/Magento/Core/Model/Theme/Domain/Staging.php b/app/code/Magento/Theme/Model/Theme/Domain/Staging.php
similarity index 96%
rename from app/code/Magento/Core/Model/Theme/Domain/Staging.php
rename to app/code/Magento/Theme/Model/Theme/Domain/Staging.php
index 837f3c6079ebd..772de2d5598bb 100644
--- a/app/code/Magento/Core/Model/Theme/Domain/Staging.php
+++ b/app/code/Magento/Theme/Model/Theme/Domain/Staging.php
@@ -7,7 +7,7 @@
/**
* Staging theme model class
*/
-namespace Magento\Core\Model\Theme\Domain;
+namespace Magento\Theme\Model\Theme\Domain;
class Staging implements \Magento\Framework\View\Design\Theme\Domain\StagingInterface
{
diff --git a/app/code/Magento/Core/Model/Theme/Domain/Virtual.php b/app/code/Magento/Theme/Model/Theme/Domain/Virtual.php
similarity index 94%
rename from app/code/Magento/Core/Model/Theme/Domain/Virtual.php
rename to app/code/Magento/Theme/Model/Theme/Domain/Virtual.php
index 265e7f00ff5cf..1250e7a38deda 100644
--- a/app/code/Magento/Core/Model/Theme/Domain/Virtual.php
+++ b/app/code/Magento/Theme/Model/Theme/Domain/Virtual.php
@@ -7,7 +7,7 @@
/**
* Virtual theme domain model
*/
-namespace Magento\Core\Model\Theme\Domain;
+namespace Magento\Theme\Model\Theme\Domain;
class Virtual implements \Magento\Framework\View\Design\Theme\Domain\VirtualInterface
{
@@ -19,7 +19,7 @@ class Virtual implements \Magento\Framework\View\Design\Theme\Domain\VirtualInte
protected $_theme;
/**
- * @var \Magento\Core\Model\ThemeFactory $themeFactory
+ * @var \Magento\Theme\Model\ThemeFactory $themeFactory
*/
protected $_themeFactory;
@@ -44,13 +44,13 @@ class Virtual implements \Magento\Framework\View\Design\Theme\Domain\VirtualInte
/**
* @param \Magento\Framework\View\Design\ThemeInterface $theme
- * @param \Magento\Core\Model\ThemeFactory $themeFactory
+ * @param \Magento\Theme\Model\ThemeFactory $themeFactory
* @param \Magento\Theme\Model\CopyService $themeCopyService
* @param \Magento\Theme\Model\Config\Customization $customizationConfig
*/
public function __construct(
\Magento\Framework\View\Design\ThemeInterface $theme,
- \Magento\Core\Model\ThemeFactory $themeFactory,
+ \Magento\Theme\Model\ThemeFactory $themeFactory,
\Magento\Theme\Model\CopyService $themeCopyService,
\Magento\Theme\Model\Config\Customization $customizationConfig
) {
diff --git a/app/code/Magento/Core/Model/Theme/File.php b/app/code/Magento/Theme/Model/Theme/File.php
similarity index 98%
rename from app/code/Magento/Core/Model/Theme/File.php
rename to app/code/Magento/Theme/Model/Theme/File.php
index 03065056ad3d3..0f6d4a0dfbb4f 100644
--- a/app/code/Magento/Core/Model/Theme/File.php
+++ b/app/code/Magento/Theme/Model/Theme/File.php
@@ -3,7 +3,7 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Core\Model\Theme;
+namespace Magento\Theme\Model\Theme;
use Magento\Framework\Model\AbstractModel;
use Magento\Framework\View\Design\Theme\Customization\FileInterface as CustomizationFileInterface;
@@ -78,7 +78,7 @@ public function __construct(
*/
protected function _construct()
{
- $this->_init('Magento\Core\Model\Resource\Theme\File');
+ $this->_init('Magento\Theme\Model\Resource\Theme\File');
}
/**
diff --git a/app/code/Magento/Core/Model/Theme/FileProvider.php b/app/code/Magento/Theme/Model/Theme/FileProvider.php
similarity index 74%
rename from app/code/Magento/Core/Model/Theme/FileProvider.php
rename to app/code/Magento/Theme/Model/Theme/FileProvider.php
index e452aab69ad23..50d4034c65f9d 100644
--- a/app/code/Magento/Core/Model/Theme/FileProvider.php
+++ b/app/code/Magento/Theme/Model/Theme/FileProvider.php
@@ -3,19 +3,19 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Core\Model\Theme;
+namespace Magento\Theme\Model\Theme;
class FileProvider implements \Magento\Framework\View\Design\Theme\FileProviderInterface
{
/**
- * @var \Magento\Core\Model\Resource\Theme\File\CollectionFactory
+ * @var \Magento\Theme\Model\Resource\Theme\File\CollectionFactory
*/
protected $fileFactory;
/**
- * @param \Magento\Core\Model\Resource\Theme\File\CollectionFactory $fileFactory
+ * @param \Magento\Theme\Model\Resource\Theme\File\CollectionFactory $fileFactory
*/
- public function __construct(\Magento\Core\Model\Resource\Theme\File\CollectionFactory $fileFactory)
+ public function __construct(\Magento\Theme\Model\Resource\Theme\File\CollectionFactory $fileFactory)
{
$this->fileFactory = $fileFactory;
}
diff --git a/app/code/Magento/Core/Model/Theme/Image/Path.php b/app/code/Magento/Theme/Model/Theme/Image/Path.php
similarity index 87%
rename from app/code/Magento/Core/Model/Theme/Image/Path.php
rename to app/code/Magento/Theme/Model/Theme/Image/Path.php
index 7239188676c3a..55453dc27c21e 100644
--- a/app/code/Magento/Core/Model/Theme/Image/Path.php
+++ b/app/code/Magento/Theme/Model/Theme/Image/Path.php
@@ -4,7 +4,7 @@
* See COPYING.txt for license details.
*/
-namespace Magento\Core\Model\Theme\Image;
+namespace Magento\Theme\Model\Theme\Image;
use Magento\Framework\App\Filesystem\DirectoryList;
use Magento\Framework\View\Design\ThemeInterface;
@@ -32,7 +32,7 @@ class Path implements \Magento\Framework\View\Design\Theme\Image\PathInterface
protected $assetRepo;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $storeManager;
@@ -41,12 +41,12 @@ class Path implements \Magento\Framework\View\Design\Theme\Image\PathInterface
*
* @param \Magento\Framework\Filesystem $filesystem
* @param \Magento\Framework\View\Asset\Repository $assetRepo
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
*/
public function __construct(
\Magento\Framework\Filesystem $filesystem,
\Magento\Framework\View\Asset\Repository $assetRepo,
- \Magento\Store\Model\StoreManagerInterface $storeManager
+ \Magento\Framework\Store\StoreManagerInterface $storeManager
) {
$this->mediaDirectory = $filesystem->getDirectoryRead(DirectoryList::MEDIA);
$this->assetRepo = $assetRepo;
@@ -56,7 +56,7 @@ public function __construct(
/**
* Get url to preview image
*
- * @param \Magento\Core\Model\Theme|ThemeInterface $theme
+ * @param ThemeInterface $theme
* @return string
*/
public function getPreviewImageUrl(ThemeInterface $theme)
@@ -68,7 +68,7 @@ public function getPreviewImageUrl(ThemeInterface $theme)
/**
* Get path to preview image
*
- * @param \Magento\Core\Model\Theme|ThemeInterface $theme
+ * @param ThemeInterface $theme
* @return string
*/
public function getPreviewImagePath(ThemeInterface $theme)
diff --git a/app/code/Magento/Core/Model/Theme/Registration.php b/app/code/Magento/Theme/Model/Theme/Registration.php
similarity index 93%
rename from app/code/Magento/Core/Model/Theme/Registration.php
rename to app/code/Magento/Theme/Model/Theme/Registration.php
index 77bc639e3cb7f..75b975e073447 100644
--- a/app/code/Magento/Core/Model/Theme/Registration.php
+++ b/app/code/Magento/Theme/Model/Theme/Registration.php
@@ -3,7 +3,7 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Core\Model\Theme;
+namespace Magento\Theme\Model\Theme;
use Magento\Framework\App\Filesystem\DirectoryList;
use Magento\Framework\Filesystem;
@@ -16,7 +16,7 @@
class Registration
{
/**
- * @var \Magento\Core\Model\Resource\Theme\Data\CollectionFactory
+ * @var \Magento\Theme\Model\Resource\Theme\Data\CollectionFactory
*/
protected $_collectionFactory;
@@ -55,13 +55,13 @@ class Registration
/**
* Initialize dependencies
*
- * @param \Magento\Core\Model\Resource\Theme\Data\CollectionFactory $collectionFactory
- * @param \Magento\Core\Model\Theme\Data\Collection $filesystemCollection
+ * @param \Magento\Theme\Model\Resource\Theme\Data\CollectionFactory $collectionFactory
+ * @param \Magento\Theme\Model\Theme\Data\Collection $filesystemCollection
* @param Filesystem $filesystem
*/
public function __construct(
- \Magento\Core\Model\Resource\Theme\Data\CollectionFactory $collectionFactory,
- \Magento\Core\Model\Theme\Data\Collection $filesystemCollection,
+ \Magento\Theme\Model\Resource\Theme\Data\CollectionFactory $collectionFactory,
+ \Magento\Theme\Model\Theme\Data\Collection $filesystemCollection,
Filesystem $filesystem
) {
$this->_collectionFactory = $collectionFactory;
diff --git a/app/code/Magento/Core/Model/Theme/Resolver.php b/app/code/Magento/Theme/Model/Theme/Resolver.php
similarity index 83%
rename from app/code/Magento/Core/Model/Theme/Resolver.php
rename to app/code/Magento/Theme/Model/Theme/Resolver.php
index ed859980d9cef..7469e654bbfcb 100644
--- a/app/code/Magento/Core/Model/Theme/Resolver.php
+++ b/app/code/Magento/Theme/Model/Theme/Resolver.php
@@ -3,7 +3,7 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Core\Model\Theme;
+namespace Magento\Theme\Model\Theme;
/**
* Theme resolver model
@@ -16,7 +16,7 @@ class Resolver implements \Magento\Framework\View\Design\Theme\ResolverInterface
protected $design;
/**
- * @var \Magento\Core\Model\Resource\Theme\CollectionFactory
+ * @var \Magento\Theme\Model\Resource\Theme\CollectionFactory
*/
protected $themeFactory;
@@ -28,12 +28,12 @@ class Resolver implements \Magento\Framework\View\Design\Theme\ResolverInterface
/**
* @param \Magento\Framework\App\State $appState
* @param \Magento\Framework\View\DesignInterface $design
- * @param \Magento\Core\Model\Resource\Theme\CollectionFactory $themeFactory
+ * @param \Magento\Theme\Model\Resource\Theme\CollectionFactory $themeFactory
*/
public function __construct(
\Magento\Framework\App\State $appState,
\Magento\Framework\View\DesignInterface $design,
- \Magento\Core\Model\Resource\Theme\CollectionFactory $themeFactory
+ \Magento\Theme\Model\Resource\Theme\CollectionFactory $themeFactory
) {
$this->design = $design;
$this->themeFactory = $themeFactory;
@@ -52,7 +52,7 @@ public function get()
return $this->design->getDesignTheme();
}
- /** @var \Magento\Core\Model\Resource\Theme\Collection $themeCollection */
+ /** @var \Magento\Theme\Model\Resource\Theme\Collection $themeCollection */
$themeCollection = $this->themeFactory->create();
$themeIdentifier = $this->design->getConfigurationDesignTheme($area);
if (is_numeric($themeIdentifier)) {
diff --git a/app/code/Magento/Core/Model/Theme/Source/Theme.php b/app/code/Magento/Theme/Model/Theme/Source/Theme.php
similarity index 95%
rename from app/code/Magento/Core/Model/Theme/Source/Theme.php
rename to app/code/Magento/Theme/Model/Theme/Source/Theme.php
index a1949e21fa483..b1ebe82d6257a 100644
--- a/app/code/Magento/Core/Model/Theme/Source/Theme.php
+++ b/app/code/Magento/Theme/Model/Theme/Source/Theme.php
@@ -7,7 +7,7 @@
/**
* Source model for eav attribute custom_design
*/
-namespace Magento\Core\Model\Theme\Source;
+namespace Magento\Theme\Model\Theme\Source;
use Magento\Eav\Model\Entity\Attribute\Source\AbstractSource;
use Magento\Framework\View\Design\Theme\Label;
diff --git a/app/code/Magento/Core/Model/Theme/ThemeProvider.php b/app/code/Magento/Theme/Model/Theme/ThemeProvider.php
similarity index 69%
rename from app/code/Magento/Core/Model/Theme/ThemeProvider.php
rename to app/code/Magento/Theme/Model/Theme/ThemeProvider.php
index c8903a28a4f32..a17280ce4a2c4 100644
--- a/app/code/Magento/Core/Model/Theme/ThemeProvider.php
+++ b/app/code/Magento/Theme/Model/Theme/ThemeProvider.php
@@ -3,27 +3,27 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Core\Model\Theme;
+namespace Magento\Theme\Model\Theme;
class ThemeProvider implements \Magento\Framework\View\Design\Theme\ThemeProviderInterface
{
/**
- * @var \Magento\Core\Model\Resource\Theme\CollectionFactory
+ * @var \Magento\Theme\Model\Resource\Theme\CollectionFactory
*/
protected $collectionFactory;
/**
- * @var \Magento\Core\Model\ThemeFactory
+ * @var \Magento\Theme\Model\ThemeFactory
*/
protected $themeFactory;
/**
- * @param \Magento\Core\Model\Resource\Theme\CollectionFactory $collectionFactory
- * @param \Magento\Core\Model\ThemeFactory $themeFactory
+ * @param \Magento\Theme\Model\Resource\Theme\CollectionFactory $collectionFactory
+ * @param \Magento\Theme\Model\ThemeFactory $themeFactory
*/
public function __construct(
- \Magento\Core\Model\Resource\Theme\CollectionFactory $collectionFactory,
- \Magento\Core\Model\ThemeFactory $themeFactory
+ \Magento\Theme\Model\Resource\Theme\CollectionFactory $collectionFactory,
+ \Magento\Theme\Model\ThemeFactory $themeFactory
) {
$this->collectionFactory = $collectionFactory;
$this->themeFactory = $themeFactory;
@@ -34,7 +34,7 @@ public function __construct(
*/
public function getThemeByFullPath($fullPath)
{
- /** @var $themeCollection \Magento\Core\Model\Resource\Theme\Collection */
+ /** @var $themeCollection \Magento\Theme\Model\Resource\Theme\Collection */
$themeCollection = $this->collectionFactory->create();
return $themeCollection->getThemeByFullPath($fullPath);
}
@@ -46,7 +46,7 @@ public function getThemeCustomizations(
$area = \Magento\Framework\App\Area::AREA_FRONTEND,
$type = \Magento\Framework\View\Design\ThemeInterface::TYPE_VIRTUAL
) {
- /** @var $themeCollection \Magento\Core\Model\Resource\Theme\Collection */
+ /** @var $themeCollection \Magento\Theme\Model\Resource\Theme\Collection */
$themeCollection = $this->collectionFactory->create();
$themeCollection->addAreaFilter($area)->addTypeFilter($type);
return $themeCollection;
diff --git a/app/code/Magento/Core/Model/View/Design.php b/app/code/Magento/Theme/Model/View/Design.php
similarity index 91%
rename from app/code/Magento/Core/Model/View/Design.php
rename to app/code/Magento/Theme/Model/View/Design.php
index b8e5b24978e0d..cbccc25cba247 100644
--- a/app/code/Magento/Core/Model/View/Design.php
+++ b/app/code/Magento/Theme/Model/View/Design.php
@@ -4,7 +4,7 @@
* See COPYING.txt for license details.
*/
-namespace Magento\Core\Model\View;
+namespace Magento\Theme\Model\View;
/**
* Keeps design settings for current request
@@ -21,7 +21,7 @@ class Design implements \Magento\Framework\View\DesignInterface
/**
* Package theme
*
- * @var \Magento\Core\Model\Theme
+ * @var \Magento\Theme\Model\Theme
*/
protected $_theme;
@@ -36,7 +36,7 @@ class Design implements \Magento\Framework\View\DesignInterface
/**
* Store list manager
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -46,7 +46,7 @@ class Design implements \Magento\Framework\View\DesignInterface
protected $_flyweightFactory;
/**
- * @var \Magento\Core\Model\ThemeFactory
+ * @var \Magento\Theme\Model\ThemeFactory
*/
protected $_themeFactory;
@@ -71,19 +71,19 @@ class Design implements \Magento\Framework\View\DesignInterface
protected $_appState;
/**
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\View\Design\Theme\FlyweightFactory $flyweightFactory
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
- * @param \Magento\Core\Model\ThemeFactory $themeFactory
+ * @param \Magento\Theme\Model\ThemeFactory $themeFactory
* @param \Magento\Framework\ObjectManagerInterface $objectManager
* @param \Magento\Framework\App\State $appState
* @param array $themes
*/
public function __construct(
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\View\Design\Theme\FlyweightFactory $flyweightFactory,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
- \Magento\Core\Model\ThemeFactory $themeFactory,
+ \Magento\Theme\Model\ThemeFactory $themeFactory,
\Magento\Framework\ObjectManagerInterface $objectManager,
\Magento\Framework\App\State $appState,
array $themes
@@ -172,7 +172,7 @@ public function getConfigurationDesignTheme($area = null, array $params = [])
} else {
$theme = (string) $this->_scopeConfig->getValue(
self::XML_PATH_THEME_ID,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -210,7 +210,7 @@ public function setDefaultDesignTheme()
/**
* Design theme model getter
*
- * @return \Magento\Core\Model\Theme
+ * @return \Magento\Theme\Model\Theme
*/
public function getDesignTheme()
{
diff --git a/app/code/Magento/Theme/composer.json b/app/code/Magento/Theme/composer.json
index cf599aa603f79..ca9d608211e22 100644
--- a/app/code/Magento/Theme/composer.json
+++ b/app/code/Magento/Theme/composer.json
@@ -8,6 +8,7 @@
"magento/module-customer": "0.42.0-beta5",
"magento/module-backend": "0.42.0-beta5",
"magento/module-cms": "0.42.0-beta5",
+ "magento/module-eav": "0.42.0-beta5",
"magento/framework": "0.42.0-beta5",
"magento/module-require-js": "0.42.0-beta5",
"magento/magento-composer-installer": "*"
diff --git a/app/code/Magento/Theme/data/theme_setup/data-install-2.0.0.php b/app/code/Magento/Theme/data/theme_setup/data-install-2.0.0.php
new file mode 100644
index 0000000000000..48a2609247b3b
--- /dev/null
+++ b/app/code/Magento/Theme/data/theme_setup/data-install-2.0.0.php
@@ -0,0 +1,57 @@
+createMigrationSetup();
+$installer->startSetup();
+
+/*
+ * Register themes
+ */
+$installer->getEventManager()->dispatch('theme_registration_from_filesystem');
+
+/**
+ * Update theme's data
+ */
+$fileCollection = $this->createThemeFactory();
+$fileCollection->addDefaultPattern('*');
+$fileCollection->setItemObjectClass('Magento\Theme\Model\Theme\Data');
+
+$resourceCollection = $this->createThemeResourceFactory();
+$resourceCollection->setItemObjectClass('Magento\Theme\Model\Theme\Data');
+
+/** @var $theme \Magento\Framework\View\Design\ThemeInterface */
+foreach ($resourceCollection as $theme) {
+ $themeType = $fileCollection->hasTheme($theme)
+ ? \Magento\Framework\View\Design\ThemeInterface::TYPE_PHYSICAL
+ : \Magento\Framework\View\Design\ThemeInterface::TYPE_VIRTUAL;
+ $theme->setType($themeType)->save();
+}
+
+$fileCollection = $this->createThemeFactory();
+$fileCollection->addDefaultPattern('*');
+$fileCollection->setItemObjectClass('Magento\Theme\Model\Theme\Data');
+
+$themeDbCollection = $this->createThemeResourceFactory();
+$themeDbCollection->setItemObjectClass('Magento\Theme\Model\Theme\Data');
+
+/** @var $theme \Magento\Framework\View\Design\ThemeInterface */
+foreach ($fileCollection as $theme) {
+ $dbTheme = $themeDbCollection->getThemeByFullPath($theme->getFullPath());
+ $dbTheme->setCode($theme->getCode());
+ $dbTheme->save();
+}
+
+/**
+ * Update rows in theme
+ */
+$installer->getConnection()->update(
+ $installer->getTable('theme'),
+ ['area' => 'frontend'],
+ ['area = ?' => '']
+);
+
+$installer->endSetup();
diff --git a/app/code/Magento/Theme/etc/di.xml b/app/code/Magento/Theme/etc/di.xml
index dc3e240d1cf13..f7444ee959e32 100644
--- a/app/code/Magento/Theme/etc/di.xml
+++ b/app/code/Magento/Theme/etc/di.xml
@@ -50,6 +50,13 @@
deployed_version.txt
+
+
+
+ - Magento\Theme\Model\Resource\Setup
+
+
+
diff --git a/app/code/Magento/Core/etc/events.xml b/app/code/Magento/Theme/etc/events.xml
similarity index 62%
rename from app/code/Magento/Core/etc/events.xml
rename to app/code/Magento/Theme/etc/events.xml
index e4ebd985bf061..713f62c30d12a 100644
--- a/app/code/Magento/Core/etc/events.xml
+++ b/app/code/Magento/Theme/etc/events.xml
@@ -7,12 +7,12 @@
-->
-
+
-
+
-
+
diff --git a/app/code/Magento/Theme/etc/module.xml b/app/code/Magento/Theme/etc/module.xml
index 333d35ddfe0b4..6be8fcb4b0112 100644
--- a/app/code/Magento/Theme/etc/module.xml
+++ b/app/code/Magento/Theme/etc/module.xml
@@ -6,7 +6,7 @@
*/
-->
-
+
diff --git a/app/code/Magento/Theme/sql/theme_setup/install-2.0.0.php b/app/code/Magento/Theme/sql/theme_setup/install-2.0.0.php
new file mode 100644
index 0000000000000..17fa614e28230
--- /dev/null
+++ b/app/code/Magento/Theme/sql/theme_setup/install-2.0.0.php
@@ -0,0 +1,144 @@
+getConnection();
+
+$installer->startSetup();
+
+/**
+ * Create table 'theme'
+ */
+$table = $connection->newTable(
+ $installer->getTable('theme')
+)->addColumn(
+ 'theme_id',
+ \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
+ null,
+ ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
+ 'Theme identifier'
+)->addColumn(
+ 'parent_id',
+ \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
+ null,
+ ['nullable' => true],
+ 'Parent Id'
+)->addColumn(
+ 'theme_path',
+ \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+ 255,
+ ['nullable' => true],
+ 'Theme Path'
+)->addColumn(
+ 'theme_version',
+ \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+ 255,
+ ['nullable' => false],
+ 'Theme Version'
+)->addColumn(
+ 'theme_title',
+ \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+ 255,
+ ['nullable' => false],
+ 'Theme Title'
+)->addColumn(
+ 'preview_image',
+ \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+ 255,
+ ['nullable' => true],
+ 'Preview Image'
+)->addColumn(
+ 'is_featured',
+ \Magento\Framework\DB\Ddl\Table::TYPE_BOOLEAN,
+ null,
+ ['nullable' => false, 'default' => 0],
+ 'Is Theme Featured'
+)->addColumn(
+ 'area',
+ \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+ 255,
+ ['nullable' => false],
+ 'Theme Area'
+)->addColumn(
+ 'type',
+ \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
+ null,
+ ['nullable' => false],
+ 'Theme type: 0:physical, 1:virtual, 2:staging'
+)->addColumn(
+ 'code',
+ \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+ null,
+ [],
+ 'Full theme code, including package'
+)->setComment(
+ 'Core theme'
+);
+$connection->createTable($table);
+
+/**
+ * Create table 'theme_file'
+ */
+$table = $connection->newTable(
+ $installer->getTable('theme_file')
+)->addColumn(
+ 'theme_files_id',
+ \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
+ null,
+ ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
+ 'Theme files identifier'
+)->addColumn(
+ 'theme_id',
+ \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
+ null,
+ ['nullable' => false, 'unsigned' => true],
+ 'Theme Id'
+)->addColumn(
+ 'file_path',
+ \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+ 255,
+ ['nullable' => true],
+ 'Relative path to file'
+)->addColumn(
+ 'file_type',
+ \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+ 32,
+ ['nullable' => false],
+ 'File Type'
+)->addColumn(
+ 'content',
+ \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+ \Magento\Framework\DB\Ddl\Table::MAX_TEXT_SIZE,
+ ['nullable' => false],
+ 'File Content'
+)->addColumn(
+ 'sort_order',
+ \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
+ null,
+ ['nullable' => false, 'default' => 0],
+ 'Sort Order'
+)->addColumn(
+ 'is_temporary',
+ \Magento\Framework\DB\Ddl\Table::TYPE_BOOLEAN,
+ null,
+ ['nullable' => false, 'default' => 0],
+ 'Is Temporary File'
+)->addForeignKey(
+ $installer->getFkName('theme_file', 'theme_id', 'theme', 'theme_id'),
+ 'theme_id',
+ $installer->getTable('theme'),
+ 'theme_id',
+ \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
+ \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
+)->setComment(
+ 'Core theme files'
+);
+$connection->createTable($table);
+
+$installer->endSetup();
diff --git a/app/code/Magento/Core/sql/core_setup/upgrade-2.0.0-2.0.1.php b/app/code/Magento/Theme/sql/theme_setup/upgrade-2.0.0-2.0.1.php
similarity index 90%
rename from app/code/Magento/Core/sql/core_setup/upgrade-2.0.0-2.0.1.php
rename to app/code/Magento/Theme/sql/theme_setup/upgrade-2.0.0-2.0.1.php
index 30d0fe8d43cd0..b521db97a3ff9 100644
--- a/app/code/Magento/Core/sql/core_setup/upgrade-2.0.0-2.0.1.php
+++ b/app/code/Magento/Theme/sql/theme_setup/upgrade-2.0.0-2.0.1.php
@@ -14,7 +14,7 @@
* Remove column 'theme_version' from 'core_theme'
*/
$connection->dropColumn(
- $installer->getTable('core_theme'),
+ $installer->getTable('theme'),
'theme_version'
);
diff --git a/app/code/Magento/Theme/view/adminhtml/layout/adminhtml_system_design_theme_block.xml b/app/code/Magento/Theme/view/adminhtml/layout/adminhtml_system_design_theme_block.xml
index 2825bab9eabe1..d11386b2cc0e4 100644
--- a/app/code/Magento/Theme/view/adminhtml/layout/adminhtml_system_design_theme_block.xml
+++ b/app/code/Magento/Theme/view/adminhtml/layout/adminhtml_system_design_theme_block.xml
@@ -11,7 +11,7 @@
theme_grid
- Magento\Core\Model\Resource\Theme\Grid\Collection
+ Magento\Theme\Model\Resource\Theme\Grid\Collection
1
1
diff --git a/app/code/Magento/Translation/Model/Inline/Config.php b/app/code/Magento/Translation/Model/Inline/Config.php
index 9545445dd9651..a1b17671b574c 100644
--- a/app/code/Magento/Translation/Model/Inline/Config.php
+++ b/app/code/Magento/Translation/Model/Inline/Config.php
@@ -41,7 +41,7 @@ public function isActive($scope = null)
{
return $this->_scopeConfig->isSetFlag(
'dev/translate_inline/active',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$scope
);
}
diff --git a/app/code/Magento/Translation/Model/Inline/Parser.php b/app/code/Magento/Translation/Model/Inline/Parser.php
index 7635037657204..02eade209c3ff 100644
--- a/app/code/Magento/Translation/Model/Inline/Parser.php
+++ b/app/code/Magento/Translation/Model/Inline/Parser.php
@@ -95,7 +95,7 @@ class Parser implements \Magento\Framework\Translate\Inline\ParserInterface
protected $_resourceFactory;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -122,7 +122,7 @@ class Parser implements \Magento\Framework\Translate\Inline\ParserInterface
/**
* Initialize base inline translation model
*
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Translation\Model\Resource\StringFactory $resource
* @param \Zend_Filter_Interface $inputFilter
* @param \Magento\Framework\App\State $appState
@@ -131,7 +131,7 @@ class Parser implements \Magento\Framework\Translate\Inline\ParserInterface
*/
public function __construct(
\Magento\Translation\Model\Resource\StringFactory $resource,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Zend_Filter_Interface $inputFilter,
\Magento\Framework\App\State $appState,
\Magento\Framework\App\Cache\TypeListInterface $appCache,
diff --git a/app/code/Magento/Ui/Component/Filter/Type/Date.php b/app/code/Magento/Ui/Component/Filter/Type/Date.php
index fa7a956403277..30e269adc3d72 100644
--- a/app/code/Magento/Ui/Component/Filter/Type/Date.php
+++ b/app/code/Magento/Ui/Component/Filter/Type/Date.php
@@ -141,7 +141,7 @@ protected function convertDate($date, LocaleInterface $locale)
$dateObj->setTimezone(
$this->scopeConfig->getValue(
$this->localeDate->getDefaultTimezonePath(),
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)
);
diff --git a/app/code/Magento/Ui/composer.json b/app/code/Magento/Ui/composer.json
index 117fa952a7f2f..095298fa1657a 100644
--- a/app/code/Magento/Ui/composer.json
+++ b/app/code/Magento/Ui/composer.json
@@ -4,7 +4,6 @@
"require": {
"php": "~5.4.11|~5.5.0|~5.6.0",
"magento/module-backend": "0.42.0-beta5",
- "magento/module-store": "0.42.0-beta5",
"magento/framework": "0.42.0-beta5",
"magento/module-eav": "0.42.0-beta5",
"magento/magento-composer-installer": "*"
diff --git a/app/code/Magento/Ups/Block/Backend/System/CarrierConfig.php b/app/code/Magento/Ups/Block/Backend/System/CarrierConfig.php
index ccdd22cf7b447..3ec3e633a6884 100644
--- a/app/code/Magento/Ups/Block/Backend/System/CarrierConfig.php
+++ b/app/code/Magento/Ups/Block/Backend/System/CarrierConfig.php
@@ -73,6 +73,6 @@ public function getWebsiteModel()
*/
public function getConfig($path, $store = null)
{
- return $this->_scopeConfig->getValue($path, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
+ return $this->_scopeConfig->getValue($path, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store);
}
}
diff --git a/app/code/Magento/Ups/Model/Carrier.php b/app/code/Magento/Ups/Model/Carrier.php
index e88b68ea433ca..b256f0b19c2d7 100644
--- a/app/code/Magento/Ups/Model/Carrier.php
+++ b/app/code/Magento/Ups/Model/Carrier.php
@@ -250,7 +250,7 @@ public function setRequest(RateRequest $request)
} else {
$origCountry = $this->_scopeConfig->getValue(
\Magento\Sales\Model\Order\Shipment::XML_PATH_STORE_COUNTRY_ID,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$request->getStoreId()
);
}
@@ -262,7 +262,7 @@ public function setRequest(RateRequest $request)
} else {
$origRegionCode = $this->_scopeConfig->getValue(
\Magento\Sales\Model\Order\Shipment::XML_PATH_STORE_REGION_ID,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$request->getStoreId()
);
}
@@ -277,7 +277,7 @@ public function setRequest(RateRequest $request)
$rowRequest->setOrigPostal(
$this->_scopeConfig->getValue(
\Magento\Sales\Model\Order\Shipment::XML_PATH_STORE_ZIP,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$request->getStoreId()
)
);
@@ -289,7 +289,7 @@ public function setRequest(RateRequest $request)
$rowRequest->setOrigCity(
$this->_scopeConfig->getValue(
\Magento\Sales\Model\Order\Shipment::XML_PATH_STORE_CITY,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$request->getStoreId()
)
);
diff --git a/app/code/Magento/UrlRewrite/Controller/Router.php b/app/code/Magento/UrlRewrite/Controller/Router.php
index ce2f31fc0d2a2..64d646e9fd48f 100644
--- a/app/code/Magento/UrlRewrite/Controller/Router.php
+++ b/app/code/Magento/UrlRewrite/Controller/Router.php
@@ -21,7 +21,7 @@ class Router implements \Magento\Framework\App\RouterInterface
/** @var \Magento\Framework\UrlInterface */
protected $url;
- /** @var \Magento\Store\Model\StoreManagerInterface */
+ /** @var \Magento\Framework\Store\StoreManagerInterface */
protected $storeManager;
/** @var \Magento\Framework\App\ResponseInterface */
@@ -33,14 +33,14 @@ class Router implements \Magento\Framework\App\RouterInterface
/**
* @param \Magento\Framework\App\ActionFactory $actionFactory
* @param \Magento\Framework\UrlInterface $url
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\ResponseInterface $response
* @param UrlFinderInterface $urlFinder
*/
public function __construct(
\Magento\Framework\App\ActionFactory $actionFactory,
\Magento\Framework\UrlInterface $url,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\App\ResponseInterface $response,
UrlFinderInterface $urlFinder
) {
diff --git a/app/code/Magento/UrlRewrite/Model/Resource/UrlRewriteCollection.php b/app/code/Magento/UrlRewrite/Model/Resource/UrlRewriteCollection.php
index aa9747a8ea73c..ee1c4b2a83987 100644
--- a/app/code/Magento/UrlRewrite/Model/Resource/UrlRewriteCollection.php
+++ b/app/code/Magento/UrlRewrite/Model/Resource/UrlRewriteCollection.php
@@ -12,7 +12,7 @@ class UrlRewriteCollection extends \Magento\Framework\Model\Resource\Db\Collecti
/**
* Store Manager Model
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $storeManager;
@@ -21,7 +21,7 @@ class UrlRewriteCollection extends \Magento\Framework\Model\Resource\Db\Collecti
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param mixed $connection
* @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource
*/
@@ -30,7 +30,7 @@ public function __construct(
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
$connection = null,
\Magento\Framework\Model\Resource\Db\AbstractDb $resource = null
) {
diff --git a/app/code/Magento/UrlRewrite/sql/urlrewrite_setup/install-2.0.0.php b/app/code/Magento/UrlRewrite/sql/urlrewrite_setup/install-2.0.0.php
index 7d34039a067a3..2136aaa0c59ca 100644
--- a/app/code/Magento/UrlRewrite/sql/urlrewrite_setup/install-2.0.0.php
+++ b/app/code/Magento/UrlRewrite/sql/urlrewrite_setup/install-2.0.0.php
@@ -4,7 +4,7 @@
* See COPYING.txt for license details.
*/
-/* @var $installer \Magento\Core\Model\Resource\Setup */
+/* @var $installer \Magento\Theme\Model\Resource\Setup */
$installer = $this;
$installer->startSetup();
diff --git a/app/code/Magento/User/Model/User.php b/app/code/Magento/User/Model/User.php
index 08bf907613175..e6dc2de80badc 100644
--- a/app/code/Magento/User/Model/User.php
+++ b/app/code/Magento/User/Model/User.php
@@ -120,7 +120,7 @@ class User extends AbstractModel implements StorageInterface
protected $_transportBuilder;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -136,7 +136,7 @@ class User extends AbstractModel implements StorageInterface
* @param \Magento\Framework\Stdlib\DateTime $dateTime
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param array $data
*
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
@@ -151,7 +151,7 @@ public function __construct(
\Magento\Framework\Mail\Template\TransportBuilder $transportBuilder,
\Magento\Framework\Encryption\EncryptorInterface $encryptor,
\Magento\Framework\Stdlib\DateTime $dateTime,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\Model\Resource\AbstractResource $resource = null,
\Magento\Framework\Data\Collection\Db $resourceCollection = null,
array $data = []
@@ -214,7 +214,7 @@ public function __wakeup()
$this->_roleFactory = $objectManager->get('Magento\Authorization\Model\RoleFactory');
$this->_encryptor = $objectManager->get('Magento\Framework\Encryption\EncryptorInterface');
$this->_transportBuilder = $objectManager->get('Magento\Framework\Mail\Template\TransportBuilder');
- $this->_storeManager = $objectManager->get('Magento\Store\Model\StoreManagerInterface');
+ $this->_storeManager = $objectManager->get('Magento\Framework\Store\StoreManagerInterface');
}
/**
diff --git a/app/code/Magento/User/composer.json b/app/code/Magento/User/composer.json
index dd4e422f4c957..71ed2e236e498 100644
--- a/app/code/Magento/User/composer.json
+++ b/app/code/Magento/User/composer.json
@@ -7,7 +7,6 @@
"magento/module-backend": "0.42.0-beta5",
"magento/module-core": "0.42.0-beta5",
"magento/module-integration": "0.42.0-beta5",
- "magento/module-store": "0.42.0-beta5",
"magento/module-theme": "0.42.0-beta5",
"magento/framework": "0.42.0-beta5",
"magento/module-require-js": "0.42.0-beta5",
diff --git a/app/code/Magento/Usps/Model/Carrier.php b/app/code/Magento/Usps/Model/Carrier.php
index efccb26521a63..adfb7e8a7586c 100644
--- a/app/code/Magento/Usps/Model/Carrier.php
+++ b/app/code/Magento/Usps/Model/Carrier.php
@@ -278,7 +278,7 @@ public function setRequest(\Magento\Quote\Model\Quote\Address\RateRequest $reque
$r->setOrigPostal(
$this->_scopeConfig->getValue(
\Magento\Sales\Model\Order\Shipment::XML_PATH_STORE_ZIP,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$request->getStoreId()
)
);
@@ -290,7 +290,7 @@ public function setRequest(\Magento\Quote\Model\Quote\Address\RateRequest $reque
$r->setOrigCountryId(
$this->_scopeConfig->getValue(
\Magento\Sales\Model\Order\Shipment::XML_PATH_STORE_COUNTRY_ID,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$request->getStoreId()
)
);
diff --git a/app/code/Magento/Usps/composer.json b/app/code/Magento/Usps/composer.json
index 33db2ad9aa8f5..8df444fb44218 100644
--- a/app/code/Magento/Usps/composer.json
+++ b/app/code/Magento/Usps/composer.json
@@ -3,7 +3,6 @@
"description": "N/A",
"require": {
"php": "~5.4.11|~5.5.0|~5.6.0",
- "magento/module-store": "0.42.0-beta5",
"magento/module-shipping": "0.42.0-beta5",
"magento/module-directory": "0.42.0-beta5",
"magento/module-core": "0.42.0-beta5",
diff --git a/app/code/Magento/Webapi/Model/PathProcessor.php b/app/code/Magento/Webapi/Model/PathProcessor.php
index 243e2940e8cf4..c52baf7ffa802 100644
--- a/app/code/Magento/Webapi/Model/PathProcessor.php
+++ b/app/code/Magento/Webapi/Model/PathProcessor.php
@@ -11,14 +11,14 @@
class PathProcessor
{
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
private $storeManager;
/**
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
*/
- public function __construct(\Magento\Store\Model\StoreManagerInterface $storeManager)
+ public function __construct(\Magento\Framework\Store\StoreManagerInterface $storeManager)
{
$this->storeManager = $storeManager;
}
diff --git a/app/code/Magento/Webapi/Model/Soap/Server.php b/app/code/Magento/Webapi/Model/Soap/Server.php
index af0160985783c..7d8c5e01a46e0 100644
--- a/app/code/Magento/Webapi/Model/Soap/Server.php
+++ b/app/code/Magento/Webapi/Model/Soap/Server.php
@@ -44,7 +44,7 @@ class Server
protected $_request;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -70,7 +70,7 @@ class Server
* @param \Magento\Framework\Config\ScopeInterface $configScope
* @param \Magento\Webapi\Controller\Soap\Request $request
* @param \Magento\Framework\DomDocument\Factory $domDocumentFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Webapi\Model\Soap\Server\Factory $soapServerFactory
* @param \Magento\Framework\Reflection\TypeProcessor $typeProcessor
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
@@ -81,7 +81,7 @@ public function __construct(
\Magento\Framework\Config\ScopeInterface $configScope,
\Magento\Webapi\Controller\Soap\Request $request,
\Magento\Framework\DomDocument\Factory $domDocumentFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Webapi\Model\Soap\Server\Factory $soapServerFactory,
\Magento\Framework\Reflection\TypeProcessor $typeProcessor,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
@@ -104,7 +104,7 @@ public function __construct(
/** Enable or disable SOAP extension WSDL cache depending on Magento configuration. */
$wsdlCacheEnabled = $this->_scopeConfig->isSetFlag(
self::CONFIG_PATH_WSDL_CACHE_ENABLED,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
if ($wsdlCacheEnabled) {
ini_set('soap.wsdl_cache_enabled', '1');
@@ -136,7 +136,7 @@ public function getApiCharset()
{
$charset = $this->_scopeConfig->getValue(
self::CONFIG_PATH_SOAP_CHARSET,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
return $charset ? $charset : self::SOAP_DEFAULT_ENCODING;
}
diff --git a/app/code/Magento/Webapi/Model/Soap/Wsdl/Generator.php b/app/code/Magento/Webapi/Model/Soap/Wsdl/Generator.php
index 53788ac0df13f..7ac161b8213b6 100644
--- a/app/code/Magento/Webapi/Model/Soap/Wsdl/Generator.php
+++ b/app/code/Magento/Webapi/Model/Soap/Wsdl/Generator.php
@@ -44,7 +44,7 @@ class Generator
protected $_registeredTypes = [];
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $storeManager;
@@ -55,14 +55,14 @@ class Generator
* @param Factory $wsdlFactory
* @param \Magento\Webapi\Model\Cache\Type $cache
* @param \Magento\Framework\Reflection\TypeProcessor $typeProcessor
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
*/
public function __construct(
\Magento\Webapi\Model\Soap\Config $apiConfig,
Factory $wsdlFactory,
\Magento\Webapi\Model\Cache\Type $cache,
\Magento\Framework\Reflection\TypeProcessor $typeProcessor,
- \Magento\Store\Model\StoreManagerInterface $storeManager
+ \Magento\Framework\Store\StoreManagerInterface $storeManager
) {
$this->_apiConfig = $apiConfig;
$this->_wsdlFactory = $wsdlFactory;
diff --git a/app/code/Magento/Weee/Helper/Data.php b/app/code/Magento/Weee/Helper/Data.php
index aa6ac7d19875f..60331dc441fc2 100644
--- a/app/code/Magento/Weee/Helper/Data.php
+++ b/app/code/Magento/Weee/Helper/Data.php
@@ -64,13 +64,13 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
protected $_weeeConfig;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
/**
* @param \Magento\Framework\App\Helper\Context $context
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Weee\Model\Tax $weeeTax
* @param \Magento\Weee\Model\Config $weeeConfig
* @param \Magento\Tax\Helper\Data $taxData
@@ -78,7 +78,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
*/
public function __construct(
\Magento\Framework\App\Helper\Context $context,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Weee\Model\Tax $weeeTax,
\Magento\Weee\Model\Config $weeeConfig,
\Magento\Tax\Helper\Data $taxData,
diff --git a/app/code/Magento/Weee/Model/Attribute/Backend/Weee/Tax.php b/app/code/Magento/Weee/Model/Attribute/Backend/Weee/Tax.php
index 284593f0d3cfd..80f129ee53157 100644
--- a/app/code/Magento/Weee/Model/Attribute/Backend/Weee/Tax.php
+++ b/app/code/Magento/Weee/Model/Attribute/Backend/Weee/Tax.php
@@ -15,7 +15,7 @@ class Tax extends \Magento\Catalog\Model\Product\Attribute\Backend\Price
protected $_attributeTax;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -26,7 +26,7 @@ class Tax extends \Magento\Catalog\Model\Product\Attribute\Backend\Price
/**
* @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Helper\Data $catalogData
* @param \Magento\Framework\App\Config\ScopeConfigInterface $config
* @param \Magento\Directory\Helper\Data $directoryHelper
@@ -34,7 +34,7 @@ class Tax extends \Magento\Catalog\Model\Product\Attribute\Backend\Price
*/
public function __construct(
\Magento\Directory\Model\CurrencyFactory $currencyFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Catalog\Helper\Data $catalogData,
\Magento\Framework\App\Config\ScopeConfigInterface $config,
\Magento\Directory\Helper\Data $directoryHelper,
diff --git a/app/code/Magento/Weee/Model/Config.php b/app/code/Magento/Weee/Model/Config.php
index aebe98ed8d72f..bb29336adea74 100644
--- a/app/code/Magento/Weee/Model/Config.php
+++ b/app/code/Magento/Weee/Model/Config.php
@@ -60,7 +60,7 @@ public function getPriceDisplayType($store = null)
{
return $this->scopeConfig->getValue(
self::XML_PATH_FPT_DISPLAY_PRODUCT_VIEW,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -75,7 +75,7 @@ public function getListPriceDisplayType($store = null)
{
return $this->scopeConfig->getValue(
self::XML_PATH_FPT_DISPLAY_PRODUCT_LIST,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -90,7 +90,7 @@ public function getSalesPriceDisplayType($store = null)
{
return $this->scopeConfig->getValue(
self::XML_PATH_FPT_DISPLAY_SALES,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -105,7 +105,7 @@ public function getEmailPriceDisplayType($store = null)
{
return $this->scopeConfig->getValue(
self::XML_PATH_FPT_DISPLAY_EMAIL,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -120,7 +120,7 @@ public function includeInSubtotal($store = null)
{
return $this->scopeConfig->isSetFlag(
self::XML_PATH_FPT_INCLUDE_IN_SUBTOTAL,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -135,7 +135,7 @@ public function isTaxable($store = null)
{
return $this->scopeConfig->isSetFlag(
self::XML_PATH_FPT_TAXABLE,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -150,7 +150,7 @@ public function isEnabled($store = null)
{
return $this->scopeConfig->getValue(
self::XML_PATH_FPT_ENABLED,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
);
}
diff --git a/app/code/Magento/Weee/Model/Resource/Attribute/Backend/Weee/Tax.php b/app/code/Magento/Weee/Model/Resource/Attribute/Backend/Weee/Tax.php
index ee2d81eaa9ae6..eeae9174af042 100644
--- a/app/code/Magento/Weee/Model/Resource/Attribute/Backend/Weee/Tax.php
+++ b/app/code/Magento/Weee/Model/Resource/Attribute/Backend/Weee/Tax.php
@@ -13,17 +13,17 @@
class Tax extends \Magento\Framework\Model\Resource\Db\AbstractDb
{
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
/**
* @param \Magento\Framework\App\Resource $resource
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
- \Magento\Store\Model\StoreManagerInterface $storeManager
+ \Magento\Framework\Store\StoreManagerInterface $storeManager
) {
$this->_storeManager = $storeManager;
parent::__construct($resource);
diff --git a/app/code/Magento/Weee/Model/Tax.php b/app/code/Magento/Weee/Model/Tax.php
index 7eab12df0722d..0af28c3883985 100644
--- a/app/code/Magento/Weee/Model/Tax.php
+++ b/app/code/Magento/Weee/Model/Tax.php
@@ -54,7 +54,7 @@ class Tax extends \Magento\Framework\Model\AbstractModel
protected $_attributeFactory;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -89,7 +89,7 @@ class Tax extends \Magento\Framework\Model\AbstractModel
* @param \Magento\Framework\Model\Context $context
* @param \Magento\Framework\Registry $registry
* @param \Magento\Eav\Model\Entity\AttributeFactory $attributeFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Tax\Model\CalculationFactory $calculationFactory
* @param \Magento\Customer\Model\Session $customerSession
* @param AccountManagementInterface $accountManagement
@@ -105,7 +105,7 @@ public function __construct(
\Magento\Framework\Model\Context $context,
\Magento\Framework\Registry $registry,
\Magento\Eav\Model\Entity\AttributeFactory $attributeFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Tax\Model\CalculationFactory $calculationFactory,
\Magento\Customer\Model\Session $customerSession,
AccountManagementInterface $accountManagement,
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/Container.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/Container.php
index e6cc436a8790c..1b1d5a6cf68f9 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/Container.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/Container.php
@@ -21,20 +21,20 @@ class Container extends \Magento\Framework\View\Element\Html\Select
protected $_layoutProcessorFactory;
/**
- * @var \Magento\Core\Model\Resource\Theme\CollectionFactory
+ * @var \Magento\Theme\Model\Resource\Theme\CollectionFactory
*/
protected $_themesFactory;
/**
* @param \Magento\Framework\View\Element\Context $context
* @param \Magento\Framework\View\Layout\ProcessorFactory $layoutProcessorFactory
- * @param \Magento\Core\Model\Resource\Theme\CollectionFactory $themesFactory
+ * @param \Magento\Theme\Model\Resource\Theme\CollectionFactory $themesFactory
* @param array $data
*/
public function __construct(
\Magento\Framework\View\Element\Context $context,
\Magento\Framework\View\Layout\ProcessorFactory $layoutProcessorFactory,
- \Magento\Core\Model\Resource\Theme\CollectionFactory $themesFactory,
+ \Magento\Theme\Model\Resource\Theme\CollectionFactory $themesFactory,
array $data = []
) {
$this->_layoutProcessorFactory = $layoutProcessorFactory;
@@ -98,11 +98,11 @@ protected function _beforeToHtml()
* Retrieve theme instance by its identifier
*
* @param int $themeId
- * @return \Magento\Core\Model\Theme|null
+ * @return \Magento\Theme\Model\Theme|null
*/
protected function _getThemeInstance($themeId)
{
- /** @var \Magento\Core\Model\Resource\Theme\Collection $themeCollection */
+ /** @var \Magento\Theme\Model\Resource\Theme\Collection $themeCollection */
$themeCollection = $this->_themesFactory->create();
return $themeCollection->getItemById($themeId);
}
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/DesignAbstraction.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/DesignAbstraction.php
index 0ae5d6b080736..62e01e5cf2d3b 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/DesignAbstraction.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/DesignAbstraction.php
@@ -19,7 +19,7 @@ class DesignAbstraction extends \Magento\Framework\View\Element\Html\Select
protected $_layoutProcessorFactory;
/**
- * @var \Magento\Core\Model\Resource\Theme\CollectionFactory
+ * @var \Magento\Theme\Model\Resource\Theme\CollectionFactory
*/
protected $_themesFactory;
@@ -31,14 +31,14 @@ class DesignAbstraction extends \Magento\Framework\View\Element\Html\Select
/**
* @param \Magento\Framework\View\Element\Context $context
* @param \Magento\Framework\View\Layout\ProcessorFactory $layoutProcessorFactory
- * @param \Magento\Core\Model\Resource\Theme\CollectionFactory $themesFactory
+ * @param \Magento\Theme\Model\Resource\Theme\CollectionFactory $themesFactory
* @param \Magento\Framework\App\State $appState
* @param array $data
*/
public function __construct(
\Magento\Framework\View\Element\Context $context,
\Magento\Framework\View\Layout\ProcessorFactory $layoutProcessorFactory,
- \Magento\Core\Model\Resource\Theme\CollectionFactory $themesFactory,
+ \Magento\Theme\Model\Resource\Theme\CollectionFactory $themesFactory,
\Magento\Framework\App\State $appState,
array $data = []
) {
@@ -71,11 +71,11 @@ protected function _beforeToHtml()
* Retrieve theme instance by its identifier
*
* @param int $themeId
- * @return \Magento\Core\Model\Theme|null
+ * @return \Magento\Theme\Model\Theme|null
*/
protected function _getThemeInstance($themeId)
{
- /** @var \Magento\Core\Model\Resource\Theme\Collection $themeCollection */
+ /** @var \Magento\Theme\Model\Resource\Theme\Collection $themeCollection */
$themeCollection = $this->_themesFactory->create();
return $themeCollection->getItemById($themeId);
}
diff --git a/app/code/Magento/Widget/Model/Resource/Widget/Instance/Options/ThemeId.php b/app/code/Magento/Widget/Model/Resource/Widget/Instance/Options/ThemeId.php
index 41f2fb4463f69..7f06fb9414ac1 100644
--- a/app/code/Magento/Widget/Model/Resource/Widget/Instance/Options/ThemeId.php
+++ b/app/code/Magento/Widget/Model/Resource/Widget/Instance/Options/ThemeId.php
@@ -18,9 +18,9 @@ class ThemeId implements \Magento\Framework\Option\ArrayInterface
protected $_resourceModel;
/**
- * @param \Magento\Core\Model\Resource\Theme\Collection $widgetResourceModel
+ * @param \Magento\Theme\Model\Resource\Theme\Collection $widgetResourceModel
*/
- public function __construct(\Magento\Core\Model\Resource\Theme\Collection $widgetResourceModel)
+ public function __construct(\Magento\Theme\Model\Resource\Theme\Collection $widgetResourceModel)
{
$this->_resourceModel = $widgetResourceModel;
}
diff --git a/app/code/Magento/Widget/Model/Template/Filter.php b/app/code/Magento/Widget/Model/Template/Filter.php
index b22efabc1483b..a4fed3b151e13 100644
--- a/app/code/Magento/Widget/Model/Template/Filter.php
+++ b/app/code/Magento/Widget/Model/Template/Filter.php
@@ -28,7 +28,7 @@ class Filter extends \Magento\Cms\Model\Template\Filter
* @param \Magento\Framework\View\Asset\Repository $assetRepo
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param \Magento\Core\Model\VariableFactory $coreVariableFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\View\LayoutInterface $layout
* @param \Magento\Framework\View\LayoutFactory $layoutFactory
* @param \Magento\Framework\App\State $appState
@@ -44,7 +44,7 @@ public function __construct(
\Magento\Framework\View\Asset\Repository $assetRepo,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
\Magento\Core\Model\VariableFactory $coreVariableFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\View\LayoutInterface $layout,
\Magento\Framework\View\LayoutFactory $layoutFactory,
\Magento\Framework\App\State $appState,
diff --git a/app/code/Magento/Widget/composer.json b/app/code/Magento/Widget/composer.json
index 345e79062cc40..e6db266e52bd7 100644
--- a/app/code/Magento/Widget/composer.json
+++ b/app/code/Magento/Widget/composer.json
@@ -8,6 +8,7 @@
"magento/module-core": "0.42.0-beta5",
"magento/module-backend": "0.42.0-beta5",
"magento/module-catalog": "0.42.0-beta5",
+ "magento/module-theme": "0.42.0-beta5",
"magento/framework": "0.42.0-beta5",
"magento/magento-composer-installer": "*"
},
diff --git a/app/code/Magento/Widget/sql/widget_setup/install-2.0.0.php b/app/code/Magento/Widget/sql/widget_setup/install-2.0.0.php
index ef9dba7090588..3f91b5008df1e 100644
--- a/app/code/Magento/Widget/sql/widget_setup/install-2.0.0.php
+++ b/app/code/Magento/Widget/sql/widget_setup/install-2.0.0.php
@@ -147,9 +147,9 @@
['unsigned' => true, 'nullable' => false, 'default' => '0'],
'Sort order'
)->addForeignKey(
- $installer->getFkName('widget_instance', 'theme_id', 'core_theme', 'theme_id'),
+ $installer->getFkName('widget_instance', 'theme_id', 'theme', 'theme_id'),
'theme_id',
- $installer->getTable('core_theme'),
+ $installer->getTable('theme'),
'theme_id',
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
diff --git a/app/code/Magento/Wishlist/Block/Rss/Link.php b/app/code/Magento/Wishlist/Block/Rss/Link.php
index bc5ae6908cba8..ef711ecfe392a 100644
--- a/app/code/Magento/Wishlist/Block/Rss/Link.php
+++ b/app/code/Magento/Wishlist/Block/Rss/Link.php
@@ -64,7 +64,7 @@ public function isRssAllowed()
{
return $this->_scopeConfig->isSetFlag(
'rss/wishlist/active',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
}
diff --git a/app/code/Magento/Wishlist/Controller/Index/Send.php b/app/code/Magento/Wishlist/Controller/Index/Send.php
index c989d815bda47..3eea28afb56dc 100644
--- a/app/code/Magento/Wishlist/Controller/Index/Send.php
+++ b/app/code/Magento/Wishlist/Controller/Index/Send.php
@@ -155,12 +155,12 @@ public function execute()
try {
$scopeConfig = $this->_objectManager->get('Magento\Framework\App\Config\ScopeConfigInterface');
- $storeManager = $this->_objectManager->get('Magento\Store\Model\StoreManagerInterface');
+ $storeManager = $this->_objectManager->get('Magento\Framework\Store\StoreManagerInterface');
foreach ($emails as $email) {
$transport = $this->_transportBuilder->setTemplateIdentifier(
$scopeConfig->getValue(
'wishlist/email/email_template',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)
)->setTemplateOptions(
[
@@ -181,7 +181,7 @@ public function execute()
)->setFrom(
$scopeConfig->getValue(
'wishlist/email/email_identity',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)
)->addTo(
$email
diff --git a/app/code/Magento/Wishlist/Helper/Data.php b/app/code/Magento/Wishlist/Helper/Data.php
index 2eed816763a18..1179efbb00e6f 100644
--- a/app/code/Magento/Wishlist/Helper/Data.php
+++ b/app/code/Magento/Wishlist/Helper/Data.php
@@ -78,7 +78,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
protected $_wishlistFactory;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -103,7 +103,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param \Magento\Customer\Model\Session $customerSession
* @param \Magento\Wishlist\Model\WishlistFactory $wishlistFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Core\Helper\PostData $postDataHelper
* @param \Magento\Customer\Helper\View $customerViewHelper
* @param WishlistProviderInterface $wishlistProvider
@@ -114,7 +114,7 @@ public function __construct(
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
\Magento\Customer\Model\Session $customerSession,
\Magento\Wishlist\Model\WishlistFactory $wishlistFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Core\Helper\PostData $postDataHelper,
\Magento\Customer\Helper\View $customerViewHelper,
WishlistProviderInterface $wishlistProvider
@@ -202,13 +202,13 @@ public function getItemCount()
$storedDisplayType = $this->_customerSession->getWishlistDisplayType();
$currentDisplayType = $this->_scopeConfig->getValue(
self::XML_PATH_WISHLIST_LINK_USE_QTY,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
$storedDisplayOutOfStockProducts = $this->_customerSession->getDisplayOutOfStockProducts();
$currentDisplayOutOfStockProducts = $this->_scopeConfig->getValue(
self::XML_PATH_CATALOGINVENTORY_SHOW_OUT_OF_STOCK,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
if (!$this->_customerSession->hasWishlistItemCount() ||
$currentDisplayType != $storedDisplayType ||
@@ -424,7 +424,7 @@ public function isAllow()
{
if ($this->_moduleManager->isOutputEnabled($this->_getModuleName()) && $this->_scopeConfig->getValue(
'wishlist/general/active',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)
) {
return true;
@@ -507,7 +507,7 @@ public function calculate()
$collection = $this->getWishlistItemCollection()->setInStockFilter(true);
if ($this->_scopeConfig->getValue(
self::XML_PATH_WISHLIST_LINK_USE_QTY,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)
) {
$count = $collection->getItemsQty();
@@ -517,13 +517,13 @@ public function calculate()
$this->_customerSession->setWishlistDisplayType(
$this->_scopeConfig->getValue(
self::XML_PATH_WISHLIST_LINK_USE_QTY,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)
);
$this->_customerSession->setDisplayOutOfStockProducts(
$this->_scopeConfig->getValue(
self::XML_PATH_CATALOGINVENTORY_SHOW_OUT_OF_STOCK,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)
);
}
@@ -541,7 +541,7 @@ public function isDisplayQty()
{
return $this->_scopeConfig->getValue(
self::XML_PATH_WISHLIST_LINK_USE_QTY,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
}
}
diff --git a/app/code/Magento/Wishlist/Helper/Rss.php b/app/code/Magento/Wishlist/Helper/Rss.php
index 5cfee1dc5f205..f39b959ca9554 100644
--- a/app/code/Magento/Wishlist/Helper/Rss.php
+++ b/app/code/Magento/Wishlist/Helper/Rss.php
@@ -32,7 +32,7 @@ class Rss extends \Magento\Wishlist\Helper\Data
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param \Magento\Customer\Model\Session $customerSession
* @param \Magento\Wishlist\Model\WishlistFactory $wishlistFactory
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Core\Helper\PostData $postDataHelper
* @param \Magento\Customer\Helper\View $customerViewHelper
* @param \Magento\Wishlist\Controller\WishlistProviderInterface $wishlistProvider
@@ -46,7 +46,7 @@ public function __construct(
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
\Magento\Customer\Model\Session $customerSession,
\Magento\Wishlist\Model\WishlistFactory $wishlistFactory,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Core\Helper\PostData $postDataHelper,
\Magento\Customer\Helper\View $customerViewHelper,
\Magento\Wishlist\Controller\WishlistProviderInterface $wishlistProvider,
@@ -120,6 +120,9 @@ public function getCustomer()
public function isRssAllow()
{
return $this->_moduleManager->isEnabled('Magento_Rss')
- && $this->_scopeConfig->isSetFlag('rss/wishlist/active', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+ && $this->_scopeConfig->isSetFlag(
+ 'rss/wishlist/active',
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ );
}
}
diff --git a/app/code/Magento/Wishlist/Model/Config.php b/app/code/Magento/Wishlist/Model/Config.php
index de0e315021c11..a8789a30d62db 100644
--- a/app/code/Magento/Wishlist/Model/Config.php
+++ b/app/code/Magento/Wishlist/Model/Config.php
@@ -44,11 +44,11 @@ public function __construct(
) {
$emailLimitInConfig = (int)$scopeConfig->getValue(
self::XML_PATH_SHARING_EMAIL_LIMIT,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
$textLimitInConfig = (int)$scopeConfig->getValue(
self::XML_PATH_SHARING_TEXT_LIMIT,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
$this->_sharingEmailLimit = $emailLimitInConfig ?: self::SHARING_EMAIL_LIMIT;
$this->_sharignTextLimit = $textLimitInConfig ?: self::SHARING_TEXT_LIMIT;
diff --git a/app/code/Magento/Wishlist/Model/Item.php b/app/code/Magento/Wishlist/Model/Item.php
index 314afecc70465..33fb1733c7c20 100644
--- a/app/code/Magento/Wishlist/Model/Item.php
+++ b/app/code/Magento/Wishlist/Model/Item.php
@@ -89,7 +89,7 @@ class Item extends AbstractModel implements ItemInterface
protected $_flagOptionsSaved = null;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -126,7 +126,7 @@ class Item extends AbstractModel implements ItemInterface
/**
* @param \Magento\Framework\Model\Context $context
* @param \Magento\Framework\Registry $registry
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\Stdlib\DateTime\DateTime $date
* @param \Magento\Catalog\Model\Resource\Url $catalogUrl
* @param OptionFactory $wishlistOptFactory
@@ -141,7 +141,7 @@ class Item extends AbstractModel implements ItemInterface
public function __construct(
\Magento\Framework\Model\Context $context,
\Magento\Framework\Registry $registry,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\Stdlib\DateTime\DateTime $date,
\Magento\Catalog\Model\Resource\Url $catalogUrl,
OptionFactory $wishlistOptFactory,
diff --git a/app/code/Magento/Wishlist/Model/Resource/Item/Collection.php b/app/code/Magento/Wishlist/Model/Resource/Item/Collection.php
index 847f86a83e759..c92ca61a4a9c4 100644
--- a/app/code/Magento/Wishlist/Model/Resource/Item/Collection.php
+++ b/app/code/Magento/Wishlist/Model/Resource/Item/Collection.php
@@ -83,7 +83,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
protected $stockConfiguration = null;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -133,13 +133,13 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
protected $_appState;
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\CatalogInventory\Api\StockConfigurationInterface $stockConfiguration
* @param \Magento\Sales\Helper\Admin $adminhtmlSales
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\Stdlib\DateTime\DateTime $date
* @param \Magento\Wishlist\Model\Config $wishlistConfig
* @param \Magento\Catalog\Model\Product\Visibility $productVisibility
@@ -155,13 +155,13 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\CatalogInventory\Api\StockConfigurationInterface $stockConfiguration,
\Magento\Sales\Helper\Admin $adminhtmlSales,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\Stdlib\DateTime\DateTime $date,
\Magento\Wishlist\Model\Config $wishlistConfig,
\Magento\Catalog\Model\Product\Visibility $productVisibility,
diff --git a/app/code/Magento/Wishlist/Model/Resource/Item/Collection/Grid.php b/app/code/Magento/Wishlist/Model/Resource/Item/Collection/Grid.php
index d9bad91899272..41cf27e9b5bf1 100644
--- a/app/code/Magento/Wishlist/Model/Resource/Item/Collection/Grid.php
+++ b/app/code/Magento/Wishlist/Model/Resource/Item/Collection/Grid.php
@@ -22,13 +22,13 @@ class Grid extends \Magento\Wishlist\Model\Resource\Item\Collection
protected $_registryManager;
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\CatalogInventory\Api\StockConfigurationInterface $stockConfiguration
* @param \Magento\Sales\Helper\Admin $adminhtmlSales
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\Stdlib\DateTime\DateTime $date
* @param \Magento\Wishlist\Model\Config $wishlistConfig
* @param \Magento\Catalog\Model\Product\Visibility $productVisibility
@@ -45,13 +45,13 @@ class Grid extends \Magento\Wishlist\Model\Resource\Item\Collection
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\CatalogInventory\Api\StockConfigurationInterface $stockConfiguration,
\Magento\Sales\Helper\Admin $adminhtmlSales,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\Stdlib\DateTime\DateTime $date,
\Magento\Wishlist\Model\Config $wishlistConfig,
\Magento\Catalog\Model\Product\Visibility $productVisibility,
diff --git a/app/code/Magento/Wishlist/Model/Rss/Wishlist.php b/app/code/Magento/Wishlist/Model/Rss/Wishlist.php
index 88f6ab4487f08..a481a648414de 100644
--- a/app/code/Magento/Wishlist/Model/Rss/Wishlist.php
+++ b/app/code/Magento/Wishlist/Model/Rss/Wishlist.php
@@ -116,7 +116,7 @@ public function isAllowed()
{
return (bool)$this->scopeConfig->getValue(
'rss/wishlist/active',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
}
diff --git a/app/code/Magento/Wishlist/Model/Wishlist.php b/app/code/Magento/Wishlist/Model/Wishlist.php
index 45933e31a1a7f..53f1365e38a8e 100644
--- a/app/code/Magento/Wishlist/Model/Wishlist.php
+++ b/app/code/Magento/Wishlist/Model/Wishlist.php
@@ -75,7 +75,7 @@ class Wishlist extends \Magento\Framework\Model\AbstractModel implements \Magent
protected $_catalogProduct;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -126,7 +126,7 @@ class Wishlist extends \Magento\Framework\Model\AbstractModel implements \Magent
* @param \Magento\Wishlist\Helper\Data $wishlistData
* @param ResourceWishlist $resource
* @param Collection $resourceCollection
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\Stdlib\DateTime\DateTime $date
* @param ItemFactory $wishlistItemFactory
* @param CollectionFactory $wishlistCollectionFactory
@@ -145,7 +145,7 @@ public function __construct(
\Magento\Wishlist\Helper\Data $wishlistData,
ResourceWishlist $resource,
Collection $resourceCollection,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\Stdlib\DateTime\DateTime $date,
ItemFactory $wishlistItemFactory,
CollectionFactory $wishlistCollectionFactory,
diff --git a/app/code/Magento/Wishlist/etc/frontend/di.xml b/app/code/Magento/Wishlist/etc/frontend/di.xml
index 29615760932b3..ae0159a6d6181 100644
--- a/app/code/Magento/Wishlist/etc/frontend/di.xml
+++ b/app/code/Magento/Wishlist/etc/frontend/di.xml
@@ -16,7 +16,7 @@
Magento\Wishlist\Model\Session\Storage
-
+
- /wishlist/
diff --git a/app/etc/di.xml b/app/etc/di.xml
index 16a596733f025..f5ddd4fff30c4 100644
--- a/app/etc/di.xml
+++ b/app/etc/di.xml
@@ -20,10 +20,10 @@
-
-
-
-
+
+
+
+
@@ -49,13 +49,13 @@
-
+
-
-
-
+
+
+
@@ -64,7 +64,7 @@
-
+
@@ -72,7 +72,7 @@
-
+
@@ -200,7 +200,7 @@
-
+
Magento\Store\Model\StoreManager\Proxy
@@ -346,12 +346,12 @@
blockRenderPool
- Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ Magento\Framework\Store\ScopeInterface::SCOPE_STORE
- Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ Magento\Framework\Store\ScopeInterface::SCOPE_STORE
diff --git a/composer.json b/composer.json
index 335239646a243..e843bf5312375 100644
--- a/composer.json
+++ b/composer.json
@@ -79,6 +79,7 @@
"magento/module-customer": "self.version",
"magento/module-customer-import-export": "self.version",
"magento/module-design-editor": "self.version",
+ "magento/module-developer": "self.version",
"magento/module-dhl": "self.version",
"magento/module-directory": "self.version",
"magento/module-downloadable": "self.version",
diff --git a/composer.lock b/composer.lock
index 468bb76ee6930..ebcaf425145bf 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "hash": "bf5c9bfea7230f2f1647df81ce568d5c",
+ "hash": "765ea6c5792e7a59ec10377e9741ca56",
"packages": [
{
"name": "composer/composer",
@@ -1821,16 +1821,16 @@
},
{
"name": "fabpot/php-cs-fixer",
- "version": "v1.4",
+ "version": "v1.4.1",
"source": {
"type": "git",
"url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
- "reference": "72a8c34210c0fbd8caa007fccea87a59f6f0a4d3"
+ "reference": "fecd7041b663796ef84c3c22361ec216a6a0e740"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/72a8c34210c0fbd8caa007fccea87a59f6f0a4d3",
- "reference": "72a8c34210c0fbd8caa007fccea87a59f6f0a4d3",
+ "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/fecd7041b663796ef84c3c22361ec216a6a0e740",
+ "reference": "fecd7041b663796ef84c3c22361ec216a6a0e740",
"shasum": ""
},
"require": {
@@ -1870,7 +1870,7 @@
}
],
"description": "A script to automatically fix Symfony Coding Standard",
- "time": "2015-01-12 21:28:53"
+ "time": "2015-01-27 18:37:20"
},
{
"name": "league/climate",
@@ -3219,7 +3219,6 @@
"phpmd/phpmd": 0
},
"prefer-stable": false,
- "prefer-lowest": false,
"platform": {
"php": "~5.4.11|~5.5.0|~5.6.0"
},
diff --git a/dev/tests/api-functional/framework/Magento/TestFramework/Authentication/Rest/OauthClient.php b/dev/tests/api-functional/framework/Magento/TestFramework/Authentication/Rest/OauthClient.php
index ae4604fd1c322..4923269ead4cd 100644
--- a/dev/tests/api-functional/framework/Magento/TestFramework/Authentication/Rest/OauthClient.php
+++ b/dev/tests/api-functional/framework/Magento/TestFramework/Authentication/Rest/OauthClient.php
@@ -83,7 +83,7 @@ public function getAccessTokenEndpoint()
*/
public function getTestApiEndpoint()
{
- $defaultStoreCode = Bootstrap::getObjectManager()->get('Magento\Store\Model\StoreManagerInterface')
+ $defaultStoreCode = Bootstrap::getObjectManager()->get('Magento\Framework\Store\StoreManagerInterface')
->getStore()->getCode();
return new Uri(TESTS_BASE_URL . '/rest/' . $defaultStoreCode . '/V1/testmodule1');
}
diff --git a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/Webapi/Adapter/Rest.php b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/Webapi/Adapter/Rest.php
index 7488f42ae0674..d645edf62d111 100644
--- a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/Webapi/Adapter/Rest.php
+++ b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/Webapi/Adapter/Rest.php
@@ -53,7 +53,7 @@ public function __construct()
'Magento\TestFramework\TestCase\Webapi\Adapter\Rest\DocumentationGenerator'
);
$this->defaultStoreCode = Bootstrap::getObjectManager()
- ->get('Magento\Store\Model\StoreManagerInterface')
+ ->get('Magento\Framework\Store\StoreManagerInterface')
->getStore()
->getCode();
}
diff --git a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/Webapi/Adapter/Soap.php b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/Webapi/Adapter/Soap.php
index d2055f96d98a0..c219a84439f0c 100644
--- a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/Webapi/Adapter/Soap.php
+++ b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/Webapi/Adapter/Soap.php
@@ -127,10 +127,13 @@ public function generateWsdlUrl($services, $storeCode = null)
/** Sort list of services to avoid having different WSDL URLs for the identical lists of services. */
//TODO: This may change since same resource of multiple versions may be allowed after namespace changes
ksort($services);
- /** @var \Magento\Store\Model\StoreManagerInterface $storeManager */
+ /** @var \Magento\Framework\Store\StoreManagerInterface $storeManager */
$storeCode = !is_null($storeCode)
? (string)$storeCode
- : Bootstrap::getObjectManager()->get('Magento\Store\Model\StoreManagerInterface')->getStore()->getCode();
+ : Bootstrap::getObjectManager()
+ ->get('Magento\Framework\Store\StoreManagerInterface')
+ ->getStore()
+ ->getCode();
/** TESTS_BASE_URL is initialized in PHPUnit configuration */
$wsdlUrl = rtrim(TESTS_BASE_URL, '/') . self::WSDL_BASE_PATH . '/' . $storeCode . '?wsdl=1&services=';
diff --git a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/WebapiAbstract.php b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/WebapiAbstract.php
index 50cd00f7497f0..f62e6944d5075 100644
--- a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/WebapiAbstract.php
+++ b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/WebapiAbstract.php
@@ -490,7 +490,7 @@ protected function _updateAppConfig(
if ($cleanAppCache) {
if ($updateLocalConfig) {
$objectManager->get('Magento\Framework\App\Config\ReinitableConfigInterface')->reinit();
- $objectManager->get('Magento\Store\Model\StoreManagerInterface')->reinitStores();
+ $objectManager->get('Magento\Framework\Store\StoreManagerInterface')->reinitStores();
}
if (!$this->_cleanAppConfigCache()) {
diff --git a/dev/tests/api-functional/testsuite/Magento/Webapi/WsdlGenerationFromDataObjectTest.php b/dev/tests/api-functional/testsuite/Magento/Webapi/WsdlGenerationFromDataObjectTest.php
index aedba2b6b9448..611d08e922dc0 100644
--- a/dev/tests/api-functional/testsuite/Magento/Webapi/WsdlGenerationFromDataObjectTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Webapi/WsdlGenerationFromDataObjectTest.php
@@ -27,7 +27,7 @@ class WsdlGenerationFromDataObjectTest extends \Magento\TestFramework\TestCase\W
protected function setUp()
{
$this->_markTestAsSoapOnly("WSDL generation tests are intended to be executed for SOAP adapter only.");
- $this->_storeCode = Bootstrap::getObjectManager()->get('Magento\Store\Model\StoreManagerInterface')
+ $this->_storeCode = Bootstrap::getObjectManager()->get('Magento\Framework\Store\StoreManagerInterface')
->getStore()->getCode();
$this->_soapUrl = "{$this->_baseUrl}/soap/{$this->_storeCode}?services=testModule5AllSoapAndRestV1%2CtestModule5AllSoapAndRestV2";
parent::setUp();
diff --git a/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Repository/TableCollection.php b/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Repository/TableCollection.php
index 9c4ed81e91f72..97c04925d2f70 100644
--- a/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Repository/TableCollection.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Repository/TableCollection.php
@@ -21,7 +21,7 @@ class TableCollection extends AbstractCollection
/**
* @constructor
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -30,7 +30,7 @@ class TableCollection extends AbstractCollection
* @param array $fixture
*/
public function __construct(
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Annotation/ConfigFixture.php b/dev/tests/integration/framework/Magento/TestFramework/Annotation/ConfigFixture.php
index 9854602a507fc..f64460972aaca 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Annotation/ConfigFixture.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Annotation/ConfigFixture.php
@@ -48,7 +48,7 @@ protected function _getConfigValue($configPath, $scopeCode = null)
$scopeConfig = $objectManager->get('Magento\Framework\App\Config\ScopeConfigInterface');
$result = $scopeConfig->getValue(
$configPath,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$scopeCode
);
}
@@ -82,7 +82,7 @@ protected function _setConfigValue($configPath, $value, $storeCode = false)
)->setValue(
$configPath,
$value,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$storeCode
);
}
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Helper/Eav.php b/dev/tests/integration/framework/Magento/TestFramework/Helper/Eav.php
index 6cb6d83f78dc9..68171fa53f9db 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Helper/Eav.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Helper/Eav.php
@@ -18,7 +18,7 @@ class Eav
public static function setIncrementIdPrefix($entityType, $prefix)
{
$website = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->getWebsite();
$storeId = $website->getDefaultStore()->getId();
$entityTypeModel = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
diff --git a/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractIntegrity.php b/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractIntegrity.php
index a2db86ab7f45d..d498f186f0504 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractIntegrity.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractIntegrity.php
@@ -55,14 +55,14 @@ protected function _isFileForDisabledModule($file)
/**
* Returns flat array of themes currently located in system
*
- * @return \Magento\Core\Model\Theme[]
+ * @return \Magento\Theme\Model\Theme[]
*/
protected function _getDesignThemes()
{
$themeItems = [];
- /** @var $themeCollection \Magento\Core\Model\Theme\Collection */
+ /** @var $themeCollection \Magento\Theme\Model\Theme\Collection */
$themeCollection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
- 'Magento\Core\Model\Resource\Theme\Collection'
+ 'Magento\Theme\Model\Resource\Theme\Collection'
);
/** @var $theme \Magento\Framework\View\Design\ThemeInterface */
foreach ($themeCollection as $theme) {
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Block/_files/backend_theme.php b/dev/tests/integration/testsuite/Magento/Backend/Block/_files/backend_theme.php
index 646f6c2228d73..57dd7ae149107 100644
--- a/dev/tests/integration/testsuite/Magento/Backend/Block/_files/backend_theme.php
+++ b/dev/tests/integration/testsuite/Magento/Backend/Block/_files/backend_theme.php
@@ -3,10 +3,10 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-/** @var $registration \Magento\Core\Model\Theme\Registration */
+/** @var $registration \Magento\Theme\Model\Theme\Registration */
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Framework\App\AreaList')
->getArea(\Magento\Backend\App\Area\FrontNameResolver::AREA_CODE)
->load(\Magento\Framework\App\Area::PART_CONFIG);
$registration = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
- ->create('Magento\Core\Model\Theme\Registration');
+ ->create('Magento\Theme\Model\Theme\Registration');
$registration->register('*/*/theme.xml');
diff --git a/dev/tests/integration/testsuite/Magento/Captcha/Model/ObserverTest.php b/dev/tests/integration/testsuite/Magento/Captcha/Model/ObserverTest.php
index 49526b16b0fb2..a48dbc77a7f1e 100644
--- a/dev/tests/integration/testsuite/Magento/Captcha/Model/ObserverTest.php
+++ b/dev/tests/integration/testsuite/Magento/Captcha/Model/ObserverTest.php
@@ -46,7 +46,7 @@ public function testBackendLoginActionWithInvalidCaptchaReturnsError()
public function testCaptchaIsRequiredAfterFailedLoginAttempts()
{
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->setCurrentStore(
0
);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/NewTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/NewTest.php
index 0801e8bccbcda..d5a5a01937fcd 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/NewTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/NewTest.php
@@ -54,7 +54,7 @@ public function testGetCacheKeyInfo()
$this->assertSame(1, array_shift($keys));
$this->assertEquals(
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->getStore()->getId(),
$info[1]
);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Helper/DataTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Helper/DataTest.php
index 4c5970e3506b1..222e942923088 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Helper/DataTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Helper/DataTest.php
@@ -5,11 +5,14 @@
*/
namespace Magento\Catalog\Helper;
-use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\Store\ScopeInterface;
use Magento\Tax\Model\ClassModel;
use Magento\Tax\Model\Config;
use Magento\Tax\Model\TaxRuleFixtureFactory;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class DataTest extends \PHPUnit_Framework_TestCase
{
/**
@@ -201,7 +204,7 @@ public function testIsUsingStaticUrlsAllowed()
$this->assertTrue($this->helper->isUsingStaticUrlsAllowed());
$this->helper->setStoreId(
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->getStore()->getId()
);
$this->assertTrue($this->helper->isUsingStaticUrlsAllowed());
@@ -222,7 +225,7 @@ public function testIsUrlDirectivesParsingAllowed()
$this->assertFalse($this->helper->isUrlDirectivesParsingAllowed());
$this->helper->setStoreId(
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->getStore()->getId()
);
$this->assertFalse($this->helper->isUrlDirectivesParsingAllowed());
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Helper/ImageTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Helper/ImageTest.php
index 8c73b9779c883..b311d6d29cd22 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Helper/ImageTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Helper/ImageTest.php
@@ -47,7 +47,7 @@ public static function setUpBeforeClass()
// watermark fixture
mkdir(
$fixtureMediaDir . '/watermark/stores/' . $objectManager->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->getStore()->getId(),
0777,
true
@@ -55,7 +55,7 @@ public static function setUpBeforeClass()
copy(
"{$fixtureDir}/watermark.jpg",
$fixtureMediaDir . '/watermark/stores/' . $objectManager->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->getStore()->getId() . '/watermark.jpg'
);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/AbstractTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/AbstractTest.php
index b45e05df43559..012c01e5233c5 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/AbstractTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/AbstractTest.php
@@ -137,7 +137,7 @@ public function testGetStore()
$this->assertSame(
$store,
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->getStore()
);
}
@@ -146,7 +146,7 @@ public function testGetWebsiteStoreIds()
{
$ids = $this->_model->getWebsiteStoreIds();
$storeId = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->getStore()->getId();
$this->assertEquals([$storeId => $storeId], $ids);
}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Category/CategoryImageTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Category/CategoryImageTest.php
index c5fb702940342..fce29e9ddddf6 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Category/CategoryImageTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Category/CategoryImageTest.php
@@ -29,12 +29,12 @@ class CategoryImageTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
$this->_oldLogActive = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->getStore()->getConfig(
'dev/log/active'
);
$this->_oldExceptionFile = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->getStore()->getConfig(
'dev/log/exception_file'
);
@@ -47,7 +47,7 @@ protected function tearDown()
)->setValue(
'dev/log/active',
$this->_oldLogActive,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
$this->_oldLogActive = null;
@@ -57,7 +57,7 @@ protected function tearDown()
)->setValue(
'dev/log/exception_file',
$this->_oldExceptionFile,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
$this->_oldExceptionFile = null;
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Category/CategoryImageTest/StubZendLogWriterStream.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Category/CategoryImageTest/StubZendLogWriterStream.php
index 667241e2d64f0..6780850add530 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Category/CategoryImageTest/StubZendLogWriterStream.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Category/CategoryImageTest/StubZendLogWriterStream.php
@@ -10,7 +10,7 @@
)->setValue(
'dev/log/active',
1,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
@@ -18,7 +18,7 @@
)->setValue(
'dev/log/exception_file',
'save_category_without_image.log',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
class StubZendLogWriterStream extends \Zend_Log_Writer_Stream
{
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/CategoryTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/CategoryTest.php
index 72a723413d214..42f25fa8110aa 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/CategoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/CategoryTest.php
@@ -27,8 +27,8 @@ class CategoryTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
- /** @var $storeManager \Magento\Store\Model\StoreManagerInterface */
- $storeManager = $objectManager->get('Magento\Store\Model\StoreManagerInterface');
+ /** @var $storeManager \Magento\Framework\Store\StoreManagerInterface */
+ $storeManager = $objectManager->get('Magento\Framework\Store\StoreManagerInterface');
$this->_store = $storeManager->getStore();
$this->_model = $objectManager->create('Magento\Catalog\Model\Category');
}
@@ -96,7 +96,7 @@ public function testGetStoreIds()
/* id from fixture */
$this->assertContains(
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->getStore()->getId(),
$this->_model->getStoreIds()
);
@@ -106,7 +106,7 @@ public function testSetGetStoreId()
{
$this->assertEquals(
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->getStore()->getId(),
$this->_model->getStoreId()
);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/DesignTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/DesignTest.php
index e3ad6077d6ec3..dd289bde153b4 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/DesignTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/DesignTest.php
@@ -37,7 +37,7 @@ public function testApplyCustomDesign($theme)
}
/**
- * @return \Magento\Core\Model\Theme
+ * @return \Magento\Theme\Model\Theme
*/
public function getThemeModel()
{
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/CategoryTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/CategoryTest.php
index e9fed1bf4d723..0f06fae7c13e7 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/CategoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/CategoryTest.php
@@ -150,7 +150,7 @@ public function testGetCurrentStore()
{
$this->assertSame(
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->getStore(),
$this->_model->getCurrentStore()
);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/PriceTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/PriceTest.php
index 7b46196b1238b..20cb539091c77 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/PriceTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/PriceTest.php
@@ -79,7 +79,7 @@ public function testAfterSave()
$product->getId(),
$this->_model->getAttribute()->getId(),
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->getStore()->getId()
)
);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/TierpriceTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/TierpriceTest.php
index 231b6fc7c3cf9..026dd9dac902e 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/TierpriceTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/TierpriceTest.php
@@ -141,10 +141,10 @@ public function testAfterSave()
public function testAfterSaveEmpty()
{
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->setCurrentStore(
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->getStore(
\Magento\Store\Model\Store::DEFAULT_STORE_ID
)
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductExternalTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductExternalTest.php
index 197d9efa5595f..29b25636b3107 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductExternalTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductExternalTest.php
@@ -31,7 +31,7 @@ public function testGetStoreId()
{
$this->assertEquals(
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->getStore()->getId(),
$this->_model->getStoreId()
);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductTest.php
index db9cfaa872bda..62e2ae63f8cba 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductTest.php
@@ -202,7 +202,7 @@ public function testDuplicateSkuGeneration()
protected function _undo($duplicate)
{
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->getStore()->setId(
\Magento\Store\Model\Store::DEFAULT_STORE_ID
);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/controllers/_files/products.php b/dev/tests/integration/testsuite/Magento/Catalog/controllers/_files/products.php
index ab28f1432590a..60d88b22736c9 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/controllers/_files/products.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/controllers/_files/products.php
@@ -28,7 +28,7 @@
)->setAttributeSetId(
4
)->setWebsiteIds(
- [$obectManager->get('Magento\Store\Model\StoreManagerInterface')->getStore()->getWebsiteId()]
+ [$obectManager->get('Magento\Framework\Store\StoreManagerInterface')->getStore()->getWebsiteId()]
)->setSku(
'simple_product_1'
)->setName(
@@ -69,7 +69,7 @@
)->setAttributeSetId(
4
)->setWebsiteIds(
- [$obectManager->get('Magento\Store\Model\StoreManagerInterface')->getStore()->getWebsiteId()]
+ [$obectManager->get('Magento\Framework\Store\StoreManagerInterface')->getStore()->getWebsiteId()]
)->setSku(
'simple_product_2'
)->setName(
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
index 6c0af79022f84..daab88995bb84 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
@@ -809,7 +809,7 @@ public function testProductsWithMultipleStores()
$product->load($id);
$this->assertEquals('1', $product->getHasOptions());
- $objectManager->get('Magento\Store\Model\StoreManagerInterface')->setCurrentStore('fixturestore');
+ $objectManager->get('Magento\Framework\Store\StoreManagerInterface')->setCurrentStore('fixturestore');
/** @var \Magento\Catalog\Model\Product $simpleProduct */
$simpleProduct = $objectManager->create('Magento\Catalog\Model\Product');
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/discount_10percent.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/discount_10percent.php
index cd139fa8b271c..aec9d9c02d152 100644
--- a/dev/tests/integration/testsuite/Magento/Checkout/_files/discount_10percent.php
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/discount_10percent.php
@@ -14,7 +14,7 @@
'is_active' => true,
'website_ids' => [
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->getStore()->getWebsiteId()
],
'customer_group_ids' => [\Magento\Customer\Model\GroupManagement::NOT_LOGGED_IN_ID],
diff --git a/dev/tests/integration/testsuite/Magento/Cms/Controller/RouterTest.php b/dev/tests/integration/testsuite/Magento/Cms/Controller/RouterTest.php
index 69e7ee649b9a3..687923eb5a46a 100644
--- a/dev/tests/integration/testsuite/Magento/Cms/Controller/RouterTest.php
+++ b/dev/tests/integration/testsuite/Magento/Cms/Controller/RouterTest.php
@@ -29,10 +29,10 @@ protected function setUp()
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Framework\UrlInterface'),
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Cms\Model\PageFactory'),
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
),
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)
);
}
diff --git a/dev/tests/integration/testsuite/Magento/Cms/_files/block.php b/dev/tests/integration/testsuite/Magento/Cms/_files/block.php
index bd641ff387ff8..b5a791a7bd740 100644
--- a/dev/tests/integration/testsuite/Magento/Cms/_files/block.php
+++ b/dev/tests/integration/testsuite/Magento/Cms/_files/block.php
@@ -21,7 +21,7 @@
)->setStores(
[
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->getStore()->getId()
]
)->save();
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/Resource/Layout/UpdateTest.php b/dev/tests/integration/testsuite/Magento/Core/Model/Resource/Layout/UpdateTest.php
index 116a065ef7525..487a1dd895b05 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/Resource/Layout/UpdateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Core/Model/Resource/Layout/UpdateTest.php
@@ -33,7 +33,7 @@ public function testFetchUpdatesByHandle()
'test_handle',
$theme,
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->getStore()
);
$this->assertEquals('not_temporary', $result);
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/cache_test_theme/layout_test_handle.xml b/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/cache_test_theme/layout_test_handle.xml
deleted file mode 100644
index 471811f57e840..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/cache_test_theme/layout_test_handle.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
- Text declared in the frontend/test/cache_test_theme
-
-
-
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/test_theme/layout_test_handle.xml b/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/test_theme/layout_test_handle.xml
deleted file mode 100644
index bf6a4d41c47d9..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/test_theme/layout_test_handle.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
- Text declared in the frontend/test/test_theme
-
-
-
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/var/log/exception.log b/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/var/log/exception.log
deleted file mode 100644
index e69de29bb2d1d..0000000000000
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/var/log/system.log b/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/var/log/system.log
deleted file mode 100644
index e69de29bb2d1d..0000000000000
diff --git a/dev/tests/integration/testsuite/Magento/Core/_files/second_third_store.php b/dev/tests/integration/testsuite/Magento/Core/_files/second_third_store.php
index c8702a0756932..385f755a67e2f 100644
--- a/dev/tests/integration/testsuite/Magento/Core/_files/second_third_store.php
+++ b/dev/tests/integration/testsuite/Magento/Core/_files/second_third_store.php
@@ -30,5 +30,5 @@
/* Refresh stores memory cache */
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->reinitStores();
diff --git a/dev/tests/integration/testsuite/Magento/Core/_files/store.php b/dev/tests/integration/testsuite/Magento/Core/_files/store.php
index dcb4f52e6722d..eb7df4f2fdaa2 100644
--- a/dev/tests/integration/testsuite/Magento/Core/_files/store.php
+++ b/dev/tests/integration/testsuite/Magento/Core/_files/store.php
@@ -8,10 +8,10 @@
$storeCode = 'fixturestore';
if (!$store->load($storeCode)->getId()) {
$websiteId = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->getWebsite()->getId();
$groupId = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->getWebsite()->getDefaultGroupId();
$store->setCode(
$storeCode
@@ -30,6 +30,6 @@
/* Refresh stores memory cache */
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->reinitStores();
}
diff --git a/dev/tests/integration/testsuite/Magento/CurrencySymbol/Model/System/CurrencysymbolTest.php b/dev/tests/integration/testsuite/Magento/CurrencySymbol/Model/System/CurrencysymbolTest.php
index f4bbd8d197d07..eb6b0856d4ad0 100644
--- a/dev/tests/integration/testsuite/Magento/CurrencySymbol/Model/System/CurrencysymbolTest.php
+++ b/dev/tests/integration/testsuite/Magento/CurrencySymbol/Model/System/CurrencysymbolTest.php
@@ -31,7 +31,7 @@ protected function tearDown()
{
$this->currencySymbolModel = null;
Bootstrap::getObjectManager()->get('Magento\Framework\App\Config\ReinitableConfigInterface')->reinit();
- Bootstrap::getObjectManager()->create('Magento\Store\Model\StoreManagerInterface')->reinitStores();
+ Bootstrap::getObjectManager()->create('Magento\Framework\Store\StoreManagerInterface')->reinitStores();
}
public function testGetCurrencySymbolsData()
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/CartTest.php b/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/CartTest.php
index f7160adb6c3af..425bee97ddaa6 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/CartTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/CartTest.php
@@ -22,7 +22,7 @@ class CartTest extends \PHPUnit_Framework_TestCase
/** @var \Magento\Framework\Registry */
private $_coreRegistry;
- /** @var \Magento\Store\Model\StoreManagerInterface */
+ /** @var \Magento\Framework\Store\StoreManagerInterface */
private $_storeManager;
/** @var Cart */
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/View/PersonalInfoTest.php b/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/View/PersonalInfoTest.php
index e64ecd5349f07..6f368ec09deaa 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/View/PersonalInfoTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/View/PersonalInfoTest.php
@@ -31,7 +31,7 @@ class PersonalInfoTest extends \PHPUnit_Framework_TestCase
/** @var \Magento\Customer\Api\GroupRepositoryInterface */
private $_groupRepository;
- /** @var \Magento\Store\Model\StoreManagerInterface */
+ /** @var \Magento\Framework\Store\StoreManagerInterface */
private $_storeManager;
/** @var \Magento\Framework\ObjectManagerInterface */
@@ -52,7 +52,7 @@ public function setUp()
{
$this->_objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
- $this->_storeManager = $this->_objectManager->get('Magento\Store\Model\StoreManagerInterface');
+ $this->_storeManager = $this->_objectManager->get('Magento\Framework\Store\StoreManagerInterface');
$this->_context = $this->_objectManager->get(
'Magento\Backend\Block\Template\Context',
['storeManager' => $this->_storeManager]
@@ -162,7 +162,7 @@ public function testGetStoreCreateDateTimezone()
->getDefaultTimezonePath();
$timezone = $this->_context->getScopeConfig()->getValue(
$defaultTimeZonePath,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$this->_loadCustomer()->getStoreId()
);
$this->assertEquals($timezone, $this->_block->getStoreCreateDateTimezone());
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/ViewTest.php b/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/ViewTest.php
index e01715aa33c05..5014293855a47 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/ViewTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/ViewTest.php
@@ -29,7 +29,7 @@ class ViewTest extends \PHPUnit_Framework_TestCase
/** @var CustomerRepositoryInterface */
private $_customerRepository;
- /** @var \Magento\Store\Model\StoreManagerInterface */
+ /** @var \Magento\Framework\Store\StoreManagerInterface */
private $_storeManager;
/** @var \Magento\Framework\ObjectManagerInterface */
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/GroupManagementTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/GroupManagementTest.php
index 92b884b1d254d..0f8d9fe72cedd 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Model/GroupManagementTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Model/GroupManagementTest.php
@@ -6,7 +6,7 @@
namespace Magento\Customer\Model;
-use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\Store\ScopeInterface;
use Magento\TestFramework\Helper\Bootstrap;
/**
@@ -45,8 +45,8 @@ public function testGetDefaultGroupWithStoreId($testGroup, $storeId)
* @magentoDataFixture Magento/Core/_files/second_third_store.php
*/
public function testGetDefaultGroupWithNonDefaultStoreId()
- { /** @var \Magento\Store\Model\StoreManagerInterface $storeManager */
- $storeManager = Bootstrap::getObjectManager()->get('Magento\Store\Model\StoreManagerInterface');
+ { /** @var \Magento\Framework\Store\StoreManagerInterface $storeManager */
+ $storeManager = Bootstrap::getObjectManager()->get('Magento\Framework\Store\StoreManagerInterface');
$nonDefaultStore = $storeManager->getStore('secondstore');
$nonDefaultStoreId = $nonDefaultStore->getId();
/** @var \Magento\Framework\App\MutableScopeConfig $scopeConfig */
@@ -54,7 +54,7 @@ public function testGetDefaultGroupWithNonDefaultStoreId()
$scopeConfig->setValue(
\Magento\Customer\Model\GroupManagement::XML_PATH_DEFAULT_ID,
2,
- ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
'secondstore'
);
$testGroup = ['id' => 2, 'code' => 'Wholesale', 'tax_class_id' => 3, 'tax_class_name' => 'Retail Customer'];
@@ -111,8 +111,8 @@ public function testGetAllGroup()
*/
public function getDefaultGroupDataProvider()
{
- /** @var \Magento\Store\Model\StoreManagerInterface $storeManager */
- $storeManager = Bootstrap::getObjectManager()->get('Magento\Store\Model\StoreManagerInterface');
+ /** @var \Magento\Framework\Store\StoreManagerInterface $storeManager */
+ $storeManager = Bootstrap::getObjectManager()->get('Magento\Framework\Store\StoreManagerInterface');
$defaultStoreId = $storeManager->getStore()->getId();
return [
'no store id' => [
diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/quote.php b/dev/tests/integration/testsuite/Magento/Customer/_files/quote.php
index d40823b6573ef..7175a2f5c599c 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/_files/quote.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/quote.php
@@ -39,7 +39,7 @@
1
)->setStoreId(
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->getStore()->getId()
)->setReservedOrderId(
'test01'
diff --git a/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Export/AddressTest.php b/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Export/AddressTest.php
index 73012c62e5cfd..baf260103a378 100644
--- a/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Export/AddressTest.php
+++ b/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Export/AddressTest.php
@@ -36,7 +36,7 @@ protected function setUp()
);
$websites = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->getWebsites(
true
);
diff --git a/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Export/CustomerTest.php b/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Export/CustomerTest.php
index 9dac322d762f6..88da061d8948e 100644
--- a/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Export/CustomerTest.php
+++ b/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Export/CustomerTest.php
@@ -182,7 +182,7 @@ public function testFilterEntityCollection()
'email' => 'example.com',
'created_at' => [$createdAtDate, ''],
'store_id' => \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->getStore()->getId()
]
];
diff --git a/dev/tests/integration/testsuite/Magento/DesignEditor/Model/_files/design/themes.php b/dev/tests/integration/testsuite/Magento/DesignEditor/Model/_files/design/themes.php
index 2786bd4637e50..ac4b027c8075b 100644
--- a/dev/tests/integration/testsuite/Magento/DesignEditor/Model/_files/design/themes.php
+++ b/dev/tests/integration/testsuite/Magento/DesignEditor/Model/_files/design/themes.php
@@ -22,8 +22,8 @@
->getArea(\Magento\Backend\App\Area\FrontNameResolver::AREA_CODE)
->load(\Magento\Framework\App\Area::PART_CONFIG);
-/** @var $registration \Magento\Core\Model\Theme\Registration */
+/** @var $registration \Magento\Theme\Model\Theme\Registration */
$registration = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
- 'Magento\Core\Model\Theme\Registration'
+ 'Magento\Theme\Model\Theme\Registration'
);
$registration->register('*/*/*/theme.xml');
diff --git a/dev/tests/integration/testsuite/Magento/Directory/Model/ObserverTest.php b/dev/tests/integration/testsuite/Magento/Directory/Model/ObserverTest.php
index 018c8b1c71e89..3601d7b0fac0d 100644
--- a/dev/tests/integration/testsuite/Magento/Directory/Model/ObserverTest.php
+++ b/dev/tests/integration/testsuite/Magento/Directory/Model/ObserverTest.php
@@ -9,7 +9,7 @@
namespace Magento\Directory\Model;
use Magento\Framework\ObjectManagerInterface;
-use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\Store\ScopeInterface;
use Magento\TestFramework\Helper\Bootstrap;
/**
@@ -43,15 +43,23 @@ public function setUp()
$this->objectManager = Bootstrap::getObjectManager();
$this->scopeConfig = $this->objectManager->create('Magento\Framework\App\MutableScopeConfig');
- $this->scopeConfig->setValue(Observer::IMPORT_ENABLE, 1, ScopeInterface::SCOPE_STORE);
- $this->scopeConfig->setValue(Observer::CRON_STRING_PATH, 'cron-string-path', ScopeInterface::SCOPE_STORE);
- $this->scopeConfig->setValue(Observer::IMPORT_SERVICE, 'webservicex', ScopeInterface::SCOPE_STORE);
+ $this->scopeConfig->setValue(Observer::IMPORT_ENABLE, 1, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+ $this->scopeConfig->setValue(
+ Observer::CRON_STRING_PATH,
+ 'cron-string-path',
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ );
+ $this->scopeConfig->setValue(
+ Observer::IMPORT_SERVICE,
+ 'webservicex',
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ );
$this->configResource = $this->objectManager->get('Magento\Core\Model\Resource\Config');
$this->configResource->saveConfig(
$this->baseCurrencyPath,
$this->baseCurrency,
- ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
0
);
@@ -74,7 +82,7 @@ public function testScheduledUpdateCurrencyRates()
$this->configResource->saveConfig(
$this->allowedCurrenciesPath,
$allowedCurrencies,
- ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
0
);
$this->observer->scheduledUpdateCurrencyRates(null);
diff --git a/dev/tests/integration/testsuite/Magento/Email/Model/Template/FilterTest.php b/dev/tests/integration/testsuite/Magento/Email/Model/Template/FilterTest.php
index 01466396b11cb..81529277542fd 100644
--- a/dev/tests/integration/testsuite/Magento/Email/Model/Template/FilterTest.php
+++ b/dev/tests/integration/testsuite/Magento/Email/Model/Template/FilterTest.php
@@ -127,19 +127,19 @@ public function testLayoutDirective($area, $directiveParams, $expectedOutput)
$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
$themes = ['frontend' => 'test_default', 'adminhtml' => 'test_default'];
- $design = $objectManager->create('Magento\Core\Model\View\Design', ['themes' => $themes]);
- $objectManager->addSharedInstance($design, 'Magento\Core\Model\View\Design');
+ $design = $objectManager->create('Magento\Theme\Model\View\Design', ['themes' => $themes]);
+ $objectManager->addSharedInstance($design, 'Magento\Theme\Model\View\Design');
\Magento\TestFramework\Helper\Bootstrap::getInstance()->loadArea($area);
- $collection = $objectManager->create('Magento\Core\Model\Resource\Theme\Collection');
+ $collection = $objectManager->create('Magento\Theme\Model\Resource\Theme\Collection');
$themeId = $collection->getThemeByFullPath('frontend/test_default')->getId();
$objectManager->get(
'Magento\Framework\App\Config\MutableScopeConfigInterface'
)->setValue(
\Magento\Framework\View\DesignInterface::XML_PATH_THEME_ID,
$themeId,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
/** @var $layout \Magento\Framework\View\LayoutInterface */
diff --git a/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php b/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php
index 5ffaed0005fad..ea2d858bd2224 100644
--- a/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php
@@ -65,7 +65,7 @@ public function testSetGetTemplateFilter()
$this->assertSame($filter, $this->_model->getTemplateFilter());
$this->assertEquals(
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->getStore()->getId(),
$filter->getStoreId()
);
@@ -106,7 +106,7 @@ public function testGetProcessedTemplate()
[
'area' => 'frontend',
'store' => \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->getStore(
'fixturestore'
)->getId()
@@ -130,7 +130,7 @@ protected function _setNotDefaultThemeForFixtureStore()
)->setValue(
\Magento\Framework\View\DesignInterface::XML_PATH_THEME_ID,
$theme->getId(),
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
'fixturestore'
);
}
@@ -154,7 +154,7 @@ public function testGetProcessedTemplateSubject()
[
'area' => 'frontend',
'store' => \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->getStore(
'fixturestore'
)->getId()
@@ -194,7 +194,7 @@ public function testSetDesignConfigException($config)
public function setDesignConfigExceptionDataProvider()
{
$storeId = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
- ->get('Magento\Store\Model\StoreManagerInterface')->getStore()->getId();
+ ->get('Magento\Framework\Store\StoreManagerInterface')->getStore()->getId();
return [
[[]],
[['area' => 'frontend']],
diff --git a/dev/tests/integration/testsuite/Magento/Email/Model/_files/themes.php b/dev/tests/integration/testsuite/Magento/Email/Model/_files/themes.php
index 4227acdddc95c..d86d89064bc1e 100644
--- a/dev/tests/integration/testsuite/Magento/Email/Model/_files/themes.php
+++ b/dev/tests/integration/testsuite/Magento/Email/Model/_files/themes.php
@@ -20,9 +20,9 @@
$objectManger->configure([
'preferences' => [
- 'Magento\Core\Model\Theme' => 'Magento\Core\Model\Theme\Data',
+ 'Magento\Theme\Model\Theme' => 'Magento\Theme\Model\Theme\Data',
],
]);
-/** @var $registration \Magento\Core\Model\Theme\Registration */
-$registration = $objectManger->create('Magento\Core\Model\Theme\Registration');
+/** @var $registration \Magento\Theme\Model\Theme\Registration */
+$registration = $objectManger->create('Magento\Theme\Model\Theme\Registration');
$registration->register('*/*/theme.xml');
diff --git a/dev/tests/integration/testsuite/Magento/Framework/App/AreaTest.php b/dev/tests/integration/testsuite/Magento/Framework/App/AreaTest.php
index ff4581aa74a22..309bbd17a4008 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/App/AreaTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/App/AreaTest.php
@@ -15,7 +15,7 @@ class AreaTest extends \PHPUnit_Framework_TestCase
public static function tearDownAfterClass()
{
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Framework\App\CacheInterface')
- ->clean([\Magento\Core\Model\Design::CACHE_TAG]);
+ ->clean([\Magento\Theme\Model\Design::CACHE_TAG]);
}
protected function setUp()
@@ -82,7 +82,7 @@ public function testDetectDesignUserAgent()
/**
* @magentoConfigFixture current_store design/theme/ua_regexp a:1:{s:1:"_";a:2:{s:6:"regexp";s:10:"/firefox/i";s:5:"value";s:13:"Magento/blank";}}
* @magentoConfigFixture current_store design/package/ua_regexp a:1:{s:1:"_";a:2:{s:6:"regexp";s:10:"/firefox/i";s:5:"value";s:13:"Magento/blank";}}
- * @magentoDataFixture Magento/Core/_files/design_change.php
+ * @magentoDataFixture Magento/Theme/_files/design_change.php
* @magentoAppIsolation enabled
*/
// @codingStandardsIgnoreEnd
@@ -100,7 +100,7 @@ public function testDetectDesignDesignChange()
* Test that non-frontend areas are not affected neither by user-agent reg expressions, nor by the "design change"
*
* @magentoConfigFixture current_store design/theme/ua_regexp a:1:{s:1:"_";a:2:{s:6:"regexp";s:10:"/firefox/i";s:5:"value";s:13:"Magento/blank";}}
- * magentoDataFixture Magento/Core/_files/design_change.php
+ * magentoDataFixture Magento/Theme/_files/design_change.php
* @magentoAppIsolation enabled
*/
// @codingStandardsIgnoreEnd
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Less/_files/themes.php b/dev/tests/integration/testsuite/Magento/Framework/Less/_files/themes.php
index 9ed201b0f6e0f..d22b22213d885 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Less/_files/themes.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Less/_files/themes.php
@@ -17,6 +17,6 @@
$objectManger->get('Magento\Framework\App\State')
->setAreaCode(\Magento\Framework\View\DesignInterface::DEFAULT_AREA);
-/** @var $registration \Magento\Core\Model\Theme\Registration */
-$registration = $objectManger->create('Magento\Core\Model\Theme\Registration');
+/** @var $registration \Magento\Theme\Model\Theme\Registration */
+$registration = $objectManger->create('Magento\Theme\Model\Theme\Registration');
$registration->register('*/*/*/theme.xml');
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Model/Resource/Db/Collection/AbstractTest.php b/dev/tests/integration/testsuite/Magento/Framework/Model/Resource/Db/Collection/AbstractTest.php
index 6a68888d7f677..9a0f7ca1a9bf5 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Model/Resource/Db/Collection/AbstractTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Model/Resource/Db/Collection/AbstractTest.php
@@ -42,7 +42,7 @@ protected function setUp()
);
$entityFactory = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Core\Model\EntityFactory'
+ 'Magento\Framework\Data\Collection\EntityFactory'
);
$logger = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Psr\Log\LoggerInterface');
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Session/SidResolverTest.php b/dev/tests/integration/testsuite/Magento/Framework/Session/SidResolverTest.php
index 14f9874a7378c..e3a45563f3b8b 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Session/SidResolverTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Session/SidResolverTest.php
@@ -93,7 +93,7 @@ public function testGetSid($sid, $useFrontedSid, $isOwnOriginUrl, $testSid)
'getValue'
)->with(
\Magento\Framework\Session\SidResolver::XML_PATH_USE_FRONTEND_SID,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)->will(
$this->returnValue($useFrontedSid)
);
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Translate/InlineTest.php b/dev/tests/integration/testsuite/Magento/Framework/Translate/InlineTest.php
index ae0d6cc07a199..063f55ebb7a76 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Translate/InlineTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Translate/InlineTest.php
@@ -43,7 +43,7 @@ protected function setUp()
);
/* Called getConfig as workaround for setConfig bug */
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->getStore(
$this->_storeId
)->getConfig(
@@ -54,7 +54,7 @@ protected function setUp()
)->setValue(
'dev/translate_inline/active',
true,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$this->_storeId
);
}
@@ -66,7 +66,7 @@ public function testIsAllowed()
$this->assertTrue(
$this->_model->isAllowed(
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->getStore(
$this->_storeId
)
@@ -78,7 +78,7 @@ public function testIsAllowed()
$this->assertFalse(
$this->_model->isAllowed(
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->getStore(
$this->_storeId
)
diff --git a/dev/tests/integration/testsuite/Magento/Framework/TranslateTest.php b/dev/tests/integration/testsuite/Magento/Framework/TranslateTest.php
index 8dbe6f2e51535..43f836a844397 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/TranslateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/TranslateTest.php
@@ -26,7 +26,7 @@ protected function setUp()
$viewFileSystem->expects($this->any())
->method('getLocaleFileName')
->will(
- $this->returnValue(dirname(__DIR__) . '/Core/Model/_files/design/frontend/Test/default/i18n/en_US.csv')
+ $this->returnValue(dirname(__DIR__) . '/Theme/Model/_files/design/frontend/Test/default/i18n/en_US.csv')
);
/** @var \Magento\Framework\View\Design\ThemeInterface $theme */
@@ -47,15 +47,15 @@ protected function setUp()
dirname(__DIR__) . '/Core/Model/_files/Magento/Catalog/i18n'
);
- /** @var \Magento\Core\Model\View\Design $designModel */
+ /** @var \Magento\Theme\Model\View\Design $designModel */
$designModel = $this->getMock(
- 'Magento\Core\Model\View\Design',
+ 'Magento\Theme\Model\View\Design',
['getDesignTheme'],
[
- $objectManager->get('Magento\Store\Model\StoreManagerInterface'),
+ $objectManager->get('Magento\Framework\Store\StoreManagerInterface'),
$objectManager->get('Magento\Framework\View\Design\Theme\FlyweightFactory'),
$objectManager->get('Magento\Framework\App\Config\ScopeConfigInterface'),
- $objectManager->get('Magento\Core\Model\ThemeFactory'),
+ $objectManager->get('Magento\Theme\Model\ThemeFactory'),
$objectManager->get('Magento\Framework\ObjectManagerInterface'),
$objectManager->get('Magento\Framework\App\State'),
['frontend' => 'Test/default']
@@ -64,7 +64,7 @@ protected function setUp()
$designModel->expects($this->any())->method('getDesignTheme')->will($this->returnValue($theme));
- $objectManager->addSharedInstance($designModel, 'Magento\Core\Model\View\Design\Proxy');
+ $objectManager->addSharedInstance($designModel, 'Magento\Theme\Model\View\Design\Proxy');
$model = $objectManager->create('Magento\Framework\Translate');
$objectManager->addSharedInstance($model, 'Magento\Framework\Translate');
diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/Design/Theme/LabelTest.php b/dev/tests/integration/testsuite/Magento/Framework/View/Design/Theme/LabelTest.php
index 619960785fdaf..64586056f5e69 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/View/Design/Theme/LabelTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/View/Design/Theme/LabelTest.php
@@ -24,7 +24,7 @@ protected function setUp()
*/
public function testGetLabelsCollection()
{
- /** @var $expectedCollection \Magento\Core\Model\Resource\Theme\Collection */
+ /** @var $expectedCollection \Magento\Theme\Model\Resource\Theme\Collection */
$expectedCollection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
'Magento\Framework\View\Design\Theme\Label\ListInterface'
);
diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/FileSystemTest.php b/dev/tests/integration/testsuite/Magento/Framework/View/FileSystemTest.php
index 898c6b8a61c67..bf43171989191 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/View/FileSystemTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/View/FileSystemTest.php
@@ -10,7 +10,7 @@
/**
* Tests for the view layer fallback mechanism
- * @magentoDataFixture Magento/Core/Model/_files/design/themes.php
+ * @magentoDataFixture Magento/Theme/Model/_files/design/themes.php
*/
class FileSystemTest extends \PHPUnit_Framework_TestCase
{
@@ -25,7 +25,7 @@ protected function setUp()
[
Bootstrap::INIT_PARAM_FILESYSTEM_DIR_PATHS => [
DirectoryList::THEMES => [
- 'path' => dirname(dirname(__DIR__)) . '/Core/Model/_files/design',
+ 'path' => dirname(dirname(__DIR__)) . '/Theme/Model/_files/design',
],
],
]
diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/_files/fallback/themes_registration.php b/dev/tests/integration/testsuite/Magento/Framework/View/_files/fallback/themes_registration.php
index 14d156e41eb0b..9021a36b63a91 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/View/_files/fallback/themes_registration.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/View/_files/fallback/themes_registration.php
@@ -13,6 +13,6 @@
]);
$objectManger = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-/** @var $registration \Magento\Core\Model\Theme\Registration */
-$registration = $objectManger->create('Magento\Core\Model\Theme\Registration');
+/** @var $registration \Magento\Theme\Model\Theme\Registration */
+$registration = $objectManger->create('Magento\Theme\Model\Theme\Registration');
$registration->register('*/*/*/theme.xml');
diff --git a/dev/tests/integration/testsuite/Magento/ImportExport/Model/Export/AbstractStubEntity.php b/dev/tests/integration/testsuite/Magento/ImportExport/Model/Export/AbstractStubEntity.php
index 8cfb1a015e9cb..031d37ec7a649 100644
--- a/dev/tests/integration/testsuite/Magento/ImportExport/Model/Export/AbstractStubEntity.php
+++ b/dev/tests/integration/testsuite/Magento/ImportExport/Model/Export/AbstractStubEntity.php
@@ -13,7 +13,7 @@ abstract class AbstractStubEntity extends \Magento\ImportExport\Model\Export\Abs
{
public function __construct(
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\ImportExport\Model\Export\Factory $collectionFactory,
\Magento\ImportExport\Model\Resource\CollectionByPagesIteratorFactory $resourceColFactory,
array $data = []
diff --git a/dev/tests/integration/testsuite/Magento/ImportExport/Model/Export/EntityAbstractTest.php b/dev/tests/integration/testsuite/Magento/ImportExport/Model/Export/EntityAbstractTest.php
index 3c445575a6fda..8166c915ae479 100644
--- a/dev/tests/integration/testsuite/Magento/ImportExport/Model/Export/EntityAbstractTest.php
+++ b/dev/tests/integration/testsuite/Magento/ImportExport/Model/Export/EntityAbstractTest.php
@@ -109,7 +109,7 @@ abstract class Stub_Magento_ImportExport_Model_Export_AbstractEntity
{
public function __construct(
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\ImportExport\Model\Export\Factory $collectionFactory,
\Magento\ImportExport\Model\Resource\CollectionByPagesIteratorFactory $resourceColFactory,
array $data = []
diff --git a/dev/tests/integration/testsuite/Magento/Newsletter/Model/TemplateTest.php b/dev/tests/integration/testsuite/Magento/Newsletter/Model/TemplateTest.php
index a9014cfc04a0d..8eadd1a288a00 100644
--- a/dev/tests/integration/testsuite/Magento/Newsletter/Model/TemplateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Newsletter/Model/TemplateTest.php
@@ -38,7 +38,7 @@ public function testGetProcessedTemplateFrontend($store, $design)
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
'Magento\Framework\App\Config\MutableScopeConfigInterface'
)->setValue(
- \Magento\Core\Model\View\Design::XML_PATH_THEME_ID,
+ \Magento\Theme\Model\View\Design::XML_PATH_THEME_ID,
$design,
'store',
$store
diff --git a/dev/tests/integration/testsuite/Magento/Newsletter/_files/queue.php b/dev/tests/integration/testsuite/Magento/Newsletter/_files/queue.php
index 58529e1a56500..db3b3ba683ee8 100644
--- a/dev/tests/integration/testsuite/Magento/Newsletter/_files/queue.php
+++ b/dev/tests/integration/testsuite/Magento/Newsletter/_files/queue.php
@@ -14,8 +14,8 @@
$template->load('fixture_tpl', 'template_code');
$templateId = $template->getId();
-$currentStore = $objectManager->get('Magento\Store\Model\StoreManagerInterface')->getStore()->getId();
-$otherStore = $objectManager->get('Magento\Store\Model\StoreManagerInterface')->getStore('fixturestore')->getId();
+$currentStore = $objectManager->get('Magento\Framework\Store\StoreManagerInterface')->getStore()->getId();
+$otherStore = $objectManager->get('Magento\Framework\Store\StoreManagerInterface')->getStore('fixturestore')->getId();
/** @var $queue \Magento\Newsletter\Model\Queue */
$queue = $objectManager->create('Magento\Newsletter\Model\Queue');
diff --git a/dev/tests/integration/testsuite/Magento/Newsletter/_files/subscribers.php b/dev/tests/integration/testsuite/Magento/Newsletter/_files/subscribers.php
index fe3cc067ec3e1..3a5b36d59e16b 100644
--- a/dev/tests/integration/testsuite/Magento/Newsletter/_files/subscribers.php
+++ b/dev/tests/integration/testsuite/Magento/Newsletter/_files/subscribers.php
@@ -8,10 +8,10 @@
require __DIR__ . '/../../../Magento/Customer/_files/customer.php';
$currentStore = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->getStore()->getId();
$otherStore = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->getStore(
'fixturestore'
)->getId();
diff --git a/dev/tests/integration/testsuite/Magento/Payment/Model/ObserverTest.php b/dev/tests/integration/testsuite/Magento/Payment/Model/ObserverTest.php
index 94ea3cb8e6e50..1f44e5c0481d4 100644
--- a/dev/tests/integration/testsuite/Magento/Payment/Model/ObserverTest.php
+++ b/dev/tests/integration/testsuite/Magento/Payment/Model/ObserverTest.php
@@ -60,7 +60,7 @@ public function testUpdateOrderStatusForPaymentMethodsEvent()
$scopeConfig = $this->_objectManager->get('Magento\Framework\App\Config\ScopeConfigInterface');
$defaultStatus = (string)$scopeConfig->getValue(
'payment/checkmo/order_status',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
/** @var \Magento\Core\Model\Resource\Config $config */
@@ -76,7 +76,7 @@ public function testUpdateOrderStatusForPaymentMethodsEvent()
$newStatus = (string)$scopeConfig->getValue(
'payment/checkmo/order_status',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
$status->unassignState(\Magento\Sales\Model\Order::STATE_NEW);
@@ -85,7 +85,7 @@ public function testUpdateOrderStatusForPaymentMethodsEvent()
$unassignedStatus = $scopeConfig->getValue(
'payment/checkmo/order_status',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
$this->assertEquals('pending', $defaultStatus);
@@ -116,7 +116,7 @@ public function testUpdateOrderStatusForPaymentMethods()
$scopeConfig = $this->_objectManager->get('Magento\Framework\App\Config\ScopeConfigInterface');
$unassignedStatus = (string)$scopeConfig->getValue(
'payment/checkmo/order_status',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
$this->assertEquals('pending', $unassignedStatus);
}
@@ -140,6 +140,6 @@ protected function _createEventObserver()
protected function _resetConfig()
{
$this->_objectManager->get('Magento\Framework\App\Config\ReinitableConfigInterface')->reinit();
- $this->_objectManager->create('Magento\Store\Model\StoreManagerInterface')->reinitStores();
+ $this->_objectManager->create('Magento\Framework\Store\StoreManagerInterface')->reinitStores();
}
}
diff --git a/dev/tests/integration/testsuite/Magento/Review/_files/customer_review.php b/dev/tests/integration/testsuite/Magento/Review/_files/customer_review.php
index 547516ebfcbf7..19ece27a66e1a 100644
--- a/dev/tests/integration/testsuite/Magento/Review/_files/customer_review.php
+++ b/dev/tests/integration/testsuite/Magento/Review/_files/customer_review.php
@@ -26,13 +26,19 @@
->setEntityPkValue($product->getId())
->setStatusId(\Magento\Review\Model\Review::STATUS_PENDING)
->setStoreId(
- \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Store\Model\StoreManagerInterface')
- ->getStore()->getId()
+ \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+ ->get('Magento\Framework\Store\StoreManagerInterface')
+ ->getStore()
+ ->getId()
+ )
+ ->setStores(
+ [
+ \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+ ->get('Magento\Framework\Store\StoreManagerInterface')
+ ->getStore()
+ ->getId()
+ ]
)
- ->setStores([
- \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Store\Model\StoreManagerInterface')
- ->getStore()->getId()
- ])
->save();
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Framework\Registry')->register(
diff --git a/dev/tests/integration/testsuite/Magento/Review/_files/different_reviews.php b/dev/tests/integration/testsuite/Magento/Review/_files/different_reviews.php
index a5e5fa9104b6d..e92f3c6183c21 100644
--- a/dev/tests/integration/testsuite/Magento/Review/_files/different_reviews.php
+++ b/dev/tests/integration/testsuite/Magento/Review/_files/different_reviews.php
@@ -18,12 +18,12 @@
\Magento\Review\Model\Review::STATUS_PENDING
)->setStoreId(
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->getStore()->getId()
)->setStores(
[
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->getStore()->getId()
]
)->save();
@@ -40,12 +40,12 @@
\Magento\Review\Model\Review::STATUS_APPROVED
)->setStoreId(
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->getStore()->getId()
)->setStores(
[
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->getStore()->getId()
]
)->save();
@@ -62,12 +62,12 @@
\Magento\Review\Model\Review::STATUS_APPROVED
)->setStoreId(
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->getStore()->getId()
)->setStores(
[
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->getStore()->getId()
]
)->save();
diff --git a/dev/tests/integration/testsuite/Magento/Review/_files/review_xss.php b/dev/tests/integration/testsuite/Magento/Review/_files/review_xss.php
index 76976691452fc..e7497306d0f59 100644
--- a/dev/tests/integration/testsuite/Magento/Review/_files/review_xss.php
+++ b/dev/tests/integration/testsuite/Magento/Review/_files/review_xss.php
@@ -15,12 +15,12 @@
\Magento\Review\Model\Review::STATUS_PENDING
)->setStoreId(
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->getStore()->getId()
)->setStores(
[
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->getStore()->getId()
]
)->setNickname(
diff --git a/dev/tests/integration/testsuite/Magento/Review/_files/reviews.php b/dev/tests/integration/testsuite/Magento/Review/_files/reviews.php
index 7f8202978fc97..8f8c6acdfcb6a 100644
--- a/dev/tests/integration/testsuite/Magento/Review/_files/reviews.php
+++ b/dev/tests/integration/testsuite/Magento/Review/_files/reviews.php
@@ -18,12 +18,12 @@
\Magento\Review\Model\Review::STATUS_PENDING
)->setStoreId(
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->getStore()->getId()
)->setStores(
[
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->getStore()->getId()
]
)->save();
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/OrderTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/OrderTest.php
index d52e7d2d4da53..21a3ab71070cc 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/OrderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/OrderTest.php
@@ -91,7 +91,12 @@ public function testSaveOrder()
->setCustomerEmail('customer@null.com')
->setBillingAddress($billingAddress)
->setShippingAddress($shippingAddress)
- ->setStoreId($this->objectManager->get('Magento\Store\Model\StoreManagerInterface')->getStore()->getId())
+ ->setStoreId(
+ $this->objectManager
+ ->get('Magento\Framework\Store\StoreManagerInterface')
+ ->getStore()
+ ->getId()
+ )
->addItem($orderItem)
->setPayment($payment);
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order.php
index dfd4511b37c4b..6d9497bc2c372 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/order.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order.php
@@ -51,7 +51,7 @@
)->setShippingAddress(
$shippingAddress
)->setStoreId(
- $objectManager->get('Magento\Store\Model\StoreManagerInterface')->getStore()->getId()
+ $objectManager->get('Magento\Framework\Store\StoreManagerInterface')->getStore()->getId()
)->addItem(
$orderItem
)->setPayment(
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_fixture_store.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_fixture_store.php
index 6bbd0430c0bfc..1f0759c65b3f8 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/order_fixture_store.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_fixture_store.php
@@ -47,7 +47,7 @@
)->setShippingAddress(
$shippingAddress
)->setStoreId(
- $objectManager->get('Magento\Store\Model\StoreManagerInterface')->getStore('fixturestore')->getId()
+ $objectManager->get('Magento\Framework\Store\StoreManagerInterface')->getStore('fixturestore')->getId()
)->addItem(
$orderItem
)->setPayment(
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_info.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_info.php
index 1862adfcee81f..9cf0caca1f276 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/order_info.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_info.php
@@ -45,7 +45,7 @@
true
)->setStoreId(
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->getStore()->getId()
)->setReservedOrderId(
'test01'
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_paid_with_payflowpro.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_paid_with_payflowpro.php
index 130ace4811f7e..356ca3a729887 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/order_paid_with_payflowpro.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_paid_with_payflowpro.php
@@ -35,7 +35,7 @@
$shippingAddress
)->setStoreId(
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->getStore()->getId()
)->setPayment(
$payment
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/quote.php b/dev/tests/integration/testsuite/Magento/Sales/_files/quote.php
index 8bdafe16f41aa..b4d418c387eec 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/quote.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/quote.php
@@ -50,7 +50,7 @@
true
)->setStoreId(
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->getStore()->getId()
)->setReservedOrderId(
'test01'
diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/_files/cart_rule_40_percent_off.php b/dev/tests/integration/testsuite/Magento/SalesRule/_files/cart_rule_40_percent_off.php
index c9a49409c7e8e..4c7173aa92459 100644
--- a/dev/tests/integration/testsuite/Magento/SalesRule/_files/cart_rule_40_percent_off.php
+++ b/dev/tests/integration/testsuite/Magento/SalesRule/_files/cart_rule_40_percent_off.php
@@ -25,7 +25,7 @@
'stop_rules_processing' => 1,
'website_ids' => [
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->getWebsite()->getId()
]
]
diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/_files/cart_rule_50_percent_off.php b/dev/tests/integration/testsuite/Magento/SalesRule/_files/cart_rule_50_percent_off.php
index 3aa0026f5a48b..2c6f6460c8462 100644
--- a/dev/tests/integration/testsuite/Magento/SalesRule/_files/cart_rule_50_percent_off.php
+++ b/dev/tests/integration/testsuite/Magento/SalesRule/_files/cart_rule_50_percent_off.php
@@ -25,7 +25,7 @@
'stop_rules_processing' => 1,
'website_ids' => [
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->getWebsite()->getId()
]
]
diff --git a/dev/tests/integration/testsuite/Magento/Store/Model/GroupTest.php b/dev/tests/integration/testsuite/Magento/Store/Model/GroupTest.php
index 33faa758e8e30..5310ecab43bc0 100644
--- a/dev/tests/integration/testsuite/Magento/Store/Model/GroupTest.php
+++ b/dev/tests/integration/testsuite/Magento/Store/Model/GroupTest.php
@@ -22,7 +22,7 @@ protected function setUp()
public function testSetGetWebsite()
{
$this->assertFalse($this->_model->getWebsite());
- $website = Bootstrap::getObjectManager()->get('Magento\Store\Model\StoreManagerInterface')->getWebsite();
+ $website = Bootstrap::getObjectManager()->get('Magento\Framework\Store\StoreManagerInterface')->getWebsite();
$this->_model->setWebsite($website);
$actualResult = $this->_model->getWebsite();
$this->assertSame($website, $actualResult);
@@ -34,7 +34,7 @@ public function testSetGetWebsite()
public function testGetWebsiteDefault()
{
$this->assertFalse($this->_model->getWebsite());
- $website = Bootstrap::getObjectManager()->get('Magento\Store\Model\StoreManagerInterface')->getWebsite();
+ $website = Bootstrap::getObjectManager()->get('Magento\Framework\Store\StoreManagerInterface')->getWebsite();
$this->_model->setWebsite($website);
// Empty string should get treated like no parameter
$actualResult = $this->_model->getWebsite('');
diff --git a/dev/tests/integration/testsuite/Magento/Store/Model/StoreTest.php b/dev/tests/integration/testsuite/Magento/Store/Model/StoreTest.php
index af24b2b206fb1..961873bc56359 100644
--- a/dev/tests/integration/testsuite/Magento/Store/Model/StoreTest.php
+++ b/dev/tests/integration/testsuite/Magento/Store/Model/StoreTest.php
@@ -120,7 +120,7 @@ public function testSetGetWebsite()
{
$this->assertFalse($this->model->getWebsite());
$website = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->getWebsite();
$this->model->setWebsite($website);
$actualResult = $this->model->getWebsite();
@@ -157,14 +157,14 @@ public function testGetBaseUrl($type, $useRewrites, $useStoreCode, $expected)
)->setValue(
\Magento\Store\Model\Store::XML_PATH_USE_REWRITES,
$useRewrites,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
'Magento\Framework\App\Config\MutableScopeConfigInterface'
)->setValue(
\Magento\Store\Model\Store::XML_PATH_STORE_IN_URL,
$useStoreCode,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
$actual = $this->model->getBaseUrl($type);
@@ -244,14 +244,14 @@ public function testGetBaseUrlForCustomEntryPoint($type, $useCustomEntryPoint, $
)->setValue(
\Magento\Store\Model\Store::XML_PATH_USE_REWRITES,
false,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
'Magento\Framework\App\Config\MutableScopeConfigInterface'
)->setValue(
\Magento\Store\Model\Store::XML_PATH_STORE_IN_URL,
$useStoreCode,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
// emulate custom entry point
diff --git a/dev/tests/integration/testsuite/Magento/Store/_files/second_store.php b/dev/tests/integration/testsuite/Magento/Store/_files/second_store.php
index ac1a841589326..a8ee609555451 100644
--- a/dev/tests/integration/testsuite/Magento/Store/_files/second_store.php
+++ b/dev/tests/integration/testsuite/Magento/Store/_files/second_store.php
@@ -6,10 +6,10 @@
$store = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Magento\Store\Model\Store');
$websiteId = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->getWebsite()->getId();
$groupId = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->getWebsite()->getDefaultGroupId();
$store->setCode(
'fixture_second_store'
@@ -28,5 +28,5 @@
/* Refresh stores memory cache */
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->reinitStores();
diff --git a/dev/tests/integration/testsuite/Magento/Test/Integrity/LayoutTest.php b/dev/tests/integration/testsuite/Magento/Test/Integrity/LayoutTest.php
index 0529cf8577a6f..3b8ab45122e45 100644
--- a/dev/tests/integration/testsuite/Magento/Test/Integrity/LayoutTest.php
+++ b/dev/tests/integration/testsuite/Magento/Test/Integrity/LayoutTest.php
@@ -22,7 +22,7 @@ class LayoutTest extends \PHPUnit_Framework_TestCase
public static function setUpBeforeClass()
{
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->configure(
- ['preferences' => ['Magento\Core\Model\Theme' => 'Magento\Core\Model\Theme\Data']]
+ ['preferences' => ['Magento\Theme\Model\Theme' => 'Magento\Theme\Model\Theme\Data']]
);
}
@@ -162,9 +162,9 @@ public function pageTypesDeclarationDataProvider()
'Magento\Framework\View\File\Collector\Override\ThemeModular',
['subDir' => 'layout/override/theme']
);
- /** @var $themeCollection \Magento\Core\Model\Theme\Collection */
+ /** @var $themeCollection \Magento\Theme\Model\Theme\Collection */
$themeCollection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
- 'Magento\Core\Model\Theme\Collection'
+ 'Magento\Theme\Model\Theme\Collection'
);
$themeCollection->addDefaultPattern('*');
/** @var $themeLayouts \Magento\Framework\View\File[] */
@@ -319,9 +319,9 @@ public function overrideThemeFilesDataProvider()
protected function _retrieveFilesForEveryTheme(\Magento\Framework\View\File\CollectorInterface $filesRetriever)
{
$result = [];
- /** @var $themeCollection \Magento\Core\Model\Theme\Collection */
+ /** @var $themeCollection \Magento\Theme\Model\Theme\Collection */
$themeCollection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
- 'Magento\Core\Model\Theme\Collection'
+ 'Magento\Theme\Model\Theme\Collection'
);
$themeCollection->addDefaultPattern('*');
/** @var $theme \Magento\Framework\View\Design\ThemeInterface */
diff --git a/dev/tests/integration/testsuite/Magento/Test/Integrity/Magento/Payment/MethodsTest.php b/dev/tests/integration/testsuite/Magento/Test/Integrity/Magento/Payment/MethodsTest.php
index 4a578a6020c64..83e7bf3ed7951 100644
--- a/dev/tests/integration/testsuite/Magento/Test/Integrity/Magento/Payment/MethodsTest.php
+++ b/dev/tests/integration/testsuite/Magento/Test/Integrity/Magento/Payment/MethodsTest.php
@@ -25,7 +25,7 @@ public function testPaymentMethod($code, $methodClass)
'Magento\Framework\View\Element\BlockFactory'
);
$storeId = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->getStore()->getId();
/** @var $model \Magento\Payment\Model\MethodInterface */
if (empty($methodClass)) {
@@ -60,20 +60,20 @@ public function testPaymentMethod($code, $methodClass)
if ($model->canUseInternal()) {
try {
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->getStore()->setId(
\Magento\Store\Model\Store::DEFAULT_STORE_ID
);
$block->setArea('adminhtml');
$this->assertFileExists($block->getTemplateFile(), $message);
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->getStore()->setId(
$storeId
);
} catch (\Exception $e) {
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->getStore()->setId(
$storeId
);
diff --git a/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/BlockInstantiationTest.php b/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/BlockInstantiationTest.php
index 0462ee3f50c75..520ca3b468242 100644
--- a/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/BlockInstantiationTest.php
+++ b/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/BlockInstantiationTest.php
@@ -57,7 +57,7 @@ public function allBlocksDataProvider()
try {
/** @var $website \Magento\Store\Model\Website */
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->getStore()->setWebsiteId(
0
);
diff --git a/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/TemplateFilesTest.php b/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/TemplateFilesTest.php
index 7f6f9b1b7d010..b5551a59d44eb 100644
--- a/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/TemplateFilesTest.php
+++ b/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/TemplateFilesTest.php
@@ -51,7 +51,7 @@ public function allTemplatesDataProvider()
try {
/** @var $website \Magento\Store\Model\Website */
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->getStore()->setWebsiteId(
0
);
diff --git a/dev/tests/integration/testsuite/Magento/Test/Integrity/ViewFileReferenceTest.php b/dev/tests/integration/testsuite/Magento/Test/Integrity/ViewFileReferenceTest.php
index 3cd69afc1bcf8..6d17602e4b09c 100644
--- a/dev/tests/integration/testsuite/Magento/Test/Integrity/ViewFileReferenceTest.php
+++ b/dev/tests/integration/testsuite/Magento/Test/Integrity/ViewFileReferenceTest.php
@@ -43,7 +43,7 @@ class ViewFileReferenceTest extends \PHPUnit_Framework_TestCase
protected static $_checkThemeLocales = [];
/**
- * @var \Magento\Core\Model\Theme\Collection
+ * @var \Magento\Theme\Model\Theme\Collection
*/
protected static $_themeCollection;
@@ -51,7 +51,7 @@ public static function setUpBeforeClass()
{
$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
$objectManager->configure(
- ['preferences' => ['Magento\Core\Model\Theme' => 'Magento\Core\Model\Theme\Data']]
+ ['preferences' => ['Magento\Theme\Model\Theme' => 'Magento\Theme\Model\Theme\Data']]
);
/** @var $fallbackPool \Magento\Framework\View\Design\Fallback\RulePool */
@@ -66,7 +66,7 @@ public static function setUpBeforeClass()
self::$_filesFallback = $objectManager->get('Magento\Framework\View\Design\FileResolution\Fallback\File');
// Themes to be checked
- self::$_themeCollection = $objectManager->get('Magento\Core\Model\Theme\Collection');
+ self::$_themeCollection = $objectManager->get('Magento\Theme\Model\Theme\Collection');
self::$_themeCollection->addDefaultPattern('*');
// Compose list of locales, needed to be checked for themes
diff --git a/dev/tests/integration/testsuite/Magento/Theme/Block/Html/FooterTest.php b/dev/tests/integration/testsuite/Magento/Theme/Block/Html/FooterTest.php
index cb05d829b1e0d..b9353ea075ea7 100644
--- a/dev/tests/integration/testsuite/Magento/Theme/Block/Html/FooterTest.php
+++ b/dev/tests/integration/testsuite/Magento/Theme/Block/Html/FooterTest.php
@@ -10,7 +10,7 @@
class FooterTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\Core\Model\Theme
+ * @var \Magento\Theme\Model\Theme
*/
protected $_theme;
@@ -31,7 +31,7 @@ public function testGetCacheKeyInfo()
$context->setValue(Context::CONTEXT_AUTH, false, false);
$block = $objectManager->get('Magento\Framework\View\LayoutInterface')
->createBlock('Magento\Theme\Block\Html\Footer');
- $storeId = $objectManager->get('Magento\Store\Model\StoreManagerInterface')->getStore()->getId();
+ $storeId = $objectManager->get('Magento\Framework\Store\StoreManagerInterface')->getStore()->getId();
$this->assertEquals(
['PAGE_FOOTER', $storeId, 0, $this->_theme->getId(), null],
$block->getCacheKeyInfo()
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/Design/Backend/ExceptionsTest.php b/dev/tests/integration/testsuite/Magento/Theme/Model/Design/Backend/ExceptionsTest.php
similarity index 96%
rename from dev/tests/integration/testsuite/Magento/Core/Model/Design/Backend/ExceptionsTest.php
rename to dev/tests/integration/testsuite/Magento/Theme/Model/Design/Backend/ExceptionsTest.php
index 24e7fabed4e60..6559bcd4e0292 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/Design/Backend/ExceptionsTest.php
+++ b/dev/tests/integration/testsuite/Magento/Theme/Model/Design/Backend/ExceptionsTest.php
@@ -3,19 +3,19 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Core\Model\Design\Backend;
+namespace Magento\Theme\Model\Design\Backend;
class ExceptionsTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\Core\Model\Design\Backend\Exceptions
+ * @var \Magento\Theme\Model\Design\Backend\Exceptions
*/
protected $_model = null;
protected function setUp()
{
$this->_model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
- 'Magento\Core\Model\Design\Backend\Exceptions'
+ 'Magento\Theme\Model\Design\Backend\Exceptions'
);
$this->_model->setScope('default');
$this->_model->setScopeId(0);
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/DesignTest.php b/dev/tests/integration/testsuite/Magento/Theme/Model/DesignTest.php
similarity index 89%
rename from dev/tests/integration/testsuite/Magento/Core/Model/DesignTest.php
rename to dev/tests/integration/testsuite/Magento/Theme/Model/DesignTest.php
index 9ea5ecf857641..24b8a4e7b3dc9 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/DesignTest.php
+++ b/dev/tests/integration/testsuite/Magento/Theme/Model/DesignTest.php
@@ -3,19 +3,19 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Core\Model;
+namespace Magento\Theme\Model;
class DesignTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\Core\Model\Design
+ * @var \Magento\Theme\Model\Design
*/
protected $_model;
protected function setUp()
{
$this->_model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
- 'Magento\Core\Model\Design'
+ 'Magento\Theme\Model\Design'
);
}
@@ -26,7 +26,7 @@ public function testLoadChange()
}
/**
- * @magentoDataFixture Magento/Core/_files/design_change.php
+ * @magentoDataFixture Magento/Theme/_files/design_change.php
*/
public function testChangeDesign()
{
@@ -36,11 +36,11 @@ public function testChangeDesign()
'Magento\Framework\View\DesignInterface'
);
$storeId = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->getDefaultStoreView()->getId();
// fixture design_change
$designChange = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
- 'Magento\Core\Model\Design'
+ 'Magento\Theme\Model\Design'
);
$designChange->loadChange($storeId)->changeDesign($design);
$this->assertEquals('Magento/luma', $design->getDesignTheme()->getThemePath());
@@ -60,7 +60,7 @@ public function testCRUD()
$this->assertNotEmpty($this->_model->getId());
try {
- $model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Magento\Core\Model\Design');
+ $model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Magento\Theme\Model\Design');
$model->loadChange(1);
$this->assertEquals($this->_model->getId(), $model->getId());
@@ -78,7 +78,7 @@ public function testCRUD()
throw $e;
}
- $model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Magento\Core\Model\Design');
+ $model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Magento\Theme\Model\Design');
$model->loadChange(1);
$this->assertEmpty($model->getId());
}
@@ -93,7 +93,7 @@ public function testCollection()
}
/**
- * @magentoDataFixture Magento/Core/_files/design_change.php
+ * @magentoDataFixture Magento/Theme/_files/design_change.php
* @magentoConfigFixture current_store general/locale/timezone UTC
*/
public function testLoadChangeCache()
@@ -103,14 +103,14 @@ public function testLoadChangeCache()
->create('Magento\Framework\Stdlib\DateTime');
$date = $dateTime->now(true);
$storeId = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->getDefaultStoreView()->getId();
// fixture design_change
$cacheId = 'design_change_' . md5($storeId . $date);
- /** @var \Magento\Core\Model\Design $design */
- $design = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Magento\Core\Model\Design');
+ /** @var \Magento\Theme\Model\Design $design */
+ $design = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Magento\Theme\Model\Design');
$design->loadChange($storeId, $date);
$cachedDesign = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
@@ -126,7 +126,7 @@ public function testLoadChangeCache()
$design->setDesign('Magento/blank')->save();
- $design = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Magento\Core\Model\Design');
+ $design = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Magento\Theme\Model\Design');
$design->loadChange($storeId, $date);
$cachedDesign = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
@@ -142,7 +142,7 @@ public function testLoadChangeCache()
/**
* @magentoAppIsolation enabled
- * @magentoDataFixture Magento/Core/_files/design_change_timezone.php
+ * @magentoDataFixture Magento/Theme/_files/design_change_timezone.php
* @dataProvider loadChangeTimezoneDataProvider
*/
public function testLoadChangeTimezone($storeCode, $storeTimezone, $storeUtcOffset)
@@ -166,7 +166,7 @@ public function testLoadChangeTimezone($storeCode, $storeTimezone, $storeUtcOffs
}
$store = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->getStore(
$storeCode
);
@@ -189,7 +189,7 @@ public function testLoadChangeTimezone($storeCode, $storeTimezone, $storeUtcOffs
);
// store time must stay unchanged during test execution
$design = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
- 'Magento\Core\Model\Design',
+ 'Magento\Theme\Model\Design',
['localeDate' => $locale]
);
$design->loadChange($storeId);
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/ObserverTest.php b/dev/tests/integration/testsuite/Magento/Theme/Model/ObserverTest.php
similarity index 80%
rename from dev/tests/integration/testsuite/Magento/Core/Model/ObserverTest.php
rename to dev/tests/integration/testsuite/Magento/Theme/Model/ObserverTest.php
index a914b9dac9f10..3740b4fd94d07 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/ObserverTest.php
+++ b/dev/tests/integration/testsuite/Magento/Theme/Model/ObserverTest.php
@@ -7,7 +7,7 @@
/**
* Test theme observer
*/
-namespace Magento\Core\Model;
+namespace Magento\Theme\Model;
class ObserverTest extends \PHPUnit_Framework_TestCase
{
@@ -40,19 +40,19 @@ public function testThemeRegistration()
$this->_eventObserver->getEvent()->setPathPattern($pattern);
$themeRegistration = $this->getMock(
- 'Magento\Core\Model\Theme\Registration',
+ 'Magento\Theme\Model\Theme\Registration',
['register'],
[
- $this->_objectManager->create('Magento\Core\Model\Resource\Theme\Data\CollectionFactory'),
- $this->_objectManager->create('Magento\Core\Model\Theme\Data\Collection'),
+ $this->_objectManager->create('Magento\Theme\Model\Resource\Theme\Data\CollectionFactory'),
+ $this->_objectManager->create('Magento\Theme\Model\Theme\Data\Collection'),
$this->_objectManager->create('Magento\Framework\Filesystem')
]
);
$themeRegistration->expects($this->once())->method('register')->with($this->equalTo($pattern));
- $this->_objectManager->addSharedInstance($themeRegistration, 'Magento\Core\Model\Theme\Registration');
+ $this->_objectManager->addSharedInstance($themeRegistration, 'Magento\Theme\Model\Theme\Registration');
- /** @var $observer \Magento\Core\Model\Observer */
- $observer = $this->_objectManager->create('Magento\Core\Model\Observer');
+ /** @var $observer \Magento\Theme\Model\Observer */
+ $observer = $this->_objectManager->create('Magento\Theme\Model\Observer');
$observer->themeRegistration($this->_eventObserver);
}
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/Resource/Theme/CollectionTest.php b/dev/tests/integration/testsuite/Magento/Theme/Model/Resource/Theme/CollectionTest.php
similarity index 90%
rename from dev/tests/integration/testsuite/Magento/Core/Model/Resource/Theme/CollectionTest.php
rename to dev/tests/integration/testsuite/Magento/Theme/Model/Resource/Theme/CollectionTest.php
index c5545fee90a97..fba3925eeec8c 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/Resource/Theme/CollectionTest.php
+++ b/dev/tests/integration/testsuite/Magento/Theme/Model/Resource/Theme/CollectionTest.php
@@ -3,7 +3,7 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Core\Model\Resource\Theme;
+namespace Magento\Theme\Model\Resource\Theme;
use Magento\Framework\View\Design\ThemeInterface;
@@ -12,17 +12,17 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
public static function setUpBeforeClass()
{
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->configure(
- ['preferences' => ['Magento\Core\Model\Theme' => 'Magento\Core\Model\Theme\Data']]
+ ['preferences' => ['Magento\Theme\Model\Theme' => 'Magento\Theme\Model\Theme\Data']]
);
}
/**
- * @return \Magento\Core\Model\Resource\Theme\Collection
+ * @return \Magento\Theme\Model\Resource\Theme\Collection
*/
protected static function _getThemesCollection()
{
return \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
- 'Magento\Core\Model\Resource\Theme\Collection'
+ 'Magento\Theme\Model\Resource\Theme\Collection'
);
}
@@ -89,9 +89,9 @@ public function getThemeByFullPathDataProvider()
*/
public function testAddAreaFilter($area, $themeCount)
{
- /** @var $themeCollection \Magento\Core\Model\Resource\Theme\Collection */
+ /** @var $themeCollection \Magento\Theme\Model\Resource\Theme\Collection */
$themeCollection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
- 'Magento\Core\Model\Resource\Theme\Collection'
+ 'Magento\Theme\Model\Resource\Theme\Collection'
);
$themeCollection->addAreaFilter($area);
$this->assertCount($themeCount, $themeCollection);
@@ -113,13 +113,13 @@ public function addAreaFilterDataProvider()
* @magentoDataFixture setThemeFixture
* @magentoDbIsolation enabled
* @dataProvider addTypeFilterDataProvider
- * @covers \Magento\Core\Model\Resource\Theme\Collection::addAreaFilter
+ * @covers \Magento\Theme\Model\Resource\Theme\Collection::addAreaFilter
*/
public function testAddTypeFilter($themeType, $themeCount)
{
- /** @var $themeCollection \Magento\Core\Model\Resource\Theme\Collection */
+ /** @var $themeCollection \Magento\Theme\Model\Resource\Theme\Collection */
$themeCollection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
- 'Magento\Core\Model\Resource\Theme\Collection'
+ 'Magento\Theme\Model\Resource\Theme\Collection'
);
$themeCollection->addAreaFilter('test_area3');
if ($themeType !== false) {
@@ -144,13 +144,13 @@ public function addTypeFilterDataProvider()
/**
* @magentoDataFixture setThemeFixture
* @magentoDbIsolation enabled
- * @covers \Magento\Core\Model\Resource\Theme\Collection::filterVisibleThemes
+ * @covers \Magento\Theme\Model\Resource\Theme\Collection::filterVisibleThemes
*/
public function testFilterVisibleThemes()
{
- /** @var $themeCollection \Magento\Core\Model\Resource\Theme\Collection */
+ /** @var $themeCollection \Magento\Theme\Model\Resource\Theme\Collection */
$themeCollection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
- 'Magento\Core\Model\Resource\Theme\Collection'
+ 'Magento\Theme\Model\Resource\Theme\Collection'
);
$themeCollection->addAreaFilter('test_area3')->filterVisibleThemes();
$this->assertCount(2, $themeCollection);
@@ -194,7 +194,7 @@ public function testCheckParentInThemes()
/**
* Set themes fixtures
*
- * @return \Magento\Core\Model\Resource\Theme\Collection
+ * @return \Magento\Theme\Model\Resource\Theme\Collection
*/
public static function setThemeFixture()
{
@@ -345,15 +345,15 @@ public static function getInheritedThemeList()
}
/**
- * @covers \Magento\Core\Model\Resource\Theme\Collection::filterPhysicalThemes
+ * @covers \Magento\Theme\Model\Resource\Theme\Collection::filterPhysicalThemes
*/
public function testFilterPhysicalThemesPerPage()
{
$collection = $this->_getThemesCollection();
- $collection->filterPhysicalThemes(1, \Magento\Core\Model\Resource\Theme\Collection::DEFAULT_PAGE_SIZE);
+ $collection->filterPhysicalThemes(1, \Magento\Theme\Model\Resource\Theme\Collection::DEFAULT_PAGE_SIZE);
$this->assertLessThanOrEqual(
- \Magento\Core\Model\Resource\Theme\Collection::DEFAULT_PAGE_SIZE,
+ \Magento\Theme\Model\Resource\Theme\Collection::DEFAULT_PAGE_SIZE,
$collection->count()
);
@@ -365,7 +365,7 @@ public function testFilterPhysicalThemesPerPage()
}
/**
- * @covers \Magento\Core\Model\Resource\Theme\Collection::filterPhysicalThemes
+ * @covers \Magento\Theme\Model\Resource\Theme\Collection::filterPhysicalThemes
*/
public function testFilterPhysicalThemes()
{
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/Theme/CollectionTest.php b/dev/tests/integration/testsuite/Magento/Theme/Model/Theme/CollectionTest.php
similarity index 94%
rename from dev/tests/integration/testsuite/Magento/Core/Model/Theme/CollectionTest.php
rename to dev/tests/integration/testsuite/Magento/Theme/Model/Theme/CollectionTest.php
index bdd7f9a9f4fd3..5cebc86af62c7 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/Theme/CollectionTest.php
+++ b/dev/tests/integration/testsuite/Magento/Theme/Model/Theme/CollectionTest.php
@@ -7,14 +7,14 @@
/**
* Test for filesystem themes collection
*/
-namespace Magento\Core\Model\Theme;
+namespace Magento\Theme\Model\Theme;
use Magento\Framework\App\Filesystem\DirectoryList;
class CollectionTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\Core\Model\Theme\Collection
+ * @var \Magento\Theme\Model\Theme\Collection
*/
protected $_model;
@@ -36,7 +36,7 @@ protected function setUp()
['directoryList' => $directoryList]
);
$this->_model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
- 'Magento\Core\Model\Theme\Collection',
+ 'Magento\Theme\Model\Theme\Collection',
['filesystem' => $filesystem]
);
}
@@ -92,7 +92,7 @@ public function expectedThemeDataFromConfiguration()
* Test if theme present in file system
*
* @magentoAppIsolation enabled
- * @covers \Magento\Core\Model\Theme\Collection::hasTheme
+ * @covers \Magento\Theme\Model\Theme\Collection::hasTheme
*/
public function testHasThemeInCollection()
{
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/Theme/Domain/VirtualTest.php b/dev/tests/integration/testsuite/Magento/Theme/Model/Theme/Domain/VirtualTest.php
similarity index 98%
rename from dev/tests/integration/testsuite/Magento/Core/Model/Theme/Domain/VirtualTest.php
rename to dev/tests/integration/testsuite/Magento/Theme/Model/Theme/Domain/VirtualTest.php
index e82871b5b7476..07549fb0e3620 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/Theme/Domain/VirtualTest.php
+++ b/dev/tests/integration/testsuite/Magento/Theme/Model/Theme/Domain/VirtualTest.php
@@ -3,7 +3,7 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Core\Model\Theme\Domain;
+namespace Magento\Theme\Model\Theme\Domain;
use Magento\Framework\View\Design\ThemeInterface;
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/Theme/FileTest.php b/dev/tests/integration/testsuite/Magento/Theme/Model/Theme/FileTest.php
similarity index 87%
rename from dev/tests/integration/testsuite/Magento/Core/Model/Theme/FileTest.php
rename to dev/tests/integration/testsuite/Magento/Theme/Model/Theme/FileTest.php
index f721c3132e43b..0ac775af23b27 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/Theme/FileTest.php
+++ b/dev/tests/integration/testsuite/Magento/Theme/Model/Theme/FileTest.php
@@ -3,12 +3,12 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Core\Model\Theme;
+namespace Magento\Theme\Model\Theme;
class FileTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\Core\Model\Theme\File
+ * @var \Magento\Theme\Model\Theme\File
*/
protected $_model;
@@ -18,14 +18,14 @@ class FileTest extends \PHPUnit_Framework_TestCase
protected $_data = [];
/**
- * @var \Magento\Core\Model\Theme
+ * @var \Magento\Theme\Model\Theme
*/
protected $_theme;
protected function setUp()
{
$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
- $this->_model = $objectManager->create('Magento\Core\Model\Theme\File');
+ $this->_model = $objectManager->create('Magento\Theme\Model\Theme\File');
/** @var $themeModel \Magento\Framework\View\Design\ThemeInterface */
$themeModel = $objectManager->create('Magento\Framework\View\Design\ThemeInterface');
$this->_theme = $themeModel->getCollection()->getFirstItem();
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/Theme/RegistrationTest.php b/dev/tests/integration/testsuite/Magento/Theme/Model/Theme/RegistrationTest.php
similarity index 93%
rename from dev/tests/integration/testsuite/Magento/Core/Model/Theme/RegistrationTest.php
rename to dev/tests/integration/testsuite/Magento/Theme/Model/Theme/RegistrationTest.php
index 3b682651f74c7..2e4b7dec86632 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/Theme/RegistrationTest.php
+++ b/dev/tests/integration/testsuite/Magento/Theme/Model/Theme/RegistrationTest.php
@@ -3,7 +3,7 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Core\Model\Theme;
+namespace Magento\Theme\Model\Theme;
use Magento\Framework\App\Bootstrap;
use Magento\Framework\App\Filesystem\DirectoryList;
@@ -11,12 +11,12 @@
class RegistrationTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\Core\Model\Theme\Registration
+ * @var \Magento\Theme\Model\Theme\Registration
*/
protected $_model;
/**
- * @var \Magento\Core\Model\Theme
+ * @var \Magento\Theme\Model\Theme
*/
protected $_theme;
@@ -44,14 +44,14 @@ protected function setUp()
$this->_theme = $objectManager
->create('Magento\Framework\View\Design\ThemeInterface');
$this->_model = $objectManager
- ->create('Magento\Core\Model\Theme\Registration');
+ ->create('Magento\Theme\Model\Theme\Registration');
}
/**
* Register themes by pattern
* Use this method only with database isolation
*
- * @return \Magento\Core\Model\Theme\RegistrationTest
+ * @return \Magento\Theme\Model\Theme\RegistrationTest
*/
protected function registerThemes()
{
@@ -63,7 +63,7 @@ protected function registerThemes()
/**
* Use this method only with database isolation
*
- * @return \Magento\Core\Model\Theme
+ * @return \Magento\Theme\Model\Theme
*/
protected function _getTestTheme()
{
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/ThemeTest.php b/dev/tests/integration/testsuite/Magento/Theme/Model/Theme/Source/ThemeTest.php
similarity index 74%
rename from dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/ThemeTest.php
rename to dev/tests/integration/testsuite/Magento/Theme/Model/Theme/Source/ThemeTest.php
index 8976d042d7ba0..4d60b8745124a 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/ThemeTest.php
+++ b/dev/tests/integration/testsuite/Magento/Theme/Model/Theme/Source/ThemeTest.php
@@ -3,7 +3,7 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Core\Model\Theme\Source;
+namespace Magento\Theme\Model\Theme\Source;
use Magento\TestFramework\Helper\Bootstrap;
@@ -15,11 +15,11 @@ class ThemeTest extends \PHPUnit_Framework_TestCase
{
public function testGetAllOptions()
{
- /** @var $model \Magento\Core\Model\Theme\Source\Theme */
- $model = Bootstrap::getObjectManager()->create('Magento\Core\Model\Theme\Source\Theme');
+ /** @var $model \Magento\Theme\Model\Theme\Source\Theme */
+ $model = Bootstrap::getObjectManager()->create('Magento\Theme\Model\Theme\Source\Theme');
- /** @var $expectedCollection \Magento\Core\Model\Theme\Collection */
- $expectedCollection = Bootstrap::getObjectManager()->create('Magento\Core\Model\Resource\Theme\Collection');
+ /** @var $expectedCollection \Magento\Theme\Model\Theme\Collection */
+ $expectedCollection = Bootstrap::getObjectManager()->create('Magento\Theme\Model\Resource\Theme\Collection');
$expectedCollection->addFilter('area', 'frontend');
$expectedItemsCount = count($expectedCollection);
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/a_d/theme.xml b/dev/tests/integration/testsuite/Magento/Theme/Model/Theme/Source/_files/design/frontend/a_d/theme.xml
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/a_d/theme.xml
rename to dev/tests/integration/testsuite/Magento/Theme/Model/Theme/Source/_files/design/frontend/a_d/theme.xml
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/b_e/theme.xml b/dev/tests/integration/testsuite/Magento/Theme/Model/Theme/Source/_files/design/frontend/b_e/theme.xml
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/b_e/theme.xml
rename to dev/tests/integration/testsuite/Magento/Theme/Model/Theme/Source/_files/design/frontend/b_e/theme.xml
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/magento_default/theme.xml b/dev/tests/integration/testsuite/Magento/Theme/Model/Theme/Source/_files/design/frontend/magento_default/theme.xml
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/magento_default/theme.xml
rename to dev/tests/integration/testsuite/Magento/Theme/Model/Theme/Source/_files/design/frontend/magento_default/theme.xml
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/magento_g/theme.xml b/dev/tests/integration/testsuite/Magento/Theme/Model/Theme/Source/_files/design/frontend/magento_g/theme.xml
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/magento_g/theme.xml
rename to dev/tests/integration/testsuite/Magento/Theme/Model/Theme/Source/_files/design/frontend/magento_g/theme.xml
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/ThemeTest.php b/dev/tests/integration/testsuite/Magento/Theme/Model/ThemeTest.php
similarity index 96%
rename from dev/tests/integration/testsuite/Magento/Core/Model/ThemeTest.php
rename to dev/tests/integration/testsuite/Magento/Theme/Model/ThemeTest.php
index f6dc72f56e87b..c2f78e3065fd8 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/ThemeTest.php
+++ b/dev/tests/integration/testsuite/Magento/Theme/Model/ThemeTest.php
@@ -3,7 +3,7 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Core\Model;
+namespace Magento\Theme\Model;
class ThemeTest extends \PHPUnit_Framework_TestCase
{
@@ -63,7 +63,7 @@ public function testChildRelation()
}
/**
- * @magentoDataFixture Magento/Core/Model/_files/design/themes.php
+ * @magentoDataFixture Magento/Theme/Model/_files/design/themes.php
* @magentoAppIsolation enabled
* @magentoAppArea frontend
*/
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/View/DesignTest.php b/dev/tests/integration/testsuite/Magento/Theme/Model/View/DesignTest.php
similarity index 95%
rename from dev/tests/integration/testsuite/Magento/Core/Model/View/DesignTest.php
rename to dev/tests/integration/testsuite/Magento/Theme/Model/View/DesignTest.php
index 76c5d876745aa..44dae02dfb119 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/View/DesignTest.php
+++ b/dev/tests/integration/testsuite/Magento/Theme/Model/View/DesignTest.php
@@ -3,13 +3,13 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Core\Model\View;
+namespace Magento\Theme\Model\View;
use Magento\Framework\App\Bootstrap;
use Magento\Framework\App\Filesystem\DirectoryList;
/**
- * @magentoDataFixture Magento/Core/Model/_files/design/themes.php
+ * @magentoDataFixture Magento/Theme/Model/_files/design/themes.php
*/
class DesignTest extends \PHPUnit_Framework_TestCase
{
@@ -110,10 +110,10 @@ public function testGetConfigurationDesignThemeDefaults()
$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
$themes = ['frontend' => 'test_f', 'adminhtml' => 'test_a'];
- $design = $objectManager->create('Magento\Core\Model\View\Design', ['themes' => $themes]);
- $objectManager->addSharedInstance($design, 'Magento\Core\Model\View\Design');
+ $design = $objectManager->create('Magento\Theme\Model\View\Design', ['themes' => $themes]);
+ $objectManager->addSharedInstance($design, 'Magento\Theme\Model\View\Design');
- $model = $objectManager->get('Magento\Core\Model\View\Design');
+ $model = $objectManager->get('Magento\Theme\Model\View\Design');
$this->assertEquals('test_f', $model->getConfigurationDesignTheme());
$this->assertEquals('test_f', $model->getConfigurationDesignTheme('frontend'));
@@ -131,7 +131,7 @@ public function testGetConfigurationDesignThemeDefaults()
public function testGetConfigurationDesignThemeStore()
{
$storeId = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->getStore()->getId();
$this->assertEquals('one', $this->_model->getConfigurationDesignTheme());
$this->assertEquals('one', $this->_model->getConfigurationDesignTheme(null, ['store' => $storeId]));
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/adminhtml/Vendor/test/theme.xml b/dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/adminhtml/Vendor/test/theme.xml
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/_files/design/adminhtml/Vendor/test/theme.xml
rename to dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/adminhtml/Vendor/test/theme.xml
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/area_two/Vendor/theme_one/theme.xml b/dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/area_two/Vendor/theme_one/theme.xml
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/_files/design/area_two/Vendor/theme_one/theme.xml
rename to dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/area_two/Vendor/theme_one/theme.xml
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/area_two/Vendor/theme_one/web/file b/dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/area_two/Vendor/theme_one/web/file
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/_files/design/area_two/Vendor/theme_one/web/file
rename to dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/area_two/Vendor/theme_one/web/file
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/design_area/Vendor/theme_one/theme.xml b/dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/design_area/Vendor/theme_one/theme.xml
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/_files/design/design_area/Vendor/theme_one/theme.xml
rename to dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/design_area/Vendor/theme_one/theme.xml
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/design_area/Vendor/theme_one/web/file b/dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/design_area/Vendor/theme_one/web/file
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/_files/design/design_area/Vendor/theme_one/web/file
rename to dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/design_area/Vendor/theme_one/web/file
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/default/theme.xml b/dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Magento/default/theme.xml
similarity index 91%
rename from dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/default/theme.xml
rename to dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Magento/default/theme.xml
index 8eec125360581..49e2a0830a3a4 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/default/theme.xml
+++ b/dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Magento/default/theme.xml
@@ -6,4 +6,5 @@
-->
Default
+ 0.1.0
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Magento/default_iphone/images/preview_image.jpg b/dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Magento/default_iphone/images/preview_image.jpg
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Magento/default_iphone/images/preview_image.jpg
rename to dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Magento/default_iphone/images/preview_image.jpg
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Magento/default_iphone/theme.xml b/dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Magento/default_iphone/theme.xml
similarity index 93%
rename from dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Magento/default_iphone/theme.xml
rename to dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Magento/default_iphone/theme.xml
index 616e5b8cc4ce0..c01058ce1edc6 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Magento/default_iphone/theme.xml
+++ b/dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Magento/default_iphone/theme.xml
@@ -9,5 +9,6 @@
images/preview_image.jpg
+ 0.1.0
Magento/default
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/cache_test_theme/theme.xml b/dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Test/cache_test_theme/theme.xml
similarity index 92%
rename from dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/cache_test_theme/theme.xml
rename to dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Test/cache_test_theme/theme.xml
index d37ba660c060f..1db1b557740c3 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/cache_test_theme/theme.xml
+++ b/dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Test/cache_test_theme/theme.xml
@@ -6,5 +6,6 @@
-->
Cache Test Theme
+ 0.1.0
Test/default
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/default/Magento_Catalog/catalog_category_view.xml b/dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Test/default/Magento_Catalog/catalog_category_view.xml
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/default/Magento_Catalog/catalog_category_view.xml
rename to dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Test/default/Magento_Catalog/catalog_category_view.xml
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/default/Magento_Catalog/catalog_category_view_type_default.xml b/dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Test/default/Magento_Catalog/catalog_category_view_type_default.xml
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/default/Magento_Catalog/catalog_category_view_type_default.xml
rename to dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Test/default/Magento_Catalog/catalog_category_view_type_default.xml
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/default/Magento_Catalog/catalog_product_view.xml b/dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Test/default/Magento_Catalog/catalog_product_view.xml
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/default/Magento_Catalog/catalog_product_view.xml
rename to dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Test/default/Magento_Catalog/catalog_product_view.xml
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/default/Magento_Catalog/catalog_product_view_type_simple.xml b/dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Test/default/Magento_Catalog/catalog_product_view_type_simple.xml
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/default/Magento_Catalog/catalog_product_view_type_simple.xml
rename to dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Test/default/Magento_Catalog/catalog_product_view_type_simple.xml
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/default/Magento_Catalog/templates/theme_template.phtml b/dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Test/default/Magento_Catalog/templates/theme_template.phtml
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/default/Magento_Catalog/templates/theme_template.phtml
rename to dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Test/default/Magento_Catalog/templates/theme_template.phtml
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/default/Magento_Catalog/theme_file.txt b/dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Test/default/Magento_Catalog/theme_file.txt
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/default/Magento_Catalog/theme_file.txt
rename to dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Test/default/Magento_Catalog/theme_file.txt
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/default/Magento_Catalog/theme_file_with_2_dots..txt b/dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Test/default/Magento_Catalog/theme_file_with_2_dots..txt
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/default/Magento_Catalog/theme_file_with_2_dots..txt
rename to dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Test/default/Magento_Catalog/theme_file_with_2_dots..txt
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/default/Magento_Cms/layout_test_handle_extra.xml b/dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Test/default/Magento_Cms/layout_test_handle_extra.xml
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/default/Magento_Cms/layout_test_handle_extra.xml
rename to dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Test/default/Magento_Cms/layout_test_handle_extra.xml
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/default/Magento_Core/layout_test_handle_main.xml b/dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Test/default/Magento_Core/layout_test_handle_main.xml
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/default/Magento_Core/layout_test_handle_main.xml
rename to dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Test/default/Magento_Core/layout_test_handle_main.xml
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/default/Magento_Core/layout_test_handle_sample.xml b/dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Test/default/Magento_Core/layout_test_handle_sample.xml
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/default/Magento_Core/layout_test_handle_sample.xml
rename to dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Test/default/Magento_Core/layout_test_handle_sample.xml
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/default/Namespace_Module/web/favicon.ico b/dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Test/default/Namespace_Module/web/favicon.ico
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/default/Namespace_Module/web/favicon.ico
rename to dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Test/default/Namespace_Module/web/favicon.ico
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/default/etc/view.xml b/dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Test/default/etc/view.xml
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/default/etc/view.xml
rename to dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Test/default/etc/view.xml
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/default/i18n/en_US.csv b/dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Test/default/i18n/en_US.csv
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/default/i18n/en_US.csv
rename to dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Test/default/i18n/en_US.csv
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/publication/theme.xml b/dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Test/default/theme.xml
similarity index 91%
rename from dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/publication/theme.xml
rename to dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Test/default/theme.xml
index 8eec125360581..49e2a0830a3a4 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/publication/theme.xml
+++ b/dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Test/default/theme.xml
@@ -6,4 +6,5 @@
-->
Default
+ 0.1.0
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/default/web/css/styles.css b/dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Test/default/web/css/styles.css
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/default/web/css/styles.css
rename to dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Test/default/web/css/styles.css
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/default/web/i18n/fr_FR/logo.gif b/dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Test/default/web/i18n/fr_FR/logo.gif
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/default/web/i18n/fr_FR/logo.gif
rename to dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Test/default/web/i18n/fr_FR/logo.gif
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/default/web/images/logo.gif b/dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Test/default/web/images/logo.gif
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/default/web/images/logo.gif
rename to dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Test/default/web/images/logo.gif
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/default/web/images/logo_email.gif b/dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Test/default/web/images/logo_email.gif
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/default/web/images/logo_email.gif
rename to dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Test/default/web/images/logo_email.gif
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/default/web/js/tabs.js b/dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Test/default/web/js/tabs.js
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/default/web/js/tabs.js
rename to dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Test/default/web/js/tabs.js
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/default/web/result_source.css b/dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Test/default/web/result_source.css
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/default/web/result_source.css
rename to dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Test/default/web/result_source.css
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/default/web/result_source_dev.css b/dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Test/default/web/result_source_dev.css
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/default/web/result_source_dev.css
rename to dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Test/default/web/result_source_dev.css
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/default/web/source.less b/dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Test/default/web/source.less
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/default/web/source.less
rename to dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Test/default/web/source.less
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Magento/default/theme.xml b/dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Test/publication/theme.xml
similarity index 91%
rename from dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Magento/default/theme.xml
rename to dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Test/publication/theme.xml
index 8eec125360581..49e2a0830a3a4 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Magento/default/theme.xml
+++ b/dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Test/publication/theme.xml
@@ -6,4 +6,5 @@
-->
Default
+ 0.1.0
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/test_theme/theme.xml b/dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Test/test_theme/theme.xml
similarity index 92%
rename from dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/test_theme/theme.xml
rename to dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Test/test_theme/theme.xml
index c982f1d93cbc9..108e4a8742502 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/test_theme/theme.xml
+++ b/dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Test/test_theme/theme.xml
@@ -6,5 +6,6 @@
-->
Test Theme
+ 0.1.0
Test/default
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Vendor/custom_theme/Fixture_Module/web/fixture_script.js b/dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Vendor/custom_theme/Fixture_Module/web/fixture_script.js
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Vendor/custom_theme/Fixture_Module/web/fixture_script.js
rename to dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Vendor/custom_theme/Fixture_Module/web/fixture_script.js
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Vendor/custom_theme/theme.xml b/dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Vendor/custom_theme/theme.xml
similarity index 92%
rename from dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Vendor/custom_theme/theme.xml
rename to dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Vendor/custom_theme/theme.xml
index e20f6a70ac658..2dfa014452f3d 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Vendor/custom_theme/theme.xml
+++ b/dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Vendor/custom_theme/theme.xml
@@ -6,5 +6,6 @@
-->
Custom Theme
+ 0.1.0
Vendor/default
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Vendor/default/Namespace_Module/web/absolute_valid_module.gif b/dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Vendor/default/Namespace_Module/web/absolute_valid_module.gif
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Vendor/default/Namespace_Module/web/absolute_valid_module.gif
rename to dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Vendor/default/Namespace_Module/web/absolute_valid_module.gif
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Vendor/default/access_violation.php b/dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Vendor/default/access_violation.php
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Vendor/default/access_violation.php
rename to dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Vendor/default/access_violation.php
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Vendor/default/theme.xml b/dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Vendor/default/theme.xml
similarity index 91%
rename from dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Vendor/default/theme.xml
rename to dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Vendor/default/theme.xml
index 8eec125360581..49e2a0830a3a4 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Vendor/default/theme.xml
+++ b/dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Vendor/default/theme.xml
@@ -6,4 +6,5 @@
-->
Default
+ 0.1.0
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Vendor/default/web/css/1.gif b/dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Vendor/default/web/css/1.gif
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Vendor/default/web/css/1.gif
rename to dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Vendor/default/web/css/1.gif
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Vendor/default/web/css/base64.css b/dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Vendor/default/web/css/base64.css
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Vendor/default/web/css/base64.css
rename to dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Vendor/default/web/css/base64.css
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Vendor/default/web/css/body.gif b/dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Vendor/default/web/css/body.gif
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Vendor/default/web/css/body.gif
rename to dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Vendor/default/web/css/body.gif
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Vendor/default/web/css/deep/recursive.css b/dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Vendor/default/web/css/deep/recursive.css
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Vendor/default/web/css/deep/recursive.css
rename to dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Vendor/default/web/css/deep/recursive.css
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Vendor/default/web/css/exception.css b/dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Vendor/default/web/css/exception.css
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Vendor/default/web/css/exception.css
rename to dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Vendor/default/web/css/exception.css
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Vendor/default/web/css/file.css b/dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Vendor/default/web/css/file.css
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Vendor/default/web/css/file.css
rename to dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Vendor/default/web/css/file.css
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Vendor/default/web/h1.gif b/dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Vendor/default/web/h1.gif
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Vendor/default/web/h1.gif
rename to dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Vendor/default/web/h1.gif
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Vendor/default/web/images/h2.gif b/dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Vendor/default/web/images/h2.gif
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Vendor/default/web/images/h2.gif
rename to dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Vendor/default/web/images/h2.gif
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Vendor/default/web/recursive.css b/dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Vendor/default/web/recursive.css
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Vendor/default/web/recursive.css
rename to dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Vendor/default/web/recursive.css
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Vendor/default/web/recursive.gif b/dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Vendor/default/web/recursive.gif
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Vendor/default/web/recursive.gif
rename to dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Vendor/default/web/recursive.gif
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Vendor/default/web/recursive2.gif b/dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Vendor/default/web/recursive2.gif
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Vendor/default/web/recursive2.gif
rename to dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Vendor/default/web/recursive2.gif
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Vendor/default/web/scripts.js b/dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Vendor/default/web/scripts.js
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Vendor/default/web/scripts.js
rename to dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Vendor/default/web/scripts.js
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/access_violation.php b/dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/access_violation.php
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/access_violation.php
rename to dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/access_violation.php
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/themes.php b/dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/themes.php
similarity index 80%
rename from dev/tests/integration/testsuite/Magento/Core/Model/_files/design/themes.php
rename to dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/themes.php
index 7062ae7f4a108..4ce7fa807ac8b 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/themes.php
+++ b/dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/themes.php
@@ -15,10 +15,10 @@
],
]);
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->configure(
- ['preferences' => ['Magento\Core\Model\Theme' => 'Magento\Core\Model\Theme\Data']]
+ ['preferences' => ['Magento\Theme\Model\Theme' => 'Magento\Theme\Model\Theme\Data']]
);
-/** @var $registration \Magento\Core\Model\Theme\Registration */
+/** @var $registration \Magento\Theme\Model\Theme\Registration */
$registration = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
- 'Magento\Core\Model\Theme\Registration'
+ 'Magento\Theme\Model\Theme\Registration'
);
$registration->register(implode('/', ['*', '*', '*', 'theme.xml']));
diff --git a/dev/tests/integration/testsuite/Magento/Core/_files/design_change.php b/dev/tests/integration/testsuite/Magento/Theme/_files/design_change.php
similarity index 72%
rename from dev/tests/integration/testsuite/Magento/Core/_files/design_change.php
rename to dev/tests/integration/testsuite/Magento/Theme/_files/design_change.php
index 0c33bcf0af2c3..bce3e85d2b19e 100644
--- a/dev/tests/integration/testsuite/Magento/Core/_files/design_change.php
+++ b/dev/tests/integration/testsuite/Magento/Theme/_files/design_change.php
@@ -5,8 +5,8 @@
*/
$storeId = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->getDefaultStoreView()->getId();
-/** @var $change \Magento\Core\Model\Design */
-$change = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Magento\Core\Model\Design');
+/** @var $change \Magento\Theme\Model\Design */
+$change = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Magento\Theme\Model\Design');
$change->setStoreId($storeId)->setDesign('Magento/luma')->setDateFrom('2001-01-01 01:01:01')->save();
diff --git a/dev/tests/integration/testsuite/Magento/Core/_files/design_change_rollback.php b/dev/tests/integration/testsuite/Magento/Theme/_files/design_change_rollback.php
similarity index 82%
rename from dev/tests/integration/testsuite/Magento/Core/_files/design_change_rollback.php
rename to dev/tests/integration/testsuite/Magento/Theme/_files/design_change_rollback.php
index 59a7e7ce9c738..291e081396076 100644
--- a/dev/tests/integration/testsuite/Magento/Core/_files/design_change_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Theme/_files/design_change_rollback.php
@@ -6,4 +6,4 @@
/** @var $cache \Magento\Framework\App\Cache */
$cache = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Magento\Framework\App\Cache');
-$cache->clean([\Magento\Core\Model\Design::CACHE_TAG]);
+$cache->clean([\Magento\Theme\Model\Design::CACHE_TAG]);
diff --git a/dev/tests/integration/testsuite/Magento/Core/_files/design_change_timezone.php b/dev/tests/integration/testsuite/Magento/Theme/_files/design_change_timezone.php
similarity index 91%
rename from dev/tests/integration/testsuite/Magento/Core/_files/design_change_timezone.php
rename to dev/tests/integration/testsuite/Magento/Theme/_files/design_change_timezone.php
index 8e058cb4f2cc3..c9de375655863 100644
--- a/dev/tests/integration/testsuite/Magento/Core/_files/design_change_timezone.php
+++ b/dev/tests/integration/testsuite/Magento/Theme/_files/design_change_timezone.php
@@ -14,11 +14,11 @@
];
foreach ($designChanges as $designChangeData) {
$storeId = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->getStore(
$designChangeData['store']
)->getId();
- $change = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Magento\Core\Model\Design');
+ $change = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Magento\Theme\Model\Design');
$change->setStoreId(
$storeId
)->setDesign(
diff --git a/dev/tests/integration/testsuite/Magento/Core/_files/design_change_timezone_rollback.php b/dev/tests/integration/testsuite/Magento/Theme/_files/design_change_timezone_rollback.php
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/_files/design_change_timezone_rollback.php
rename to dev/tests/integration/testsuite/Magento/Theme/_files/design_change_timezone_rollback.php
diff --git a/dev/tests/integration/testsuite/Magento/Translation/Model/InlineParserTest.php b/dev/tests/integration/testsuite/Magento/Translation/Model/InlineParserTest.php
index da9e72ff09906..34e234cde3f9d 100644
--- a/dev/tests/integration/testsuite/Magento/Translation/Model/InlineParserTest.php
+++ b/dev/tests/integration/testsuite/Magento/Translation/Model/InlineParserTest.php
@@ -26,7 +26,7 @@ protected function setUp()
);
/* Called getConfig as workaround for setConfig bug */
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->getStore(
$this->_storeId
)->getConfig(
@@ -37,7 +37,7 @@ protected function setUp()
)->setValue(
'dev/translate_inline/active',
true,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$this->_storeId
);
}
diff --git a/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Edit/FormTest.php b/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Edit/FormTest.php
index 18382c4b69f1e..2cbcdf0cec9f7 100644
--- a/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Edit/FormTest.php
+++ b/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Edit/FormTest.php
@@ -105,7 +105,7 @@ public function testStoreElementSingleStore()
// Check that store value set correctly
$defaultStore = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->getStore(
true
)->getId();
diff --git a/dev/tests/integration/testsuite/Magento/Webapi/Model/PathProcessorTest.php b/dev/tests/integration/testsuite/Magento/Webapi/Model/PathProcessorTest.php
index 23031143f514c..eeae74762e0f1 100644
--- a/dev/tests/integration/testsuite/Magento/Webapi/Model/PathProcessorTest.php
+++ b/dev/tests/integration/testsuite/Magento/Webapi/Model/PathProcessorTest.php
@@ -9,7 +9,7 @@
class PathProcessorTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $storeManager;
@@ -21,7 +21,7 @@ class PathProcessorTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
- $this->storeManager = $objectManager->get('Magento\Store\Model\StoreManagerInterface');
+ $this->storeManager = $objectManager->get('Magento\Framework\Store\StoreManagerInterface');
$this->pathProcessor = $objectManager->get('Magento\Webapi\Model\PathProcessor');
}
diff --git a/dev/tests/integration/testsuite/Magento/Webapi/Model/Soap/ServerTest.php b/dev/tests/integration/testsuite/Magento/Webapi/Model/Soap/ServerTest.php
index 5d8bf16ecb1cc..76adf00063361 100644
--- a/dev/tests/integration/testsuite/Magento/Webapi/Model/Soap/ServerTest.php
+++ b/dev/tests/integration/testsuite/Magento/Webapi/Model/Soap/ServerTest.php
@@ -28,7 +28,7 @@ class ServerTest extends \PHPUnit_Framework_TestCase
/** @var \Magento\Store\Model\Store */
protected $_storeMock;
- /** @var \Magento\Store\Model\StoreManagerInterface */
+ /** @var \Magento\Framework\Store\StoreManagerInterface */
protected $_storeManagerMock;
/** @var \Magento\Webapi\Model\Soap\Server\Factory */
diff --git a/dev/tests/integration/testsuite/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/DesignAbstractionTest.php b/dev/tests/integration/testsuite/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/DesignAbstractionTest.php
index 11deff771ab78..8d4ba2edcaa64 100644
--- a/dev/tests/integration/testsuite/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/DesignAbstractionTest.php
+++ b/dev/tests/integration/testsuite/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/DesignAbstractionTest.php
@@ -58,7 +58,7 @@ function ($data) use ($processorMock, $layoutUtility) {
$this->_block = new DesignAbstraction(
$objectManager->get('Magento\Framework\View\Element\Template\Context'),
$processorFactoryMock,
- $objectManager->get('Magento\Core\Model\Resource\Theme\CollectionFactory'),
+ $objectManager->get('Magento\Theme\Model\Resource\Theme\CollectionFactory'),
$appState,
[
'name' => 'design_abstractions',
diff --git a/dev/tests/performance/testsuite/fixtures/catalog_200_categories_80k_products.php b/dev/tests/performance/testsuite/fixtures/catalog_200_categories_80k_products.php
index 84427ea9f19ca..f467c451e6689 100644
--- a/dev/tests/performance/testsuite/fixtures/catalog_200_categories_80k_products.php
+++ b/dev/tests/performance/testsuite/fixtures/catalog_200_categories_80k_products.php
@@ -15,7 +15,7 @@
$nestingLevel = 1;
$parentCategoryId = $defaultParentCategoryId = $this->getObjectManager()->get(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->getStore()->getRootCategoryId();
$nestingPath = "1/{$parentCategoryId}";
$categoryPath = '';
diff --git a/dev/tests/performance/testsuite/fixtures/sales_100k_orders.php b/dev/tests/performance/testsuite/fixtures/sales_100k_orders.php
index e5a666c78a2ca..fc48c71952496 100644
--- a/dev/tests/performance/testsuite/fixtures/sales_100k_orders.php
+++ b/dev/tests/performance/testsuite/fixtures/sales_100k_orders.php
@@ -43,7 +43,7 @@
\Magento\Sales\Model\Order::STATE_NEW,
true
)->setStoreId(
- $this->getObjectManager()->get('Magento\Store\Model\StoreManagerInterface')->getStore()->getId()
+ $this->getObjectManager()->get('Magento\Framework\Store\StoreManagerInterface')->getStore()->getId()
);
for ($i = 1; $i <= 100000; $i++) {
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Library/_files/blacklist.txt b/dev/tests/static/testsuite/Magento/Test/Integrity/Library/_files/blacklist.txt
index 8949f27c27436..53770b9f92ec4 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/Library/_files/blacklist.txt
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Library/_files/blacklist.txt
@@ -73,3 +73,8 @@ lib/internal/Magento/Framework/Session/SidResolverInterface.php
lib/internal/Magento/Framework/App/Filesystem/DirectoryList/Configuration.php
lib/internal/Magento/Framework/Filesystem/Driver/Http.php
+
+lib/internal/Magento/Framework/Url/ScopeResolver.php
+lib/internal/Magento/Framework/Url/SecurityInfo.php
+lib/internal/Magento/Framework/Url/RouteParamsResolver.php
+lib/internal/Magento/Framework/View/Url/Config.php
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Readme/_files/blacklist/ce.txt b/dev/tests/static/testsuite/Magento/Test/Integrity/Readme/_files/blacklist/ce.txt
index 366964138a05f..07c64e4180cf1 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/Readme/_files/blacklist/ce.txt
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Readme/_files/blacklist/ce.txt
@@ -32,6 +32,7 @@ lib/internal/Magento/Framework/RequireJs
lib/internal/Magento/Framework/Search
lib/internal/Magento/Framework/Serialization
lib/internal/Magento/Framework/Simplexml
+lib/internal/Magento/Framework/Store
lib/internal/Magento/Framework/System
lib/internal/Magento/Framework/Test
lib/internal/Magento/Framework/Url
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/tables_ce.php b/dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/tables_ce.php
index 980e001c02481..07767f5c8d8cd 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/tables_ce.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/tables_ce.php
@@ -312,8 +312,7 @@
'wishlist_item_option' => 'Magento_Wishlist',
'wishlist' => 'Magento_Wishlist',
'admin_system_messages' => 'Magento_AdminNotification',
- 'core_theme' => 'Magento_Core',
- 'core_theme_files' => 'Magento_Core',
- 'core_theme_files_link' => 'Magento_Core',
+ 'theme' => 'Magento_Theme',
+ 'theme_files' => 'Magento_Theme',
'vde_theme_change' => 'Magento_DesignEditor'
];
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
index f12e7d360fea2..f99505f07a1eb 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
@@ -823,8 +823,8 @@
['Mage_Core_Model_Session_Abstract_Varien'],
['Mage_Core_Model_Session_Abstract_Zend'],
['Magento\Core\Model\Source\Email\Variables', 'Magento\Email\Model\Source\Variables'],
- ['Magento\Core\Model\Store\ListInterface', 'Magento\Store\Model\StoreManagerInterface'],
- ['Magento\Core\Model\Store\StorageInterface', 'Magento\Store\Model\StoreManagerInterface'],
+ ['Magento\Core\Model\Store\ListInterface', 'Magento\Framework\Store\StoreManagerInterface'],
+ ['Magento\Core\Model\Store\StorageInterface', 'Magento\Framework\Store\StoreManagerInterface'],
['Mage_Core_Model_Store_Group_Limitation'],
['Mage_Core_Model_Store_Limitation'],
['Magento\Core\Model\Variable\Observer'],
@@ -1365,6 +1365,22 @@
['Magento\Sales\Model\Resource\Order\Shipment\Attribute\Backend\Parent'],
['Magento\Quote\Model\Resource\Quote\Address\Attribute\Backend\Parent'],
['Magento\Core\Helper\Http'],
+ ['Magento\Core\Helper\Theme', 'Magento\Theme\Helper\Theme'],
+ ['Magento\Core\Model\Theme', 'Magento\Theme\Model\Theme'],
+ ['Magento\Core\Model\Theme\Collection', 'Magento\Theme\Model\Theme\Collection'],
+ ['Magento\Core\Model\Theme\Data', 'Magento\Theme\Model\Theme\Data'],
+ ['Magento\Core\Model\Theme\File', 'Magento\Theme\Model\Theme\File'],
+ ['Magento\Core\Model\Theme\FileProvider', 'Magento\Theme\Model\Theme\FileProvider'],
+ ['Magento\Core\Model\Theme\Registration', 'Magento\Theme\Model\Theme\Registration'],
+ ['Magento\Core\Model\Theme\Resolver', 'Magento\Theme\Model\Theme\Resolver'],
+ ['Magento\Core\Model\Theme\ThemeProvider', 'Magento\Theme\Model\Theme\ThemeProvider'],
+ ['Magento\Core\Model\Theme\Customization\Config', 'Magento\Theme\Model\Theme\Customization\Config'],
+ ['Magento\Core\Model\Theme\Data\Collection', 'Magento\Theme\Model\Theme\Data\Collection'],
+ ['Magento\Core\Model\Theme\Domain\Physical', 'Magento\Theme\Model\Theme\Domain\Physical'],
+ ['Magento\Core\Model\Theme\Domain\Staging', 'Magento\Theme\Model\Theme\Domain\Staging'],
+ ['Magento\Core\Model\Theme\Domain\Virtual', 'Magento\Theme\Model\Theme\Domain\Virtual'],
+ ['Magento\Core\Model\Theme\Image\Path', 'Magento\Theme\Model\Theme\Image\Path'],
+ ['Magento\Core\Model\Theme\Source\Theme', 'Magento\Theme\Model\Theme\Source\Theme'],
['Magento\Core\Model\ThemeInterface', 'Magento\Framework\View\Design\ThemeInterface'],
['Magento\Core\Model\View\DesignInterface', 'Magento\Framework\View\DesignInterface'],
['Magento\Core\Model\Layout\Element', 'Magento\Framework\View\Layout\Element'],
@@ -1574,8 +1590,10 @@
['Magento\Core\Model\View\FileSystem', 'Magento\Framework\View\FileSystem'],
['Magento\Core\Model\View\Service', 'Magento\Framework\View\Asset\Repository'],
['Magento\Core\Model\View\Url', 'Magento\Framework\View\Asset\Repository'],
+ ['Magento\Core\Model\View\Url\Config', 'Magento\Framework\View\Url\Config'],
['Magento\Core\Model\View\Config', 'Magento\Framework\View\Config'],
['Magento\Core\Model\Image\Factory', 'Magento\Framework\Image\Factory'],
+ ['Magento\Store\Model\StoreManagerInterface', 'Magento\Framework\Store\StoreManagerInterface'],
['Magento\Core\Model\Theme\Image', 'Magento\Framework\View\Design\Theme\Image'],
['Magento\Core\Model\Theme\FlyweightFactory', 'Magento\Framework\View\Design\Theme\FlyweightFactory'],
['Magento\Core\Model\Image\AdapterFactory', 'Magento\Framework\Image\AdapterFactory'],
@@ -1611,6 +1629,7 @@
['Magento\Core\Block\Text\TextList\Link', 'Magento\Framework\View\Element\Text\TextList\Link'],
['Magento\Core\Block\Messages', 'Magento\Framework\View\Element\Messages'],
['Magento\Core\Model\Message', 'Magento\Framework\Message\Factory'],
+ ['Magento\Core\Model\Resource\Setup', 'Magento\Theme\Model\Resource\Setup'],
['Magento\Core\Model\Message\AbstractMessage', 'Magento\Framework\Message\AbstractMessage'],
['Magento\Core\Model\Message\Collection', 'Magento\Framework\Message\Collection'],
['Magento\Core\Model\Message\CollectionFactory', 'Magento\Framework\Message\CollectionFactory'],
@@ -1619,6 +1638,8 @@
['Magento\Core\Model\Message\Notice', 'Magento\Framework\Message\Notice'],
['Magento\Core\Model\Message\Success', 'Magento\Framework\Message\Success'],
['Magento\Core\Block\Html\Date', 'Magento\Framework\View\Element\Html\Date'],
+ ['Magento\Core\Model\Theme\Observer', 'Magento\Theme\Model\Observer'],
+ ['Magento\Core\Model\Observer', 'Magento\Theme\Model\Observer'],
['Magento\Core\Block\Html\Select', 'Magento\Framework\View\Element\Html\Select'],
['Magento\Core\Block\AbstractBlock', 'Magento\Framework\View\Element\AbstractBlock'],
['Magento\Core\Block\Template', 'Magento\Framework\View\Element\Template'],
@@ -1636,6 +1657,7 @@
['Magento\Adminhtml\Controller\Report\Sales', 'Magento\Reports\Controller\Adminhtml\Sales'],
['Magento\Adminhtml\Controller\Report\Shopcart', 'Magento\Reports\Controller\Adminhtml\Shopcart'],
['Magento\Adminhtml\Controller\Report\Statistics', 'Magento\Reports\Controller\Adminhtml\Statistics'],
+ ['Magento\Core\Model\Url\ScopeResolver', 'Magento\Framework\Url\ScopeResolver'],
[
'Magento\Adminhtml\Block\Report\Config\Form\Field\MtdStart',
'Magento\Reports\Block\Adminhtml\Config\Form\Field\MtdStart'
@@ -2202,7 +2224,8 @@
['Magento\Core\Model\Resource\Website', 'Magento\Store\Model\Resource\Website'],
['Magento\Core\Model\Resource\Website\Collection', 'Magento\Store\Model\Resource\Website\Collection'],
['Magento\Core\Model\Resource\Website\Grid\Collection', 'Magento\Store\Model\Resource\Website\Grid\Collection'],
- ['Magento\Core\Model\ScopeInterface', 'Magento\Store\Model\ScopeInterface'],
+ ['Magento\Core\Model\ScopeInterface', 'Magento\Framework\Store\ScopeInterface'],
+ ['Magento\Store\Model\ScopeInterface', 'Magento\Framework\Store\ScopeInterface'],
['Magento\Core\Model\Store', 'Magento\Store\Model\Store'],
['Magento\Store\Model\Exception', 'Magento\Framework\Model\Exception, Magento\Framework\App\InitException'],
['Magento\Core\Model\Store\Group', 'Magento\Store\Model\Group'],
@@ -2218,7 +2241,7 @@
['Magento\BaseScopeInterface', 'Magento\Framework\App\ScopeInterface'],
['Magento\BaseScopeResolverInterface', 'Magento\Framework\App\ScopeResolverInterface'],
['Magento\Framework\Locale\ScopeConfigInterface'],
- ['Magento\Framework\StoreManagerInterface', 'Magento\Store\Model\StoreManagerInterface'],
+ ['Magento\Framework\StoreManagerInterface', 'Magento\Framework\Store\StoreManagerInterface'],
['Magento\Core\Model\Module\Output\Config', 'Magento\Framework\Module\Output\Config'],
['Magento\Core\Model\Resource\Setup\Context', 'Magento\Framework\Module\Setup\Context'],
['Magento\Core\Model\Resource\Setup\Migration', 'Magento\Framework\Module\Setup\Migration'],
@@ -2830,13 +2853,35 @@
'Magento\Framework\Interception\ObjectManager\Config',
'Magento\Framework\Interception\ObjectManager\Config\Developer'
],
+ ['Magento\Core\Model\Design', 'Magento\Theme\Model\Design'],
+ ['Magento\Core\Model\Resource\Design', 'Magento\Theme\Model\Resource\Design'],
+ ['Magento\Core\Model\Resource\Design\Collection', 'Magento\Theme\Model\Resource\Design\Collection'],
+ ['Magento\Core\Model\View\Design', 'Magento\Theme\Model\View\Design'],
+ ['Magento\Core\Model\Design\Backend\Theme', 'Magento\Theme\Model\Design\Backend\Theme'],
+ ['Magento\Core\Model\Design\Backend\Exceptions', 'Magento\Theme\Model\Design\Backend\Exceptions'],
+ ['Magento\Core\Model\Resource\Theme', 'Magento\Theme\Model\Resource\Theme'],
+ [
+ 'Magento\Core\Model\Resource\Theme\Customization\Update',
+ 'Magento\Theme\Model\Resource\Theme\Customization\Update'
+ ],
+ ['Magento\Core\Model\Resource\Theme\Data\Collection', 'Magento\Theme\Model\Resource\Theme\Data\Collection'],
+ ['Magento\Core\Model\Resource\Theme\File\Collection', 'Magento\Theme\Model\Resource\Theme\File\Collection'],
+ ['Magento\Core\Model\Resource\Theme\Grid\Collection', 'Magento\Theme\Model\Resource\Theme\Grid\Collection'],
+ ['Magento\Core\Model\Resource\Theme\Collection', 'Magento\Theme\Model\Resource\Theme\Collection'],
+ ['Magento\Core\Model\Resource\Theme\File', 'Magento\Core\Model\Resource\Theme\File'],
['Magento\Framework\ObjectManager\Config\ProxyConfig'],
['Magento\Catalog\Block\Product\Send'],
['Magento\Catalog\Helper\Product\Options'],
['Magento\Cms\Model\Resource\Page\Service'],
+ [
+ 'Magento\Core\Model\TemplateEngine\Decorator\DebugHints',
+ 'Magento\Developer\Model\TemplateEngine\Decorator\DebugHints'
+ ],
['Magento\Directory\Helper\Url'],
['Magento\GiftMessage\Helper\Url'],
['Magento\Rss\Helper\Data'],
+ ['Magento\Core\Model\EntityFactory', 'Magento\Framework\Data\Collection\EntityFactory'],
+ ['Magento\Core\Model\Factory', 'Magento\Framework\Data\Collection\ModelFactory'],
['Magento\Sales\Model\ConverterInterface'],
['Magento\Paypal\Block\System\Config\Fieldset\Location'],
['Magento\Paypal\Block\Payflow\Advanced\Review'],
@@ -2851,8 +2896,14 @@
['Magento\Tax\Model\Sales\Total\Quote\Nominal\Subtotal'],
['Magento\SalesRule\Model\Quote\Nominal\Discount'],
['Magento\Sales\Model\Quote\Address\Total\Nominal'],
+ ['Magento\Core\Model\Url\RouteParamsResolver', 'Magento\Framework\Url\RouteParamsResolver'],
+ ['Magento\Core\Model\Url\SecurityInfo', 'Magento\Framework\Url\SecurityInfo'],
['Magento\Sales\Model\Quote\Address\Total\Nominal\Collector'],
['Magento\Sales\Model\Quote\Address\Total\Nominal\Shipping'],
['Magento\Sales\Model\Quote\Address\Total\Nominal\Subtotal'],
['Magento\Core\Model\Validator\Factory', 'Magento\Framework\Validator\Factory'],
+ [
+ 'Magento\Core\Model\TemplateEngine\Plugin\DebugHints',
+ 'Magento\Developer\Model\TemplateEngine\Plugin\DebugHints'
+ ],
];
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_config_nodes.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_config_nodes.php
index 724512ff417f5..af061c650f65b 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_config_nodes.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_config_nodes.php
@@ -48,7 +48,7 @@
'/config/global/session' => 'This configuration moved to Di configuration of \Magento\Framework\Session\Validator',
'/config/global/ignore_user_agents' => 'This configuration moved to Di configuration of \Magento\Log\Model\Visitor',
'/config/global/request' => 'This configuration moved to Di configuration of \Magento\Framework\App\RequestInterface',
- '/config/global/secure_url' => 'This configuration moved to Di configuration of \Magento\Core\Model\Url\SecurityInfo',
+ '/config/global/secure_url' => 'This configuration moved to Di configuration of \Magento\Framework\Url\SecurityInfo',
'/config/global/dev' => 'This configuration moved to Di configuration of \Magento\Framework\App\Action\Context',
'/config/global/webapi' => 'This configuration moved to Di configuration of \Magento\Webapi\Controller\Request\Rest\Interpreter\Factory' .
' and \Magento\Webapi\Controller\Response\Rest\Renderer\Factory',
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_constants.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_constants.php
index a648097786fb8..bcffdfd411409 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_constants.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_constants.php
@@ -115,12 +115,12 @@
['RULE_PERM_ALLOW', '\Magento\Framework\Math\Random'],
['RULE_PERM_DENY', '\Magento\Framework\Math\Random'],
['RULE_PERM_INHERIT', '\Magento\Framework\Math\Random'],
- ['SCOPE_TYPE_GROUP', 'Magento\Core\Model\App', 'Magento\Store\Model\ScopeInterface::SCOPE_GROUP'],
- ['SCOPE_TYPE_STORE', 'Magento\Core\Model\App', 'Magento\Store\Model\ScopeInterface::SCOPE_STORE'],
+ ['SCOPE_TYPE_GROUP', 'Magento\Core\Model\App', 'Magento\Framework\Store\ScopeInterface::SCOPE_GROUP'],
+ ['SCOPE_TYPE_STORE', 'Magento\Core\Model\App', 'Magento\Framework\Store\ScopeInterface::SCOPE_STORE'],
[
'SCOPE_TYPE_WEBSITE',
'Magento\Core\Model\App',
- 'Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE'
+ 'Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE'
],
['SEESION_MAX_COOKIE_LIFETIME'],
['TYPE_BINARY', null, 'Magento_DB_Ddl_Table::TYPE_BLOB'],
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
index 1d518787e59f2..e65261334af42 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
@@ -296,6 +296,7 @@
['checkDateTime', 'Magento\Framework\Stdlib\DateTime\DateTime'],
['chooseTemplate', 'Magento\Checkout\Block\Cart'],
['cleanCache', 'Magento\Core\Model\Config'],
+ ['cleanCache', '\Magento\Core\Model\Observer', '\Magento\Backend\Model\Observer'],
['cleanDbRow', 'Magento\Framework\App\Resource'],
['cleanMergedJsCss', 'Magento\Core\Model\Design\Package', 'Magento\Framework\View\Asset\MergeService'],
['cleanMergedJsCss', 'Magento\Core\Model\Design\Package\Proxy', 'Magento\Framework\View\Asset\MergeService'],
@@ -1624,9 +1625,9 @@
'getRatingSummary',
'Magento\Catalog\Model\Product'
],
- ['getCurrentStore', 'Magento\Store\Model\StoreManagerInterface'],
- ['getAnyStoreView', 'Magento\Store\Model\StoreManagerInterface'],
- ['throwStoreException', 'Magento\Store\Model\StoreManagerInterface'],
+ ['getCurrentStore', 'Magento\Framework\Store\StoreManagerInterface'],
+ ['getAnyStoreView', 'Magento\Framework\Store\StoreManagerInterface'],
+ ['throwStoreException', 'Magento\Framework\Store\StoreManagerInterface'],
['getCustomer', 'Magento\ProductAlert\Helper\Data'],
['addCustomerFilter', 'Magento\ProductAlert\Model\Resource\Stock\Collection'],
['addCustomerFilter', 'Magento\ProductAlert\Model\Resource\Price\Collection'],
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_namespaces.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_namespaces.php
index 91f2539d15511..231499e66fa8c 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_namespaces.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_namespaces.php
@@ -70,6 +70,7 @@
['Magento\RecurringPayment'],
['Magento\PayPalRecurringPayment'],
['Magento\ConfigurableProduct\Service'],
+ ['Magento\Core\Model\TemplateEngine\Decorator', 'Magento\Developer\Model\TemplateEngine\Decorator'],
['Magento\Catalog\Service'],
['Magento\CheckoutAgreements\Service'],
['Magento\Checkout\Service'],
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_paths.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_paths.php
index 7ae96fdd6f596..4a3619f232d72 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_paths.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_paths.php
@@ -221,7 +221,19 @@
['/lib/Magento/Object', '/lib/Magento/Framework/Object'],
['/dev/tests/unit/testsuite/Magento/Object', '/dev/tests/unit/testsuite/Magento/Framework/Object'],
['/dev/tests/integration/testsuite/Magento/Object', '/dev/tests/integration/testsuite/Magento/Framework/Object'],
+ ['/dev/tests/unit/testsuite/Magento/Core/Model/View/Url', '/dev/tests/unit/testsuite/Magento/Framework/View/Url'],
+ ['/app/code/Magento/Core/Model/View/Url', '/lib/internal/Magento/Framework/View/Url'],
['/downloader'],
+ ['/app/code/Magento/Core/Model/Design/Backend', '/app/code/Magento/Theme/Model/Design/Backend'],
+ [
+ '/dev/tests/integration/testsuite/Magento/Core/Model/Design/Backend',
+ '/dev/tests/integration/testsuite/Magento/Theme/Model/Design/Backend'
+ ],
+ ['/app/code/Magento/Core/Model/Resource/Theme', '/app/code/Magento/Theme/Model/Resource/Theme'],
+ [
+ '/dev/tests/integration/testsuite/Magento/Core/Model/Resource/Theme',
+ '/dev/tests/integration/testsuite/Magento/Theme/Model/Resource/Theme'
+ ],
['/app/code/Magento/Install'],
['/dev/tests/integration/testsuite/Magento/Install'],
['/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Install'],
@@ -242,4 +254,7 @@
['/app/code/Magento/Sales/Model/Quote/Address/Total/Nominal'],
['/app/code/Magento/Checkout/Block/Total/Nominal.php'],
['/app/code/Magento/Checkout/etc/sales.xml'],
+ ['/app/code/Magento/Core/Model/TemplateEngine/Decorator/DebugHints.php'],
+ ['/dev/tests/unit/testsuite/Magento/Core/Model/TemplateEngine/Decorator/DebugHints.php'],
+
];
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt
index 6261135f9816c..150a66be8a961 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt
+++ b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt
@@ -145,3 +145,6 @@ Magento/GroupedProduct/Model/Resource/Product/Type/Grouped
lib/internal/Magento/Framework/Interception/ObjectManager/Config
app/code/Magento/OfflinePayments/Model
Magento/Weee/Model/Resource
+Magento/Theme/Model/Design/Backend
+Magento/Core/Model/Resource/Layout/Link
+Magento/Theme/Model/Resource/Design
diff --git a/dev/tests/unit/testsuite/Magento/AdminNotification/Model/System/Message/BaseurlTest.php b/dev/tests/unit/testsuite/Magento/AdminNotification/Model/System/Message/BaseurlTest.php
index 290d926e37e6c..d2271e2cdcd9e 100644
--- a/dev/tests/unit/testsuite/Magento/AdminNotification/Model/System/Message/BaseurlTest.php
+++ b/dev/tests/unit/testsuite/Magento/AdminNotification/Model/System/Message/BaseurlTest.php
@@ -48,7 +48,7 @@ protected function setUp()
$this->_configMock = $this->getMock('Magento\Framework\App\Config', [], [], '', false);
$this->_urlBuilderMock = $this->getMock('Magento\Framework\UrlInterface');
- $this->_storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface');
+ $this->_storeManagerMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
$configFactoryMock = $this->getMock(
'Magento\Framework\App\Config\ValueFactory',
['create'],
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Block/Widget/Grid/Column/Renderer/CurrencyTest.php b/dev/tests/unit/testsuite/Magento/Backend/Block/Widget/Grid/Column/Renderer/CurrencyTest.php
index 46bbce1b13e90..3606e9ba1afbb 100644
--- a/dev/tests/unit/testsuite/Magento/Backend/Block/Widget/Grid/Column/Renderer/CurrencyTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backend/Block/Widget/Grid/Column/Renderer/CurrencyTest.php
@@ -49,7 +49,7 @@ class CurrencyTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->_storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface');
+ $this->_storeManagerMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
$this->_localeMock = $this->getMock('Magento\Framework\Locale\CurrencyInterface');
$this->_requestMock = $this->getMock('Magento\Framework\App\RequestInterface');
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Block/Widget/Grid/ColumnSetTest.php b/dev/tests/unit/testsuite/Magento/Backend/Block/Widget/Grid/ColumnSetTest.php
index c6f1264a4bf78..73c6792ffc59e 100644
--- a/dev/tests/unit/testsuite/Magento/Backend/Block/Widget/Grid/ColumnSetTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backend/Block/Widget/Grid/ColumnSetTest.php
@@ -193,7 +193,7 @@ public function testItemHasMultipleRows()
$item = new \Magento\Framework\Object();
// prepare sub-collection
$subCollection = new \Magento\Framework\Data\Collection(
- $this->getMock('Magento\Core\Model\EntityFactory', [], [], '', false)
+ $this->getMock('Magento\Framework\Data\Collection\EntityFactory', [], [], '', false)
);
$subCollection->addItem(new \Magento\Framework\Object(['test4' => '1', 'test5' => '2']));
$subCollection->addItem(new \Magento\Framework\Object(['test4' => '2', 'test5' => '2']));
@@ -215,7 +215,7 @@ public function testShouldRenderTotalWithEmptyCollection()
$this->_prepareLayoutWithGrid(
$this->_prepareGridMock(
new \Magento\Framework\Data\Collection(
- $this->getMock('Magento\Core\Model\EntityFactory', [], [], '', false)
+ $this->getMock('Magento\Framework\Data\Collection\EntityFactory', [], [], '', false)
)
)
);
@@ -247,7 +247,7 @@ public function testShouldRenderSubtotalWithNotEmptySubData()
$item = new \Magento\Framework\Object();
// prepare sub-collection
$subCollection = new \Magento\Framework\Data\Collection(
- $this->getMock('Magento\Core\Model\EntityFactory', [], [], '', false)
+ $this->getMock('Magento\Framework\Data\Collection\EntityFactory', [], [], '', false)
);
$subCollection->addItem(new \Magento\Framework\Object(['test4' => '1', 'test5' => '2']));
$subCollection->addItem(new \Magento\Framework\Object(['test4' => '2', 'test5' => '2']));
@@ -262,7 +262,7 @@ public function testUpdateItemByFirstMultiRow()
$item = new \Magento\Framework\Object(['test1' => '1']);
// prepare sub-collection
$subCollection = new \Magento\Framework\Data\Collection(
- $this->getMock('Magento\Core\Model\EntityFactory', [], [], '', false)
+ $this->getMock('Magento\Framework\Data\Collection\EntityFactory', [], [], '', false)
);
$subCollection->addItem(new \Magento\Framework\Object(['test4' => '1', 'test5' => '2']));
$subCollection->addItem(new \Magento\Framework\Object(['test4' => '2', 'test5' => '2']));
@@ -280,7 +280,7 @@ public function testGetSubTotals()
{
// prepare sub-collection
$subCollection = new \Magento\Framework\Data\Collection(
- $this->getMock('Magento\Core\Model\EntityFactory', [], [], '', false)
+ $this->getMock('Magento\Framework\Data\Collection\EntityFactory', [], [], '', false)
);
$subCollection->addItem(new \Magento\Framework\Object(['column' => '1']));
$subCollection->addItem(new \Magento\Framework\Object(['column' => '1']));
@@ -345,7 +345,7 @@ protected function _prepareGridMock($collection)
protected function _getTestCollection()
{
$collection = new \Magento\Framework\Data\Collection(
- $this->getMock('Magento\Core\Model\EntityFactory', [], [], '', false)
+ $this->getMock('Magento\Framework\Data\Collection\EntityFactory', [], [], '', false)
);
$items = [
new \Magento\Framework\Object(['test1' => '1', 'test2' => '2']),
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Model/AuthTest.php b/dev/tests/unit/testsuite/Magento/Backend/Model/AuthTest.php
index 222efa59a2dae..5436a9a755602 100644
--- a/dev/tests/unit/testsuite/Magento/Backend/Model/AuthTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backend/Model/AuthTest.php
@@ -36,7 +36,7 @@ protected function setUp()
{
$this->_eventManagerMock = $this->getMock('\Magento\Framework\Event\ManagerInterface');
$this->_credentialStorage = $this->getMock('\Magento\Backend\Model\Auth\Credential\StorageInterface');
- $this->_modelFactoryMock = $this->getMock('\Magento\Core\Model\Factory', [], [], '', false);
+ $this->_modelFactoryMock = $this->getMock('\Magento\Framework\Data\Collection\ModelFactory', [], [], '', false);
$objectManager = new ObjectManager($this);
$this->_model = $objectManager->getObject(
'Magento\Backend\Model\Auth',
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Model/Config/ScopeDefinerTest.php b/dev/tests/unit/testsuite/Magento/Backend/Model/Config/ScopeDefinerTest.php
index 4b6a50dcf2fd4..498149ba64b1a 100644
--- a/dev/tests/unit/testsuite/Magento/Backend/Model/Config/ScopeDefinerTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backend/Model/Config/ScopeDefinerTest.php
@@ -37,7 +37,7 @@ public function testGetScopeReturnsStoreScopeIfStoreIsSpecified()
)->will(
$this->returnValueMap([['website', null, 'someWebsite'], ['store', null, 'someStore']])
);
- $this->assertEquals(\Magento\Store\Model\ScopeInterface::SCOPE_STORE, $this->_model->getScope());
+ $this->assertEquals(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $this->_model->getScope());
}
public function testGetScopeReturnsWebsiteScopeIfWebsiteIsSpecified()
@@ -49,6 +49,6 @@ public function testGetScopeReturnsWebsiteScopeIfWebsiteIsSpecified()
)->will(
$this->returnValueMap([['website', null, 'someWebsite'], ['store', null, null]])
);
- $this->assertEquals(\Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE, $this->_model->getScope());
+ $this->assertEquals(\Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE, $this->_model->getScope());
}
}
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Model/Config/Structure/AbstractElementTest.php b/dev/tests/unit/testsuite/Magento/Backend/Model/Config/Structure/AbstractElementTest.php
index f41efd6524af4..cd4b3cacf534e 100644
--- a/dev/tests/unit/testsuite/Magento/Backend/Model/Config/Structure/AbstractElementTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backend/Model/Config/Structure/AbstractElementTest.php
@@ -125,11 +125,11 @@ public function isVisibleReturnsTrueForProperScopesDataProvider()
],
[
['showInDefault' => 0, 'showInStore' => 1, 'showInWebsite' => 0],
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
],
[
['showInDefault' => 0, 'showInStore' => 0, 'showInWebsite' => 1],
- \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE
]
];
}
@@ -154,11 +154,11 @@ public function isVisibleReturnsFalseForNonProperScopesDataProvider()
],
[
['showInDefault' => 1, 'showInStore' => 0, 'showInWebsite' => 1],
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
],
[
['showInDefault' => 1, 'showInStore' => 1, 'showInWebsite' => 0],
- \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE
]
];
}
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Model/Config/Structure/Element/Dependency/MapperTest.php b/dev/tests/unit/testsuite/Magento/Backend/Model/Config/Structure/Element/Dependency/MapperTest.php
index 13366a5d68c3f..942caa54c5dd0 100644
--- a/dev/tests/unit/testsuite/Magento/Backend/Model/Config/Structure/Element/Dependency/MapperTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backend/Model/Config/Structure/Element/Dependency/MapperTest.php
@@ -136,7 +136,7 @@ public function testGetDependenciesWhenDependentIsInvisible($isValueSatisfy)
'getValue'
)->with(
$dependentPath,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
self::STORE_CODE
)->will(
$this->returnValue(self::VALUE_IN_STORE)
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Model/ConfigTest.php b/dev/tests/unit/testsuite/Magento/Backend/Model/ConfigTest.php
index cf4017fb0e782..305790efadf79 100644
--- a/dev/tests/unit/testsuite/Magento/Backend/Model/ConfigTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backend/Model/ConfigTest.php
@@ -48,7 +48,7 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
protected $_dataFactoryMock;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -112,7 +112,7 @@ protected function setUp()
false
);
- $this->_storeManager = $this->getMockForAbstractClass('Magento\Store\Model\StoreManagerInterface');
+ $this->_storeManager = $this->getMockForAbstractClass('Magento\Framework\Store\StoreManagerInterface');
$this->_model = new \Magento\Backend\Model\Config(
$this->_appConfigMock,
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Model/ObserverTest.php b/dev/tests/unit/testsuite/Magento/Backend/Model/ObserverTest.php
new file mode 100644
index 0000000000000..02be11b7c89df
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Backend/Model/ObserverTest.php
@@ -0,0 +1,69 @@
+getMockForAbstractClass('Zend_Cache_Backend_Interface');
+ $cacheFrontendMock = $this->getMockForAbstractClass('Magento\Framework\Cache\FrontendInterface');
+ $frontendPoolMock = $this->getMock(
+ 'Magento\Framework\App\Cache\Frontend\Pool',
+ [],
+ [],
+ '',
+ false
+ );
+ $cronScheduleMock = $this->getMock('Magento\Cron\Model\Schedule', [], [], '', false);
+
+ $cacheBackendMock->expects(
+ $this->once()
+ )->method(
+ 'clean'
+ )->with(
+ \Zend_Cache::CLEANING_MODE_OLD,
+ []
+ );
+
+ $cacheFrontendMock->expects(
+ $this->once()
+ )->method(
+ 'getBackend'
+ )->will(
+ $this->returnValue($cacheBackendMock)
+ );
+
+ $frontendPoolMock->expects(
+ $this->any()
+ )->method(
+ 'valid'
+ )->will(
+ $this->onConsecutiveCalls(true, false)
+ );
+
+ $frontendPoolMock->expects(
+ $this->any()
+ )->method(
+ 'current'
+ )->will(
+ $this->returnValue($cacheFrontendMock)
+ );
+
+ $objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
+ /**
+ * @var \Magento\Backend\Model\Observer
+ */
+ $model = $objectManagerHelper->getObject(
+ 'Magento\Backend\Model\Observer',
+ [
+ 'cacheFrontendPool' => $frontendPoolMock,
+ ]
+ );
+
+ $model->cleanCache($cronScheduleMock);
+ }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Model/Session/AdminConfigTest.php b/dev/tests/unit/testsuite/Magento/Backend/Model/Session/AdminConfigTest.php
index e419e13a938ee..660a720d13ff3 100644
--- a/dev/tests/unit/testsuite/Magento/Backend/Model/Session/AdminConfigTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backend/Model/Session/AdminConfigTest.php
@@ -29,7 +29,7 @@ class AdminConfigTest extends \PHPUnit_Framework_TestCase
private $objectManager;
/**
- * @var \Magento\Store\Model\StoreManagerInterface | \PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Framework\Store\StoreManagerInterface | \PHPUnit_Framework_MockObject_MockObject
*/
private $storeManagerMock;
@@ -61,7 +61,7 @@ protected function setUp()
->disableOriginalConstructor()
->getMock();
$storeMock->expects($this->once())->method('getBaseUrl')->will($this->returnValue('/'));
- $this->storeManagerMock = $this->getMockForAbstractClass('\Magento\Store\Model\StoreManagerInterface');
+ $this->storeManagerMock = $this->getMockForAbstractClass('\Magento\Framework\Store\StoreManagerInterface');
$this->storeManagerMock->expects($this->once())->method('getStore')->will($this->returnValue($storeMock));
$this->filesystemMock = $this->getMock('\Magento\Framework\Filesystem', [], [], '', false);
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Model/Session/QuoteTest.php b/dev/tests/unit/testsuite/Magento/Backend/Model/Session/QuoteTest.php
index ac801cd35c338..5fa83e855b285 100644
--- a/dev/tests/unit/testsuite/Magento/Backend/Model/Session/QuoteTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backend/Model/Session/QuoteTest.php
@@ -12,7 +12,7 @@
class QuoteTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $storeManagerMock;
@@ -183,7 +183,7 @@ protected function setUp()
false
);
$this->storeManagerMock = $this->getMockForAbstractClass(
- 'Magento\Store\Model\StoreManagerInterface',
+ 'Magento\Framework\Store\StoreManagerInterface',
[],
'',
false
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Model/UrlTest.php b/dev/tests/unit/testsuite/Magento/Backend/Model/UrlTest.php
index ab47208132cd1..0108acedf986a 100644
--- a/dev/tests/unit/testsuite/Magento/Backend/Model/UrlTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backend/Model/UrlTest.php
@@ -161,7 +161,7 @@ protected function setUp()
'create'
)->will(
$this->returnValue(
- $this->getMock('Magento\Core\Model\Url\RouteParamsResolver', [], [], '', false)
+ $this->getMock('Magento\Framework\Url\RouteParamsResolver', [], [], '', false)
)
);
$this->_model = $helper->getObject(
@@ -183,7 +183,7 @@ protected function setUp()
'create'
)->will(
$this->returnValue(
- $this->getMock('Magento\Core\Model\Url\RouteParamsResolver', [], [], '', false)
+ $this->getMock('Magento\Framework\Url\RouteParamsResolver', [], [], '', false)
)
);
$this->_model = $helper->getObject(
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Model/Widget/Grid/AbstractTotalsTest.php b/dev/tests/unit/testsuite/Magento/Backend/Model/Widget/Grid/AbstractTotalsTest.php
index eaab3d15c4b3e..1acb1aa887414 100644
--- a/dev/tests/unit/testsuite/Magento/Backend/Model/Widget/Grid/AbstractTotalsTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backend/Model/Widget/Grid/AbstractTotalsTest.php
@@ -64,7 +64,7 @@ protected function tearDown()
protected function _getTestCollection()
{
$collection = new \Magento\Framework\Data\Collection(
- $this->getMock('Magento\Core\Model\EntityFactory', [], [], '', false)
+ $this->getMock('Magento\Framework\Data\Collection\EntityFactory', [], [], '', false)
);
$items = [new \Magento\Framework\Object(['test1' => '1', 'test2' => '2'])];
foreach ($items as $item) {
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Model/Widget/Grid/SubTotalsTest.php b/dev/tests/unit/testsuite/Magento/Backend/Model/Widget/Grid/SubTotalsTest.php
index 36f4f5b468f10..2e4f4a7d526c4 100644
--- a/dev/tests/unit/testsuite/Magento/Backend/Model/Widget/Grid/SubTotalsTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backend/Model/Widget/Grid/SubTotalsTest.php
@@ -85,7 +85,7 @@ public function testCountTotals()
protected function _getTestCollection()
{
$collection = new \Magento\Framework\Data\Collection(
- $this->getMock('Magento\Core\Model\EntityFactory', [], [], '', false)
+ $this->getMock('Magento\Framework\Data\Collection\EntityFactory', [], [], '', false)
);
$items = [
new \Magento\Framework\Object(['sub_test1' => '1', 'sub_test2' => '2']),
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Model/Widget/Grid/TotalsTest.php b/dev/tests/unit/testsuite/Magento/Backend/Model/Widget/Grid/TotalsTest.php
index 6a0f59a55b54a..6904fd1838326 100644
--- a/dev/tests/unit/testsuite/Magento/Backend/Model/Widget/Grid/TotalsTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backend/Model/Widget/Grid/TotalsTest.php
@@ -73,7 +73,7 @@ public function testCountTotals()
{
// prepare collection
$collection = new \Magento\Framework\Data\Collection(
- $this->getMock('Magento\Core\Model\EntityFactory', [], [], '', false)
+ $this->getMock('Magento\Framework\Data\Collection\EntityFactory', [], [], '', false)
);
$items = [
new \Magento\Framework\Object(['test1' => '1', 'test2' => '2']),
@@ -96,7 +96,7 @@ public function testCountTotalsWithSubItems()
// prepare collection
$collection = new \Magento\Framework\Data\Collection(
- $this->getMock('Magento\Core\Model\EntityFactory', [], [], '', false)
+ $this->getMock('Magento\Framework\Data\Collection\EntityFactory', [], [], '', false)
);
$items = [
new \Magento\Framework\Object(
@@ -118,7 +118,7 @@ public function testCountTotalsWithSubItems()
foreach ($items as $item) {
// prepare sub-collection
$subCollection = new \Magento\Framework\Data\Collection(
- $this->getMock('Magento\Core\Model\EntityFactory', [], [], '', false)
+ $this->getMock('Magento\Framework\Data\Collection\EntityFactory', [], [], '', false)
);
$subCollection->addItem(new \Magento\Framework\Object(['test4' => '1', 'test5' => '2']));
$subCollection->addItem(new \Magento\Framework\Object(['test4' => '2', 'test5' => '2']));
diff --git a/dev/tests/unit/testsuite/Magento/Bundle/Model/LinkManagementTest.php b/dev/tests/unit/testsuite/Magento/Bundle/Model/LinkManagementTest.php
index 723814408cadc..9d1f3e7b650ec 100644
--- a/dev/tests/unit/testsuite/Magento/Bundle/Model/LinkManagementTest.php
+++ b/dev/tests/unit/testsuite/Magento/Bundle/Model/LinkManagementTest.php
@@ -69,7 +69,7 @@ class LinkManagementTest extends \PHPUnit_Framework_TestCase
protected $optionCollectionFactoryMock;
/**
- * @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Store\Model\StoreManagerInterface
+ * @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Framework\Store\StoreManagerInterface
*/
protected $storeManagerMock;
@@ -141,7 +141,7 @@ protected function setUp()
$this->optionCollectionFactoryMock = $this->getMock(
'\Magento\Bundle\Model\Resource\Option\CollectionFactory', ['create'], [], '', false
);
- $this->storeManagerMock = $this->getMock('\Magento\Store\Model\StoreManagerInterface', [], [], '', false);
+ $this->storeManagerMock = $this->getMock('\Magento\Framework\Store\StoreManagerInterface', [], [], '', false);
$this->model = $helper->getObject(
'\Magento\Bundle\Model\LinkManagement',
diff --git a/dev/tests/unit/testsuite/Magento/Bundle/Model/OptionRepositoryTest.php b/dev/tests/unit/testsuite/Magento/Bundle/Model/OptionRepositoryTest.php
index 7bff3de04713e..093571a535ee5 100644
--- a/dev/tests/unit/testsuite/Magento/Bundle/Model/OptionRepositoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/Bundle/Model/OptionRepositoryTest.php
@@ -84,7 +84,7 @@ protected function setUp()
'',
false
);
- $this->storeManagerMock = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
+ $this->storeManagerMock = $this->getMock('\Magento\Framework\Store\StoreManagerInterface');
$this->linkManagementMock = $this->getMock('\Magento\Bundle\Api\ProductLinkManagementInterface');
$this->optionListMock = $this->getMock('\Magento\Bundle\Model\Product\OptionList', [], [], '', false);
$this->linkListMock = $this->getMock('\Magento\Bundle\Model\Product\LinksList', [], [], '', false);
diff --git a/dev/tests/unit/testsuite/Magento/Bundle/Model/Product/CatalogPriceTest.php b/dev/tests/unit/testsuite/Magento/Bundle/Model/Product/CatalogPriceTest.php
index 96b005e33439e..c82c12bb55c90 100644
--- a/dev/tests/unit/testsuite/Magento/Bundle/Model/Product/CatalogPriceTest.php
+++ b/dev/tests/unit/testsuite/Magento/Bundle/Model/Product/CatalogPriceTest.php
@@ -39,7 +39,7 @@ class CatalogPriceTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface');
+ $this->storeManagerMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
$this->commonPriceMock = $this->getMock(
'Magento\Catalog\Model\Product\CatalogPrice',
[],
diff --git a/dev/tests/unit/testsuite/Magento/Bundle/Model/Product/PriceTest.php b/dev/tests/unit/testsuite/Magento/Bundle/Model/Product/PriceTest.php
index 656aafc5baf03..01b99cd72d0a7 100644
--- a/dev/tests/unit/testsuite/Magento/Bundle/Model/Product/PriceTest.php
+++ b/dev/tests/unit/testsuite/Magento/Bundle/Model/Product/PriceTest.php
@@ -66,7 +66,7 @@ protected function setUp()
'',
false
);
- $this->storeManagerMock = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
+ $this->storeManagerMock = $this->getMock('\Magento\Framework\Store\StoreManagerInterface');
$this->localeDateMock = $this->getMock('\Magento\Framework\Stdlib\DateTime\TimezoneInterface');
$this->customerSessionMock = $this->getMock('\Magento\Customer\Model\Session', [], [], '', false);
$this->eventManagerMock = $this->getMock('\Magento\Framework\Event\ManagerInterface');
diff --git a/dev/tests/unit/testsuite/Magento/Bundle/Model/Product/TypeTest.php b/dev/tests/unit/testsuite/Magento/Bundle/Model/Product/TypeTest.php
index 11bcf428e513e..c915ace0f5c2e 100644
--- a/dev/tests/unit/testsuite/Magento/Bundle/Model/Product/TypeTest.php
+++ b/dev/tests/unit/testsuite/Magento/Bundle/Model/Product/TypeTest.php
@@ -32,7 +32,7 @@ class TypeTest extends \PHPUnit_Framework_TestCase
protected $catalogData;
/**
- * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $storeManager;
@@ -70,7 +70,7 @@ protected function setUp()
$this->catalogData = $this->getMockBuilder('Magento\Catalog\Helper\Data')
->disableOriginalConstructor()
->getMock();
- $this->storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
+ $this->storeManager = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
->disableOriginalConstructor()
->getMock();
$this->bundleOptionFactory = $this->getMockBuilder('Magento\Bundle\Model\OptionFactory')
diff --git a/dev/tests/unit/testsuite/Magento/Captcha/Helper/DataTest.php b/dev/tests/unit/testsuite/Magento/Captcha/Helper/DataTest.php
index 0e4c592978aa5..4662e60bb7ab2 100644
--- a/dev/tests/unit/testsuite/Magento/Captcha/Helper/DataTest.php
+++ b/dev/tests/unit/testsuite/Magento/Captcha/Helper/DataTest.php
@@ -84,7 +84,7 @@ public function testGetConfigNode()
'getValue'
)->with(
'customer/captcha/enable',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)->will(
$this->returnValue('1')
);
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Block/Adminhtml/Category/AbstractCategoryTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Block/Adminhtml/Category/AbstractCategoryTest.php
index 067a798dec8dc..c5071cc170d54 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Block/Adminhtml/Category/AbstractCategoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Block/Adminhtml/Category/AbstractCategoryTest.php
@@ -69,7 +69,7 @@ protected function setUp()
->disableOriginalConstructor()
->getMock();
- $this->storeManagerMock = $this->getMockBuilder('\Magento\Store\Model\StoreManagerInterface')
+ $this->storeManagerMock = $this->getMockBuilder('\Magento\Framework\Store\StoreManagerInterface')
->disableOriginalConstructor()
->getMock();
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/AlertsTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/AlertsTest.php
index e2a0f4918ffb9..d2a0f1b8747f7 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/AlertsTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/AlertsTest.php
@@ -40,13 +40,13 @@ public function testCanShowTab($priceAllow, $stockAllow, $canShowTab)
$valueMap = [
[
'catalog/productalert/allow_price',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
null,
$priceAllow,
],
[
'catalog/productalert/allow_stock',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
null,
$stockAllow
],
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/InventoryTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/InventoryTest.php
index 800477edfff34..bef24530adc90 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/InventoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/InventoryTest.php
@@ -46,7 +46,7 @@ class InventoryTest extends \PHPUnit_Framework_TestCase
protected $contextMock;
/**
- * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $storeManagerMock;
@@ -112,7 +112,7 @@ protected function setUp()
false
);
$this->storeManagerMock = $this->getMockForAbstractClass(
- 'Magento\Store\Model\StoreManagerInterface',
+ 'Magento\Framework\Store\StoreManagerInterface',
[],
'',
false
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Block/Category/Rss/LinkTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Block/Category/Rss/LinkTest.php
index 9058281e07d07..36f76a7b3c41f 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Block/Category/Rss/LinkTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Block/Category/Rss/LinkTest.php
@@ -34,7 +34,7 @@ class LinkTest extends \PHPUnit_Framework_TestCase
protected $scopeConfigInterface;
/**
- * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $storeManagerInterface;
@@ -47,7 +47,7 @@ protected function setUp()
{
$this->urlBuilderInterface = $this->getMock('Magento\Framework\App\Rss\UrlBuilderInterface');
$this->scopeConfigInterface = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
- $this->storeManagerInterface = $this->getMock('Magento\Store\Model\StoreManagerInterface');
+ $this->storeManagerInterface = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
$this->registry = $this->getMock('Magento\Framework\Registry');
$this->objectManagerHelper = new ObjectManagerHelper($this);
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Block/Rss/CategoryTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Block/Rss/CategoryTest.php
index 6032a4afbffab..1bfe887439116 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Block/Rss/CategoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Block/Rss/CategoryTest.php
@@ -54,7 +54,7 @@ class CategoryTest extends \PHPUnit_Framework_TestCase
protected $customerSession;
/**
- * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $storeManager;
@@ -105,7 +105,7 @@ protected function setUp()
$this->imageHelper = $this->getMock('Magento\Catalog\Helper\Image', [], [], '', false);
$this->customerSession = $this->getMock('Magento\Customer\Model\Session', ['getId'], [], '', false);
$this->customerSession->expects($this->any())->method('getId')->will($this->returnValue(1));
- $this->storeManager = $this->getMock('Magento\Store\Model\StoreManagerInterface');
+ $this->storeManager = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
$store = $this->getMockBuilder('\Magento\Store\Model\Store')
->setMethods(['getId', '__wakeup'])->disableOriginalConstructor()->getMock();
$store->expects($this->any())->method('getId')->will($this->returnValue(1));
@@ -194,7 +194,7 @@ public function testGetCacheLifetime()
public function testIsAllowed()
{
$this->scopeConfig->expects($this->once())->method('isSetFlag')
- ->with('rss/catalog/category', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
+ ->with('rss/catalog/category', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)
->will($this->returnValue(true));
$this->assertEquals(true, $this->block->isAllowed());
}
@@ -202,7 +202,7 @@ public function testIsAllowed()
public function testGetFeeds()
{
$this->scopeConfig->expects($this->once())->method('isSetFlag')
- ->with('rss/catalog/category', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
+ ->with('rss/catalog/category', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)
->will($this->returnValue(true));
$category = $this->getMockBuilder('\Magento\Catalog\Model\Category')
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Block/Rss/Product/NewProductsTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Block/Rss/Product/NewProductsTest.php
index 5ab728554a13e..23ddf2db094e1 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Block/Rss/Product/NewProductsTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Block/Rss/Product/NewProductsTest.php
@@ -44,7 +44,7 @@ class NewProductsTest extends \PHPUnit_Framework_TestCase
protected $rssUrlBuilder;
/**
- * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $storeManager;
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Block/Rss/Product/SpecialTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Block/Rss/Product/SpecialTest.php
index 49707aaca9b33..b497f057e72ca 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Block/Rss/Product/SpecialTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Block/Rss/Product/SpecialTest.php
@@ -54,7 +54,7 @@ class SpecialTest extends \PHPUnit_Framework_TestCase
protected $rssUrlBuilder;
/**
- * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $storeManager;
@@ -95,7 +95,7 @@ protected function setUp()
$this->rssModel = $this->getMock('Magento\Catalog\Model\Rss\Product\Special', [], [], '', false);
$this->rssUrlBuilder = $this->getMock('Magento\Framework\App\Rss\UrlBuilderInterface');
- $this->storeManager = $this->getMock('Magento\Store\Model\StoreManagerInterface');
+ $this->storeManager = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
$store = $this->getMockBuilder('\Magento\Store\Model\Store')
->setMethods(['getId', 'getFrontendName', '__wakeup'])->disableOriginalConstructor()->getMock();
$store->expects($this->any())->method('getId')->will($this->returnValue(1));
@@ -209,7 +209,7 @@ protected function getItemMock()
public function testIsAllowed()
{
$this->scopeConfig->expects($this->once())->method('isSetFlag')
- ->with('rss/catalog/special', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
+ ->with('rss/catalog/special', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)
->will($this->returnValue(true));
$this->assertEquals(true, $this->block->isAllowed());
}
@@ -222,7 +222,7 @@ public function testGetCacheLifetime()
public function testGetFeeds()
{
$this->scopeConfig->expects($this->once())->method('isSetFlag')
- ->with('rss/catalog/special', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
+ ->with('rss/catalog/special', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)
->will($this->returnValue(true));
$this->rssUrlBuilder->expects($this->once())->method('getUrl')
->with(['type' => 'special_products'])
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Block/Widget/LinkTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Block/Widget/LinkTest.php
index 3028f4a437b9d..6cf427a930bf0 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Block/Widget/LinkTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Block/Widget/LinkTest.php
@@ -12,7 +12,7 @@
class LinkTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Store\Model\StoreManagerInterface
+ * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Store\StoreManagerInterface
*/
protected $storeManager;
@@ -33,7 +33,7 @@ class LinkTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->storeManager = $this->getMock('Magento\Store\Model\StoreManagerInterface');
+ $this->storeManager = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
$this->urlFinder = $this->getMock('Magento\UrlRewrite\Model\UrlFinderInterface');
$context = $this->getMock('Magento\Framework\View\Element\Template\Context', [], [], '', false);
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Controller/Adminhtml/Category/SaveTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Controller/Adminhtml/Category/SaveTest.php
index 9e484f562bb08..473b20cc9f0a5 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Controller/Adminhtml/Category/SaveTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Controller/Adminhtml/Category/SaveTest.php
@@ -328,11 +328,11 @@ public function testExecute($categoryId, $storeId, $activeTabId, $parentId)
false
);
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
* |\PHPUnit_Framework_MockObject_MockObject $storeManagerMock
*/
$storeManagerMock = $this->getMockForAbstractClass(
- 'Magento\Store\Model\StoreManagerInterface',
+ 'Magento\Framework\Store\StoreManagerInterface',
[],
'',
false,
@@ -408,7 +408,7 @@ public function testExecute($categoryId, $storeId, $activeTabId, $parentId)
['Magento\Backend\Model\Auth\Session', $sessionMock],
['Magento\Framework\Registry', $registryMock],
['Magento\Cms\Model\Wysiwyg\Config', $wysiwygConfigMock],
- ['Magento\Store\Model\StoreManagerInterface', $storeManagerMock],
+ ['Magento\Framework\Store\StoreManagerInterface', $storeManagerMock],
]
)
);
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Initialization/HelperTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Initialization/HelperTest.php
index 0eb89b9f1735d..8d0497c352128 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Initialization/HelperTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Initialization/HelperTest.php
@@ -63,7 +63,7 @@ protected function setUp()
$this->jsHelperMock = $this->getMock('Magento\Backend\Helper\Js', [], [], '', false);
$this->storeMock = $this->getMock('Magento\Store\Model\Store', [], [], '', false);
$this->websiteMock = $this->getMock('Magento\Store\Model\Website', [], [], '', false);
- $this->storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface');
+ $this->storeManagerMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
$this->stockFilterMock = $this->getMock(
'Magento\Catalog\Controller\Adminhtml\Product\Initialization\StockDataFilter',
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Controller/Category/ViewTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Controller/Category/ViewTest.php
index 5cedb13bbfb0b..d5872fa7459dc 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Controller/Category/ViewTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Controller/Category/ViewTest.php
@@ -75,7 +75,7 @@ class ViewTest extends \PHPUnit_Framework_TestCase
protected $store;
/**
- * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $storeManager;
@@ -156,7 +156,7 @@ public function setUp()
$this->categoryRepository = $this->getMock('Magento\Catalog\Api\CategoryRepositoryInterface');
$this->store = $this->getMock('Magento\Store\Model\Store', [], [], '', false);
- $this->storeManager = $this->getMock('Magento\Store\Model\StoreManagerInterface');
+ $this->storeManager = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
$this->storeManager->expects($this->any())->method('getStore')->will($this->returnValue($this->store));
$this->catalogDesign = $this->getMock('Magento\Catalog\Model\Design', [], [], '', false);
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Controller/Product/Compare/IndexTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Controller/Product/Compare/IndexTest.php
index 4fbc2520073e6..3152e59ba5134 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Controller/Product/Compare/IndexTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Controller/Product/Compare/IndexTest.php
@@ -41,7 +41,7 @@ class IndexTest extends \PHPUnit_Framework_TestCase
/** @var \Magento\Catalog\Model\Session|\PHPUnit_Framework_MockObject_MockObject */
protected $catalogSession;
- /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
protected $storeManagerMock;
/** @var \Magento\Core\App\Action\FormKeyValidator|\PHPUnit_Framework_MockObject_MockObject */
@@ -94,7 +94,7 @@ protected function setUp()
$this->visitorMock = $this->getMock('Magento\Customer\Model\Visitor', [], [], '', false);
$this->listCompareMock = $this->getMock('Magento\Catalog\Model\Product\Compare\ListCompare', [], [], '', false);
$this->catalogSession = $this->getMock('Magento\Catalog\Model\Session', ['setBeforeCompareUrl'], [], '', false);
- $this->storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface');
+ $this->storeManagerMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
$this->formKeyValidatorMock = $this->getMock('Magento\Core\App\Action\FormKeyValidator', [], [], '', false);
$this->redirectFactoryMock = $this->getMock(
'Magento\Framework\Controller\Result\RedirectFactory',
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Helper/Product/Edit/Action/AttributeTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Helper/Product/Edit/Action/AttributeTest.php
index 97cf8bd59a454..35d41e0f46b2b 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Helper/Product/Edit/Action/AttributeTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Helper/Product/Edit/Action/AttributeTest.php
@@ -11,7 +11,7 @@
class AttributeTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $storeManagerMock;
@@ -30,7 +30,7 @@ protected function setUp()
$objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
$this->storeManagerMock = $this->getMockForAbstractClass(
- 'Magento\Store\Model\StoreManagerInterface',
+ 'Magento\Framework\Store\StoreManagerInterface',
[],
'',
false
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Helper/Product/Flat/IndexerTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Helper/Product/Flat/IndexerTest.php
index 853094b5a1940..4cb9c96a4d73a 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Helper/Product/Flat/IndexerTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Helper/Product/Flat/IndexerTest.php
@@ -18,7 +18,7 @@ class IndexerTest extends \PHPUnit_Framework_TestCase
protected $_model;
/**
- * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $_storeManagerMock;
@@ -73,7 +73,7 @@ public function setUp()
$eavFactoryMock = $this->getMock('Magento\Eav\Model\Entity\AttributeFactory', [], [], '', false);
- $this->_storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface');
+ $this->_storeManagerMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
$this->_connectionMock = $this->getMock(
'Magento\Framework\DB\Adapter\Pdo\Mysql',
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Category/TreeTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Category/TreeTest.php
index 8b38af7d56cf1..07dbf1a28ec7e 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Category/TreeTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Category/TreeTest.php
@@ -16,7 +16,7 @@ class TreeTest extends \PHPUnit_Framework_TestCase
protected $categoryTreeMock;
/**
- * @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Store\Model\StoreManagerInterface
+ * @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Framework\Store\StoreManagerInterface
*/
protected $storeManagerMock;
@@ -60,7 +60,7 @@ public function setUp()
->getMock();
$this->storeManagerMock = $this->getMockBuilder(
- '\Magento\Store\Model\StoreManagerInterface'
+ '\Magento\Framework\Store\StoreManagerInterface'
)->disableOriginalConstructor()
->getMock();
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/CategoryRepositoryTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/CategoryRepositoryTest.php
index f6f9d8fa22d6a..615c06b20bb09 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/CategoryRepositoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/CategoryRepositoryTest.php
@@ -49,7 +49,7 @@ protected function setUp()
false
);
$this->categoryResourceMock = $this->getMock('\Magento\Catalog\Model\Resource\Category', [], [], '', false);
- $this->storeManagerMock = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
+ $this->storeManagerMock = $this->getMock('\Magento\Framework\Store\StoreManagerInterface');
$this->model = new \Magento\Catalog\Model\CategoryRepository(
$this->categoryFactoryMock,
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/CategoryTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/CategoryTest.php
index b6c02ba81cfe5..410d476b1e7b3 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/CategoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/CategoryTest.php
@@ -29,7 +29,7 @@ class CategoryTest extends \PHPUnit_Framework_TestCase
/** @var \Magento\Framework\Registry|\PHPUnit_Framework_MockObject_MockObject */
protected $registry;
- /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
protected $storeManager;
/** @var \Magento\Catalog\Model\Resource\Category\Tree|\PHPUnit_Framework_MockObject_MockObject */
@@ -95,7 +95,7 @@ protected function setUp()
->will($this->returnValue($this->cacheManager));
$this->registry = $this->getMock('Magento\Framework\Registry');
- $this->storeManager = $this->getMock('Magento\Store\Model\StoreManagerInterface');
+ $this->storeManager = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
$this->categoryTreeResource = $this->getMock('Magento\Catalog\Model\Resource\Category\Tree', [], [], '', false);
$this->categoryTreeFactory = $this->getMock(
'Magento\Catalog\Model\Resource\Category\TreeFactory',
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/ConfigTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/ConfigTest.php
index a18df7aeb95fa..00b5c4639d7c5 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/ConfigTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/ConfigTest.php
@@ -222,7 +222,7 @@ protected function prepareConfigModelForAttributes()
$attribute->expects($this->any())->method('getStoreLabel')->will($this->returnValue($storeLabel));
$attribute->expects($this->any())->method('getAttributeCode')->will($this->returnValue($attributeCode));
- $storeManager = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
+ $storeManager = $this->getMock('\Magento\Framework\Store\StoreManagerInterface');
$store = $this->getMock('\Magento\Store\Model\Store', [], [], '', false);
$storeManager->expects($this->any())->method('getStore')->will($this->returnValue($store));
$store->expects($this->any())->method('getId')->will($this->returnValue($storeId));
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/EraserTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/EraserTest.php
index c666bd8fe562a..8cc520a832084 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/EraserTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/EraserTest.php
@@ -47,7 +47,7 @@ protected function setUp()
[2, 'store_2_flat'],
]));
- $this->storeManager = $this->getMock('Magento\Store\Model\StoreManagerInterface');
+ $this->storeManager = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
$this->model = new \Magento\Catalog\Model\Indexer\Product\Flat\Action\Eraser(
$resource,
$this->indexerHelper,
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/RowTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/RowTest.php
index 7014626764887..c61db945fa33c 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/RowTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/RowTest.php
@@ -66,7 +66,7 @@ public function setUp()
$this->resource->expects($this->any())->method('getConnection')
->with('default')
->will($this->returnValue($this->connection));
- $this->storeManager = $this->getMock('Magento\Store\Model\StoreManagerInterface');
+ $this->storeManager = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
$this->store = $this->getMock('Magento\Store\Model\Store', [], [], '', false);
$this->store->expects($this->any())->method('getId')->will($this->returnValue('store_id_1'));
$this->storeManager->expects($this->any())->method('getStores')->will($this->returnValue([$this->store]));
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/RowsTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/RowsTest.php
index 0789115e20184..8ac88371f39e6 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/RowsTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/RowsTest.php
@@ -66,7 +66,7 @@ public function setUp()
$this->_resource->expects($this->any())->method('getConnection')
->with('default')
->will($this->returnValue($this->_connection));
- $this->_storeManager = $this->getMock('Magento\Store\Model\StoreManagerInterface');
+ $this->_storeManager = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
$this->_store = $this->getMock('Magento\Store\Model\Store', [], [], '', false);
$this->_store->expects($this->any())->method('getId')->will($this->returnValue('store_id_1'));
$this->_storeManager->expects($this->any())->method('getStores')->will(
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Price/ObserverTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Price/ObserverTest.php
index 1373adaf475bb..0615e954a4e09 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Price/ObserverTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Price/ObserverTest.php
@@ -18,7 +18,7 @@ class ObserverTest extends \PHPUnit_Framework_TestCase
protected $_model;
/**
- * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $_storeManagerMock;
@@ -52,7 +52,7 @@ protected function setUp()
$this->_objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
$this->_storeManagerMock = $this->getMock(
- 'Magento\Store\Model\StoreManagerInterface',
+ 'Magento\Framework\Store\StoreManagerInterface',
[],
[],
'',
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Price/System/Config/PriceScopeTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Price/System/Config/PriceScopeTest.php
index e3418ae001718..d775de563f864 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Price/System/Config/PriceScopeTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Price/System/Config/PriceScopeTest.php
@@ -42,7 +42,7 @@ public function setUp()
$contextMock = $this->getMock('Magento\Framework\Model\Context', [], [], '', false);
$registryMock = $this->getMock('Magento\Framework\Registry', [], [], '', false);
- $storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface', [], [], '', false);
+ $storeManagerMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface', [], [], '', false);
$configMock = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Category/FilterableAttributeListTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Category/FilterableAttributeListTest.php
index dae378983bc93..893d39009226f 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Category/FilterableAttributeListTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Category/FilterableAttributeListTest.php
@@ -21,7 +21,7 @@ class FilterableAttributeListTest extends \PHPUnit_Framework_TestCase
protected $collectionFactoryMock;
/**
- * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Store\Model\StoreManagerInterface
+ * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Store\StoreManagerInterface
*/
protected $storeManagerMock;
@@ -36,7 +36,7 @@ protected function setUp()
'\Magento\Catalog\Model\Resource\Product\Attribute\CollectionFactory', ['create'], [], '', false);
$this->storeManagerMock = $this->getMock(
- '\Magento\Store\Model\StoreManagerInterface', [], [], '', false
+ '\Magento\Framework\Store\StoreManagerInterface', [], [], '', false
);
$this->layerMock = $this->getMock(
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Category/StateKeyTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Category/StateKeyTest.php
index 4dc836c0be5bb..b57c96109df04 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Category/StateKeyTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Category/StateKeyTest.php
@@ -25,7 +25,7 @@ class StateKeyTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->storeManagerMock = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
+ $this->storeManagerMock = $this->getMock('\Magento\Framework\Store\StoreManagerInterface');
$this->customerSessionMock = $this->getMock('\Magento\Customer\Model\Session', [], [], '', false);
$this->model = new StateKey($this->storeManagerMock, $this->customerSessionMock);
}
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Filter/AttributeTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Filter/AttributeTest.php
index 74725687834c1..dd7cc714be674 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Filter/AttributeTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Filter/AttributeTest.php
@@ -40,7 +40,7 @@ class AttributeTest extends \PHPUnit_Framework_TestCase
/** @var \Magento\Catalog\Model\Layer\Filter\ItemFactory|MockObject */
private $filterItemFactory;
- /** @var \Magento\Store\Model\StoreManagerInterface|MockObject */
+ /** @var \Magento\Framework\Store\StoreManagerInterface|MockObject */
private $storeManager;
/** @var \Magento\Catalog\Model\Layer|MockObject */
@@ -60,8 +60,8 @@ protected function setUp()
->setMethods(['create'])
->getMock();
- /** @var \Magento\Store\Model\StoreManagerInterface $storeManager */
- $this->storeManager = $this->getMockBuilder('\Magento\Store\Model\StoreManagerInterface')
+ /** @var \Magento\Framework\Store\StoreManagerInterface $storeManager */
+ $this->storeManager = $this->getMockBuilder('\Magento\Framework\Store\StoreManagerInterface')
->disableOriginalConstructor()
->setMethods([])
->getMockForAbstractClass();
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Filter/DataProvider/PriceTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Filter/DataProvider/PriceTest.php
index 500dd8dd04151..27a78d73f12ef 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Filter/DataProvider/PriceTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Filter/DataProvider/PriceTest.php
@@ -199,23 +199,23 @@ private function getValueMap()
{
return [
Price::XML_PATH_RANGE_CALCULATION => [
- 'scope' => \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ 'scope' => \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
'value' => 111,
],
Price::XML_PATH_RANGE_STEP => [
- 'scope' => \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ 'scope' => \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
'value' => 222,
],
Price::XML_PATH_ONE_PRICE_INTERVAL => [
- 'scope' => \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ 'scope' => \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
'value' => 333,
],
Price::XML_PATH_INTERVAL_DIVISION_LIMIT => [
- 'scope' => \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ 'scope' => \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
'value' => 444,
],
Price::XML_PATH_RANGE_MAX_INTERVALS => [
- 'scope' => \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ 'scope' => \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
'value' => 555,
],
];
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Search/CollectionFilterTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Search/CollectionFilterTest.php
index 8b527c450c529..4c1cba95e7409 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Search/CollectionFilterTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Search/CollectionFilterTest.php
@@ -36,7 +36,7 @@ protected function setUp()
$this->visibilityMock = $this->getMock('Magento\Catalog\Model\Product\Visibility', [], [], '', false);
$this->catalogConfigMock = $this->getMock('\Magento\Catalog\Model\Config', [], [], '', false);
- $this->storeManagerMock = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
+ $this->storeManagerMock = $this->getMock('\Magento\Framework\Store\StoreManagerInterface');
$this->model = $objectManager->getObject(
'Magento\Catalog\Model\Layer\Search\CollectionFilter',
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Search/FilterableAttributeListTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Search/FilterableAttributeListTest.php
index 2afb8894af13f..f1cbd1b6e995c 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Search/FilterableAttributeListTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Search/FilterableAttributeListTest.php
@@ -21,7 +21,7 @@ class FilterableAttributeListTest extends \PHPUnit_Framework_TestCase
protected $collectionFactoryMock;
/**
- * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Store\Model\StoreManagerInterface
+ * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Store\StoreManagerInterface
*/
protected $storeManagerMock;
@@ -36,7 +36,7 @@ protected function setUp()
'\Magento\Catalog\Model\Resource\Product\Attribute\CollectionFactory', ['create'], [], '', false);
$this->storeManagerMock = $this->getMock(
- '\Magento\Store\Model\StoreManagerInterface', [], [], '', false
+ '\Magento\Framework\Store\StoreManagerInterface', [], [], '', false
);
$this->layerMock = $this->getMock(
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Search/StateKeyTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Search/StateKeyTest.php
index fec85625a7bdf..2c2cfc3367298 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Search/StateKeyTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Search/StateKeyTest.php
@@ -32,7 +32,7 @@ class StateKeyTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->storeManagerMock = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
+ $this->storeManagerMock = $this->getMock('\Magento\Framework\Store\StoreManagerInterface');
$this->customerSessionMock = $this->getMock('\Magento\Customer\Model\Session', [], [], '', false);
$this->queryFactoryMock = $this->getMock(
'\Magento\Search\Model\QueryFactory',
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/LayerTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/LayerTest.php
index 10a9fad9e9994..ed1218a621e26 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/LayerTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/LayerTest.php
@@ -30,7 +30,7 @@ class LayerTest extends \PHPUnit_Framework_TestCase
private $registry;
/**
- * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
private $storeManager;
@@ -113,7 +113,7 @@ protected function setUp()
->disableOriginalConstructor()
->getMockForAbstractClass();
- $this->storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
+ $this->storeManager = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
->setMethods(['getStore'])
->disableOriginalConstructor()
->getMockForAbstractClass();
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/ObserverTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/ObserverTest.php
index 5228841640a91..ec274d371280d 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/ObserverTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/ObserverTest.php
@@ -36,7 +36,7 @@ class ObserverTest extends \PHPUnit_Framework_TestCase
protected $_categoryFlatState;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -58,7 +58,7 @@ public function setUp()
false
);
- $this->_storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
+ $this->_storeManager = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
->disableOriginalConstructor()
->getMock();
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractTest.php
index 67f5e0b62d3e4..74ad52b9b7c10 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractTest.php
@@ -25,7 +25,7 @@ protected function setUp()
$this->_helper->expects($this->any())->method('isPriceGlobal')->will($this->returnValue(true));
$currencyFactoryMock = $this->getMock('Magento\Directory\Model\CurrencyFactory', [], [], '', false);
- $storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface', [], [], '', false);
+ $storeManagerMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface', [], [], '', false);
$productTypeMock = $this->getMock('Magento\Catalog\Model\Product\Type', [], [], '', false);
$configMock = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
$groupManagement = $this->getMock('Magento\Customer\Api\GroupManagementInterface', [], [], '', false);
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/Frontend/ImageTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/Frontend/ImageTest.php
index e63adaac73997..a05773d718f39 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/Frontend/ImageTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/Frontend/ImageTest.php
@@ -50,13 +50,13 @@ private function getMockedProduct()
}
/**
- * @return \Magento\Store\Model\StoreManagerInterface
+ * @return \Magento\Framework\Store\StoreManagerInterface
*/
private function getMockedStoreManager()
{
$mockedStore = $this->getMockedStore();
- $mockBuilder = $this->getMockBuilder('\Magento\Store\Model\StoreManagerInterface');
+ $mockBuilder = $this->getMockBuilder('\Magento\Framework\Store\StoreManagerInterface');
$mock = $mockBuilder->setMethods(['getStore'])
->disableOriginalConstructor()
->getMockForAbstractClass();
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/Source/CountryofmanufactureTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/Source/CountryofmanufactureTest.php
index fd6081a924b9b..0439a06ca072f 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/Source/CountryofmanufactureTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/Source/CountryofmanufactureTest.php
@@ -8,7 +8,7 @@
class CountryofmanufactureTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $storeManagerMock;
@@ -29,7 +29,7 @@ class CountryofmanufactureTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->storeManagerMock = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
+ $this->storeManagerMock = $this->getMock('\Magento\Framework\Store\StoreManagerInterface');
$this->storeMock = $this->getMock('\Magento\Store\Model\Store', [], [], '', false);
$this->cacheConfig = $this->getMock('\Magento\Framework\App\Cache\Type\Config', [], [], '', false);
$this->objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Gallery/GalleryManagementTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Gallery/GalleryManagementTest.php
index 7acab9fb41df6..3a37b1a9e63f3 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Gallery/GalleryManagementTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Gallery/GalleryManagementTest.php
@@ -65,7 +65,7 @@ class GalleryManagementTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->storeManagerMock = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
+ $this->storeManagerMock = $this->getMock('\Magento\Framework\Store\StoreManagerInterface');
$this->productRepositoryMock = $this->getMock('\Magento\Catalog\Api\ProductRepositoryInterface');
$this->attributeRepositoryMock = $this->getMock('\Magento\Catalog\Api\ProductAttributeRepositoryInterface');
$this->mediaConfigMock = $this->getMock('\Magento\Catalog\Model\Product\Media\Config', [], [], '', false);
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/GroupPriceManagementTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/GroupPriceManagementTest.php
index 7969e5c4096ad..85843f457590b 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/GroupPriceManagementTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/GroupPriceManagementTest.php
@@ -70,7 +70,7 @@ protected function setUp()
'',
false
);
- $this->storeManagerMock = $this->getMockBuilder('\Magento\Store\Model\StoreManagerInterface')
+ $this->storeManagerMock = $this->getMockBuilder('\Magento\Framework\Store\StoreManagerInterface')
->setMethods(['getWebsite'])
->disableOriginalConstructor()
->getMockForAbstractClass();
@@ -92,7 +92,7 @@ protected function setUp()
$this->productRepositoryMock->expects($this->any())->method('get')->with('product_sku')
->will($this->returnValue($this->productMock));
$this->configMock = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
- $this->storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface');
+ $this->storeManagerMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
$this->groupPriceManagement = new GroupPriceManagement(
$this->productRepositoryMock,
$this->priceBuilderMock,
@@ -121,7 +121,7 @@ public function testGetList($configValue, $groupData, $expected)
$this->configMock
->expects($this->once())
->method('getValue')
- ->with('catalog/price/scope', \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE)
+ ->with('catalog/price/scope', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE)
->will($this->returnValue($configValue));
$this->priceBuilderMock
->expects($this->once())
@@ -160,7 +160,7 @@ public function testSuccessRemoveGroupPrice()
$this->configMock
->expects($this->once())
->method('getValue')
- ->with('catalog/price/scope', \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE)
+ ->with('catalog/price/scope', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE)
->will($this->returnValue(0));
$this->priceModifierMock->expects($this->once())->method('removeGroupPrice')->with($this->productMock, 4, 0);
@@ -192,7 +192,7 @@ public function testSuccessRemoveGroupPriceFromWebsiteLevel()
$this->configMock
->expects($this->once())
->method('getValue')
- ->with('catalog/price/scope', \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE)
+ ->with('catalog/price/scope', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE)
->will($this->returnValue(1));
$this->priceModifierMock->expects($this->once())->method('removeGroupPrice')->with($this->productMock, 4, 1);
@@ -212,7 +212,7 @@ public function testSetNewPriceWithGlobalPriceScope()
$this->configMock
->expects($this->once())
->method('getValue')
- ->with('catalog/price/scope', \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE)
+ ->with('catalog/price/scope', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE)
->will($this->returnValue(1));
$this->productMock->expects($this->once())->method('setData')->with(
@@ -244,7 +244,7 @@ public function testSetUpdatedPriceWithGlobalPriceScope()
$this->configMock
->expects($this->once())
->method('getValue')
- ->with('catalog/price/scope', \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE)
+ ->with('catalog/price/scope', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE)
->will($this->returnValue(0));
$this->productMock->expects($this->once())->method('setData')->with(
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/ImageTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/ImageTest.php
index 06258ab926587..3a0753f82425b 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/ImageTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/ImageTest.php
@@ -31,7 +31,7 @@ class ImageTest extends \PHPUnit_Framework_TestCase
protected $registry;
/**
- * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $storeManager;
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Media/AttributeManagementTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Media/AttributeManagementTest.php
index c188c4997faa0..d31a79c6fa0c9 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Media/AttributeManagementTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Media/AttributeManagementTest.php
@@ -39,7 +39,7 @@ protected function setUp()
false
);
$this->storeId = 1;
- $this->storeManagerMock = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
+ $this->storeManagerMock = $this->getMock('\Magento\Framework\Store\StoreManagerInterface');
$storeMock = $this->getMock('\Magento\Store\Model\Store', [], [], '', false);
$storeMock->expects($this->any())
->method('getId')
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/TierPriceManagementTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/TierPriceManagementTest.php
index 42e114740a7ac..3867bafcf987f 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/TierPriceManagementTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/TierPriceManagementTest.php
@@ -79,7 +79,7 @@ protected function setUp()
'',
false
);
- $this->storeManagerMock = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
+ $this->storeManagerMock = $this->getMock('\Magento\Framework\Store\StoreManagerInterface');
$this->websiteMock =
$this->getMock('Magento\Store\Model\Website', ['getId', '__wakeup'], [], '', false);
$this->productMock = $this->getMock(
@@ -129,7 +129,7 @@ public function testGetList($configValue, $customerGroupId, $groupData, $expecte
$this->configMock
->expects($this->once())
->method('getValue')
- ->with('catalog/price/scope', \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE)
+ ->with('catalog/price/scope', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE)
->will($this->returnValue($configValue));
if ($expected) {
$this->priceBuilderMock
@@ -182,7 +182,7 @@ public function testSuccessDeleteTierPrice()
$this->configMock
->expects($this->once())
->method('getValue')
- ->with('catalog/price/scope', \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE)
+ ->with('catalog/price/scope', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE)
->will($this->returnValue(0));
$this->priceModifierMock->expects($this->once())->method('removeTierPrice')->with($this->productMock, 4, 5, 0);
@@ -214,7 +214,7 @@ public function testSuccessDeleteTierPriceFromWebsiteLevel()
$this->configMock
->expects($this->once())
->method('getValue')
- ->with('catalog/price/scope', \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE)
+ ->with('catalog/price/scope', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE)
->will($this->returnValue(1));
$this->priceModifierMock->expects($this->once())->method('removeTierPrice')->with($this->productMock, 4, 5, 1);
@@ -243,7 +243,7 @@ public function testSetNewPriceWithGlobalPriceScopeAll()
$this->configMock
->expects($this->once())
->method('getValue')
- ->with('catalog/price/scope', \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE)
+ ->with('catalog/price/scope', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE)
->will($this->returnValue(1));
$this->productMock->expects($this->once())->method('setData')->with(
@@ -289,7 +289,7 @@ public function testSetNewPriceWithGlobalPriceScope()
$this->configMock
->expects($this->once())
->method('getValue')
- ->with('catalog/price/scope', \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE)
+ ->with('catalog/price/scope', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE)
->will($this->returnValue(0));
$this->productMock->expects($this->once())->method('setData')->with(
@@ -317,7 +317,7 @@ public function testSetUpdatedPriceWithGlobalPriceScope()
$this->configMock
->expects($this->once())
->method('getValue')
- ->with('catalog/price/scope', \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE)
+ ->with('catalog/price/scope', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE)
->will($this->returnValue(0));
$this->productMock->expects($this->once())->method('setData')->with(
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/UrlTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/UrlTest.php
index d6adddac76b3f..32ea31a22a5f2 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/UrlTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/UrlTest.php
@@ -65,7 +65,7 @@ protected function setUp()
$store = $this->getMock('Magento\Store\Model\Store', ['getId', '__wakeup'], [], '', false);
$store->expects($this->any())->method('getId')->will($this->returnValue(1));
- $storeManager = $this->getMockForAbstractClass('Magento\Store\Model\StoreManagerInterface');
+ $storeManager = $this->getMockForAbstractClass('Magento\Framework\Store\StoreManagerInterface');
$storeManager->expects($this->any())->method('getStore')->will($this->returnValue($store));
$objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/ProductTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/ProductTest.php
index 1dc92b950212b..c95fddb929682 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/ProductTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/ProductTest.php
@@ -196,7 +196,7 @@ public function setUp()
->disableOriginalConstructor()
->getMock();
- $storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
+ $storeManager = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
->disableOriginalConstructor()
->getMockForAbstractClass();
$storeManager->expects($this->any())
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/AbstractTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/AbstractTest.php
index 0a8c04067abc7..c1f9815215697 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/AbstractTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/AbstractTest.php
@@ -88,7 +88,7 @@ public function testWalkAttributes()
$this->getMock('Magento\Framework\Locale\FormatInterface'),
$this->getMock('Magento\Eav\Model\Resource\Helper', [], [], '', false, false),
$this->getMock('Magento\Framework\Validator\UniversalFactory', [], [], '', false, false),
- $this->getMock('Magento\Store\Model\StoreManagerInterface', [], [], '', false),
+ $this->getMock('Magento\Framework\Store\StoreManagerInterface', [], [], '', false),
$this->getMock('Magento\Catalog\Model\Factory', [], [], '', false),
[]
]
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Category/TreeTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Category/TreeTest.php
index a9421ac5ce0cc..81b93bac76a08 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Category/TreeTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Category/TreeTest.php
@@ -179,7 +179,7 @@ public function testAddCollectionData()
$store = $this->getMock('Magento\Store\Model\Store', [], [], '', false);
$store->expects($this->any())->method('getId')->will($this->returnValue(1));
- $storeManager = $this->getMockForAbstractClass('Magento\Store\Model\StoreManagerInterface');
+ $storeManager = $this->getMockForAbstractClass('Magento\Framework\Store\StoreManagerInterface');
$storeManager->expects($this->any())->method('getStore')->will($this->returnValue($store));
$model = $objectHelper->getObject(
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Product/FlatTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Product/FlatTest.php
index 1f17b422ce1bc..dcc7de50a43c6 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Product/FlatTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Product/FlatTest.php
@@ -18,7 +18,7 @@ class FlatTest extends \PHPUnit_Framework_TestCase
protected $_store;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManagerInterface;
@@ -26,7 +26,7 @@ public function setUp()
{
$this->_store = $this->getMock('\Magento\Store\Model\Store', [], [], '', false);
- $this->_storeManagerInterface = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
+ $this->_storeManagerInterface = $this->getMock('\Magento\Framework\Store\StoreManagerInterface');
$this->_storeManagerInterface->expects(
$this->any()
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Product/Link/Product/CollectionTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Product/Link/Product/CollectionTest.php
index 43aa35827c157..5aac658f62f1b 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Product/Link/Product/CollectionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Product/Link/Product/CollectionTest.php
@@ -20,7 +20,7 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
/** @var ObjectManagerHelper */
protected $objectManagerHelper;
- /** @var \Magento\Core\Model\EntityFactory|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var \Magento\Framework\Data\Collection\EntityFactory|\PHPUnit_Framework_MockObject_MockObject */
protected $entityFactoryMock;
/** @var \Magento\Logger|\PHPUnit_Framework_MockObject_MockObject */
@@ -47,7 +47,7 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
/** @var \Magento\Validator\UniversalFactory|\PHPUnit_Framework_MockObject_MockObject */
protected $universalFactoryMock;
- /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
protected $storeManagerMock;
/** @var \Magento\Catalog\Helper\Data|\PHPUnit_Framework_MockObject_MockObject */
@@ -76,7 +76,7 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->entityFactoryMock = $this->getMock('Magento\Core\Model\EntityFactory', [], [], '', false);
+ $this->entityFactoryMock = $this->getMock('Magento\Framework\Data\Collection\EntityFactory', [], [], '', false);
$this->loggerMock = $this->getMock('Psr\Log\LoggerInterface');
$this->fetchStrategyMock = $this->getMock('Magento\Framework\Data\Collection\Db\FetchStrategyInterface');
$this->managerInterfaceMock = $this->getMock('Magento\Framework\Event\ManagerInterface');
@@ -90,7 +90,7 @@ protected function setUp()
$entity->expects($this->any())->method('getDefaultAttributes')->will($this->returnValue([]));
$this->universalFactoryMock = $this->getMock('Magento\Framework\Validator\UniversalFactory', [], [], '', false);
$this->universalFactoryMock->expects($this->any())->method('create')->will($this->returnValue($entity));
- $this->storeManagerMock = $this->getMockForAbstractClass('Magento\Store\Model\StoreManagerInterface');
+ $this->storeManagerMock = $this->getMockForAbstractClass('Magento\Framework\Store\StoreManagerInterface');
$this->storeManagerMock
->expects($this->any())
->method('getStore')
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Product/Option/CollectionTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Product/Option/CollectionTest.php
index 8ab0bf35a4b57..6a8fa9447c617 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Product/Option/CollectionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Product/Option/CollectionTest.php
@@ -21,7 +21,7 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
protected $loggerMock;
/**
- * @var \Magento\Core\Model\EntityFactory|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Framework\Data\Collection\EntityFactory|\PHPUnit_Framework_MockObject_MockObject
*/
protected $entityFactoryMock;
@@ -41,7 +41,7 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
protected $optionsFactoryMock;
/**
- * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $storeManagerMock;
@@ -63,7 +63,7 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
$this->entityFactoryMock = $this->getMock(
- 'Magento\Core\Model\EntityFactory', ['create'], [], '', false
+ 'Magento\Framework\Data\Collection\EntityFactory', ['create'], [], '', false
);
$this->loggerMock = $this->getMock('Psr\Log\LoggerInterface');
$this->fetchStrategyMock = $this->getMock(
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Rss/Product/SpecialTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Rss/Product/SpecialTest.php
index 90ef1470e5404..a660645a399b8 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Rss/Product/SpecialTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Rss/Product/SpecialTest.php
@@ -34,7 +34,7 @@ class SpecialTest extends \PHPUnit_Framework_TestCase
protected $product;
/**
- * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $storeManager;
diff --git a/dev/tests/unit/testsuite/Magento/CatalogImportExport/Model/Import/Product/Type/OptionTest.php b/dev/tests/unit/testsuite/Magento/CatalogImportExport/Model/Import/Product/Type/OptionTest.php
index fd6d0ed19124c..85282bf88352e 100644
--- a/dev/tests/unit/testsuite/Magento/CatalogImportExport/Model/Import/Product/Type/OptionTest.php
+++ b/dev/tests/unit/testsuite/Magento/CatalogImportExport/Model/Import/Product/Type/OptionTest.php
@@ -227,7 +227,7 @@ protected function setUp()
$this->getMock('Magento\ImportExport\Model\Resource\Import\Data', [], [], '', false),
$this->getMock('Magento\Framework\App\Resource', [], [], '', false),
$this->getMock('Magento\ImportExport\Model\Resource\Helper', [], [], '', false),
- $this->getMock('Magento\Store\Model\StoreManagerInterface', [], [], '', false),
+ $this->getMock('Magento\Framework\Store\StoreManagerInterface', [], [], '', false),
$this->getMock('Magento\Catalog\Model\ProductFactory', [], [], '', false),
$this->getMock(
'Magento\Catalog\Model\Resource\Product\Option\CollectionFactory',
@@ -383,7 +383,7 @@ protected function _getSourceDataMocks($addExpectations, $doubleOptions)
['fetchAll']
);
$logger = $this->getMock('Psr\Log\LoggerInterface');
- $entityFactory = $this->getMock('Magento\Core\Model\EntityFactory', [], [], '', false);
+ $entityFactory = $this->getMock('Magento\Framework\Data\Collection\EntityFactory', [], [], '', false);
$optionCollection = $this->getMock(
'Magento\Framework\Data\Collection\Db',
diff --git a/dev/tests/unit/testsuite/Magento/CatalogInventory/Api/StockConfigurationTest.php b/dev/tests/unit/testsuite/Magento/CatalogInventory/Api/StockConfigurationTest.php
index f17c621f516cc..b9f12e0da9093 100644
--- a/dev/tests/unit/testsuite/Magento/CatalogInventory/Api/StockConfigurationTest.php
+++ b/dev/tests/unit/testsuite/Magento/CatalogInventory/Api/StockConfigurationTest.php
@@ -91,7 +91,7 @@ public function testIsShowOutOfStock()
->method('isSetFlag')
->with(
\Magento\CatalogInventory\Model\Configuration::XML_PATH_SHOW_OUT_OF_STOCK,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
)
->will($this->returnValue(true));
@@ -105,7 +105,7 @@ public function testIsAutoReturnEnabled()
->method('isSetFlag')
->with(
\Magento\CatalogInventory\Model\Configuration::XML_PATH_ITEM_AUTO_RETURN,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
)
->will($this->returnValue(true));
@@ -119,7 +119,7 @@ public function testIsDisplayProductStockStatus()
->method('isSetFlag')
->with(
\Magento\CatalogInventory\Model\Configuration::XML_PATH_DISPLAY_PRODUCT_STOCK_STATUS,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
)
->will($this->returnValue(true));
diff --git a/dev/tests/unit/testsuite/Magento/CatalogInventory/Helper/MinsaleqtyTest.php b/dev/tests/unit/testsuite/Magento/CatalogInventory/Helper/MinsaleqtyTest.php
index 7f58b91dd74c4..18a631ac3c7da 100644
--- a/dev/tests/unit/testsuite/Magento/CatalogInventory/Helper/MinsaleqtyTest.php
+++ b/dev/tests/unit/testsuite/Magento/CatalogInventory/Helper/MinsaleqtyTest.php
@@ -74,7 +74,7 @@ public function testGetConfigValue($customerGroupId, $store, $minSaleQty, $resul
->method('getValue')
->with(
$this->equalTo(\Magento\CatalogInventory\Model\Configuration::XML_PATH_MIN_SALE_QTY),
- $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
$this->equalTo($store)
)
->will($this->returnValue($minSaleQty));
diff --git a/dev/tests/unit/testsuite/Magento/CatalogInventory/Helper/StockTest.php b/dev/tests/unit/testsuite/Magento/CatalogInventory/Helper/StockTest.php
index c604ab66bfb48..5bde5faa49a2f 100644
--- a/dev/tests/unit/testsuite/Magento/CatalogInventory/Helper/StockTest.php
+++ b/dev/tests/unit/testsuite/Magento/CatalogInventory/Helper/StockTest.php
@@ -47,7 +47,7 @@ protected function setUp()
)
->disableOriginalConstructor()
->getMock();
- $this->storeManagerMock = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
+ $this->storeManagerMock = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
->disableOriginalConstructor()
->getMock();
$this->scopeConfigMock = $this->getMockBuilder('Magento\Framework\App\Config\ScopeConfigInterface')
diff --git a/dev/tests/unit/testsuite/Magento/CatalogInventory/Model/ConfigurationTest.php b/dev/tests/unit/testsuite/Magento/CatalogInventory/Model/ConfigurationTest.php
index 3228670da3763..38c2c55877b0f 100644
--- a/dev/tests/unit/testsuite/Magento/CatalogInventory/Model/ConfigurationTest.php
+++ b/dev/tests/unit/testsuite/Magento/CatalogInventory/Model/ConfigurationTest.php
@@ -46,7 +46,7 @@ protected function setUp()
$this->minSaleQtyHelperMock = $this->getMockBuilder('Magento\CatalogInventory\Helper\Minsaleqty')
->disableOriginalConstructor()
->getMock();
- $this->storeManagerMock = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
+ $this->storeManagerMock = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
->disableOriginalConstructor()
->getMock();
$this->model = new Configuration(
@@ -99,7 +99,7 @@ public function testCanSubtractQty()
{
$this->scopeConfigMock->expects($this->once())
->method('isSetFlag')
- ->with(Configuration::XML_PATH_CAN_SUBTRACT, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, 1)
+ ->with(Configuration::XML_PATH_CAN_SUBTRACT, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, 1)
->willReturn(true);
$this->assertTrue($this->model->canSubtractQty(1));
}
@@ -109,7 +109,7 @@ public function testGetMinQty()
$qty = 1;
$this->scopeConfigMock->expects($this->once())
->method('getValue')
- ->with(Configuration::XML_PATH_MIN_QTY, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, 1)
+ ->with(Configuration::XML_PATH_MIN_QTY, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, 1)
->willReturn($qty);
$this->assertEquals($qty, $this->model->getMinQty(1));
}
@@ -132,7 +132,7 @@ public function testGetMaxSaleQty()
$store = 1;
$this->scopeConfigMock->expects($this->once())
->method('getValue')
- ->with(Configuration::XML_PATH_MAX_SALE_QTY, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store)
+ ->with(Configuration::XML_PATH_MAX_SALE_QTY, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store)
->willReturn(1);
$this->assertEquals(1, $this->model->getMaxSaleQty($store));
}
@@ -143,7 +143,11 @@ public function testGetNotifyStockQty()
$this->scopeConfigMock->expects($this->once())
->method('getValue')
- ->with(Configuration::XML_PATH_NOTIFY_STOCK_QTY, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store)
+ ->with(
+ Configuration::XML_PATH_NOTIFY_STOCK_QTY,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ $store
+ )
->willReturn(1);
$this->assertEquals(1, $this->model->getNotifyStockQty($store));
}
@@ -156,7 +160,7 @@ public function testGetEnableQtyIncrements()
->method('getValue')
->with(
Configuration::XML_PATH_ENABLE_QTY_INCREMENTS,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
)->willReturn(1);
$this->assertEquals(1, $this->model->getEnableQtyIncrements($store));
@@ -168,7 +172,7 @@ public function testGetQtyIncrements()
$this->scopeConfigMock->expects($this->once())
->method('getValue')
- ->with(Configuration::XML_PATH_QTY_INCREMENTS, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store)
+ ->with(Configuration::XML_PATH_QTY_INCREMENTS, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store)
->willReturn(1);
$this->assertEquals(1, $this->model->getQtyIncrements($store));
}
@@ -178,7 +182,7 @@ public function testGetBackorders()
$store = 1;
$this->scopeConfigMock->expects($this->once())
->method('getValue')
- ->with(Configuration::XML_PATH_BACKORDERS, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store)
+ ->with(Configuration::XML_PATH_BACKORDERS, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store)
->willReturn(1);
$this->model->getBackorders($store);
}
@@ -188,7 +192,11 @@ public function testGetCanBackInStock()
$store = 1;
$this->scopeConfigMock->expects($this->once())
->method('isSetFlag')
- ->with(Configuration::XML_PATH_CAN_BACK_IN_STOCK, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store)
+ ->with(
+ Configuration::XML_PATH_CAN_BACK_IN_STOCK,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ $store
+ )
->willReturn(1);
$this->assertEquals(1, $this->model->getCanBackInStock($store));
}
@@ -198,7 +206,11 @@ public function testIsShowOutOfStock()
$store = 1;
$this->scopeConfigMock->expects($this->once())
->method('isSetFlag')
- ->with(Configuration::XML_PATH_SHOW_OUT_OF_STOCK, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store)
+ ->with(
+ Configuration::XML_PATH_SHOW_OUT_OF_STOCK,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ $store
+ )
->willReturn(1);
$this->assertEquals(1, $this->model->isShowOutOfStock($store));
}
@@ -208,7 +220,11 @@ public function testIsAutoReturnEnabled()
$store = 1;
$this->scopeConfigMock->expects($this->once())
->method('isSetFlag')
- ->with(Configuration::XML_PATH_ITEM_AUTO_RETURN, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store)
+ ->with(
+ Configuration::XML_PATH_ITEM_AUTO_RETURN,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ $store
+ )
->willReturn(1);
$this->assertEquals(1, $this->model->isAutoReturnEnabled($store));
}
@@ -220,7 +236,7 @@ public function testIsDisplayProductStockStatus()
->method('isSetFlag')
->with(
Configuration::XML_PATH_DISPLAY_PRODUCT_STOCK_STATUS,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
)
->willReturn(1);
@@ -236,7 +252,7 @@ public function testGetDefaultConfigValue()
->method('getValue')
->with(
Configuration::XML_PATH_ITEM . $field,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
)
->willReturn(1);
diff --git a/dev/tests/unit/testsuite/Magento/CatalogInventory/Model/Stock/ItemTest.php b/dev/tests/unit/testsuite/Magento/CatalogInventory/Model/Stock/ItemTest.php
index 64225ea390a28..0d0ba7eac63f7 100644
--- a/dev/tests/unit/testsuite/Magento/CatalogInventory/Model/Stock/ItemTest.php
+++ b/dev/tests/unit/testsuite/Magento/CatalogInventory/Model/Stock/ItemTest.php
@@ -43,7 +43,7 @@ class ItemTest extends \PHPUnit_Framework_TestCase
protected $customerSession;
/**
- * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $storeManager;
@@ -94,7 +94,10 @@ protected function setUp()
$store = $this->getMock('Magento\Store\Model\Store', ['getId', '__wakeup'], [], '', false);
$store->expects($this->any())->method('getId')->willReturn($this->storeId);
- $this->storeManager = $this->getMockForAbstractClass('Magento\Store\Model\StoreManagerInterface', ['getStore']);
+ $this->storeManager = $this->getMockForAbstractClass(
+ 'Magento\Framework\Store\StoreManagerInterface',
+ ['getStore']
+ );
$this->storeManager->expects($this->any())->method('getStore')->willReturn($store);
$this->stockConfiguration = $this->getMock(
diff --git a/dev/tests/unit/testsuite/Magento/CatalogRule/Model/RuleTest.php b/dev/tests/unit/testsuite/Magento/CatalogRule/Model/RuleTest.php
index 61941e3f63dfe..6e7b8187a7f1f 100644
--- a/dev/tests/unit/testsuite/Magento/CatalogRule/Model/RuleTest.php
+++ b/dev/tests/unit/testsuite/Magento/CatalogRule/Model/RuleTest.php
@@ -16,7 +16,7 @@ class RuleTest extends \PHPUnit_Framework_TestCase
/** @var ObjectManagerHelper */
protected $objectManagerHelper;
- /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
protected $storeManager;
/** @var \PHPUnit_Framework_MockObject_MockObject */
@@ -33,7 +33,7 @@ class RuleTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->storeManager = $this->getMock('Magento\Store\Model\StoreManagerInterface');
+ $this->storeManager = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
$this->storeModel = $this->getMock('Magento\Store\Model\Store', ['__wakeup', 'getId'], [], '', false);
$this->combineFactory = $this->getMock(
'Magento\CatalogRule\Model\Rule\Condition\CombineFactory',
diff --git a/dev/tests/unit/testsuite/Magento/CatalogSearch/Helper/DataTest.php b/dev/tests/unit/testsuite/Magento/CatalogSearch/Helper/DataTest.php
index 5a10ccecd87ef..dd36f3bbd302a 100644
--- a/dev/tests/unit/testsuite/Magento/CatalogSearch/Helper/DataTest.php
+++ b/dev/tests/unit/testsuite/Magento/CatalogSearch/Helper/DataTest.php
@@ -46,7 +46,7 @@ class DataTest extends \PHPUnit_Framework_TestCase
protected $_filterManagerMock;
/**
- * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $_storeManagerMock;
@@ -58,7 +58,7 @@ public function setUp()
$this->_scopeConfigMock = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
$this->_escaperMock = $this->getMock('Magento\Framework\Escaper');
$this->_filterManagerMock = $this->getMock('Magento\Framework\Filter\FilterManager', [], [], '', false);
- $this->_storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface');
+ $this->_storeManagerMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
$this->_model = new \Magento\CatalogSearch\Helper\Data(
$this->_contextMock,
@@ -88,7 +88,7 @@ public function testGetMinQueryLength()
->method('getValue')
->with(
\Magento\Search\Model\Query::XML_PATH_MIN_QUERY_LENGTH,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
null
)
->will($this->returnValue($return));
@@ -102,7 +102,7 @@ public function testGetMaxQueryLength()
->method('getValue')
->with(
\Magento\Search\Model\Query::XML_PATH_MAX_QUERY_LENGTH,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
null
)
->will($this->returnValue($return));
diff --git a/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/FullTest.php b/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/FullTest.php
index 92e61845b9e34..a8f70211a849e 100644
--- a/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/FullTest.php
+++ b/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/FullTest.php
@@ -10,7 +10,7 @@ class FullTest extends \PHPUnit_Framework_TestCase
{
/** @var \Magento\Framework\Search\Request\Config|\PHPUnit_Framework_MockObject_MockObject */
protected $searchRequestConfig;
- /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
protected $storeManager;
/** @var \Magento\CatalogSearch\Model\Indexer\Fulltext\Action\Full */
protected $object;
@@ -45,7 +45,7 @@ public function setUp()
$scopeConfig = $this->getMockBuilder('Magento\Framework\App\Config\ScopeConfigInterface')
->disableOriginalConstructor()
->getMock();
- $this->storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
+ $this->storeManager = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
->disableOriginalConstructor()
->getMock();
$dateTime = $this->getMockBuilder('Magento\Framework\Stdlib\DateTime')
diff --git a/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Layer/Filter/AttributeTest.php b/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Layer/Filter/AttributeTest.php
index 32ee450a8f41c..74025239397a8 100644
--- a/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Layer/Filter/AttributeTest.php
+++ b/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Layer/Filter/AttributeTest.php
@@ -40,7 +40,7 @@ class AttributeTest extends \PHPUnit_Framework_TestCase
/** @var \Magento\Catalog\Model\Layer\Filter\ItemFactory|MockObject */
private $filterItemFactory;
- /** @var \Magento\Store\Model\StoreManagerInterface|MockObject */
+ /** @var \Magento\Framework\Store\StoreManagerInterface|MockObject */
private $storeManager;
/** @var \Magento\Catalog\Model\Layer|MockObject */
@@ -57,8 +57,8 @@ protected function setUp()
->setMethods(['create'])
->getMock();
- /** @var \Magento\Store\Model\StoreManagerInterface $storeManager */
- $this->storeManager = $this->getMockBuilder('\Magento\Store\Model\StoreManagerInterface')
+ /** @var \Magento\Framework\Store\StoreManagerInterface $storeManager */
+ $this->storeManager = $this->getMockBuilder('\Magento\Framework\Store\StoreManagerInterface')
->disableOriginalConstructor()
->setMethods([])
->getMockForAbstractClass();
diff --git a/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Resource/AdvancedTest.php b/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Resource/AdvancedTest.php
index dd4284e6a4a58..99c9dda315bd0 100644
--- a/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Resource/AdvancedTest.php
+++ b/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Resource/AdvancedTest.php
@@ -74,7 +74,7 @@ protected function getStoreManager()
->method('getId')
->willReturn(1);
- $storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
+ $storeManager = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
->setMethods(['getStore'])
->disableOriginalConstructor()
->getMockForAbstractClass();
diff --git a/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Resource/Fulltext/CollectionTest.php b/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Resource/Fulltext/CollectionTest.php
index 86ec8ae378200..002ce5621efcd 100644
--- a/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Resource/Fulltext/CollectionTest.php
+++ b/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Resource/Fulltext/CollectionTest.php
@@ -61,7 +61,7 @@ protected function getStoreManager()
->method('getId')
->willReturn(1);
- $storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
+ $storeManager = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
->setMethods(['getStore'])
->disableOriginalConstructor()
->getMockForAbstractClass();
diff --git a/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Search/IndexBuilderTest.php b/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Search/IndexBuilderTest.php
index 42883d442a961..e99d676fbecb3 100644
--- a/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Search/IndexBuilderTest.php
+++ b/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Search/IndexBuilderTest.php
@@ -23,7 +23,7 @@ class IndexBuilderTest extends \PHPUnit_Framework_TestCase
/** @var \Magento\Framework\App\Config\ScopeConfigInterface|MockObject */
private $config;
- /** @var \Magento\Store\Model\StoreManagerInterface|MockObject */
+ /** @var \Magento\Framework\Store\StoreManagerInterface|MockObject */
private $storeManager;
/** @var \Magento\Framework\Search\RequestInterface|MockObject */
@@ -71,7 +71,7 @@ protected function setUp()
->setMethods(['isSetFlag'])
->getMockForAbstractClass();
- $this->storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')->getMock();
+ $this->storeManager = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')->getMock();
$objectManagerHelper = new ObjectManagerHelper($this);
$this->target = $objectManagerHelper->getObject(
diff --git a/dev/tests/unit/testsuite/Magento/CatalogUrlRewrite/Model/CategoryUrlPathGeneratorTest.php b/dev/tests/unit/testsuite/Magento/CatalogUrlRewrite/Model/CategoryUrlPathGeneratorTest.php
index 894f7e1c6cf46..72b2c124c6499 100644
--- a/dev/tests/unit/testsuite/Magento/CatalogUrlRewrite/Model/CategoryUrlPathGeneratorTest.php
+++ b/dev/tests/unit/testsuite/Magento/CatalogUrlRewrite/Model/CategoryUrlPathGeneratorTest.php
@@ -6,7 +6,7 @@
namespace Magento\CatalogUrlRewrite\Model;
use Magento\Catalog\Model\Category;
-use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\Store\ScopeInterface;
use Magento\TestFramework\Helper\ObjectManager;
class CategoryUrlPathGeneratorTest extends \PHPUnit_Framework_TestCase
@@ -14,7 +14,7 @@ class CategoryUrlPathGeneratorTest extends \PHPUnit_Framework_TestCase
/** @var \Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator */
protected $categoryUrlPathGenerator;
- /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
protected $storeManager;
/** @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject */
@@ -42,7 +42,7 @@ protected function setUp()
'isObjectNew'
];
$this->category = $this->getMock('Magento\Catalog\Model\Category', $categoryMethods, [], '', false);
- $this->storeManager = $this->getMock('Magento\Store\Model\StoreManagerInterface');
+ $this->storeManager = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
$this->scopeConfig = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
$this->categoryRepository = $this->getMock('Magento\Catalog\Api\CategoryRepositoryInterface');
@@ -185,7 +185,11 @@ public function testGetUrlPathWithSuffixAndStore($urlPath, $storeId, $categorySt
$passedStoreId = $storeId ? $storeId : $categoryStoreId;
$this->scopeConfig->expects($this->once())->method('getValue')
- ->with(CategoryUrlPathGenerator::XML_PATH_CATEGORY_URL_SUFFIX, ScopeInterface::SCOPE_STORE, $passedStoreId)
+ ->with(
+ CategoryUrlPathGenerator::XML_PATH_CATEGORY_URL_SUFFIX,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ $passedStoreId
+ )
->will($this->returnValue($suffix));
$this->assertEquals(
@@ -212,7 +216,11 @@ public function testGetUrlPathWithSuffixWithoutStore()
$store->expects($this->once())->method('getId')->will($this->returnValue($currentStoreId));
$this->storeManager->expects($this->once())->method('getStore')->will($this->returnValue($store));
$this->scopeConfig->expects($this->once())->method('getValue')
- ->with(CategoryUrlPathGenerator::XML_PATH_CATEGORY_URL_SUFFIX, ScopeInterface::SCOPE_STORE, $currentStoreId)
+ ->with(
+ CategoryUrlPathGenerator::XML_PATH_CATEGORY_URL_SUFFIX,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ $currentStoreId
+ )
->will($this->returnValue($suffix));
$this->assertEquals(
diff --git a/dev/tests/unit/testsuite/Magento/CatalogUrlRewrite/Model/ProductUrlPathGeneratorTest.php b/dev/tests/unit/testsuite/Magento/CatalogUrlRewrite/Model/ProductUrlPathGeneratorTest.php
index 57648b02f0471..e9e01c85e5e45 100644
--- a/dev/tests/unit/testsuite/Magento/CatalogUrlRewrite/Model/ProductUrlPathGeneratorTest.php
+++ b/dev/tests/unit/testsuite/Magento/CatalogUrlRewrite/Model/ProductUrlPathGeneratorTest.php
@@ -5,7 +5,7 @@
*/
namespace Magento\CatalogUrlRewrite\Model;
-use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\Store\ScopeInterface;
use Magento\TestFramework\Helper\ObjectManager;
class ProductUrlPathGeneratorTest extends \PHPUnit_Framework_TestCase
@@ -13,7 +13,7 @@ class ProductUrlPathGeneratorTest extends \PHPUnit_Framework_TestCase
/** @var \Magento\CatalogUrlRewrite\Model\ProductUrlPathGenerator */
protected $productUrlPathGenerator;
- /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
protected $storeManager;
/** @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject */
@@ -33,7 +33,7 @@ protected function setUp()
$this->category = $this->getMock('Magento\Catalog\Model\Category', [], [], '', false);
$productMethods = ['__wakeup', 'getData', 'getUrlKey', 'getName', 'formatUrlKey', 'getId'];
$this->product = $this->getMock('Magento\Catalog\Model\Product', $productMethods, [], '', false);
- $this->storeManager = $this->getMock('Magento\Store\Model\StoreManagerInterface');
+ $this->storeManager = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
$this->scopeConfig = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
$this->categoryUrlPathGenerator = $this->getMock(
'Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator',
@@ -131,7 +131,11 @@ public function testGetUrlPathWithSuffixAndCategoryAnsStore()
->will($this->returnValue('category-url-path'));
$this->storeManager->expects($this->never())->method('getStore');
$this->scopeConfig->expects($this->once())->method('getValue')
- ->with(ProductUrlPathGenerator::XML_PATH_PRODUCT_URL_SUFFIX, ScopeInterface::SCOPE_STORE, $storeId)
+ ->with(
+ ProductUrlPathGenerator::XML_PATH_PRODUCT_URL_SUFFIX,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ $storeId
+ )
->will($this->returnValue('.html'));
$this->assertEquals(
diff --git a/dev/tests/unit/testsuite/Magento/CatalogUrlRewrite/Model/ProductUrlRewriteGeneratorTest.php b/dev/tests/unit/testsuite/Magento/CatalogUrlRewrite/Model/ProductUrlRewriteGeneratorTest.php
index 06f44a1e65f3f..446f743b26da7 100644
--- a/dev/tests/unit/testsuite/Magento/CatalogUrlRewrite/Model/ProductUrlRewriteGeneratorTest.php
+++ b/dev/tests/unit/testsuite/Magento/CatalogUrlRewrite/Model/ProductUrlRewriteGeneratorTest.php
@@ -31,7 +31,7 @@ class ProductUrlRewriteGeneratorTest extends \PHPUnit_Framework_TestCase
/** @var \Magento\CatalogUrlRewrite\Model\ObjectRegistryFactory|\PHPUnit_Framework_MockObject_MockObject */
protected $objectRegistryFactory;
- /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
protected $storeManager;
/** @var \Magento\Catalog\Model\Resource\Category\Collection|\PHPUnit_Framework_MockObject_MockObject */
@@ -44,7 +44,7 @@ protected function setUp()
->disableOriginalConstructor()->getMock();
$this->product->expects($this->any())->method('getCategoryCollection')
->will($this->returnValue($this->categoriesCollection));
- $this->storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
+ $this->storeManager = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
->disableOriginalConstructor()->getMock();
$this->categoriesCollection->expects($this->exactly(2))->method('addAttributeToSelect')
->will($this->returnSelf());
diff --git a/dev/tests/unit/testsuite/Magento/CatalogWidget/Block/Product/ProductsListTest.php b/dev/tests/unit/testsuite/Magento/CatalogWidget/Block/Product/ProductsListTest.php
index 2a2886db769f8..5a16e6709d4c8 100644
--- a/dev/tests/unit/testsuite/Magento/CatalogWidget/Block/Product/ProductsListTest.php
+++ b/dev/tests/unit/testsuite/Magento/CatalogWidget/Block/Product/ProductsListTest.php
@@ -51,7 +51,7 @@ class ProductsListTest extends \PHPUnit_Framework_TestCase
protected $widgetConditionsHelper;
/**
- * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $storeManager;
@@ -83,7 +83,7 @@ protected function setUp()
$this->builder = $this->getMock('Magento\Rule\Model\Condition\Sql\Builder', [], [], '', false);
$this->rule = $this->getMock('Magento\CatalogWidget\Model\Rule', [], [], '', false);
$this->widgetConditionsHelper = $this->getMock('Magento\Widget\Helper\Conditions');
- $this->storeManager = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
+ $this->storeManager = $this->getMock('\Magento\Framework\Store\StoreManagerInterface');
$this->design = $this->getMock('\Magento\Framework\View\DesignInterface');
$objectManagerHelper = new ObjectManagerHelper($this);
diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Controller/Cart/ConfigureTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Controller/Cart/ConfigureTest.php
index 716661bd022b1..2f19f6dbe952a 100644
--- a/dev/tests/unit/testsuite/Magento/Checkout/Controller/Cart/ConfigureTest.php
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Controller/Cart/ConfigureTest.php
@@ -122,7 +122,7 @@ public function setUp()
$session = $this->getMockBuilder('Magento\Checkout\Model\Session')
->disableOriginalConstructor()
->getMock();
- $storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
+ $storeManager = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
->disableOriginalConstructor()
->getMockForAbstractClass();
$formKeyValidator = $this->getMockBuilder('Magento\Core\App\Action\FormKeyValidator')
diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Controller/CartTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Controller/CartTest.php
index fa81eeeeb0128..208015c54eb9c 100644
--- a/dev/tests/unit/testsuite/Magento/Checkout/Controller/CartTest.php
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Controller/CartTest.php
@@ -18,7 +18,7 @@ public function testControllerImplementsProductViewInterface()
public function testGoBack()
{
$helper = new \Magento\TestFramework\Helper\ObjectManager($this);
- $storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface');
+ $storeManagerMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
$responseMock = $this->getMock('Magento\Framework\App\Response\Http', [], [], '', false);
$responseMock->headersSentThrowsException = false;
diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Helper/CartTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Helper/CartTest.php
index c01449d988414..c5ecb1d1dd72f 100644
--- a/dev/tests/unit/testsuite/Magento/Checkout/Helper/CartTest.php
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Helper/CartTest.php
@@ -80,7 +80,7 @@ protected function setUp()
$contextMock->expects($this->any())->method('getUrlBuilder')->will($this->returnValue($this->urlBuilderMock));
$contextMock->expects($this->any())->method('getRequest')->will($this->returnValue($this->requestMock));
$contextMock->expects($this->any())->method('getUrlEncoder')->will($this->returnValue($this->urlEncoder));
- $this->storeManagerMock = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
+ $this->storeManagerMock = $this->getMock('\Magento\Framework\Store\StoreManagerInterface');
$this->coreHelperMock = $this->getMock('\Magento\Core\Helper\Data', [], [], '', false);
$this->scopeConfigMock = $this->getMock('\Magento\Framework\App\Config\ScopeConfigInterface');
$this->cartMock = $this->getMock('\Magento\Checkout\Model\Cart', [], [], '', false);
@@ -162,7 +162,7 @@ public function testGetShouldRedirectToCart()
{
$storeId = 1;
$this->scopeConfigMock->expects($this->once())->method('isSetFlag')
- ->with(Cart::XML_PATH_REDIRECT_TO_CART, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $storeId)
+ ->with(Cart::XML_PATH_REDIRECT_TO_CART, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $storeId)
->will($this->returnValue(true));
$this->assertTrue($this->helper->getShouldRedirectToCart($storeId));
}
@@ -208,7 +208,7 @@ public function testGetAddUrl()
*/
public function testGetDeletePostJson($id, $url, $isAjax, $expectedPostData)
{
- $storeManager = $this->getMockForAbstractClass('\Magento\Store\Model\StoreManagerInterface');
+ $storeManager = $this->getMockForAbstractClass('\Magento\Framework\Store\StoreManagerInterface');
$coreData = $this->getMock('\Magento\Core\Helper\Data', [], [], '', false);
$scopeConfig = $this->getMockForAbstractClass('\Magento\Framework\App\Config\ScopeConfigInterface');
$checkoutCart = $this->getMock('\Magento\Checkout\Model\Cart', [], [], '', false);
diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Helper/DataTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Helper/DataTest.php
index 9e88e7178acf6..321ddd9406e61 100644
--- a/dev/tests/unit/testsuite/Magento/Checkout/Helper/DataTest.php
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Helper/DataTest.php
@@ -9,7 +9,7 @@
namespace Magento\Checkout\Helper;
use Magento\TestFramework\Helper\ObjectManager;
-use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\Store\ScopeInterface;
class DataTest extends \PHPUnit_Framework_TestCase
{
@@ -81,49 +81,49 @@ protected function setUp()
[
[
'checkout/payment_failed/template',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
8,
'fixture_email_template_payment_failed'
],
[
'checkout/payment_failed/receiver',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
8,
'sysadmin'
],
[
'trans_email/ident_sysadmin/email',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
8,
'sysadmin@example.com'
],
[
'trans_email/ident_sysadmin/name',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
8,
'System Administrator'
],
[
'checkout/payment_failed/identity',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
8,
'noreply@example.com'
],
[
'carriers/ground/title',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
null,
'Ground Shipping'
],
[
'payment/fixture-payment-method/title',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
null,
'Check Money Order'
],
[
'checkout/options/onepage_checkout_enabled',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
null,
'One Page Checkout'
]
@@ -131,7 +131,7 @@ protected function setUp()
)
);
- $this->_storeManager = $this->getMockForAbstractClass('\Magento\Store\Model\StoreManagerInterface');
+ $this->_storeManager = $this->getMockForAbstractClass('\Magento\Framework\Store\StoreManagerInterface');
$this->_checkoutSession = $this->getMock('\Magento\Checkout\Model\Session', [], [], '', false);
@@ -342,7 +342,7 @@ public function testIsCustomerMustBeLogged()
{
$this->_scopeConfig->expects($this->once())->method('isSetFlag')->with(
'checkout/options/customer_must_be_logged',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)->will($this->returnValue(true));
$this->assertTrue($this->_helper->isCustomerMustBeLogged());
}
@@ -362,7 +362,7 @@ public function testGetPriceInclTaxWithoutTax()
$rowTotal = 15;
$roundPrice = 17;
$expected = 17;
- $storeManager = $this->getMock('\Magento\Store\Model\StoreManagerInterface', [], [], '', false);
+ $storeManager = $this->getMock('\Magento\Framework\Store\StoreManagerInterface', [], [], '', false);
$objectManagerHelper = new ObjectManager($this);
$helper = $objectManagerHelper->getObject(
'\Magento\Checkout\Helper\Data',
@@ -421,7 +421,7 @@ public function testGetSubtotalInclTaxNegative()
public function testGetBasePriceInclTaxWithoutQty()
{
- $storeManager = $this->getMock('\Magento\Store\Model\StoreManagerInterface', [], [], '', false);
+ $storeManager = $this->getMock('\Magento\Framework\Store\StoreManagerInterface', [], [], '', false);
$objectManagerHelper = new ObjectManager($this);
$helper = $objectManagerHelper->getObject(
'\Magento\Checkout\Helper\Data',
@@ -438,7 +438,7 @@ public function testGetBasePriceInclTaxWithoutQty()
public function testGetBasePriceInclTax()
{
- $storeManager = $this->getMock('\Magento\Store\Model\StoreManagerInterface', [], [], '', false);
+ $storeManager = $this->getMock('\Magento\Framework\Store\StoreManagerInterface', [], [], '', false);
$objectManagerHelper = new ObjectManager($this);
$helper = $objectManagerHelper->getObject(
'\Magento\Checkout\Helper\Data',
diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Model/CartTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Model/CartTest.php
index 60df3067b5e9f..8f948deeb2aec 100644
--- a/dev/tests/unit/testsuite/Magento/Checkout/Model/CartTest.php
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Model/CartTest.php
@@ -234,7 +234,7 @@ public function testGetSummaryQty($useQty)
$this->customerSessionMock->expects($this->any())->method('isLoggedIn')->will($this->returnValue(true));
$this->scopeConfigMock->expects($this->once())->method('getValue')
- ->with('checkout/cart_link/use_qty', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
+ ->with('checkout/cart_link/use_qty', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)
->will($this->returnValue($useQty));
$qtyMethodName = ($useQty) ? 'getItemsQty' : 'getItemsCount';
diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Model/SessionTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Model/SessionTest.php
index 4151d9b246801..887bac6e9af6c 100644
--- a/dev/tests/unit/testsuite/Magento/Checkout/Model/SessionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Model/SessionTest.php
@@ -167,7 +167,7 @@ public function testRestoreQuote($hasOrderId, $hasQuoteId)
);
$storage = $this->getMock('Magento\Framework\Session\Storage', null);
$store = $this->getMock('Magento\Store\Model\Store', [], [], '', false);
- $storeManager = $this->getMockForAbstractClass('Magento\Store\Model\StoreManagerInterface');
+ $storeManager = $this->getMockForAbstractClass('Magento\Framework\Store\StoreManagerInterface');
$storeManager->expects($this->any())->method('getStore')->will($this->returnValue($store));
$eventManager = $this->getMockForAbstractClass('Magento\Framework\Event\ManagerInterface');
@@ -286,7 +286,7 @@ public function testReplaceQuote()
->method('getWebsiteId')
->will($this->returnValue($websiteId));
- $storeManager = $this->getMockForAbstractClass('Magento\Store\Model\StoreManagerInterface');
+ $storeManager = $this->getMockForAbstractClass('Magento\Framework\Store\StoreManagerInterface');
$storeManager->expects($this->any())
->method('getStore')
->will($this->returnValue($store));
diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Model/Type/OnepageTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Model/Type/OnepageTest.php
index 7b46a4a2c8eef..5c0dde41b2afe 100644
--- a/dev/tests/unit/testsuite/Magento/Checkout/Model/Type/OnepageTest.php
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Model/Type/OnepageTest.php
@@ -40,7 +40,7 @@ class OnepageTest extends \PHPUnit_Framework_TestCase
/** @var \Magento\Customer\Model\Session|\PHPUnit_Framework_MockObject_MockObject */
protected $customerSessionMock;
- /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
protected $storeManagerMock;
/** @var \Magento\Framework\App\RequestInterface|\PHPUnit_Framework_MockObject_MockObject */
@@ -134,7 +134,7 @@ protected function setUp()
'',
false
);
- $this->storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface');
+ $this->storeManagerMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
$this->requestMock = $this->getMock(
'Magento\Framework\App\RequestInterface',
['isAjax', 'getModuleName', 'setModuleName', 'getActionName', 'setActionName', 'getParam', 'getCookie']
diff --git a/dev/tests/unit/testsuite/Magento/CheckoutAgreements/Model/CheckoutAgreementsRepositoryTest.php b/dev/tests/unit/testsuite/Magento/CheckoutAgreements/Model/CheckoutAgreementsRepositoryTest.php
index 24541f489f6e3..b5ff93a8d7210 100644
--- a/dev/tests/unit/testsuite/Magento/CheckoutAgreements/Model/CheckoutAgreementsRepositoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/CheckoutAgreements/Model/CheckoutAgreementsRepositoryTest.php
@@ -5,7 +5,7 @@
*/
namespace Magento\CheckoutAgreements\Model;
-use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\Store\ScopeInterface;
use Magento\TestFramework\Helper\ObjectManager;
class CheckoutAgreementsRepositoryTest extends \PHPUnit_Framework_TestCase
@@ -46,7 +46,7 @@ protected function setUp()
'',
false
);
- $this->storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface');
+ $this->storeManagerMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
$this->scopeConfigMock = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
$this->model = new CheckoutAgreementsRepository(
$this->factoryMock,
diff --git a/dev/tests/unit/testsuite/Magento/Cms/Controller/NorouteTest.php b/dev/tests/unit/testsuite/Magento/Cms/Controller/NorouteTest.php
index 68d0d721d1a60..53d1117b9d9c7 100644
--- a/dev/tests/unit/testsuite/Magento/Cms/Controller/NorouteTest.php
+++ b/dev/tests/unit/testsuite/Magento/Cms/Controller/NorouteTest.php
@@ -54,7 +54,7 @@ protected function setUp()
$valueMap = [
[
'Magento\Framework\App\Config\ScopeConfigInterface',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$scopeConfigMock,
],
['Magento\Cms\Helper\Page', $this->_cmsHelperMock],
diff --git a/dev/tests/unit/testsuite/Magento/Cms/Helper/PageTest.php b/dev/tests/unit/testsuite/Magento/Cms/Helper/PageTest.php
index 8ce867543bc1e..f8d59563ce77d 100644
--- a/dev/tests/unit/testsuite/Magento/Cms/Helper/PageTest.php
+++ b/dev/tests/unit/testsuite/Magento/Cms/Helper/PageTest.php
@@ -34,7 +34,7 @@ class PageTest extends \PHPUnit_Framework_TestCase
protected $pageMock;
/**
- * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $storeManagerMock;
@@ -141,7 +141,7 @@ protected function setUp()
]
)
->getMock();
- $this->storeManagerMock = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
+ $this->storeManagerMock = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
->getMockForAbstractClass();
$this->localeDateMock = $this->getMockBuilder('Magento\Framework\Stdlib\DateTime\TimezoneInterface')
->getMockForAbstractClass();
diff --git a/dev/tests/unit/testsuite/Magento/Cms/Model/Resource/Page/CollectionTest.php b/dev/tests/unit/testsuite/Magento/Cms/Model/Resource/Page/CollectionTest.php
index 6c6ac15177ba4..f857bdfbe581d 100644
--- a/dev/tests/unit/testsuite/Magento/Cms/Model/Resource/Page/CollectionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Cms/Model/Resource/Page/CollectionTest.php
@@ -11,7 +11,7 @@
class CollectionTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $storeManagerMock;
@@ -107,7 +107,7 @@ protected function setUp()
->withAnyParameters()
->willReturn($this->searchResultProcessorMock);
$this->storeManagerMock = $this->getMockForAbstractClass(
- 'Magento\Store\Model\StoreManagerInterface',
+ 'Magento\Framework\Store\StoreManagerInterface',
[],
'',
false,
diff --git a/dev/tests/unit/testsuite/Magento/Cms/Model/Template/FilterTest.php b/dev/tests/unit/testsuite/Magento/Cms/Model/Template/FilterTest.php
index b8e32ba2f1a74..fded796ee9b77 100644
--- a/dev/tests/unit/testsuite/Magento/Cms/Model/Template/FilterTest.php
+++ b/dev/tests/unit/testsuite/Magento/Cms/Model/Template/FilterTest.php
@@ -11,7 +11,7 @@
class FilterTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $storeManagerMock;
@@ -27,7 +27,7 @@ class FilterTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->storeManagerMock = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
+ $this->storeManagerMock = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
->disableOriginalConstructor()
->getMock();
$this->storeMock = $this->getMockBuilder('Magento\Store\Model\Store')
diff --git a/dev/tests/unit/testsuite/Magento/Cms/Model/Wysiwyg/ConfigTest.php b/dev/tests/unit/testsuite/Magento/Cms/Model/Wysiwyg/ConfigTest.php
index b2e5d8fb32b61..a9d3696dc7b29 100644
--- a/dev/tests/unit/testsuite/Magento/Cms/Model/Wysiwyg/ConfigTest.php
+++ b/dev/tests/unit/testsuite/Magento/Cms/Model/Wysiwyg/ConfigTest.php
@@ -46,7 +46,7 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
protected $scopeConfigMock;
/**
- * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $storeManagerMock;
@@ -85,7 +85,7 @@ protected function setUp()
$this->scopeConfigMock = $this->getMockBuilder('Magento\Framework\App\Config\ScopeConfigInterface')
->disableOriginalConstructor()
->getMock();
- $this->storeManagerMock = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
+ $this->storeManagerMock = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
->disableOriginalConstructor()
->getMock();
$this->storeMock = $this->getMockBuilder('Magento\Store\Model\Store')
diff --git a/dev/tests/unit/testsuite/Magento/ConfigurableProduct/Model/Resource/Product/Type/Configurable/AttributeTest.php b/dev/tests/unit/testsuite/Magento/ConfigurableProduct/Model/Resource/Product/Type/Configurable/AttributeTest.php
index a0e3bdc23a2da..f0ebded1855a6 100644
--- a/dev/tests/unit/testsuite/Magento/ConfigurableProduct/Model/Resource/Product/Type/Configurable/AttributeTest.php
+++ b/dev/tests/unit/testsuite/Magento/ConfigurableProduct/Model/Resource/Product/Type/Configurable/AttributeTest.php
@@ -18,7 +18,7 @@ class AttributeTest extends \PHPUnit_Framework_TestCase
protected $catalogData;
/**
- * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $storeManager;
@@ -36,7 +36,7 @@ public function setUp()
->setMethods(['isPriceGlobal'])
->disableOriginalConstructor()
->getMock();
- $this->storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
+ $this->storeManager = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
->disableOriginalConstructor()
->getMock();
diff --git a/dev/tests/unit/testsuite/Magento/ConfigurableProduct/Pricing/Price/AttributePriceTest.php b/dev/tests/unit/testsuite/Magento/ConfigurableProduct/Pricing/Price/AttributePriceTest.php
index 5d88d7b9e3158..dea736872b6c6 100644
--- a/dev/tests/unit/testsuite/Magento/ConfigurableProduct/Pricing/Price/AttributePriceTest.php
+++ b/dev/tests/unit/testsuite/Magento/ConfigurableProduct/Pricing/Price/AttributePriceTest.php
@@ -47,7 +47,7 @@ class AttributePriceTest extends \PHPUnit_Framework_TestCase
protected $regularPriceMock;
/**
- * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $storeManagerMock;
diff --git a/dev/tests/unit/testsuite/Magento/Contact/Controller/Index/IndexTest.php b/dev/tests/unit/testsuite/Magento/Contact/Controller/Index/IndexTest.php
index 77f1a5a81b5d8..0569cfade91f0 100644
--- a/dev/tests/unit/testsuite/Magento/Contact/Controller/Index/IndexTest.php
+++ b/dev/tests/unit/testsuite/Magento/Contact/Controller/Index/IndexTest.php
@@ -79,7 +79,7 @@ public function setUp()
$this->getMock('\Magento\Framework\Mail\Template\TransportBuilder', [], [], '', false),
$this->getMockForAbstractClass('\Magento\Framework\Translate\Inline\StateInterface', [], '', false),
$this->_scopeConfig,
- $this->getMockForAbstractClass('\Magento\Store\Model\StoreManagerInterface', [], '', false)
+ $this->getMockForAbstractClass('\Magento\Framework\Store\StoreManagerInterface', [], '', false)
);
}
diff --git a/dev/tests/unit/testsuite/Magento/Contact/Controller/Index/PostTest.php b/dev/tests/unit/testsuite/Magento/Contact/Controller/Index/PostTest.php
index d26a9f6206941..4f9e857f11091 100644
--- a/dev/tests/unit/testsuite/Magento/Contact/Controller/Index/PostTest.php
+++ b/dev/tests/unit/testsuite/Magento/Contact/Controller/Index/PostTest.php
@@ -54,7 +54,7 @@ class PostTest extends \PHPUnit_Framework_TestCase
protected $_messageManager;
/**
- * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $_storeManager;
@@ -78,7 +78,7 @@ public function setUp()
$this->_request = $this->getMock('\Magento\Framework\App\Request\Http', ['getPost'], [], '', false);
$this->_redirect = $this->getMock('\Magento\Framework\App\Response\RedirectInterface', [], [], '', false);
$this->_view = $this->getMock('\Magento\Framework\App\ViewInterface', [], [], '', false);
- $this->_storeManager = $this->getMock('\Magento\Store\Model\StoreManagerInterface', [], [], '', false);
+ $this->_storeManager = $this->getMock('\Magento\Framework\Store\StoreManagerInterface', [], [], '', false);
$this->_transportBuilder = $this->getMock(
'\Magento\Framework\Mail\Template\TransportBuilder',
[],
diff --git a/dev/tests/unit/testsuite/Magento/Contact/Controller/IndexTest.php b/dev/tests/unit/testsuite/Magento/Contact/Controller/IndexTest.php
index 26e655449859b..170308652dbe3 100644
--- a/dev/tests/unit/testsuite/Magento/Contact/Controller/IndexTest.php
+++ b/dev/tests/unit/testsuite/Magento/Contact/Controller/IndexTest.php
@@ -56,7 +56,7 @@ public function setUp()
$this->getMock('\Magento\Framework\Mail\Template\TransportBuilder', [], [], '', false),
$this->getMockForAbstractClass('\Magento\Framework\Translate\Inline\StateInterface', [], '', false),
$this->_scopeConfig,
- $this->getMockForAbstractClass('\Magento\Store\Model\StoreManagerInterface', [], '', false)
+ $this->getMockForAbstractClass('\Magento\Framework\Store\StoreManagerInterface', [], '', false)
);
}
@@ -71,7 +71,7 @@ public function testDispatch()
'isSetFlag'
)->with(
\Magento\Contact\Controller\Index::XML_PATH_ENABLED,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)->will(
$this->returnValue(false)
);
diff --git a/dev/tests/unit/testsuite/Magento/Core/Helper/DataTest.php b/dev/tests/unit/testsuite/Magento/Core/Helper/DataTest.php
index 94808003006c0..679108ffc1674 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Helper/DataTest.php
+++ b/dev/tests/unit/testsuite/Magento/Core/Helper/DataTest.php
@@ -138,7 +138,7 @@ public function testIsDevAllowed($allowedIps, $expected, $callNum = 1)
->method('getValue')
->with(
Data::XML_PATH_DEV_ALLOW_IPS,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$storeId
)->will($this->returnValue($allowedIps));
@@ -269,7 +269,7 @@ public function testGetDefaultCountry()
->method('getValue')
->with(
Data::XML_PATH_DEFAULT_COUNTRY,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$storeId
)->will($this->returnValue($country));
diff --git a/dev/tests/unit/testsuite/Magento/Core/Helper/UrlTest.php b/dev/tests/unit/testsuite/Magento/Core/Helper/UrlTest.php
index 40e0dc69eef74..4805b2bdc54bb 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Helper/UrlTest.php
+++ b/dev/tests/unit/testsuite/Magento/Core/Helper/UrlTest.php
@@ -19,7 +19,7 @@ public function setUp()
public function testGetCurrentBase64Url()
{
- $storeManagerMock = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
+ $storeManagerMock = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
->disableOriginalConstructor()
->getMock();
$urlBuilderMock = $this->getMockBuilder('Magento\Framework\UrlInterface')
@@ -55,7 +55,7 @@ public function testGetCurrentBase64Url()
*/
public function testGetEncodedUrl($url, $callNum)
{
- $storeManagerMock = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
+ $storeManagerMock = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
->disableOriginalConstructor()
->getMock();
$urlBuilderMock = $this->getMockBuilder('Magento\Framework\UrlInterface')
@@ -96,7 +96,7 @@ public function getEncodedUrlDataProvider()
public function testGetHomeUrl()
{
- $storeManagerMock = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
+ $storeManagerMock = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
->disableOriginalConstructor()
->getMock();
$storeMock = $this->getMockBuilder('Magento\Store\Model\Store')
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Asset/ConfigTest.php b/dev/tests/unit/testsuite/Magento/Core/Model/Asset/ConfigTest.php
index c4d8376d265f9..2a33af87b514e 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Asset/ConfigTest.php
+++ b/dev/tests/unit/testsuite/Magento/Core/Model/Asset/ConfigTest.php
@@ -38,7 +38,7 @@ public function testIsMergeCssFiles($booleanData)
{
$this->scopeConfigMock->expects($this->once())
->method('isSetFlag')
- ->with(Config::XML_PATH_MERGE_CSS_FILES, \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
+ ->with(Config::XML_PATH_MERGE_CSS_FILES, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)
->willReturn($booleanData);
$this->assertSame($booleanData, $this->model->isMergeCssFiles());
}
@@ -50,7 +50,7 @@ public function testIsMergeJsFiles($booleanData)
{
$this->scopeConfigMock->expects($this->once())
->method('isSetFlag')
- ->with(Config::XML_PATH_MERGE_JS_FILES, \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
+ ->with(Config::XML_PATH_MERGE_JS_FILES, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)
->willReturn($booleanData);
$this->assertSame($booleanData, $this->model->isMergeJsFiles());
}
@@ -62,7 +62,7 @@ public function testIsAssetMinification()
->method('isSetFlag')
->with(
sprintf(Config::XML_PATH_MINIFICATION_ENABLED, $contentType),
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)->willReturn(true);
$this->assertTrue($this->model->isAssetMinification($contentType));
}
@@ -75,7 +75,7 @@ public function testGetAssetMinificationAdapter()
->method('getValue')
->with(
sprintf(Config::XML_PATH_MINIFICATION_ADAPTER, $contentType),
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)->willReturn($adapter);
$this->assertSame($adapter, $this->model->getAssetMinificationAdapter($contentType));
}
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/MergeTest.php b/dev/tests/unit/testsuite/Magento/Core/Model/Layout/MergeTest.php
index 3d3997b58011e..817190736493d 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/MergeTest.php
+++ b/dev/tests/unit/testsuite/Magento/Core/Model/Layout/MergeTest.php
@@ -73,7 +73,7 @@ protected function setUp()
$this->_store = $this->getMock('Magento\Store\Model\Store', [], [], '', false);
$this->_store->expects($this->any())->method('getId')->will($this->returnValue(20));
- $storeManager = $this->getMockForAbstractClass('Magento\Store\Model\StoreManagerInterface');
+ $storeManager = $this->getMockForAbstractClass('Magento\Framework\Store\StoreManagerInterface');
$storeManager->expects($this->once())->method('getStore')->with(null)->will($this->returnValue($this->_store));
$this->_resource = $this->getMock('Magento\Core\Model\Resource\Layout\Update', [], [], '', false);
@@ -92,7 +92,7 @@ protected function setUp()
$this->_cache = $this->getMockForAbstractClass('Magento\Framework\Cache\FrontendInterface');
- $this->_theme = $this->getMock('Magento\Core\Model\Theme', [], [], '', false, false);
+ $this->_theme = $this->getMock('Magento\Theme\Model\Theme', [], [], '', false, false);
$this->_theme->expects($this->any())->method('isPhysical')->will($this->returnValue(true));
$this->_theme->expects($this->any())->method('getArea')->will($this->returnValue('area'));
$this->_theme->expects($this->any())->method('getId')->will($this->returnValue(100));
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/ObserverTest.php b/dev/tests/unit/testsuite/Magento/Core/Model/ObserverTest.php
deleted file mode 100644
index 7a202c8f704dd..0000000000000
--- a/dev/tests/unit/testsuite/Magento/Core/Model/ObserverTest.php
+++ /dev/null
@@ -1,159 +0,0 @@
-_cacheFrontendMock = $this->getMockForAbstractClass('Magento\Framework\Cache\FrontendInterface');
-
- $this->_frontendPoolMock = $this->getMock(
- 'Magento\Framework\App\Cache\Frontend\Pool',
- [],
- [],
- '',
- false
- );
- $this->_frontendPoolMock->expects($this->any())->method('valid')->will($this->onConsecutiveCalls(true, false));
- $this->_frontendPoolMock->expects(
- $this->any()
- )->method(
- 'current'
- )->will(
- $this->returnValue($this->_cacheFrontendMock)
- );
-
- $this->_themeCustomization = $this->getMock(
- 'Magento\Framework\View\Design\Theme\Customization',
- [],
- [],
- '',
- false
- );
- $themeMock = $this->getMock(
- 'Magento\Core\Model\Theme',
- ['__wakeup', 'getCustomization'],
- [],
- '',
- false
- );
- $themeMock->expects(
- $this->any()
- )->method(
- 'getCustomization'
- )->will(
- $this->returnValue($this->_themeCustomization)
- );
-
- $designMock = $this->getMock('Magento\Framework\View\DesignInterface');
- $designMock->expects($this->any())->method('getDesignTheme')->will($this->returnValue($themeMock));
-
- $this->_assetsMock = $this->getMock(
- 'Magento\Framework\View\Asset\GroupedCollection',
- [],
- [],
- '',
- false,
- false
- );
- $this->_configMock = $this->getMock(
- '\Magento\Framework\App\Config\ReinitableConfigInterface',
- [],
- [],
- '',
- false,
- false
- );
-
- $this->_assetRepo = $this->getMock('Magento\Framework\View\Asset\Repository', [], [], '', false);
-
- $objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
- $this->_model = $objectManagerHelper->getObject(
- 'Magento\Core\Model\Observer',
- [
- 'cacheFrontendPool' => $this->_frontendPoolMock,
- 'design' => $designMock,
- 'assets' => $this->_assetsMock,
- 'assetRepo' => $this->_assetRepo,
- ]
- );
- }
-
- protected function tearDown()
- {
- $this->_cacheFrontendMock = null;
- $this->_frontendPoolMock = null;
- $this->_themeCustomization = null;
- $this->_assetsMock = null;
- $this->_model = null;
- }
-
- public function testCleanCache()
- {
- $cacheBackendMock = $this->getMockForAbstractClass('Zend_Cache_Backend_Interface');
- $cacheBackendMock->expects($this->once())->method('clean')->with(\Zend_Cache::CLEANING_MODE_OLD, []);
- $this->_cacheFrontendMock->expects(
- $this->once()
- )->method(
- 'getBackend'
- )->will(
- $this->returnValue($cacheBackendMock)
- );
- $cronScheduleMock = $this->getMock('Magento\Cron\Model\Schedule', [], [], '', false);
- $this->_model->cleanCache($cronScheduleMock);
- }
-
- public function testApplyThemeCustomization()
- {
- $asset = $this->getMock('\Magento\Framework\View\Asset\File', [], [], '', false);
- $file = $this->getMock('Magento\Core\Model\Theme\File', [], [], '', false);
- $fileService = $this->getMockForAbstractClass(
- '\Magento\Framework\View\Design\Theme\Customization\FileAssetInterface'
- );
- $file->expects($this->any())->method('getCustomizationService')->will($this->returnValue($fileService));
-
- $this->_assetRepo->expects($this->once())
- ->method('createArbitrary')
- ->will($this->returnValue($asset));
-
- $this->_themeCustomization->expects($this->once())->method('getFiles')->will($this->returnValue([$file]));
- $this->_assetsMock->expects($this->once())->method('add')->with($this->anything(), $asset);
-
- $observer = new \Magento\Framework\Event\Observer();
- $this->_model->applyThemeCustomization($observer);
- }
-}
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Resource/Layout/Link/CollectionTest.php b/dev/tests/unit/testsuite/Magento/Core/Model/Resource/Layout/Link/CollectionTest.php
index 613b7797ad091..4a5e11a66fa37 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Resource/Layout/Link/CollectionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Core/Model/Resource/Layout/Link/CollectionTest.php
@@ -28,7 +28,7 @@ protected function _getCollection(\Zend_Db_Select $select)
$eventManager = $this->getMock('Magento\Framework\Event\ManagerInterface', [], [], '', false);
return new \Magento\Core\Model\Resource\Layout\Link\Collection(
- $this->getMock('Magento\Core\Model\EntityFactory', [], [], '', false),
+ $this->getMock('Magento\Framework\Data\Collection\EntityFactory', [], [], '', false),
$this->getMock('Psr\Log\LoggerInterface'),
$this->getMockForAbstractClass('Magento\Framework\Data\Collection\Db\FetchStrategyInterface'),
$eventManager,
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Resource/Layout/Update/CollectionTest.php b/dev/tests/unit/testsuite/Magento/Core/Model/Resource/Layout/Update/CollectionTest.php
index cd08654de97fa..6bdfad2ae1062 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Resource/Layout/Update/CollectionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Core/Model/Resource/Layout/Update/CollectionTest.php
@@ -18,7 +18,7 @@ protected function _getCollection(\Zend_Db_Select $select)
$eventManager = $this->getMock('Magento\Framework\Event\ManagerInterface', [], [], '', false);
return new \Magento\Core\Model\Resource\Layout\Update\Collection(
- $this->getMock('Magento\Core\Model\EntityFactory', [], [], '', false),
+ $this->getMock('Magento\Framework\Data\Collection\EntityFactory', [], [], '', false),
$this->getMock('Psr\Log\LoggerInterface'),
$this->getMockForAbstractClass('Magento\Framework\Data\Collection\Db\FetchStrategyInterface'),
$eventManager,
diff --git a/dev/tests/unit/testsuite/Magento/Customer/Controller/Account/ConfirmTest.php b/dev/tests/unit/testsuite/Magento/Customer/Controller/Account/ConfirmTest.php
index 4d23754e8f950..c716eae071fce 100644
--- a/dev/tests/unit/testsuite/Magento/Customer/Controller/Account/ConfirmTest.php
+++ b/dev/tests/unit/testsuite/Magento/Customer/Controller/Account/ConfirmTest.php
@@ -10,7 +10,7 @@
use Magento\Customer\Helper\Address;
use Magento\Customer\Model\Url;
-use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\Store\ScopeInterface;
/**
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/dev/tests/unit/testsuite/Magento/Customer/Controller/Account/CreatePostTest.php b/dev/tests/unit/testsuite/Magento/Customer/Controller/Account/CreatePostTest.php
index 326dfd3427c80..ddae2fab0cb3c 100644
--- a/dev/tests/unit/testsuite/Magento/Customer/Controller/Account/CreatePostTest.php
+++ b/dev/tests/unit/testsuite/Magento/Customer/Controller/Account/CreatePostTest.php
@@ -12,7 +12,7 @@
use Magento\Customer\Api\AccountManagementInterface;
use Magento\Customer\Helper\Address;
use Magento\Customer\Model\Url;
-use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\Store\ScopeInterface;
/**
* @SuppressWarnings(PHPMD.TooManyFields)
diff --git a/dev/tests/unit/testsuite/Magento/Customer/Helper/AddressTest.php b/dev/tests/unit/testsuite/Magento/Customer/Helper/AddressTest.php
index 667fdb0779ddd..ad9936c78ebdf 100755
--- a/dev/tests/unit/testsuite/Magento/Customer/Helper/AddressTest.php
+++ b/dev/tests/unit/testsuite/Magento/Customer/Helper/AddressTest.php
@@ -20,7 +20,7 @@ class AddressTest extends \PHPUnit_Framework_TestCase
/** @var \Magento\Framework\View\Element\BlockFactory|\PHPUnit_Framework_MockObject_MockObject */
protected $blockFactory;
- /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
protected $storeManager;
/** @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject */
@@ -44,7 +44,7 @@ protected function setUp()
'Magento\Framework\View\Element\BlockFactory'
)->disableOriginalConstructor()->getMock();
$this->storeManager = $this->getMockBuilder(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->disableOriginalConstructor()->getMock();
$this->scopeConfig = $this->getMockBuilder(
'Magento\Framework\App\Config\ScopeConfigInterface'
@@ -155,7 +155,7 @@ public function testGetConfigCanShowConfig()
->will($this->returnValue('1'));
$this->scopeConfig->expects($this->once())//test method cache
->method('getValue')
- ->with('customer/address', \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store)
+ ->with('customer/address', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store)
->will($this->returnValue($result));
$this->storeManager->expects($this->any())->method('getStore')->will($this->returnValue($store));
$this->assertNull($this->helper->getConfig('unavailable_key'));
@@ -231,7 +231,7 @@ public function testIsVatValidationEnabled($store, $result)
->method('getValue')
->with(
\Magento\Customer\Helper\Address::XML_PATH_VAT_VALIDATION_ENABLED,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
)
->will($this->returnValue($result));
@@ -261,7 +261,7 @@ public function testHasValidateOnEachTransaction($store, $result)
->method('getValue')
->with(
\Magento\Customer\Helper\Address::XML_PATH_VIV_ON_EACH_TRANSACTION,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
)
->will($this->returnValue($result));
@@ -291,7 +291,7 @@ public function testGetTaxCalculationAddressType($store, $result)
->method('getValue')
->with(
\Magento\Customer\Helper\Address::XML_PATH_VIV_TAX_CALCULATION_ADDRESS_TYPE,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
)
->will($this->returnValue($result));
@@ -316,7 +316,7 @@ public function testIsDisableAutoGroupAssignDefaultValue()
->method('getValue')
->with(
\Magento\Customer\Helper\Address::XML_PATH_VIV_DISABLE_AUTO_ASSIGN_DEFAULT,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)
->will($this->returnValue(true));
$this->assertTrue($this->helper->isDisableAutoGroupAssignDefaultValue());
@@ -328,7 +328,7 @@ public function testIsVatAttributeVisible()
->method('getValue')
->with(
\Magento\Customer\Helper\Address::XML_PATH_VAT_FRONTEND_VISIBILITY,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)
->will($this->returnValue(true));
$this->assertTrue($this->helper->isVatAttributeVisible());
diff --git a/dev/tests/unit/testsuite/Magento/Customer/Model/Customer/Attribute/Backend/StoreTest.php b/dev/tests/unit/testsuite/Magento/Customer/Model/Customer/Attribute/Backend/StoreTest.php
index db0879fb5fc65..003b676169497 100644
--- a/dev/tests/unit/testsuite/Magento/Customer/Model/Customer/Attribute/Backend/StoreTest.php
+++ b/dev/tests/unit/testsuite/Magento/Customer/Model/Customer/Attribute/Backend/StoreTest.php
@@ -14,15 +14,15 @@ class StoreTest extends \PHPUnit_Framework_TestCase
protected $testable;
/**
- * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $storeManager;
public function setUp()
{
- $storeManager = $this->storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
+ $storeManager = $this->storeManager = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
->getMock();
- /** @var \Magento\Store\Model\StoreManagerInterface $storeManager */
+ /** @var \Magento\Framework\Store\StoreManagerInterface $storeManager */
$this->testable = new Store($storeManager);
}
diff --git a/dev/tests/unit/testsuite/Magento/Customer/Model/Customer/Attribute/Backend/WebsiteTest.php b/dev/tests/unit/testsuite/Magento/Customer/Model/Customer/Attribute/Backend/WebsiteTest.php
index 3d99d9375f764..f328441dc5714 100644
--- a/dev/tests/unit/testsuite/Magento/Customer/Model/Customer/Attribute/Backend/WebsiteTest.php
+++ b/dev/tests/unit/testsuite/Magento/Customer/Model/Customer/Attribute/Backend/WebsiteTest.php
@@ -14,15 +14,15 @@ class WebsiteTest extends \PHPUnit_Framework_TestCase
protected $testable;
/**
- * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $storeManager;
public function setUp()
{
- $storeManager = $this->storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
+ $storeManager = $this->storeManager = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
->getMock();
- /** @var \Magento\Store\Model\StoreManagerInterface $storeManager */
+ /** @var \Magento\Framework\Store\StoreManagerInterface $storeManager */
$this->testable = new Website($storeManager);
}
diff --git a/dev/tests/unit/testsuite/Magento/CustomerImportExport/Model/Export/AddressTest.php b/dev/tests/unit/testsuite/Magento/CustomerImportExport/Model/Export/AddressTest.php
index 48c4befe216c1..352592a4e8ad1 100644
--- a/dev/tests/unit/testsuite/Magento/CustomerImportExport/Model/Export/AddressTest.php
+++ b/dev/tests/unit/testsuite/Magento/CustomerImportExport/Model/Export/AddressTest.php
@@ -115,7 +115,7 @@ protected function _getModelDependencies()
{
$translator = $this->getMock('stdClass');
- $entityFactory = $this->getMock('Magento\Core\Model\EntityFactory', [], [], '', false);
+ $entityFactory = $this->getMock('Magento\Framework\Data\Collection\EntityFactory', [], [], '', false);
/** @var $attributeCollection \Magento\Framework\Data\Collection|PHPUnit_Framework_TestCase */
$attributeCollection = $this->getMock(
diff --git a/dev/tests/unit/testsuite/Magento/CustomerImportExport/Model/Export/CustomerTest.php b/dev/tests/unit/testsuite/Magento/CustomerImportExport/Model/Export/CustomerTest.php
index 0d62e8d088eb4..684ce4a2b9056 100644
--- a/dev/tests/unit/testsuite/Magento/CustomerImportExport/Model/Export/CustomerTest.php
+++ b/dev/tests/unit/testsuite/Magento/CustomerImportExport/Model/Export/CustomerTest.php
@@ -103,7 +103,7 @@ protected function _getModelDependencies()
$objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
$attributeCollection = new \Magento\Framework\Data\Collection(
- $this->getMock('Magento\Core\Model\EntityFactory', [], [], '', false)
+ $this->getMock('Magento\Framework\Data\Collection\EntityFactory', [], [], '', false)
);
foreach ($this->_attributes as $attributeData) {
$arguments = $objectManagerHelper->getConstructArguments(
diff --git a/dev/tests/unit/testsuite/Magento/CustomerImportExport/Model/Import/AbstractCustomerTest.php b/dev/tests/unit/testsuite/Magento/CustomerImportExport/Model/Import/AbstractCustomerTest.php
index 65cb7061cb00d..18b1958f07831 100644
--- a/dev/tests/unit/testsuite/Magento/CustomerImportExport/Model/Import/AbstractCustomerTest.php
+++ b/dev/tests/unit/testsuite/Magento/CustomerImportExport/Model/Import/AbstractCustomerTest.php
@@ -67,7 +67,7 @@ protected function tearDown()
protected function _getModelMock()
{
$customerCollection = new \Magento\Framework\Data\Collection(
- $this->getMock('Magento\Core\Model\EntityFactory', [], [], '', false)
+ $this->getMock('Magento\Framework\Data\Collection\EntityFactory', [], [], '', false)
);
foreach ($this->_customers as $customer) {
$customerCollection->addItem(new \Magento\Framework\Object($customer));
diff --git a/dev/tests/unit/testsuite/Magento/CustomerImportExport/Model/Import/AddressTest.php b/dev/tests/unit/testsuite/Magento/CustomerImportExport/Model/Import/AddressTest.php
index 309e4732d5b5d..7bc884e87085b 100644
--- a/dev/tests/unit/testsuite/Magento/CustomerImportExport/Model/Import/AddressTest.php
+++ b/dev/tests/unit/testsuite/Magento/CustomerImportExport/Model/Import/AddressTest.php
@@ -148,14 +148,14 @@ protected function _getModelDependencies()
$customerStorage = $this->_createCustomerStorageMock();
$customerEntity = $this->_createCustomerEntityMock();
$addressCollection = new \Magento\Framework\Data\Collection(
- $this->getMock('Magento\Core\Model\EntityFactory', [], [], '', false)
+ $this->getMock('Magento\Framework\Data\Collection\EntityFactory', [], [], '', false)
);
foreach ($this->_addresses as $address) {
$addressCollection->addItem(new \Magento\Framework\Object($address));
}
$regionCollection = new \Magento\Framework\Data\Collection(
- $this->getMock('Magento\Core\Model\EntityFactory', [], [], '', false)
+ $this->getMock('Magento\Framework\Data\Collection\EntityFactory', [], [], '', false)
);
foreach ($this->_regions as $region) {
$regionCollection->addItem(new \Magento\Framework\Object($region));
@@ -186,7 +186,7 @@ protected function _getModelDependencies()
*/
protected function _createAttrCollectionMock()
{
- $entityFactory = $this->getMock('Magento\Core\Model\EntityFactory', [], [], '', false);
+ $entityFactory = $this->getMock('Magento\Framework\Data\Collection\EntityFactory', [], [], '', false);
$attributeCollection = $this->getMock(
'Magento\Framework\Data\Collection',
['getEntityTypeCode'],
diff --git a/dev/tests/unit/testsuite/Magento/DesignEditor/Block/Adminhtml/Editor/Toolbar/Buttons/SaveTest.php b/dev/tests/unit/testsuite/Magento/DesignEditor/Block/Adminhtml/Editor/Toolbar/Buttons/SaveTest.php
index 79440646c323a..efd3e6253063d 100644
--- a/dev/tests/unit/testsuite/Magento/DesignEditor/Block/Adminhtml/Editor/Toolbar/Buttons/SaveTest.php
+++ b/dev/tests/unit/testsuite/Magento/DesignEditor/Block/Adminhtml/Editor/Toolbar/Buttons/SaveTest.php
@@ -49,7 +49,7 @@ protected function setUp()
}
/**
- * @param \Magento\Core\Model\Theme|\PHPUnit_Framework_MockObject_MockObject $theme
+ * @param \Magento\Theme\Model\Theme|\PHPUnit_Framework_MockObject_MockObject $theme
* @param string $expected
* @param array $expectedOptions
* @dataProvider initDataProvider
@@ -168,7 +168,7 @@ public function testInitStaging()
/**
* @param int $type
* @param null|bool $isAssigned
- * @return \Magento\Core\Model\Theme|\PHPUnit_Framework_MockObject_MockObject
+ * @return \Magento\Theme\Model\Theme|\PHPUnit_Framework_MockObject_MockObject
*/
protected function _getThemeMock($type, $isAssigned = null)
{
@@ -177,7 +177,7 @@ protected function _getThemeMock($type, $isAssigned = null)
if ($type == \Magento\Framework\View\Design\ThemeInterface::TYPE_VIRTUAL) {
$theme = $this->_getVirtualThemeMock($type, $isAssigned);
} else {
- $theme = $this->getMock('Magento\Core\Model\Theme', ['__sleep', '__wakeup'], [], '', false);
+ $theme = $this->getMock('Magento\Theme\Model\Theme', ['__sleep', '__wakeup'], [], '', false);
}
$theme->setType($type);
@@ -189,14 +189,14 @@ protected function _getThemeMock($type, $isAssigned = null)
/**
* @param int $type
* @param bool $isAssigned
- * @return \Magento\Core\Model\Theme|\PHPUnit_Framework_MockObject_MockObject
+ * @return \Magento\Theme\Model\Theme|\PHPUnit_Framework_MockObject_MockObject
*/
protected function _getVirtualThemeMock($type, $isAssigned)
{
// 1. Get domain model
- /** @var $domainModel \Magento\Core\Model\Theme\Domain\Virtual|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var $domainModel \Magento\Theme\Model\Theme\Domain\Virtual|\PHPUnit_Framework_MockObject_MockObject */
$domainModel = $this->getMock(
- 'Magento\Core\Model\Theme\Domain\Virtual',
+ 'Magento\Theme\Model\Theme\Domain\Virtual',
['isAssigned'],
[],
'',
@@ -205,9 +205,9 @@ protected function _getVirtualThemeMock($type, $isAssigned)
$domainModel->expects($this->any())->method('isAssigned')->will($this->returnValue($isAssigned));
// 2. Get Theme mock
- /** @var $theme \Magento\Core\Model\Theme|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var $theme \Magento\Theme\Model\Theme|\PHPUnit_Framework_MockObject_MockObject */
$theme = $this->getMock(
- 'Magento\Core\Model\Theme',
+ 'Magento\Theme\Model\Theme',
['getDomainModel', '__sleep', '__wakeup'],
[],
'',
diff --git a/dev/tests/unit/testsuite/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Code/CustomTest.php b/dev/tests/unit/testsuite/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Code/CustomTest.php
index bca4f7ab56496..480f70bef618c 100644
--- a/dev/tests/unit/testsuite/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Code/CustomTest.php
+++ b/dev/tests/unit/testsuite/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Code/CustomTest.php
@@ -23,7 +23,7 @@ class CustomTest extends \PHPUnit_Framework_TestCase
protected $_themeContext;
/**
- * @var \Magento\Core\Model\Theme|PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Theme\Model\Theme|PHPUnit_Framework_MockObject_MockObject
*/
protected $_theme;
@@ -37,7 +37,7 @@ protected function setUp()
$this->_urlBuilder = $this->getMock('Magento\Backend\Model\Url', [], [], '', false);
$this->_themeContext = $this->getMock('Magento\DesignEditor\Model\Theme\Context', [], [], '', false);
$this->_theme = $this->getMock(
- 'Magento\Core\Model\Theme',
+ 'Magento\Theme\Model\Theme',
['getId', 'getCustomization', '__wakeup'],
[],
'',
diff --git a/dev/tests/unit/testsuite/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Code/JsTest.php b/dev/tests/unit/testsuite/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Code/JsTest.php
index 91a0957b311a4..937ac0509769d 100644
--- a/dev/tests/unit/testsuite/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Code/JsTest.php
+++ b/dev/tests/unit/testsuite/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Code/JsTest.php
@@ -23,7 +23,7 @@ class JsTest extends \PHPUnit_Framework_TestCase
protected $_themeContext;
/**
- * @var \Magento\Core\Model\Theme|PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Theme\Model\Theme|PHPUnit_Framework_MockObject_MockObject
*/
protected $_theme;
@@ -42,7 +42,7 @@ protected function setUp()
$this->_urlBuilder = $this->getMock('Magento\Backend\Model\Url', [], [], '', false);
$this->_themeContext = $this->getMock('Magento\DesignEditor\Model\Theme\Context', [], [], '', false);
$this->_theme = $this->getMock(
- 'Magento\Core\Model\Theme',
+ 'Magento\Theme\Model\Theme',
['getId', 'getCustomization', '__wakeup'],
[],
'',
diff --git a/dev/tests/unit/testsuite/Magento/DesignEditor/Block/Adminhtml/Theme/Selector/SelectorList/AbstractTest.php b/dev/tests/unit/testsuite/Magento/DesignEditor/Block/Adminhtml/Theme/Selector/SelectorList/AbstractTest.php
index 47e56ac0f9812..0e3a9960d2686 100644
--- a/dev/tests/unit/testsuite/Magento/DesignEditor/Block/Adminhtml/Theme/Selector/SelectorList/AbstractTest.php
+++ b/dev/tests/unit/testsuite/Magento/DesignEditor/Block/Adminhtml/Theme/Selector/SelectorList/AbstractTest.php
@@ -56,8 +56,8 @@ public function testAddAssignButtonHtml()
true,
['getChildBlock', 'getLayout']
);
- /** @var $themeMock \Magento\Core\Model\Theme */
- $themeMock = $this->getMock('Magento\Core\Model\Theme', [], [], '', false);
+ /** @var $themeMock \Magento\Theme\Model\Theme */
+ $themeMock = $this->getMock('Magento\Theme\Model\Theme', [], [], '', false);
/** @var $themeBlockMock \Magento\DesignEditor\Block\Adminhtml\Theme */
$themeBlockMock = $this->getMock(
'Magento\DesignEditor\Block\Adminhtml\Theme',
diff --git a/dev/tests/unit/testsuite/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/FirstEntranceTest.php b/dev/tests/unit/testsuite/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/FirstEntranceTest.php
index eae7178c46324..15e80fbb202a1 100644
--- a/dev/tests/unit/testsuite/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/FirstEntranceTest.php
+++ b/dev/tests/unit/testsuite/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/FirstEntranceTest.php
@@ -101,12 +101,12 @@ protected function setUp()
* Return mocked theme collection factory model
*
* @param int $countCustomization
- * @return \Magento\Core\Model\Resource\Theme\CollectionFactory
+ * @return \Magento\Theme\Model\Resource\Theme\CollectionFactory
*/
protected function getThemeCollectionFactory($countCustomization)
{
$themeCollectionMock = $this->getMockBuilder(
- 'Magento\Core\Model\Resource\Theme\Collection'
+ 'Magento\Theme\Model\Resource\Theme\Collection'
)->disableOriginalConstructor()->setMethods(
['addTypeFilter', 'getSize']
)->getMock();
@@ -123,9 +123,9 @@ protected function getThemeCollectionFactory($countCustomization)
$themeCollectionMock->expects($this->once())->method('getSize')->will($this->returnValue($countCustomization));
- /** @var \Magento\Core\Model\Resource\Theme\CollectionFactory $collectionFactory */
+ /** @var \Magento\Theme\Model\Resource\Theme\CollectionFactory $collectionFactory */
$collectionFactory = $this->getMock(
- 'Magento\Core\Model\Resource\Theme\CollectionFactory',
+ 'Magento\Theme\Model\Resource\Theme\CollectionFactory',
['create'],
[],
'',
@@ -201,7 +201,7 @@ protected function getObjectManagerMap($countCustomization)
return [
[
- 'Magento\Core\Model\Resource\Theme\CollectionFactory',
+ 'Magento\Theme\Model\Resource\Theme\CollectionFactory',
$this->getThemeCollectionFactory($countCustomization),
],
['Magento\Framework\TranslateInterface', $translate],
diff --git a/dev/tests/unit/testsuite/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/IndexTest.php b/dev/tests/unit/testsuite/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/IndexTest.php
index 704b8f6a21ae7..b2a7c4db2a116 100644
--- a/dev/tests/unit/testsuite/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/IndexTest.php
+++ b/dev/tests/unit/testsuite/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/IndexTest.php
@@ -101,12 +101,12 @@ protected function setUp()
* Return mocked theme collection factory model
*
* @param int $countCustomization
- * @return \Magento\Core\Model\Resource\Theme\CollectionFactory
+ * @return \Magento\Theme\Model\Resource\Theme\CollectionFactory
*/
protected function getThemeCollectionFactory($countCustomization)
{
$themeCollectionMock = $this->getMockBuilder(
- 'Magento\Core\Model\Resource\Theme\Collection'
+ 'Magento\Theme\Model\Resource\Theme\Collection'
)->disableOriginalConstructor()->setMethods(
['addTypeFilter', 'getSize']
)->getMock();
@@ -123,9 +123,9 @@ protected function getThemeCollectionFactory($countCustomization)
$themeCollectionMock->expects($this->once())->method('getSize')->will($this->returnValue($countCustomization));
- /** @var \Magento\Core\Model\Resource\Theme\CollectionFactory $collectionFactory */
+ /** @var \Magento\Theme\Model\Resource\Theme\CollectionFactory $collectionFactory */
$collectionFactory = $this->getMock(
- 'Magento\Core\Model\Resource\Theme\CollectionFactory',
+ 'Magento\Theme\Model\Resource\Theme\CollectionFactory',
['create'],
[],
'',
@@ -201,7 +201,7 @@ protected function getObjectManagerMap($countCustomization)
return [
[
- 'Magento\Core\Model\Resource\Theme\CollectionFactory',
+ 'Magento\Theme\Model\Resource\Theme\CollectionFactory',
$this->getThemeCollectionFactory($countCustomization),
],
['Magento\Framework\TranslateInterface', $translate],
diff --git a/dev/tests/unit/testsuite/Magento/DesignEditor/Model/Plugin/ThemeCopyServiceTest.php b/dev/tests/unit/testsuite/Magento/DesignEditor/Model/Plugin/ThemeCopyServiceTest.php
index a86ceac9af98d..15565b9908328 100644
--- a/dev/tests/unit/testsuite/Magento/DesignEditor/Model/Plugin/ThemeCopyServiceTest.php
+++ b/dev/tests/unit/testsuite/Magento/DesignEditor/Model/Plugin/ThemeCopyServiceTest.php
@@ -41,10 +41,10 @@ public function testAroundCopySavesChangeTimeIfSourceThemeHasBeenAlreadyChanged(
$sourceChangeTime = '21:00:00';
$targetThemeId = 2;
- $sourceThemeMock = $this->getMock('Magento\Core\Model\Theme', [], [], '', false);
+ $sourceThemeMock = $this->getMock('Magento\Theme\Model\Theme', [], [], '', false);
$sourceThemeMock->expects($this->any())->method('getId')->will($this->returnValue($sourceThemeId));
- $targetThemeMock = $this->getMock('Magento\Core\Model\Theme', [], [], '', false);
+ $targetThemeMock = $this->getMock('Magento\Theme\Model\Theme', [], [], '', false);
$targetThemeMock->expects($this->any())->method('getId')->will($this->returnValue($targetThemeId));
$sourceChangeMock = $this->getMock(
diff --git a/dev/tests/unit/testsuite/Magento/DesignEditor/Model/StateTest.php b/dev/tests/unit/testsuite/Magento/DesignEditor/Model/StateTest.php
index 66eb076ea263f..2b38c3849543a 100644
--- a/dev/tests/unit/testsuite/Magento/DesignEditor/Model/StateTest.php
+++ b/dev/tests/unit/testsuite/Magento/DesignEditor/Model/StateTest.php
@@ -149,7 +149,7 @@ protected function setUp()
)->with(
$this->equalTo(\Magento\Framework\View\DesignInterface::XML_PATH_THEME_ID),
$this->equalTo(self::THEME_ID),
- $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE)
+ $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE)
)->will(
$this->returnSelf()
);
@@ -166,7 +166,7 @@ protected function setUp()
$this->returnSelf()
);
- $this->_theme = $this->getMock('Magento\Core\Model\Theme', ['getId', '__wakeup'], [], '', false);
+ $this->_theme = $this->getMock('Magento\Theme\Model\Theme', ['getId', '__wakeup'], [], '', false);
$this->_theme->expects($this->any())->method('getId')->will($this->returnValue(self::THEME_ID));
$this->_themeContext = $this->getMock(
diff --git a/dev/tests/unit/testsuite/Magento/DesignEditor/Model/Theme/ContextTest.php b/dev/tests/unit/testsuite/Magento/DesignEditor/Model/Theme/ContextTest.php
index 9b2ce58e90583..46635a1311411 100644
--- a/dev/tests/unit/testsuite/Magento/DesignEditor/Model/Theme/ContextTest.php
+++ b/dev/tests/unit/testsuite/Magento/DesignEditor/Model/Theme/ContextTest.php
@@ -18,7 +18,7 @@ class ContextTest extends \PHPUnit_Framework_TestCase
protected $_model;
/**
- * @var \Magento\Core\Model\ThemeFactory
+ * @var \Magento\Theme\Model\ThemeFactory
*/
protected $_themeFactory;
@@ -28,16 +28,16 @@ class ContextTest extends \PHPUnit_Framework_TestCase
protected $_copyService;
/**
- * @var \Magento\Core\Model\Theme
+ * @var \Magento\Theme\Model\Theme
*/
protected $_theme;
protected function setUp()
{
- $this->_themeFactory = $this->getMock('Magento\Core\Model\ThemeFactory', ['create'], [], '', false);
+ $this->_themeFactory = $this->getMock('Magento\Theme\Model\ThemeFactory', ['create'], [], '', false);
$this->_theme = $this->getMock(
- 'Magento\Core\Model\Theme',
+ 'Magento\Theme\Model\Theme',
['load', 'getId', 'getType', 'getDomainModel', 'isVirtual', '__wakeup'],
[],
'',
@@ -165,7 +165,7 @@ public function testGetStagingTheme()
$this->_theme->expects($this->atLeastOnce())->method('isVirtual')->will($this->returnValue(true));
$themeObj = $this->getMock(
- 'Magento\Core\Model\Theme\Domain\Virtual',
+ 'Magento\Theme\Model\Theme\Domain\Virtual',
['getStagingTheme'],
[],
'',
diff --git a/dev/tests/unit/testsuite/Magento/DesignEditor/Model/Url/NavigationModeTest.php b/dev/tests/unit/testsuite/Magento/DesignEditor/Model/Url/NavigationModeTest.php
index 8b662b68a91b8..9a9ad0e2c653b 100644
--- a/dev/tests/unit/testsuite/Magento/DesignEditor/Model/Url/NavigationModeTest.php
+++ b/dev/tests/unit/testsuite/Magento/DesignEditor/Model/Url/NavigationModeTest.php
@@ -73,7 +73,7 @@ protected function setUp()
'create'
)->will(
$this->returnValue(
- $this->getMock('Magento\Core\Model\Url\RouteParamsResolver', [], [], '', false)
+ $this->getMock('Magento\Framework\Url\RouteParamsResolver', [], [], '', false)
)
);
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/TemplateEngine/Decorator/DebugHintsTest.php b/dev/tests/unit/testsuite/Magento/Developer/Model/TemplateEngine/Decorator/DebugHintsTest.php
similarity index 95%
rename from dev/tests/unit/testsuite/Magento/Core/Model/TemplateEngine/Decorator/DebugHintsTest.php
rename to dev/tests/unit/testsuite/Magento/Developer/Model/TemplateEngine/Decorator/DebugHintsTest.php
index 178de7b536f0a..b1eeb24161282 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/TemplateEngine/Decorator/DebugHintsTest.php
+++ b/dev/tests/unit/testsuite/Magento/Developer/Model/TemplateEngine/Decorator/DebugHintsTest.php
@@ -3,7 +3,7 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Core\Model\TemplateEngine\Decorator;
+namespace Magento\Developer\Model\TemplateEngine\Decorator;
class DebugHintsTest extends \PHPUnit_Framework_TestCase
{
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/TemplateEngine/Plugin/DebugHintsTest.php b/dev/tests/unit/testsuite/Magento/Developer/Model/TemplateEngine/Plugin/DebugHintsTest.php
similarity index 93%
rename from dev/tests/unit/testsuite/Magento/Core/Model/TemplateEngine/Plugin/DebugHintsTest.php
rename to dev/tests/unit/testsuite/Magento/Developer/Model/TemplateEngine/Plugin/DebugHintsTest.php
index f96f9b0911dca..6b292fb6e5658 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/TemplateEngine/Plugin/DebugHintsTest.php
+++ b/dev/tests/unit/testsuite/Magento/Developer/Model/TemplateEngine/Plugin/DebugHintsTest.php
@@ -3,7 +3,7 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Core\Model\TemplateEngine\Plugin;
+namespace Magento\Developer\Model\TemplateEngine\Plugin;
class DebugHintsTest extends \PHPUnit_Framework_TestCase
{
@@ -62,7 +62,7 @@ public function testAfterCreateActive($showBlockHints)
)->method(
'create'
)->with(
- 'Magento\Core\Model\TemplateEngine\Decorator\DebugHints',
+ 'Magento\Developer\Model\TemplateEngine\Decorator\DebugHints',
$this->identicalTo(['subject' => $engine, 'showBlockHints' => $showBlockHints])
)->will(
$this->returnValue($engineDecorated)
@@ -115,13 +115,13 @@ protected function _setupConfigFixture($showTemplateHints, $showBlockHints)
[
[
DebugHints::XML_PATH_DEBUG_TEMPLATE_HINTS,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
null,
$showTemplateHints,
],
[
DebugHints::XML_PATH_DEBUG_TEMPLATE_HINTS_BLOCKS,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
null,
$showBlockHints
],
diff --git a/dev/tests/unit/testsuite/Magento/Directory/Helper/DataTest.php b/dev/tests/unit/testsuite/Magento/Directory/Helper/DataTest.php
index e5c2914f36513..62708a4d0332d 100644
--- a/dev/tests/unit/testsuite/Magento/Directory/Helper/DataTest.php
+++ b/dev/tests/unit/testsuite/Magento/Directory/Helper/DataTest.php
@@ -77,7 +77,7 @@ public function setUp()
$this->_coreHelper = $this->getMock('Magento\Core\Helper\Data', [], [], '', false);
$this->_store = $this->getMock('Magento\Store\Model\Store', [], [], '', false);
- $storeManager = $this->getMock('Magento\Store\Model\StoreManagerInterface', [], [], '', false);
+ $storeManager = $this->getMock('Magento\Framework\Store\StoreManagerInterface', [], [], '', false);
$storeManager->expects($this->any())->method('getStore')->will($this->returnValue($this->_store));
$currencyFactory = $this->getMock('Magento\Directory\Model\CurrencyFactory', [], [], '', false);
diff --git a/dev/tests/unit/testsuite/Magento/Directory/Model/ObserverTest.php b/dev/tests/unit/testsuite/Magento/Directory/Model/ObserverTest.php
index cf7afd8f96ffb..8b31ca2c35059 100644
--- a/dev/tests/unit/testsuite/Magento/Directory/Model/ObserverTest.php
+++ b/dev/tests/unit/testsuite/Magento/Directory/Model/ObserverTest.php
@@ -6,7 +6,7 @@
namespace Magento\Directory\Model;
-use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\Store\ScopeInterface;
use Magento\TestFramework\Helper\ObjectManager;
class ObserverTest extends \PHPUnit_Framework_TestCase
@@ -26,7 +26,7 @@ class ObserverTest extends \PHPUnit_Framework_TestCase
/** @var \Magento\Framework\Mail\Template\TransportBuilder|\PHPUnit_Framework_MockObject_MockObject */
protected $transportBuilder;
- /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
protected $storeManager;
/** @var \Magento\Directory\Model\CurrencyFactory|\PHPUnit_Framework_MockObject_MockObject */
@@ -79,7 +79,7 @@ public function testScheduledUpdateCurrencyRates()
$this->scopeConfig
->expects($this->at(0))
->method('getValue')
- ->with(Observer::IMPORT_ENABLE, ScopeInterface::SCOPE_STORE)
+ ->with(Observer::IMPORT_ENABLE, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)
->will($this->returnValue(1));
$this->scopeConfig
->expects($this->at(1))
@@ -89,7 +89,7 @@ public function testScheduledUpdateCurrencyRates()
$this->scopeConfig
->expects($this->at(2))
->method('getValue')
- ->with(Observer::IMPORT_SERVICE, ScopeInterface::SCOPE_STORE)
+ ->with(Observer::IMPORT_SERVICE, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)
->will($this->returnValue('import-service'));
$importInterfaceMock = $this->getMockBuilder('Magento\Directory\Model\Currency\Import\Webservicex')
->disableOriginalConstructor()
diff --git a/dev/tests/unit/testsuite/Magento/Directory/Model/PriceCurrencyTest.php b/dev/tests/unit/testsuite/Magento/Directory/Model/PriceCurrencyTest.php
index 522c50d4ce45d..67b21e1aeccb5 100644
--- a/dev/tests/unit/testsuite/Magento/Directory/Model/PriceCurrencyTest.php
+++ b/dev/tests/unit/testsuite/Magento/Directory/Model/PriceCurrencyTest.php
@@ -14,7 +14,7 @@ class PriceCurrencyTest extends \PHPUnit_Framework_TestCase
protected $priceCurrency;
/**
- * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $storeManager;
diff --git a/dev/tests/unit/testsuite/Magento/Directory/Model/Resource/Country/CollectionTest.php b/dev/tests/unit/testsuite/Magento/Directory/Model/Resource/Country/CollectionTest.php
index 6ed2d9637585b..992f6090671f4 100644
--- a/dev/tests/unit/testsuite/Magento/Directory/Model/Resource/Country/CollectionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Directory/Model/Resource/Country/CollectionTest.php
@@ -37,7 +37,7 @@ protected function setUp()
$localeListsMock->expects($this->any())->method('getCountryTranslation')->will($this->returnArgument(0));
$fetchStrategy = $this->getMockForAbstractClass('Magento\Framework\Data\Collection\Db\FetchStrategyInterface');
- $entityFactory = $this->getMock('Magento\Core\Model\EntityFactory', [], [], '', false);
+ $entityFactory = $this->getMock('Magento\Framework\Data\Collection\EntityFactory', [], [], '', false);
$scopeConfigMock = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
$logger = $this->getMock('Psr\Log\LoggerInterface');
$countryFactory = $this->getMock(
diff --git a/dev/tests/unit/testsuite/Magento/Downloadable/Model/ObserverTest.php b/dev/tests/unit/testsuite/Magento/Downloadable/Model/ObserverTest.php
index eafee58aba500..727661e6d3b1f 100644
--- a/dev/tests/unit/testsuite/Magento/Downloadable/Model/ObserverTest.php
+++ b/dev/tests/unit/testsuite/Magento/Downloadable/Model/ObserverTest.php
@@ -10,7 +10,7 @@
use Magento\Downloadable\Model\Product\Type as DownloadableProductType;
use Magento\Downloadable\Model\Resource\Link\Purchased\Item\Collection as LinkItemCollection;
use Magento\Downloadable\Model\Resource\Link\Purchased\Item\CollectionFactory;
-use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\Store\ScopeInterface;
use Magento\TestFramework\Helper\ObjectManager as ObjectManagerHelper;
class ObserverTest extends \PHPUnit_Framework_TestCase
@@ -223,7 +223,11 @@ public function testIsAllowedGuestCheckoutConfigSetToTrue($productType, $isAllow
$this->scopeConfig->expects($this->once())
->method('isSetFlag')
- ->with(Observer::XML_PATH_DISABLE_GUEST_CHECKOUT, ScopeInterface::SCOPE_STORE, $this->storeMock)
+ ->with(
+ Observer::XML_PATH_DISABLE_GUEST_CHECKOUT,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ $this->storeMock
+ )
->willReturn(true);
$this->observerMock->expects($this->exactly(3))
@@ -266,7 +270,11 @@ public function testIsAllowedGuestCheckoutConfigSetToFalse()
$this->scopeConfig->expects($this->once())
->method('isSetFlag')
- ->with(Observer::XML_PATH_DISABLE_GUEST_CHECKOUT, ScopeInterface::SCOPE_STORE, $this->storeMock)
+ ->with(
+ Observer::XML_PATH_DISABLE_GUEST_CHECKOUT,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ $this->storeMock
+ )
->willReturn(false);
$this->observerMock->expects($this->exactly(2))
diff --git a/dev/tests/unit/testsuite/Magento/Eav/Model/Entity/Collection/AbstractCollectionTest.php b/dev/tests/unit/testsuite/Magento/Eav/Model/Entity/Collection/AbstractCollectionTest.php
index c3dc433bbc8a3..8cfe0a5508d9b 100644
--- a/dev/tests/unit/testsuite/Magento/Eav/Model/Entity/Collection/AbstractCollectionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Eav/Model/Entity/Collection/AbstractCollectionTest.php
@@ -13,7 +13,7 @@ class AbstractCollectionTest extends \PHPUnit_Framework_TestCase
protected $model;
/**
- * @var \Magento\Core\Model\EntityFactory|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Framework\Data\Collection\EntityFactory|\PHPUnit_Framework_MockObject_MockObject
*/
protected $coreEntityFactoryMock;
@@ -59,7 +59,13 @@ class AbstractCollectionTest extends \PHPUnit_Framework_TestCase
public function setUp()
{
- $this->coreEntityFactoryMock = $this->getMock('Magento\Core\Model\EntityFactory', [], [], '', false);
+ $this->coreEntityFactoryMock = $this->getMock(
+ 'Magento\Framework\Data\Collection\EntityFactory',
+ [],
+ [],
+ '',
+ false
+ );
$this->loggerMock = $this->getMock('Psr\Log\LoggerInterface');
$this->fetchStrategyMock = $this->getMock(
'Magento\Framework\Data\Collection\Db\FetchStrategyInterface',
diff --git a/dev/tests/unit/testsuite/Magento/Eav/Model/Resource/Attribute/CollectionTest.php b/dev/tests/unit/testsuite/Magento/Eav/Model/Resource/Attribute/CollectionTest.php
index dcbb61434b3e9..27ab79c97be4b 100644
--- a/dev/tests/unit/testsuite/Magento/Eav/Model/Resource/Attribute/CollectionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Eav/Model/Resource/Attribute/CollectionTest.php
@@ -16,7 +16,7 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
protected $model;
/**
- * @var \Magento\Core\Model\EntityFactory|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Framework\Data\Collection\EntityFactory|\PHPUnit_Framework_MockObject_MockObject
*/
protected $entityFactoryMock;
@@ -46,7 +46,7 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
protected $entityTypeMock;
/**
- * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $storeManagerMock;
@@ -67,7 +67,7 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->entityFactoryMock = $this->getMock('Magento\Core\Model\EntityFactory', [], [], '', false);
+ $this->entityFactoryMock = $this->getMock('Magento\Framework\Data\Collection\EntityFactory', [], [], '', false);
$this->loggerMock = $this->getMock('Psr\Log\LoggerInterface');
$this->fetchStrategyMock = $this->getMock('Magento\Framework\Data\Collection\Db\FetchStrategyInterface');
$this->eventManagerMock = $this->getMock('Magento\Framework\Event\ManagerInterface');
@@ -79,7 +79,7 @@ protected function setUp()
->method('getEntityType')
->will($this->returnValue($this->entityTypeMock));
- $this->storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface');
+ $this->storeManagerMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
$this->storeManagerMock->expects($this->any())
->method('getStore')
->will($this->returnSelf());
diff --git a/dev/tests/unit/testsuite/Magento/Eav/Model/Resource/Entity/Attribute/Option/CollectionTest.php b/dev/tests/unit/testsuite/Magento/Eav/Model/Resource/Entity/Attribute/Option/CollectionTest.php
index 755ffa039cafc..cf7d5d61967df 100644
--- a/dev/tests/unit/testsuite/Magento/Eav/Model/Resource/Entity/Attribute/Option/CollectionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Eav/Model/Resource/Entity/Attribute/Option/CollectionTest.php
@@ -13,7 +13,7 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
protected $model;
/**
- * @var \Magento\Core\Model\EntityFactory|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Framework\Data\Collection\EntityFactory|\PHPUnit_Framework_MockObject_MockObject
*/
protected $entityFactoryMock;
@@ -38,7 +38,7 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
protected $coreResourceMock;
/**
- * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $storeManagerMock;
@@ -59,7 +59,7 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->entityFactoryMock = $this->getMock('Magento\Core\Model\EntityFactory', [], [], '', false);
+ $this->entityFactoryMock = $this->getMock('Magento\Framework\Data\Collection\EntityFactory', [], [], '', false);
$this->loggerMock = $this->getMock('Psr\Log\LoggerInterface');
$this->fetchStrategyMock = $this->getMock(
'Magento\Framework\Data\Collection\Db\FetchStrategyInterface',
@@ -83,7 +83,7 @@ protected function setUp()
false
);
$this->storeManagerMock = $this->getMock(
- 'Magento\Store\Model\StoreManagerInterface',
+ 'Magento\Framework\Store\StoreManagerInterface',
[],
[],
'',
diff --git a/dev/tests/unit/testsuite/Magento/Email/Block/Adminhtml/Template/PreviewTest.php b/dev/tests/unit/testsuite/Magento/Email/Block/Adminhtml/Template/PreviewTest.php
index fe240f2422bde..4f0f2f650124d 100644
--- a/dev/tests/unit/testsuite/Magento/Email/Block/Adminhtml/Template/PreviewTest.php
+++ b/dev/tests/unit/testsuite/Magento/Email/Block/Adminhtml/Template/PreviewTest.php
@@ -54,7 +54,7 @@ public function testToHtml($requestParamMap)
$design = $this->getMock('Magento\Framework\View\DesignInterface');
$store = $this->getMock('Magento\Store\Model\Store', ['getId', '__wakeup'], [], '', false);
$store->expects($this->any())->method('getId')->will($this->returnValue(1));
- $storeManager = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
+ $storeManager = $this->getMock('\Magento\Framework\Store\StoreManagerInterface');
$storeManager->expects($this->any())->method('getDefaultStoreView')->will($this->returnValue(null));
$storeManager->expects($this->any())->method('getStores')->will($this->returnValue([$store]));
@@ -140,7 +140,7 @@ public function testToHtmlWithException()
$eventManage = $this->getMock('Magento\Framework\Event\ManagerInterface');
$scopeConfig = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
$design = $this->getMock('Magento\Framework\View\DesignInterface');
- $storeManager = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
+ $storeManager = $this->getMock('\Magento\Framework\Store\StoreManagerInterface');
$storeManager->expects($this->any())->method('getDefaultStoreView')->will($this->returnValue(null));
$storeManager->expects($this->any())->method('getStores')->will($this->returnValue([]));
diff --git a/dev/tests/unit/testsuite/Magento/Email/Model/TemplateTest.php b/dev/tests/unit/testsuite/Magento/Email/Model/TemplateTest.php
index f63b91e5ea668..ec1da5be4c74e 100644
--- a/dev/tests/unit/testsuite/Magento/Email/Model/TemplateTest.php
+++ b/dev/tests/unit/testsuite/Magento/Email/Model/TemplateTest.php
@@ -28,7 +28,7 @@ public function testGetType($templateType, $expectedResult)
)->setConstructorArgs(
[
$this->getMock('Magento\Framework\Model\Context', [], [], '', false),
- $this->getMock('Magento\Core\Model\View\Design', [], [], '', false),
+ $this->getMock('Magento\Theme\Model\View\Design', [], [], '', false),
$this->getMock('Magento\Framework\Registry', [], [], '', false),
$this->getMock('Magento\Store\Model\App\Emulation', [], [], '', false),
$this->getMock('Magento\Store\Model\StoreManager', [], [], '', false),
diff --git a/dev/tests/unit/testsuite/Magento/Fedex/Model/CarrierTest.php b/dev/tests/unit/testsuite/Magento/Fedex/Model/CarrierTest.php
index a9c8534c2f270..7054c045d028f 100644
--- a/dev/tests/unit/testsuite/Magento/Fedex/Model/CarrierTest.php
+++ b/dev/tests/unit/testsuite/Magento/Fedex/Model/CarrierTest.php
@@ -48,7 +48,7 @@ public function setUp()
$rateFactory->expects($this->any())->method('create')->will($this->returnValue($rate));
$store = $this->getMock('Magento\Store\Model\Store', ['getBaseCurrencyCode', '__wakeup'], [], '', false);
- $storeManager = $this->getMockForAbstractClass('Magento\Store\Model\StoreManagerInterface');
+ $storeManager = $this->getMockForAbstractClass('Magento\Framework\Store\StoreManagerInterface');
$storeManager->expects($this->any())->method('getStore')->will($this->returnValue($store));
$priceCurrency = $this->getMockBuilder('Magento\Framework\Pricing\PriceCurrencyInterface')->getMock();
$priceCurrency->expects($this->once())
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Code/Model/File/Validator/NotProtectedExtensionTest.php b/dev/tests/unit/testsuite/Magento/Framework/Code/Model/File/Validator/NotProtectedExtensionTest.php
index 05f63c59fc8cc..970377a81108b 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Code/Model/File/Validator/NotProtectedExtensionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Code/Model/File/Validator/NotProtectedExtensionTest.php
@@ -33,7 +33,7 @@ protected function setUp()
$this->equalTo(
\Magento\Core\Model\File\Validator\NotProtectedExtension::XML_PATH_PROTECTED_FILE_EXTENSIONS
),
- $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
$this->equalTo(null)
)->will(
$this->returnValue($this->_protectedList)
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Data/Collection/DbTest.php b/dev/tests/unit/testsuite/Magento/Framework/Data/Collection/DbTest.php
index 3bbb57d093b01..febeb9032e312 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Data/Collection/DbTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Data/Collection/DbTest.php
@@ -21,7 +21,7 @@ class DbTest extends \PHPUnit_Framework_TestCase
protected $loggerMock;
/**
- * @var \Magento\Core\Model\EntityFactory|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Framework\Data\Collection\EntityFactory|\PHPUnit_Framework_MockObject_MockObject
*/
protected $entityFactoryMock;
@@ -36,7 +36,7 @@ protected function setUp()
'Magento\Framework\Data\Collection\Db\FetchStrategy\Query', ['fetchAll'], [], '', false
);
$this->entityFactoryMock = $this->getMock(
- 'Magento\Core\Model\EntityFactory', ['create'], [], '', false
+ 'Magento\Framework\Data\Collection\EntityFactory', ['create'], [], '', false
);
$this->loggerMock = $this->getMock('Psr\Log\LoggerInterface');
$this->collection = new \Magento\Framework\Data\Collection\Db(
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Data/CollectionTest.php b/dev/tests/unit/testsuite/Magento/Framework/Data/CollectionTest.php
index bfa61e0c3e285..4c1602f18febe 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Data/CollectionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Data/CollectionTest.php
@@ -15,7 +15,7 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
public function setUp()
{
$this->_model = new \Magento\Framework\Data\Collection(
- $this->getMock('Magento\Core\Model\EntityFactory', [], [], '', false)
+ $this->getMock('Magento\Framework\Data\Collection\EntityFactory', [], [], '', false)
);
}
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Module/Setup/MigrationTest.php b/dev/tests/unit/testsuite/Magento/Framework/Module/Setup/MigrationTest.php
index 8f0baa332d33f..05b05da0f75e4 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Module/Setup/MigrationTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Module/Setup/MigrationTest.php
@@ -223,8 +223,8 @@ public function testDoUpdateClassAliases($replaceRules, $tableData, $expected, $
$this->getMock('Magento\Framework\Module\ModuleListInterface'),
$this->getMock('Magento\Framework\Module\Dir\Reader', [], [], '', false, false),
$this->getMock('Magento\Framework\Module\Resource', [], [], '', false),
- $this->getMock('Magento\Core\Model\Resource\Theme\CollectionFactory', [], [], '', false),
- $this->getMock('Magento\Core\Model\Theme\CollectionFactory', [], [], '', false),
+ $this->getMock('Magento\Theme\Model\Resource\Theme\CollectionFactory', [], [], '', false),
+ $this->getMock('Magento\Theme\Model\Theme\CollectionFactory', [], [], '', false),
$this->getMock('Magento\Framework\Module\Setup\MigrationFactory', [], [], '', false),
'core_setup',
'app/etc/aliases_to_classes_map.json',
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Session/ConfigTest.php b/dev/tests/unit/testsuite/Magento/Framework/Session/ConfigTest.php
index e51b345024e43..67a8190b83e7a 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Session/ConfigTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Session/ConfigTest.php
@@ -465,7 +465,7 @@ protected function getModel($validator)
[
'scopeConfig' => $this->configMock,
'validatorFactory' => $this->validatorFactoryMock,
- 'scopeType' => \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ 'scopeType' => \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
'cacheLimiter' => \Magento\Framework\Session\SaveHandlerInterface::DEFAULT_HANDLER,
'lifetimePath' => 'test_web/test_cookie/test_cookie_lifetime',
'request' => $this->requestMock,
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Url/ScopeResolverTest.php b/dev/tests/unit/testsuite/Magento/Framework/Url/ScopeResolverTest.php
similarity index 92%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Url/ScopeResolverTest.php
rename to dev/tests/unit/testsuite/Magento/Framework/Url/ScopeResolverTest.php
index f0cbbbf066513..3e55494ff5809 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Url/ScopeResolverTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Url/ScopeResolverTest.php
@@ -3,7 +3,7 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Core\Model\Url;
+namespace Magento\Framework\Url;
class ScopeResolverTest extends \PHPUnit_Framework_TestCase
{
@@ -20,9 +20,9 @@ class ScopeResolverTest extends \PHPUnit_Framework_TestCase
public function setUp()
{
$objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
- $this->_storeManagerMock = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')->getMock();
+ $this->_storeManagerMock = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')->getMock();
$this->_object = $objectManager->getObject(
- 'Magento\Core\Model\Url\ScopeResolver',
+ 'Magento\Framework\Url\ScopeResolver',
['storeManager' => $this->_storeManagerMock]
);
}
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Url/SecurityInfoTest.php b/dev/tests/unit/testsuite/Magento/Framework/Url/SecurityInfoTest.php
similarity index 87%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Url/SecurityInfoTest.php
rename to dev/tests/unit/testsuite/Magento/Framework/Url/SecurityInfoTest.php
index 407cbde2df001..ba44579221dc9 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Url/SecurityInfoTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Url/SecurityInfoTest.php
@@ -3,7 +3,7 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Core\Model\Url;
+namespace Magento\Framework\Url;
class SecurityInfoTest extends \PHPUnit_Framework_TestCase
{
@@ -13,14 +13,14 @@ class SecurityInfoTest extends \PHPUnit_Framework_TestCase
protected $_scopeConfigMock;
/**
- * @var \Magento\Core\Model\Url\SecurityInfo
+ * @var \Magento\Framework\Url\SecurityInfo
*/
protected $_model;
protected function setUp()
{
$this->_scopeConfigMock = $this->getMock('\Magento\Framework\App\Config\ScopeConfigInterface');
- $this->_model = new \Magento\Core\Model\Url\SecurityInfo($this->_scopeConfigMock, ['/account', '/cart']);
+ $this->_model = new \Magento\Framework\Url\SecurityInfo($this->_scopeConfigMock, ['/account', '/cart']);
}
public function testIsSecureReturnsFalseIfDisabledInConfig()
diff --git a/dev/tests/unit/testsuite/Magento/Framework/UrlTest.php b/dev/tests/unit/testsuite/Magento/Framework/UrlTest.php
index 916d0154e9f85..62606668601aa 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/UrlTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/UrlTest.php
@@ -15,7 +15,7 @@
class UrlTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\Core\Model\Url\RouteParamsResolver|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Framework\Url\RouteParamsResolver|\PHPUnit_Framework_MockObject_MockObject
*/
protected $routeParamsResolverMock;
@@ -52,7 +52,7 @@ class UrlTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
$this->routeParamsResolverMock = $this->getMock(
- 'Magento\Core\Model\Url\RouteParamsResolver',
+ 'Magento\Framework\Url\RouteParamsResolver',
['getType', 'hasData', 'getData', 'getRouteParams'],
[],
'',
@@ -106,7 +106,7 @@ protected function getRequestMock($mockMethods = [])
*/
protected function getUrlModel($arguments = [])
{
- $arguments = array_merge($arguments, ['scopeType' => \Magento\Store\Model\ScopeInterface::SCOPE_STORE]);
+ $arguments = array_merge($arguments, ['scopeType' => Store\ScopeInterface::SCOPE_STORE]);
$objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
return $objectManager->getObject('Magento\Framework\Url', $arguments);
}
@@ -499,7 +499,7 @@ public function testGetConfigData($urlType, $configPath, $isSecure, $isSecureCal
$this->scopeConfig->expects($this->any())
->method('getValue')
- ->with($this->equalTo($configPath), \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $this->scopeMock)
+ ->with($this->equalTo($configPath), Store\ScopeInterface::SCOPE_STORE, $this->scopeMock)
->will($this->returnValue('http://localhost/'));
$this->routeParamsResolverMock->expects($this->at(0))->method('hasData')->with('secure_is_forced')
->will($this->returnValue(false));
@@ -546,7 +546,7 @@ public function testGetConfigDataWithSecureIsForcedParam()
->method('getValue')
->with(
'web/secure/base_url_secure_forced',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $this->scopeMock
+ Store\ScopeInterface::SCOPE_STORE, $this->scopeMock
)
->will($this->returnValue('http://localhost/'));
$this->routeParamsResolverMock->expects($this->once())->method('hasData')->with('secure_is_forced')
diff --git a/dev/tests/unit/testsuite/Magento/Framework/View/ConfigTest.php b/dev/tests/unit/testsuite/Magento/Framework/View/ConfigTest.php
index 6045070d0cd6c..286624598c562 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/View/ConfigTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/View/ConfigTest.php
@@ -64,7 +64,7 @@ protected function setUp()
public function testGetViewConfig()
{
$themeMock = $this->getMock(
- 'Magento\Core\Model\Theme',
+ 'Magento\Theme\Model\Theme',
['getId', 'getCustomization', 'getCustomViewConfigPath'],
[],
'',
diff --git a/dev/tests/unit/testsuite/Magento/Framework/View/Design/Theme/Customization/AbstractFileTest.php b/dev/tests/unit/testsuite/Magento/Framework/View/Design/Theme/Customization/AbstractFileTest.php
index 1b17ab4324365..c660d9030569a 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/View/Design/Theme/Customization/AbstractFileTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/View/Design/Theme/Customization/AbstractFileTest.php
@@ -75,7 +75,7 @@ protected function tearDown()
public function testCreate()
{
$model = $this->_modelBuilder->getMock();
- $file = $this->getMock('Magento\Core\Model\Theme\File', [], [], '', false);
+ $file = $this->getMock('Magento\Theme\Model\Theme\File', [], [], '', false);
$file->expects($this->once())->method('setCustomizationService')->with($model);
$this->_fileFactory->expects($this->once())->method('create')->will($this->returnValue($file));
/** @var $model \Magento\Framework\View\Design\Theme\Customization\AbstractFile */
@@ -88,8 +88,8 @@ public function testCreate()
public function testGetFullPath()
{
$model = $this->_modelBuilder->getMock();
- $theme = $this->getMock('Magento\Core\Model\Theme', [], [], '', false);
- $file = $this->getMock('Magento\Core\Model\Theme\File', [], [], '', false);
+ $theme = $this->getMock('Magento\Theme\Model\Theme', [], [], '', false);
+ $file = $this->getMock('Magento\Theme\Model\Theme\File', [], [], '', false);
$file->expects($this->any())->method('getTheme')->will($this->returnValue($theme));
$file->expects($this->once())->method('getData')->with('file_path')->will($this->returnValue('file.path'));
@@ -103,7 +103,7 @@ public function testGetFullPath()
);
/** @var $model \Magento\Framework\View\Design\Theme\Customization\AbstractFile */
- /** @var $file \Magento\Core\Model\Theme\File */
+ /** @var $file \Magento\Theme\Model\Theme\File */
$this->assertEquals('/path' . '/' . 'file.path', $model->getFullPath($file));
}
@@ -122,7 +122,7 @@ public function testPrepareFile($type, $fileContent, $expectedContent, $existedF
$files = [];
foreach ($existedFiles as $fileData) {
- $file = $this->getMock('Magento\Core\Model\Theme\File', ['__wakeup', 'save'], [], '', false);
+ $file = $this->getMock('Magento\Theme\Model\Theme\File', ['__wakeup', 'save'], [], '', false);
$file->setData($fileData);
$files[] = $file;
}
@@ -143,11 +143,11 @@ public function testPrepareFile($type, $fileContent, $expectedContent, $existedF
$this->returnValue($files)
);
- $theme = $this->getMock('Magento\Core\Model\Theme', [], [], '', false);
+ $theme = $this->getMock('Magento\Theme\Model\Theme', [], [], '', false);
$theme->expects($this->any())->method('getCustomization')->will($this->returnValue($customization));
$file = $this->getMock(
- 'Magento\Core\Model\Theme\File',
+ 'Magento\Theme\Model\Theme\File',
['__wakeup', 'getTheme', 'save'],
[],
'',
@@ -157,7 +157,7 @@ public function testPrepareFile($type, $fileContent, $expectedContent, $existedF
$file->setData($fileContent);
/** @var $model \Magento\Framework\View\Design\Theme\Customization\AbstractFile */
- /** @var $file \Magento\Core\Model\Theme\File */
+ /** @var $file \Magento\Theme\Model\Theme\File */
$model->prepareFile($file);
$this->assertEquals($expectedContent, $file->getData());
}
@@ -211,7 +211,7 @@ public function testSave()
{
$model = $this->_modelBuilder->setMethods(['getFullPath', 'getType', 'getContentType'])->getMock();
- $file = $this->getMock('Magento\Core\Model\Theme\File', ['__wakeup'], [], '', false);
+ $file = $this->getMock('Magento\Theme\Model\Theme\File', ['__wakeup'], [], '', false);
$file->setData(
[
'file_type' => 'js',
@@ -243,7 +243,7 @@ public function testSave()
$this->returnValue($directoryMock)
);
/** @var $model \Magento\Framework\View\Design\Theme\Customization\AbstractFile */
- /** @var $file \Magento\Core\Model\Theme\File */
+ /** @var $file \Magento\Theme\Model\Theme\File */
$model->save($file);
}
@@ -254,7 +254,7 @@ public function testSave()
public function testDelete()
{
$model = $this->_modelBuilder->setMethods(['getFullPath', 'getType', 'getContentType'])->getMock();
- $file = $this->getMock('Magento\Core\Model\Theme\File', ['__wakeup'], [], '', false);
+ $file = $this->getMock('Magento\Theme\Model\Theme\File', ['__wakeup'], [], '', false);
$file->setData(
[
'file_type' => 'js',
@@ -286,7 +286,7 @@ public function testDelete()
$model->expects($this->once())->method('getFullPath')->with($file)->will($this->returnValue('test_path'));
/** @var $model \Magento\Framework\View\Design\Theme\Customization\AbstractFile */
- /** @var $file \Magento\Core\Model\Theme\File */
+ /** @var $file \Magento\Theme\Model\Theme\File */
$model->delete($file);
}
}
diff --git a/dev/tests/unit/testsuite/Magento/Framework/View/Design/Theme/Customization/PathTest.php b/dev/tests/unit/testsuite/Magento/Framework/View/Design/Theme/Customization/PathTest.php
index e408ed7f86f6e..808649083a947 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/View/Design/Theme/Customization/PathTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/View/Design/Theme/Customization/PathTest.php
@@ -38,9 +38,9 @@ class PathTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->_theme = $this->getMock('Magento\Core\Model\Theme', ['__wakeup'], [], '', false);
+ $this->_theme = $this->getMock('Magento\Theme\Model\Theme', ['__wakeup'], [], '', false);
$this->_appState = $this->getMock('Magento\Framework\App\State', ['getAreaCode'], [], '', false);
- $appStateProperty = new \ReflectionProperty('\Magento\Core\Model\Theme', '_appState');
+ $appStateProperty = new \ReflectionProperty('\Magento\Theme\Model\Theme', '_appState');
$appStateProperty->setAccessible(true);
$appStateProperty->setValue($this->_theme, $this->_appState);
$filesystem = $this->getMock('Magento\Framework\Filesystem', [], [], '', false);
diff --git a/dev/tests/unit/testsuite/Magento/Framework/View/Design/Theme/CustomizationTest.php b/dev/tests/unit/testsuite/Magento/Framework/View/Design/Theme/CustomizationTest.php
index 82b49486b0600..e57cd5ddc1779 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/View/Design/Theme/CustomizationTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/View/Design/Theme/CustomizationTest.php
@@ -41,7 +41,7 @@ protected function setUp()
false
);
$collectionFactory = $this->getMock(
- 'Magento\Core\Model\Resource\Theme\File\CollectionFactory',
+ 'Magento\Theme\Model\Resource\Theme\File\CollectionFactory',
['create'],
[],
'',
@@ -56,7 +56,7 @@ protected function setUp()
false
);
$this->theme = $this->getMock(
- 'Magento\Core\Model\Theme',
+ 'Magento\Theme\Model\Theme',
['__wakeup', 'save', 'load'],
[],
'',
@@ -116,7 +116,7 @@ public function testGetFilesByType()
*/
public function testGenerationOfFileInfo()
{
- $file = $this->getMock('Magento\Core\Model\Theme\File', ['__wakeup', 'getFileInfo'], [], '', false);
+ $file = $this->getMock('Magento\Theme\Model\Theme\File', ['__wakeup', 'getFileInfo'], [], '', false);
$file->expects($this->once())->method('getFileInfo')->will($this->returnValue(['sample-generation']));
$this->assertEquals([['sample-generation']], $this->model->generateFileInfo([$file]));
}
@@ -197,7 +197,7 @@ public function testReorder($sequence, $filesContent)
$files = [];
$type = 'sample-type';
foreach ($filesContent as $fileContent) {
- $file = $this->getMock('Magento\Core\Model\Theme\File', ['__wakeup', 'save'], [], '', false);
+ $file = $this->getMock('Magento\Theme\Model\Theme\File', ['__wakeup', 'save'], [], '', false);
$file->expects($fileContent['isCalled'])->method('save')->will($this->returnSelf());
$file->setData($fileContent['content']);
$files[] = $file;
@@ -269,7 +269,7 @@ public function customFileContent()
*/
public function testDelete()
{
- $file = $this->getMock('Magento\Core\Model\Theme\File', ['__wakeup', 'delete'], [], '', false);
+ $file = $this->getMock('Magento\Theme\Model\Theme\File', ['__wakeup', 'delete'], [], '', false);
$file->expects($this->once())->method('delete')->will($this->returnSelf());
$file->setData(
[
diff --git a/dev/tests/unit/testsuite/Magento/Framework/View/Design/Theme/Domain/FactoryTest.php b/dev/tests/unit/testsuite/Magento/Framework/View/Design/Theme/Domain/FactoryTest.php
index 1024b16bcc56f..2f91d210f28dc 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/View/Design/Theme/Domain/FactoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/View/Design/Theme/Domain/FactoryTest.php
@@ -16,7 +16,7 @@ class FactoryTest extends \PHPUnit_Framework_TestCase
*/
public function testCreate()
{
- $themeMock = $this->getMock('Magento\Core\Model\Theme', ['__wakeup', 'getType'], [], '', false);
+ $themeMock = $this->getMock('Magento\Theme\Model\Theme', ['__wakeup', 'getType'], [], '', false);
$themeMock->expects(
$this->any()
)->method(
@@ -25,7 +25,7 @@ public function testCreate()
$this->returnValue(\Magento\Framework\View\Design\ThemeInterface::TYPE_VIRTUAL)
);
- $newThemeMock = $this->getMock('Magento\Core\Model\Theme', [], [], '', false);
+ $newThemeMock = $this->getMock('Magento\Theme\Model\Theme', [], [], '', false);
$objectManager = $this->getMock('Magento\Framework\ObjectManagerInterface');
$objectManager->expects(
@@ -49,7 +49,7 @@ public function testCreate()
public function testCreateWithWrongThemeType()
{
$wrongThemeType = 'wrong_theme_type';
- $themeMock = $this->getMock('Magento\Core\Model\Theme', ['__wakeup', 'getType'], [], '', false);
+ $themeMock = $this->getMock('Magento\Theme\Model\Theme', ['__wakeup', 'getType'], [], '', false);
$themeMock->expects($this->any())->method('getType')->will($this->returnValue($wrongThemeType));
$objectManager = $this->getMock('Magento\Framework\ObjectManagerInterface');
diff --git a/dev/tests/unit/testsuite/Magento/Framework/View/Design/Theme/FlyweightFactoryTest.php b/dev/tests/unit/testsuite/Magento/Framework/View/Design/Theme/FlyweightFactoryTest.php
index 8fe6e05a0a854..988f2491391c4 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/View/Design/Theme/FlyweightFactoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/View/Design/Theme/FlyweightFactoryTest.php
@@ -31,7 +31,7 @@ protected function setUp()
*/
public function testCreateById($path, $expectedId)
{
- $theme = $this->getMock('Magento\Core\Model\Theme', [], [], '', false);
+ $theme = $this->getMock('Magento\Theme\Model\Theme', [], [], '', false);
$theme->expects($this->exactly(3))->method('getId')->will($this->returnValue($expectedId));
$theme->expects($this->once())->method('getFullPath')->will($this->returnValue(null));
@@ -67,7 +67,7 @@ public function testCreateByPath()
{
$path = 'frontend/Magento/luma';
$themeId = 7;
- $theme = $this->getMock('Magento\Core\Model\Theme', [], [], '', false);
+ $theme = $this->getMock('Magento\Theme\Model\Theme', [], [], '', false);
$theme->expects($this->exactly(3))->method('getId')->will($this->returnValue($themeId));
$theme->expects($this->once())->method('getFullPath')->will($this->returnValue($path));
@@ -92,7 +92,7 @@ public function testCreateByPath()
public function testCreateDummy()
{
$themeId = 0;
- $theme = $this->getMock('Magento\Core\Model\Theme', [], [], '', false);
+ $theme = $this->getMock('Magento\Theme\Model\Theme', [], [], '', false);
$theme->expects($this->once())->method('getId')->will($this->returnValue($themeId));
$this->themeProviderMock->expects(
diff --git a/dev/tests/unit/testsuite/Magento/Framework/View/Design/Theme/ImageTest.php b/dev/tests/unit/testsuite/Magento/Framework/View/Design/Theme/ImageTest.php
index fc28308134593..0c5ffe1b3bc47 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/View/Design/Theme/ImageTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/View/Design/Theme/ImageTest.php
@@ -36,7 +36,7 @@ class ImageTest extends \PHPUnit_Framework_TestCase
protected $_uploaderMock;
/**
- * @var \Magento\Core\Model\Theme|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Theme\Model\Theme|\PHPUnit_Framework_MockObject_MockObject
*/
protected $_themeMock;
@@ -51,7 +51,7 @@ class ImageTest extends \PHPUnit_Framework_TestCase
protected $_rootDirectoryMock;
/**
- * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Core\Model\Theme\Image\Path
+ * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Theme\Model\Theme\Image\Path
*/
protected $imagePathMock;
@@ -90,7 +90,7 @@ protected function setUp()
$imageFactory->expects($this->any())->method('create')->will($this->returnValue($this->_imageMock));
$logger = $this->getMock('Psr\Log\LoggerInterface');
- $this->_themeMock = $this->getMock('Magento\Core\Model\Theme', ['__wakeup'], [], '', false, false);
+ $this->_themeMock = $this->getMock('Magento\Theme\Model\Theme', ['__wakeup'], [], '', false, false);
$this->_uploaderMock = $this->getMock(
'Magento\Framework\View\Design\Theme\Image\Uploader',
[],
@@ -123,11 +123,11 @@ protected function tearDown()
}
/**
- * @return \PHPUnit_Framework_MockObject_MockObject|\Magento\Core\Model\Theme\Image\Path
+ * @return \PHPUnit_Framework_MockObject_MockObject|\Magento\Theme\Model\Theme\Image\Path
*/
protected function _getImagePathMock()
{
- $imagePathMock = $this->getMock('Magento\Core\Model\Theme\Image\Path', [], [], '', false);
+ $imagePathMock = $this->getMock('Magento\Theme\Model\Theme\Image\Path', [], [], '', false);
$testBaseUrl = 'http://localhost/media_path/';
$imagePathMock->expects($this->any())->method('getPreviewImageDefaultUrl')
@@ -226,7 +226,7 @@ public function testCreatePreviewImageCopy()
->method('getPreviewImagePath')
->will($this->returnValue($previewImage));
- $themeMock = $this->getMockBuilder('Magento\Core\Model\Theme')
+ $themeMock = $this->getMockBuilder('Magento\Theme\Model\Theme')
->disableOriginalConstructor()
->setMethods(['getThemeImage', 'getPreviewImage', '__wakeup'])
->getMock();
diff --git a/dev/tests/unit/testsuite/Magento/Framework/View/Page/TitleTest.php b/dev/tests/unit/testsuite/Magento/Framework/View/Page/TitleTest.php
index cf259b68d3b07..526a8a3f3aa41 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/View/Page/TitleTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/View/Page/TitleTest.php
@@ -9,7 +9,7 @@
*/
namespace Magento\Framework\View\Page;
-use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\Store\ScopeInterface;
class TitleTest extends \PHPUnit_Framework_TestCase
{
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/View/Url/ConfigTest.php b/dev/tests/unit/testsuite/Magento/Framework/View/Url/ConfigTest.php
similarity index 88%
rename from dev/tests/unit/testsuite/Magento/Core/Model/View/Url/ConfigTest.php
rename to dev/tests/unit/testsuite/Magento/Framework/View/Url/ConfigTest.php
index e16ddf2399b08..f01362b9597e6 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/View/Url/ConfigTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/View/Url/ConfigTest.php
@@ -3,12 +3,12 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Core\Model\View\Url;
+namespace Magento\Framework\View\Url;
class ConfigTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\Core\Model\View\Url\Config
+ * @var \Magento\Framework\View\Url\Config
*/
protected $_model;
@@ -22,7 +22,7 @@ protected function setUp()
$this->_scopeConfig = $this->getMockBuilder(
'Magento\Framework\App\Config\ScopeConfigInterface'
)->disableOriginalConstructor()->getMock();
- $this->_model = new \Magento\Core\Model\View\Url\Config($this->_scopeConfig);
+ $this->_model = new \Magento\Framework\View\Url\Config($this->_scopeConfig);
}
/**
diff --git a/dev/tests/unit/testsuite/Magento/GiftMessage/Model/CartRepositoryTest.php b/dev/tests/unit/testsuite/Magento/GiftMessage/Model/CartRepositoryTest.php
index c2712492bba77..6055ad43c5fd4 100644
--- a/dev/tests/unit/testsuite/Magento/GiftMessage/Model/CartRepositoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/GiftMessage/Model/CartRepositoryTest.php
@@ -101,7 +101,7 @@ protected function setUp()
'',
false
);
- $this->storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface');
+ $this->storeManagerMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
$this->giftMessageManagerMock =
$this->getMock('Magento\GiftMessage\Model\GiftMessageManager', [], [], '', false);
$this->helperMock = $this->getMock('Magento\GiftMessage\Helper\Message', [], [], '', false);
diff --git a/dev/tests/unit/testsuite/Magento/GiftMessage/Model/ItemRepositoryTest.php b/dev/tests/unit/testsuite/Magento/GiftMessage/Model/ItemRepositoryTest.php
index 18fb89322ce34..a90156cb497ff 100644
--- a/dev/tests/unit/testsuite/Magento/GiftMessage/Model/ItemRepositoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/GiftMessage/Model/ItemRepositoryTest.php
@@ -100,7 +100,7 @@ protected function setUp()
'',
false
);
- $this->storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface');
+ $this->storeManagerMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
$this->giftMessageManagerMock =
$this->getMock('Magento\GiftMessage\Model\GiftMessageManager', [], [], '', false);
$this->helperMock = $this->getMock('Magento\GiftMessage\Helper\Message', [], [], '', false);
diff --git a/dev/tests/unit/testsuite/Magento/GoogleOptimizer/Helper/DataTest.php b/dev/tests/unit/testsuite/Magento/GoogleOptimizer/Helper/DataTest.php
index bc2c747e6d2ef..40f5bd7112898 100644
--- a/dev/tests/unit/testsuite/Magento/GoogleOptimizer/Helper/DataTest.php
+++ b/dev/tests/unit/testsuite/Magento/GoogleOptimizer/Helper/DataTest.php
@@ -63,7 +63,7 @@ public function testGoogleExperimentIsEnabled($isExperimentsEnabled)
'isSetFlag'
)->with(
\Magento\GoogleOptimizer\Helper\Data::XML_PATH_ENABLED,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
)->will(
$this->returnValue($isExperimentsEnabled)
@@ -95,7 +95,7 @@ public function testGoogleExperimentIsActive($isExperimentsEnabled, $isAnalytics
'isSetFlag'
)->with(
\Magento\GoogleOptimizer\Helper\Data::XML_PATH_ENABLED,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$store
)->will(
$this->returnValue($isExperimentsEnabled)
diff --git a/dev/tests/unit/testsuite/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items/MassAddTest.php b/dev/tests/unit/testsuite/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items/MassAddTest.php
index db475eaf54019..bf809208479cd 100644
--- a/dev/tests/unit/testsuite/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items/MassAddTest.php
+++ b/dev/tests/unit/testsuite/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items/MassAddTest.php
@@ -53,14 +53,14 @@ protected function setUp()
->setMethods(['getId', '__sleep', '__wakeup'])->getMock();
$store->expects($this->exactly(2))->method('getId')->will($this->returnValue(1));
- $storeManager = $this->getMock('Magento\Store\Model\StoreManagerInterface');
+ $storeManager = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
$storeManager->expects($this->once())->method('getStore')->will($this->returnValue($store));
$this->controllerArguments['context']->getObjectManager()
->expects($this->at(0))->method('get')->with('Magento\GoogleShopping\Model\Flag')
->will($this->returnValue($this->flag));
$this->controllerArguments['context']->getObjectManager()
- ->expects($this->at(1))->method('get')->with('Magento\Store\Model\StoreManagerInterface')
+ ->expects($this->at(1))->method('get')->with('Magento\Framework\Store\StoreManagerInterface')
->will($this->returnValue($storeManager));
$this->controller = $this->objectManagerHelper->getObject(
diff --git a/dev/tests/unit/testsuite/Magento/GoogleShopping/Helper/DataTest.php b/dev/tests/unit/testsuite/Magento/GoogleShopping/Helper/DataTest.php
index f005bf9c10912..e48388469be44 100644
--- a/dev/tests/unit/testsuite/Magento/GoogleShopping/Helper/DataTest.php
+++ b/dev/tests/unit/testsuite/Magento/GoogleShopping/Helper/DataTest.php
@@ -22,7 +22,7 @@ class DataTest extends \PHPUnit_Framework_TestCase
/** @var \Magento\Framework\Stdlib\String|\PHPUnit_Framework_MockObject_MockObject */
protected $string;
- /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
protected $storeManagerInterface;
protected function setUp()
diff --git a/dev/tests/unit/testsuite/Magento/GoogleShopping/Model/ConfigTest.php b/dev/tests/unit/testsuite/Magento/GoogleShopping/Model/ConfigTest.php
index 2a4e858daf9cf..d87417d789c6f 100644
--- a/dev/tests/unit/testsuite/Magento/GoogleShopping/Model/ConfigTest.php
+++ b/dev/tests/unit/testsuite/Magento/GoogleShopping/Model/ConfigTest.php
@@ -47,7 +47,7 @@ public function testGetAccountPassword()
->method('getValue')
->with(
'google/googleshopping/' . $configPasswordKey,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$storeId
)->will($this->returnValue($password));
$this->assertEquals($password, $this->model->getAccountPassword($storeId));
diff --git a/dev/tests/unit/testsuite/Magento/GoogleShopping/Model/MassOperationsTest.php b/dev/tests/unit/testsuite/Magento/GoogleShopping/Model/MassOperationsTest.php
index fd30bf370848c..d14ae8351bba8 100644
--- a/dev/tests/unit/testsuite/Magento/GoogleShopping/Model/MassOperationsTest.php
+++ b/dev/tests/unit/testsuite/Magento/GoogleShopping/Model/MassOperationsTest.php
@@ -28,7 +28,7 @@ class MassOperationsTest extends \PHPUnit_Framework_TestCase
/** @var \Magento\Framework\Notification\NotifierInterface|\PHPUnit_Framework_MockObject_MockObject */
protected $notificationInterface;
- /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
protected $storeManagerInterface;
/** @var \Psr\Log\LoggerInterface|\PHPUnit_Framework_MockObject_MockObject */
@@ -58,7 +58,7 @@ protected function setUp()
false
);
$this->notificationInterface = $this->getMock('Magento\Framework\Notification\NotifierInterface');
- $this->storeManagerInterface = $this->getMock('Magento\Store\Model\StoreManagerInterface');
+ $this->storeManagerInterface = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
$this->logger = $this->getMock('Psr\Log\LoggerInterface');
$this->googleShoppingHelper = $this->getMock('Magento\GoogleShopping\Helper\Data', [], [], '', false);
$this->googleShoppingCategoryHelper = $this->getMock('Magento\GoogleShopping\Helper\Category');
diff --git a/dev/tests/unit/testsuite/Magento/GroupedProduct/Block/Adminhtml/Product/Composite/Fieldset/GroupedTest.php b/dev/tests/unit/testsuite/Magento/GroupedProduct/Block/Adminhtml/Product/Composite/Fieldset/GroupedTest.php
index 796207b675067..e5d7cc1140325 100644
--- a/dev/tests/unit/testsuite/Magento/GroupedProduct/Block/Adminhtml/Product/Composite/Fieldset/GroupedTest.php
+++ b/dev/tests/unit/testsuite/Magento/GroupedProduct/Block/Adminhtml/Product/Composite/Fieldset/GroupedTest.php
@@ -38,7 +38,7 @@ protected function setUp()
$this->productMock = $this->getMock('\Magento\Catalog\Model\Product', [], [], '', false);
$this->coreHelperMock = $this->getMock('\Magento\Core\Helper\Data', [], [], '', false);
$this->storeManagerMock = $this->getMock(
- '\Magento\Store\Model\StoreManagerInterface',
+ '\Magento\Framework\Store\StoreManagerInterface',
[],
[],
'',
diff --git a/dev/tests/unit/testsuite/Magento/GroupedProduct/Model/Product/CatalogPriceTest.php b/dev/tests/unit/testsuite/Magento/GroupedProduct/Model/Product/CatalogPriceTest.php
index d469332820303..f22bcbcb95dc8 100644
--- a/dev/tests/unit/testsuite/Magento/GroupedProduct/Model/Product/CatalogPriceTest.php
+++ b/dev/tests/unit/testsuite/Magento/GroupedProduct/Model/Product/CatalogPriceTest.php
@@ -44,7 +44,7 @@ class CatalogPriceTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface');
+ $this->storeManagerMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
$this->commonPriceMock = $this->getMock(
'Magento\Catalog\Model\Product\CatalogPrice',
[],
diff --git a/dev/tests/unit/testsuite/Magento/ImportExport/Model/Import/Entity/EavAbstractTest.php b/dev/tests/unit/testsuite/Magento/ImportExport/Model/Import/Entity/EavAbstractTest.php
index 288782ca318d4..1a23367cd5298 100644
--- a/dev/tests/unit/testsuite/Magento/ImportExport/Model/Import/Entity/EavAbstractTest.php
+++ b/dev/tests/unit/testsuite/Magento/ImportExport/Model/Import/Entity/EavAbstractTest.php
@@ -49,7 +49,7 @@ class EavAbstractTest extends \PHPUnit_Framework_TestCase
protected $_resourceHelper;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
diff --git a/dev/tests/unit/testsuite/Magento/ImportExport/Model/Resource/CollectionByPagesIteratorTest.php b/dev/tests/unit/testsuite/Magento/ImportExport/Model/Resource/CollectionByPagesIteratorTest.php
index 22ca3357dd73f..c028775dc8e1d 100644
--- a/dev/tests/unit/testsuite/Magento/ImportExport/Model/Resource/CollectionByPagesIteratorTest.php
+++ b/dev/tests/unit/testsuite/Magento/ImportExport/Model/Resource/CollectionByPagesIteratorTest.php
@@ -41,7 +41,7 @@ public function testIterate()
$select = $this->getMock('Zend_Db_Select', [], [], '', false);
- $entityFactory = $this->getMock('Magento\Core\Model\EntityFactory', [], [], '', false);
+ $entityFactory = $this->getMock('Magento\Framework\Data\Collection\EntityFactory', [], [], '', false);
$logger = $this->getMock('Psr\Log\LoggerInterface');
/** @var $collectionMock \Magento\Framework\Data\Collection\Db|PHPUnit_Framework_MockObject_MockObject */
diff --git a/dev/tests/unit/testsuite/Magento/Integration/Helper/Oauth/ConsumerTest.php b/dev/tests/unit/testsuite/Magento/Integration/Helper/Oauth/ConsumerTest.php
index 6374b23bec308..3a4eb3e10c040 100644
--- a/dev/tests/unit/testsuite/Magento/Integration/Helper/Oauth/ConsumerTest.php
+++ b/dev/tests/unit/testsuite/Magento/Integration/Helper/Oauth/ConsumerTest.php
@@ -7,7 +7,7 @@
class ConsumerTest extends \PHPUnit_Framework_TestCase
{
- /** @var \Magento\Store\Model\StoreManagerInterface */
+ /** @var \Magento\Framework\Store\StoreManagerInterface */
protected $_storeManagerMock;
/** @var \Magento\Integration\Model\Oauth\Consumer\Factory */
@@ -62,7 +62,7 @@ protected function setUp()
$this->_tokenFactory->expects($this->any())->method('create')->will($this->returnValue($this->_tokenMock));
$this->_storeManagerMock = $this->getMockBuilder(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->disableOriginalConstructor()->getMockForAbstractClass();
$this->_storeMock = $this->getMockBuilder(
'Magento\Store\Model\Store'
diff --git a/dev/tests/unit/testsuite/Magento/Integration/Service/V1/OauthTest.php b/dev/tests/unit/testsuite/Magento/Integration/Service/V1/OauthTest.php
index b86c45b3bb617..2c9abbacc23bd 100644
--- a/dev/tests/unit/testsuite/Magento/Integration/Service/V1/OauthTest.php
+++ b/dev/tests/unit/testsuite/Magento/Integration/Service/V1/OauthTest.php
@@ -91,7 +91,7 @@ protected function setUp()
);
$this->_service = new \Magento\Integration\Service\V1\Oauth(
- $this->getMock('Magento\Store\Model\StoreManagerInterface', [], [], '', false),
+ $this->getMock('Magento\Framework\Store\StoreManagerInterface', [], [], '', false),
$this->_consumerFactory,
$this->_tokenFactoryMock,
$this->getMock('Magento\Integration\Helper\Oauth\Data', [], [], '', false),
diff --git a/dev/tests/unit/testsuite/Magento/Log/Model/LogTest.php b/dev/tests/unit/testsuite/Magento/Log/Model/LogTest.php
index d6442da9d999d..49e48d08d29a5 100644
--- a/dev/tests/unit/testsuite/Magento/Log/Model/LogTest.php
+++ b/dev/tests/unit/testsuite/Magento/Log/Model/LogTest.php
@@ -61,7 +61,7 @@ protected function setUp()
public function testGetLogCleanTime()
{
$this->scopeConfig->expects($this->once())->method('getValue')
- ->with(Log::XML_LOG_CLEAN_DAYS, \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
+ ->with(Log::XML_LOG_CLEAN_DAYS, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)
->will($this->returnValue(30));
$this->assertEquals(2592000, $this->log->getLogCleanTime());
}
@@ -76,7 +76,7 @@ public function testGetOnlineMinutesInterval()
$this->scopeConfig->expects($this->once())->method('getValue')
->with(
'customer/online_customers/online_minutes_interval',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)->will($this->returnValue(10));
$this->assertEquals(10, $this->log->getOnlineMinutesInterval());
diff --git a/dev/tests/unit/testsuite/Magento/Log/Model/Shell/Command/CleanTest.php b/dev/tests/unit/testsuite/Magento/Log/Model/Shell/Command/CleanTest.php
index ab7d9737d3a02..fe1b7ebb70bde 100644
--- a/dev/tests/unit/testsuite/Magento/Log/Model/Shell/Command/CleanTest.php
+++ b/dev/tests/unit/testsuite/Magento/Log/Model/Shell/Command/CleanTest.php
@@ -46,7 +46,7 @@ public function testExecuteWithDaysOffset()
->with(
\Magento\Log\Model\Log::XML_LOG_CLEAN_DAYS,
10,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
$this->_logMock->expects($this->once())->method('clean');
diff --git a/dev/tests/unit/testsuite/Magento/Log/Model/VisitorTest.php b/dev/tests/unit/testsuite/Magento/Log/Model/VisitorTest.php
index c67c65d2876dd..b8e542f9844a6 100644
--- a/dev/tests/unit/testsuite/Magento/Log/Model/VisitorTest.php
+++ b/dev/tests/unit/testsuite/Magento/Log/Model/VisitorTest.php
@@ -26,7 +26,7 @@ class VisitorTest extends \PHPUnit_Framework_TestCase
protected $sessionManagerInterface;
/**
- * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $storeManagerInterface;
@@ -59,7 +59,7 @@ public function setUp()
{
$this->registry = $this->getMock('Magento\Framework\Registry');
$this->sessionManagerInterface = $this->getMock('Magento\Framework\Session\SessionManagerInterface');
- $this->storeManagerInterface = $this->getMock('Magento\Store\Model\StoreManagerInterface');
+ $this->storeManagerInterface = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
$this->header = $this->getMock('Magento\Framework\HTTP\Header', [], [], '', false);
$this->remoteAddress = $this->getMock('Magento\Framework\HTTP\PhpEnvironment\RemoteAddress', [], [], '', false);
$this->serverAddress = $this->getMock('Magento\Framework\HTTP\PhpEnvironment\ServerAddress', [], [], '', false);
diff --git a/dev/tests/unit/testsuite/Magento/Multishipping/Block/Checkout/ShippingTest.php b/dev/tests/unit/testsuite/Magento/Multishipping/Block/Checkout/ShippingTest.php
index 931c92190cb8d..b1726bfa8f1f9 100644
--- a/dev/tests/unit/testsuite/Magento/Multishipping/Block/Checkout/ShippingTest.php
+++ b/dev/tests/unit/testsuite/Magento/Multishipping/Block/Checkout/ShippingTest.php
@@ -101,7 +101,7 @@ public function testGetCarrierName()
$carrierCode = 'some carrier code';
$name = 'some name';
$this->scopeConfigMock->expects($this->once())->method('getValue')->with('carriers/' . $carrierCode . '/title',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE)->will($this->returnValue($name));
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)->will($this->returnValue($name));
$this->assertEquals($name, $this->model->getCarrierName($carrierCode));
}
@@ -110,7 +110,7 @@ public function testGetCarrierNameWithEmptyName()
{
$carrierCode = 'some carrier code';
$this->scopeConfigMock->expects($this->once())->method('getValue')->with('carriers/' . $carrierCode . '/title',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE)->will($this->returnValue(null));
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)->will($this->returnValue(null));
$this->assertEquals($carrierCode, $this->model->getCarrierName($carrierCode));
}
diff --git a/dev/tests/unit/testsuite/Magento/Multishipping/Block/Checkout/SuccessTest.php b/dev/tests/unit/testsuite/Magento/Multishipping/Block/Checkout/SuccessTest.php
index 411eaaa51d40a..a594804f3974c 100644
--- a/dev/tests/unit/testsuite/Magento/Multishipping/Block/Checkout/SuccessTest.php
+++ b/dev/tests/unit/testsuite/Magento/Multishipping/Block/Checkout/SuccessTest.php
@@ -45,7 +45,7 @@ protected function setUp()
false
);
$this->contextMock = $this->getMock('Magento\Framework\View\Element\Template\Context', [], [], '', false);
- $this->storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface', [], [], '', false);
+ $this->storeManagerMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface', [], [], '', false);
$objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
$this->contextMock->expects($this->once())->method('getSession')->will($this->returnValue($this->sessionMock));
diff --git a/dev/tests/unit/testsuite/Magento/OfflineShipping/Block/Adminhtml/Carrier/Tablerate/GridTest.php b/dev/tests/unit/testsuite/Magento/OfflineShipping/Block/Adminhtml/Carrier/Tablerate/GridTest.php
index 09434687725e9..46064a69ed282 100644
--- a/dev/tests/unit/testsuite/Magento/OfflineShipping/Block/Adminhtml/Carrier/Tablerate/GridTest.php
+++ b/dev/tests/unit/testsuite/Magento/OfflineShipping/Block/Adminhtml/Carrier/Tablerate/GridTest.php
@@ -13,7 +13,7 @@ class GridTest extends \PHPUnit_Framework_TestCase
protected $model;
/**
- * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $storeManagerMock;
@@ -41,7 +41,7 @@ protected function setUp()
{
$objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
- $this->storeManagerMock = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
+ $this->storeManagerMock = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
->disableOriginalConstructor()
->getMock();
diff --git a/dev/tests/unit/testsuite/Magento/PageCache/Model/ConfigTest.php b/dev/tests/unit/testsuite/Magento/PageCache/Model/ConfigTest.php
index ba97f7794b386..df48750136cfb 100644
--- a/dev/tests/unit/testsuite/Magento/PageCache/Model/ConfigTest.php
+++ b/dev/tests/unit/testsuite/Magento/PageCache/Model/ConfigTest.php
@@ -66,25 +66,25 @@ public function setUp()
[
[
\Magento\PageCache\Model\Config::XML_VARNISH_PAGECACHE_BACKEND_HOST,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
null,
'example.com',
],
[
\Magento\PageCache\Model\Config::XML_VARNISH_PAGECACHE_BACKEND_PORT,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
null,
'8080'
],
[
\Magento\PageCache\Model\Config::XML_VARNISH_PAGECACHE_ACCESS_LIST,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
null,
'127.0.0.1, 192.168.0.1'
],
[
\Magento\PageCache\Model\Config::XML_VARNISH_PAGECACHE_DESIGN_THEME_REGEX,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
null,
serialize([['regexp' => '(?i)pattern', 'value' => 'value_for_pattern']])
],
diff --git a/dev/tests/unit/testsuite/Magento/Payment/Block/Info/SubstitutionTest.php b/dev/tests/unit/testsuite/Magento/Payment/Block/Info/SubstitutionTest.php
index 82ad3a3460298..601e8ba418f9a 100644
--- a/dev/tests/unit/testsuite/Magento/Payment/Block/Info/SubstitutionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Payment/Block/Info/SubstitutionTest.php
@@ -54,7 +54,7 @@ public function setUp()
$this->stringContains(
'advanced/modules_disable_output/'
),
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)->will(
$this->returnValue(
false
diff --git a/dev/tests/unit/testsuite/Magento/Payment/Model/ConfigTest.php b/dev/tests/unit/testsuite/Magento/Payment/Model/ConfigTest.php
index d62c4c2b960f6..6c30760a3c22d 100644
--- a/dev/tests/unit/testsuite/Magento/Payment/Model/ConfigTest.php
+++ b/dev/tests/unit/testsuite/Magento/Payment/Model/ConfigTest.php
@@ -8,7 +8,7 @@
namespace Magento\Payment\Model;
-use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\Store\ScopeInterface;
use Magento\TestFramework\Helper\ObjectManager as ObjectManagerHelper;
class ConfigTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Persistent/Block/Header/AdditionalTest.php b/dev/tests/unit/testsuite/Magento/Persistent/Block/Header/AdditionalTest.php
index 41518982f168d..978b902b4ad1d 100644
--- a/dev/tests/unit/testsuite/Magento/Persistent/Block/Header/AdditionalTest.php
+++ b/dev/tests/unit/testsuite/Magento/Persistent/Block/Header/AdditionalTest.php
@@ -268,7 +268,7 @@ public function testToHtml($customerId)
->method('getValue')
->with(
'advanced/modules_disable_output/Magento_Persistent',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)->willReturn(false);
// get cache
diff --git a/dev/tests/unit/testsuite/Magento/Quote/Model/Cart/ShippingMethodConverterTest.php b/dev/tests/unit/testsuite/Magento/Quote/Model/Cart/ShippingMethodConverterTest.php
index 6bd008cd8e640..187fda56b30fa 100644
--- a/dev/tests/unit/testsuite/Magento/Quote/Model/Cart/ShippingMethodConverterTest.php
+++ b/dev/tests/unit/testsuite/Magento/Quote/Model/Cart/ShippingMethodConverterTest.php
@@ -56,7 +56,7 @@ protected function setUp()
'',
false
);
- $this->storeManagerMock = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
+ $this->storeManagerMock = $this->getMock('\Magento\Framework\Store\StoreManagerInterface');
$this->currencyMock = $this->getMock('\Magento\Directory\Model\Currency', [], [], '', false);
$this->shippingMethodMock =
$this->getMock('\Magento\Quote\Api\Data\ShippingMethodInterface');
diff --git a/dev/tests/unit/testsuite/Magento/Quote/Model/Observer/Backend/CustomerQuoteTest.php b/dev/tests/unit/testsuite/Magento/Quote/Model/Observer/Backend/CustomerQuoteTest.php
index c1e59dbfd91ce..214f03f25d0cf 100644
--- a/dev/tests/unit/testsuite/Magento/Quote/Model/Observer/Backend/CustomerQuoteTest.php
+++ b/dev/tests/unit/testsuite/Magento/Quote/Model/Observer/Backend/CustomerQuoteTest.php
@@ -16,7 +16,7 @@ class CustomerQuoteTest extends \PHPUnit_Framework_TestCase
protected $customerQuote;
/**
- * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Store\Model\StoreManagerInterface
+ * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Store\StoreManagerInterface
*/
protected $storeManagerMock;
@@ -42,7 +42,7 @@ class CustomerQuoteTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->storeManagerMock = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
+ $this->storeManagerMock = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
->disableOriginalConstructor()
->getMock();
$this->configMock = $this->getMockBuilder('Magento\Customer\Model\Config\Share')
diff --git a/dev/tests/unit/testsuite/Magento/Quote/Model/Quote/AddressTest.php b/dev/tests/unit/testsuite/Magento/Quote/Model/Quote/AddressTest.php
index 6d45948f758f9..9a3678812e037 100644
--- a/dev/tests/unit/testsuite/Magento/Quote/Model/Quote/AddressTest.php
+++ b/dev/tests/unit/testsuite/Magento/Quote/Model/Quote/AddressTest.php
@@ -8,7 +8,7 @@
namespace Magento\Quote\Model\Quote;
-use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\Store\ScopeInterface;
/**
* Test class for \Magento\Sales\Model\Order
diff --git a/dev/tests/unit/testsuite/Magento/Quote/Model/Quote/Item/ProcessorTest.php b/dev/tests/unit/testsuite/Magento/Quote/Model/Quote/Item/ProcessorTest.php
index 940dd0f57106e..c41d81debcb83 100644
--- a/dev/tests/unit/testsuite/Magento/Quote/Model/Quote/Item/ProcessorTest.php
+++ b/dev/tests/unit/testsuite/Magento/Quote/Model/Quote/Item/ProcessorTest.php
@@ -8,7 +8,7 @@
use \Magento\Catalog\Model\Product;
use Magento\Quote\Model\Quote\ItemFactory;
use Magento\Quote\Model\Quote\Item;
-use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\Store\StoreManagerInterface;
use Magento\Store\Model\Store;
use Magento\Framework\App\State;
use Magento\Framework\Object;
@@ -29,7 +29,7 @@ class ProcessorTest extends \PHPUnit_Framework_TestCase
protected $quoteItemFactoryMock;
/**
- * @var StoreManagerInterface |\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Framework\Store\StoreManagerInterface |\PHPUnit_Framework_MockObject_MockObject
*/
protected $storeManagerMock;
diff --git a/dev/tests/unit/testsuite/Magento/Quote/Model/QuoteRepositoryTest.php b/dev/tests/unit/testsuite/Magento/Quote/Model/QuoteRepositoryTest.php
index 451d2281e4964..4b772d50afc65 100644
--- a/dev/tests/unit/testsuite/Magento/Quote/Model/QuoteRepositoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/Quote/Model/QuoteRepositoryTest.php
@@ -51,7 +51,7 @@ protected function setUp()
$objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
$this->quoteFactoryMock = $this->getMock('\Magento\Quote\Model\QuoteFactory', ['create'], [], '', false);
- $this->storeManagerMock = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
+ $this->storeManagerMock = $this->getMock('\Magento\Framework\Store\StoreManagerInterface');
$this->quoteMock = $this->getMock(
'\Magento\Quote\Model\Quote',
['load', 'loadByCustomer', 'getIsActive', 'getId', '__wakeup', 'setSharedStoreIds', 'save', 'delete',
diff --git a/dev/tests/unit/testsuite/Magento/Quote/Model/QuoteTest.php b/dev/tests/unit/testsuite/Magento/Quote/Model/QuoteTest.php
index 4956334694371..8635c411f574c 100644
--- a/dev/tests/unit/testsuite/Magento/Quote/Model/QuoteTest.php
+++ b/dev/tests/unit/testsuite/Magento/Quote/Model/QuoteTest.php
@@ -9,7 +9,7 @@
namespace Magento\Quote\Model;
use Magento\Quote\Model\Quote\Address;
-use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\Store\ScopeInterface;
use Magento\TestFramework\Helper\ObjectManager;
/**
@@ -932,10 +932,10 @@ public function testValidateMiniumumAmount()
$this->quote->setStoreId($storeId);
$valueMap = [
- ['sales/minimum_order/active', ScopeInterface::SCOPE_STORE, $storeId, true],
- ['sales/minimum_order/multi_address', ScopeInterface::SCOPE_STORE, $storeId, true],
+ ['sales/minimum_order/active', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $storeId, true],
+ ['sales/minimum_order/multi_address', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $storeId, true],
['sales/minimum_order/amount', ScopeInterface::SCOPE_STORE, $storeId, 20],
- ['sales/minimum_order/tax_including', ScopeInterface::SCOPE_STORE, $storeId, true],
+ ['sales/minimum_order/tax_including', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $storeId, true],
];
$this->scopeConfig->expects($this->any())
->method('isSetFlag')
@@ -958,10 +958,10 @@ public function testValidateMiniumumAmountNegative()
$this->quote->setStoreId($storeId);
$valueMap = [
- ['sales/minimum_order/active', ScopeInterface::SCOPE_STORE, $storeId, true],
- ['sales/minimum_order/multi_address', ScopeInterface::SCOPE_STORE, $storeId, true],
- ['sales/minimum_order/amount', ScopeInterface::SCOPE_STORE, $storeId, 20],
- ['sales/minimum_order/tax_including', ScopeInterface::SCOPE_STORE, $storeId, true],
+ ['sales/minimum_order/active', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $storeId, true],
+ ['sales/minimum_order/multi_address', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $storeId, true],
+ ['sales/minimum_order/amount', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $storeId, 20],
+ ['sales/minimum_order/tax_including', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $storeId, true],
];
$this->scopeConfig->expects($this->any())
->method('isSetFlag')
diff --git a/dev/tests/unit/testsuite/Magento/Reports/Model/Event/ObserverTest.php b/dev/tests/unit/testsuite/Magento/Reports/Model/Event/ObserverTest.php
index 8ab0afa7100c4..276b1c0daffac 100644
--- a/dev/tests/unit/testsuite/Magento/Reports/Model/Event/ObserverTest.php
+++ b/dev/tests/unit/testsuite/Magento/Reports/Model/Event/ObserverTest.php
@@ -76,7 +76,7 @@ public function setUp()
->willReturn($this->reportEventMock);
/** @var \Magento\Store\Model\StoreManagerInterfac|\PHPUnit_Framework_MockObject_MockObject $storeManager */
- $storeManager = $this->getMock('Magento\Store\Model\StoreManagerInterface');
+ $storeManager = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
$this->storeMock = $this->getMockBuilder('\Magento\Store\Model\Store')
->disableOriginalConstructor()->getMock();
diff --git a/dev/tests/unit/testsuite/Magento/Reports/Model/Resource/Report/Collection/AbstractCollectionTest.php b/dev/tests/unit/testsuite/Magento/Reports/Model/Resource/Report/Collection/AbstractCollectionTest.php
index 7256703d3c0b5..94a756f38bd29 100644
--- a/dev/tests/unit/testsuite/Magento/Reports/Model/Resource/Report/Collection/AbstractCollectionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Reports/Model/Resource/Report/Collection/AbstractCollectionTest.php
@@ -17,7 +17,7 @@ class AbstractCollectionTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $entityFactory = $this->getMock('\Magento\Core\Model\EntityFactory', [], [], '', false);
+ $entityFactory = $this->getMock('\Magento\Framework\Data\Collection\EntityFactory', [], [], '', false);
$logger = $this->getMock('\Psr\Log\LoggerInterface', [], [], '', false);
$fetchStrategy = $this->getMock('\Magento\Framework\Data\Collection\Db\FetchStrategy\Query', [], [], '', false);
$eventManager = $this->getMock('\Magento\Framework\Event\Manager', [], [], '', false);
diff --git a/dev/tests/unit/testsuite/Magento/Review/Block/Adminhtml/RssTest.php b/dev/tests/unit/testsuite/Magento/Review/Block/Adminhtml/RssTest.php
index 123a4cfa8af60..396c0c691006d 100644
--- a/dev/tests/unit/testsuite/Magento/Review/Block/Adminhtml/RssTest.php
+++ b/dev/tests/unit/testsuite/Magento/Review/Block/Adminhtml/RssTest.php
@@ -21,7 +21,7 @@ class RssTest extends \PHPUnit_Framework_TestCase
protected $objectManagerHelper;
/**
- * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $storeManagerInterface;
@@ -37,7 +37,7 @@ class RssTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->storeManagerInterface = $this->getMock('Magento\Store\Model\StoreManagerInterface');
+ $this->storeManagerInterface = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
$this->rss = $this->getMock('Magento\Review\Model\Rss', ['__wakeUp', 'getProductCollection'], [], '', false);
$this->urlBuilder = $this->getMock('Magento\Framework\UrlInterface');
$this->objectManagerHelper = new ObjectManagerHelper($this);
diff --git a/dev/tests/unit/testsuite/Magento/Review/Block/Customer/RecentTest.php b/dev/tests/unit/testsuite/Magento/Review/Block/Customer/RecentTest.php
index ec6ff0e55f3e7..6ac10c1809514 100644
--- a/dev/tests/unit/testsuite/Magento/Review/Block/Customer/RecentTest.php
+++ b/dev/tests/unit/testsuite/Magento/Review/Block/Customer/RecentTest.php
@@ -27,12 +27,12 @@ class RecentTest extends \PHPUnit_Framework_TestCase
/** @var \Magento\Customer\Helper\Session\CurrentCustomer|\PHPUnit_Framework_MockObject_MockObject */
protected $currentCustomer;
- /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
protected $storeManager;
protected function setUp()
{
- $this->storeManager = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
+ $this->storeManager = $this->getMock('\Magento\Framework\Store\StoreManagerInterface');
$this->context = $this->getMock('Magento\Framework\View\Element\Template\Context', [], [], '', false);
$this->context->expects(
$this->any()
diff --git a/dev/tests/unit/testsuite/Magento/Review/Controller/Adminhtml/Product/PostTest.php b/dev/tests/unit/testsuite/Magento/Review/Controller/Adminhtml/Product/PostTest.php
index 1dd384080fc18..097f6abc1b94c 100644
--- a/dev/tests/unit/testsuite/Magento/Review/Controller/Adminhtml/Product/PostTest.php
+++ b/dev/tests/unit/testsuite/Magento/Review/Controller/Adminhtml/Product/PostTest.php
@@ -135,7 +135,9 @@ protected function _prepareMockObjects()
);
$this->_objectManagerMock = $this->getMock('Magento\Framework\ObjectManagerInterface');
$this->_messageManagerMock = $this->getMock('\Magento\Framework\Message\Manager', [], [], '', false);
- $this->_storeManagerInterfaceMock = $this->getMockForAbstractClass('Magento\Store\Model\StoreManagerInterface');
+ $this->_storeManagerInterfaceMock = $this->getMockForAbstractClass(
+ 'Magento\Framework\Store\StoreManagerInterface'
+ );
$this->_storeModelMock = $this->getMock(
'Magento\Store\Model\Store', ['__wakeup', 'getId'], [], '', false
);
@@ -185,7 +187,7 @@ public function testPostAction()
$this->_requestMock->expects($this->once())->method('getPost')
->will($this->returnValue(['status_id' => 1]));
$this->_objectManagerMock->expects($this->at(0))->method('get')
- ->with('Magento\Store\Model\StoreManagerInterface')
+ ->with('Magento\Framework\Store\StoreManagerInterface')
->will($this->returnValue($this->_storeManagerInterfaceMock));
$this->_reviewFactoryMock->expects($this->once())->method('create')
->will($this->returnValue($this->_reviewModelMock));
diff --git a/dev/tests/unit/testsuite/Magento/Review/Controller/Product/PostTest.php b/dev/tests/unit/testsuite/Magento/Review/Controller/Product/PostTest.php
index 4644157c0f9ee..4102ac0034883 100644
--- a/dev/tests/unit/testsuite/Magento/Review/Controller/Product/PostTest.php
+++ b/dev/tests/unit/testsuite/Magento/Review/Controller/Product/PostTest.php
@@ -148,7 +148,7 @@ public function setUp()
$this->messageManager = $this->getMock('\Magento\Framework\Message\ManagerInterface');
$this->store = $this->getMock('\Magento\Store\Model\Store', ['getId'], [], '', false);
- $storeManager = $this->getMockForAbstractClass('\Magento\Store\Model\StoreManagerInterface');
+ $storeManager = $this->getMockForAbstractClass('\Magento\Framework\Store\StoreManagerInterface');
$storeManager->expects($this->any())->method('getStore')->will($this->returnValue($this->store));
$this->model = (new \Magento\TestFramework\Helper\ObjectManager($this))
->getObject(
diff --git a/dev/tests/unit/testsuite/Magento/Review/Model/Resource/Review/Product/CollectionTest.php b/dev/tests/unit/testsuite/Magento/Review/Model/Resource/Review/Product/CollectionTest.php
index ce455c7886c99..0f33ada38c0b4 100644
--- a/dev/tests/unit/testsuite/Magento/Review/Model/Resource/Review/Product/CollectionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Review/Model/Resource/Review/Product/CollectionTest.php
@@ -55,7 +55,7 @@ public function setUp()
$universalFactory->expects($this->any())->method('create')->will($this->returnValue($entity));
$store = $this->getMock('\Magento\Store\Model\Store', ['getId'], [], '', false);
$store->expects($this->any())->method('getId')->will($this->returnValue(1));
- $storeManager = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
+ $storeManager = $this->getMock('\Magento\Framework\Store\StoreManagerInterface');
$storeManager->expects($this->any())->method('getStore')->will($this->returnValue($store));
$fetchStrategy = $this->getMock(
'\Magento\Framework\Data\Collection\Db\FetchStrategy\Query',
diff --git a/dev/tests/unit/testsuite/Magento/Review/Model/Resource/Review/Summary/CollectionTest.php b/dev/tests/unit/testsuite/Magento/Review/Model/Resource/Review/Summary/CollectionTest.php
index de3693704dc8d..94410e34e6c15 100644
--- a/dev/tests/unit/testsuite/Magento/Review/Model/Resource/Review/Summary/CollectionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Review/Model/Resource/Review/Summary/CollectionTest.php
@@ -19,7 +19,7 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
protected $fetchStrategyMock;
/**
- * @var \Magento\Core\Model\EntityFactory|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Framework\Data\Collection\EntityFactory|\PHPUnit_Framework_MockObject_MockObject
*/
protected $entityFactoryMock;
@@ -53,7 +53,7 @@ protected function setUp()
false
);
$this->entityFactoryMock = $this->getMock(
- 'Magento\Core\Model\EntityFactory',
+ 'Magento\Framework\Data\Collection\EntityFactory',
['create'],
[],
'',
diff --git a/dev/tests/unit/testsuite/Magento/Review/Model/ReviewTest.php b/dev/tests/unit/testsuite/Magento/Review/Model/ReviewTest.php
index 20a385e193ae5..785eee86bd48a 100644
--- a/dev/tests/unit/testsuite/Magento/Review/Model/ReviewTest.php
+++ b/dev/tests/unit/testsuite/Magento/Review/Model/ReviewTest.php
@@ -37,7 +37,7 @@ class ReviewTest extends \PHPUnit_Framework_TestCase
/** @var \Magento\Review\Model\Review\Summary|\PHPUnit_Framework_MockObject_MockObject */
protected $summaryMock;
- /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
protected $storeManagerMock;
/** @var \Magento\Framework\UrlInterface|\PHPUnit_Framework_MockObject_MockObject */
@@ -82,7 +82,7 @@ protected function setUp()
false
);
$this->summaryMock = $this->getMock('Magento\Review\Model\Review\Summary', [], [], '', false);
- $this->storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface');
+ $this->storeManagerMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
$this->urlInterfaceMock = $this->getMock('Magento\Framework\UrlInterface');
$this->resource = $this->getMock('Magento\Review\Model\Resource\Review', [], [], '', false);
diff --git a/dev/tests/unit/testsuite/Magento/Rss/Model/UrlBuilderTest.php b/dev/tests/unit/testsuite/Magento/Rss/Model/UrlBuilderTest.php
index d4f72b1f046ff..119f682b59af1 100644
--- a/dev/tests/unit/testsuite/Magento/Rss/Model/UrlBuilderTest.php
+++ b/dev/tests/unit/testsuite/Magento/Rss/Model/UrlBuilderTest.php
@@ -49,7 +49,7 @@ protected function setUp()
public function testGetUrlEmpty()
{
$this->scopeConfigInterface->expects($this->once())->method('getValue')
- ->with('rss/config/active', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
+ ->with('rss/config/active', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)
->will($this->returnValue(false));
$this->assertEquals('', $this->urlBuilder->getUrl());
}
@@ -57,7 +57,7 @@ public function testGetUrlEmpty()
public function testGetUrl()
{
$this->scopeConfigInterface->expects($this->once())->method('getValue')
- ->with('rss/config/active', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
+ ->with('rss/config/active', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)
->will($this->returnValue(true));
$this->urlInterface->expects($this->once())->method('getUrl')
->with('rss/feed/index', ['type' => 'rss_feed'])
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Block/Order/Info/Buttons/RssTest.php b/dev/tests/unit/testsuite/Magento/Sales/Block/Order/Info/Buttons/RssTest.php
index d8e94b601068d..7d7432fe5a587 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Block/Order/Info/Buttons/RssTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Block/Order/Info/Buttons/RssTest.php
@@ -95,7 +95,7 @@ public function testGetLabel()
public function testIsRssAllowed()
{
$this->scopeConfigInterface->expects($this->once())->method('isSetFlag')
- ->with('rss/order/status', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
+ ->with('rss/order/status', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)
->will($this->returnValue(true));
$this->assertTrue($this->rss->isRssAllowed());
}
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Helper/AdminTest.php b/dev/tests/unit/testsuite/Magento/Sales/Helper/AdminTest.php
index 2f4573684267d..383078880447a 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Helper/AdminTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Helper/AdminTest.php
@@ -15,7 +15,7 @@ class AdminTest extends \PHPUnit_Framework_TestCase
protected $contextMock;
/**
- * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $storeManagerMock;
@@ -49,7 +49,7 @@ protected function setUp()
$this->contextMock = $this->getMockBuilder('Magento\Framework\App\Helper\Context')
->disableOriginalConstructor()
->getMock();
- $this->storeManagerMock = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
+ $this->storeManagerMock = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
->disableOriginalConstructor()
->getMock();
$this->salesConfigMock = $this->getMockBuilder('Magento\Sales\Model\Config')
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Helper/DataTest.php b/dev/tests/unit/testsuite/Magento/Sales/Helper/DataTest.php
index 7cf3a0bb02814..542ef36e9e602 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Helper/DataTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Helper/DataTest.php
@@ -37,7 +37,7 @@ protected function setUp()
->disableOriginalConstructor()
->getMock();
- $storeManagerMock = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
+ $storeManagerMock = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
->disableOriginalConstructor()
->getMock();
@@ -198,7 +198,7 @@ protected function setupScopeConfigIsSetFlag($flagName, $returnValue)
->method('isSetFlag')
->with(
$flagName,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$this->storeMock
)
->will($this->returnValue($returnValue));
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Helper/GuestTest.php b/dev/tests/unit/testsuite/Magento/Sales/Helper/GuestTest.php
index 87c343c1d6e17..9ec31888e2df3 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Helper/GuestTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Helper/GuestTest.php
@@ -26,7 +26,7 @@ class GuestTest extends \PHPUnit_Framework_TestCase
/** @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject */
protected $scopeConfigInterfaceMock;
- /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
protected $storeManagerInterfaceMock;
/** @var \Magento\Framework\App\State|\PHPUnit_Framework_MockObject_MockObject */
@@ -57,7 +57,7 @@ protected function setUp()
{
$this->appContextHelperMock = $this->getMock('Magento\Framework\App\Helper\Context', [], [], '', false);
$this->scopeConfigInterfaceMock = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
- $this->storeManagerInterfaceMock = $this->getMock('Magento\Store\Model\StoreManagerInterface');
+ $this->storeManagerInterfaceMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
$this->stateMock = $this->getMock('Magento\Framework\App\State', [], [], '', false);
$this->registryMock = $this->getMock('Magento\Framework\Registry');
$this->sessionMock = $this->getMock('Magento\Customer\Model\Session', [], [], '', false);
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Helper/ReorderTest.php b/dev/tests/unit/testsuite/Magento/Sales/Helper/ReorderTest.php
index e79ed2fb06a6e..5f23a54fc1a30 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Helper/ReorderTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Helper/ReorderTest.php
@@ -47,7 +47,7 @@ protected function setUp()
->disableOriginalConstructor()
->getMock();
- $storeManagerMock = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
+ $storeManagerMock = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
->disableOriginalConstructor()
->getMock();
@@ -129,7 +129,7 @@ protected function setupScopeConfigMock($returnValue)
->method('getValue')
->with(
Reorder::XML_PATH_SALES_REORDER_ALLOW,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$this->storeParam
)
->will($this->returnValue($returnValue));
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/CreditmemoTest.php b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/CreditmemoTest.php
index 7e9d43e006f81..c49c6b7caa185 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/CreditmemoTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/CreditmemoTest.php
@@ -59,7 +59,7 @@ public function setUp()
'orderFactory' => $this->orderFactory,
'cmItemCollectionFactory' => $this->cmItemCollectionFactoryMock,
'calculatorFactory' => $this->getMock('Magento\Framework\Math\CalculatorFactory', [], [], '', false),
- 'storeManager' => $this->getMock('Magento\Store\Model\StoreManagerInterface', [], [], '', false),
+ 'storeManager' => $this->getMock('Magento\Framework\Store\StoreManagerInterface', [], [], '', false),
'commentFactory' => $this->getMock(
'Magento\Sales\Model\Order\Creditmemo\CommentFactory',
[],
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/CreditmemoCommentIdentityTest.php b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/CreditmemoCommentIdentityTest.php
index 5288da8be24f9..5b48505ed9bf4 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/CreditmemoCommentIdentityTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/CreditmemoCommentIdentityTest.php
@@ -64,7 +64,7 @@ public function testIsEnabledTrue()
->method('isSetFlag')
->with(
$this->equalTo(CreditmemoCommentIdentity::XML_PATH_EMAIL_ENABLED),
- $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue(true));
@@ -79,7 +79,7 @@ public function testGetEmailCopyTo()
->method('getValue')
->with(
$this->equalTo(CreditmemoCommentIdentity::XML_PATH_EMAIL_COPY_TO),
- $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue('test_value,test_value2'));
@@ -94,7 +94,7 @@ public function testGetEmailCopyToEmptyResult()
->method('getValue')
->with(
$this->equalTo(CreditmemoCommentIdentity::XML_PATH_EMAIL_COPY_TO),
- $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue(null));
@@ -109,7 +109,7 @@ public function testCopyMethod()
->method('getValue')
->with(
$this->equalTo(CreditmemoCommentIdentity::XML_PATH_EMAIL_COPY_METHOD),
- $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue('copy_method'));
@@ -125,7 +125,7 @@ public function testGuestTemplateId()
->method('getValue')
->with(
$this->equalTo(CreditmemoCommentIdentity::XML_PATH_EMAIL_GUEST_TEMPLATE),
- $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue('template_id'));
@@ -141,7 +141,7 @@ public function testTemplateId()
->method('getValue')
->with(
$this->equalTo(CreditmemoCommentIdentity::XML_PATH_EMAIL_TEMPLATE),
- $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue('template_id'));
@@ -188,7 +188,7 @@ public function testGetEmailIdentity()
->method('getValue')
->with(
$this->equalTo(CreditmemoCommentIdentity::XML_PATH_EMAIL_IDENTITY),
- $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue($emailIdentity));
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/CreditmemoIdentityTest.php b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/CreditmemoIdentityTest.php
index b09bdecb12547..ffc42b708bc79 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/CreditmemoIdentityTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/CreditmemoIdentityTest.php
@@ -64,7 +64,7 @@ public function testIsEnabledTrue()
->method('isSetFlag')
->with(
$this->equalTo(CreditmemoIdentity::XML_PATH_EMAIL_ENABLED),
- $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue(true));
@@ -79,7 +79,7 @@ public function testGetEmailCopyTo()
->method('getValue')
->with(
$this->equalTo(CreditmemoIdentity::XML_PATH_EMAIL_COPY_TO),
- $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue('test_value,test_value2'));
@@ -94,7 +94,7 @@ public function testGetEmailCopyToEmptyResult()
->method('getValue')
->with(
$this->equalTo(CreditmemoIdentity::XML_PATH_EMAIL_COPY_TO),
- $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue(null));
@@ -109,7 +109,7 @@ public function testCopyMethod()
->method('getValue')
->with(
$this->equalTo(CreditmemoIdentity::XML_PATH_EMAIL_COPY_METHOD),
- $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue('copy_method'));
@@ -125,7 +125,7 @@ public function testGuestTemplateId()
->method('getValue')
->with(
$this->equalTo(CreditmemoIdentity::XML_PATH_EMAIL_GUEST_TEMPLATE),
- $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue('template_id'));
@@ -141,7 +141,7 @@ public function testTemplateId()
->method('getValue')
->with(
$this->equalTo(CreditmemoIdentity::XML_PATH_EMAIL_TEMPLATE),
- $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue('template_id'));
@@ -188,7 +188,7 @@ public function testGetEmailIdentity()
->method('getValue')
->with(
$this->equalTo(CreditmemoIdentity::XML_PATH_EMAIL_IDENTITY),
- $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue($emailIdentity));
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/InvoiceCommentIdentityTest.php b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/InvoiceCommentIdentityTest.php
index 97aaaf4a4294a..8c5bde878b000 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/InvoiceCommentIdentityTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/InvoiceCommentIdentityTest.php
@@ -64,7 +64,7 @@ public function testIsEnabledTrue()
->method('isSetFlag')
->with(
$this->equalTo(InvoiceCommentIdentity::XML_PATH_EMAIL_ENABLED),
- $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue(true));
@@ -79,7 +79,7 @@ public function testGetEmailCopyTo()
->method('getValue')
->with(
$this->equalTo(InvoiceCommentIdentity::XML_PATH_EMAIL_COPY_TO),
- $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue('test_value,test_value2'));
@@ -94,7 +94,7 @@ public function testGetEmailCopyToEmptyResult()
->method('getValue')
->with(
$this->equalTo(InvoiceCommentIdentity::XML_PATH_EMAIL_COPY_TO),
- $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue(null));
@@ -109,7 +109,7 @@ public function testCopyMethod()
->method('getValue')
->with(
$this->equalTo(InvoiceCommentIdentity::XML_PATH_EMAIL_COPY_METHOD),
- $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue('copy_method'));
@@ -125,7 +125,7 @@ public function testGuestTemplateId()
->method('getValue')
->with(
$this->equalTo(InvoiceCommentIdentity::XML_PATH_EMAIL_GUEST_TEMPLATE),
- $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue('template_id'));
@@ -141,7 +141,7 @@ public function testTemplateId()
->method('getValue')
->with(
$this->equalTo(InvoiceCommentIdentity::XML_PATH_EMAIL_TEMPLATE),
- $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue('template_id'));
@@ -188,7 +188,7 @@ public function testGetEmailIdentity()
->method('getValue')
->with(
$this->equalTo(InvoiceCommentIdentity::XML_PATH_EMAIL_IDENTITY),
- $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue($emailIdentity));
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/InvoiceIdentityTest.php b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/InvoiceIdentityTest.php
index f580011c94f41..3e9db03217907 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/InvoiceIdentityTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/InvoiceIdentityTest.php
@@ -64,7 +64,7 @@ public function testIsEnabledTrue()
->method('isSetFlag')
->with(
$this->equalTo(InvoiceIdentity::XML_PATH_EMAIL_ENABLED),
- $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue(true));
@@ -79,7 +79,7 @@ public function testGetEmailCopyTo()
->method('getValue')
->with(
$this->equalTo(InvoiceIdentity::XML_PATH_EMAIL_COPY_TO),
- $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue('test_value,test_value2'));
@@ -94,7 +94,7 @@ public function testGetEmailCopyToEmptyResult()
->method('getValue')
->with(
$this->equalTo(InvoiceIdentity::XML_PATH_EMAIL_COPY_TO),
- $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue(null));
@@ -109,7 +109,7 @@ public function testCopyMethod()
->method('getValue')
->with(
$this->equalTo(InvoiceIdentity::XML_PATH_EMAIL_COPY_METHOD),
- $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue('copy_method'));
@@ -125,7 +125,7 @@ public function testGuestTemplateId()
->method('getValue')
->with(
$this->equalTo(InvoiceIdentity::XML_PATH_EMAIL_GUEST_TEMPLATE),
- $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue('template_id'));
@@ -141,7 +141,7 @@ public function testTemplateId()
->method('getValue')
->with(
$this->equalTo(InvoiceIdentity::XML_PATH_EMAIL_TEMPLATE),
- $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue('template_id'));
@@ -188,7 +188,7 @@ public function testGetEmailIdentity()
->method('getValue')
->with(
$this->equalTo(InvoiceIdentity::XML_PATH_EMAIL_IDENTITY),
- $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue($emailIdentity));
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/OrderCommentIdentityTest.php b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/OrderCommentIdentityTest.php
index 5e9957e09e940..2e97be743c17d 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/OrderCommentIdentityTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/OrderCommentIdentityTest.php
@@ -64,7 +64,7 @@ public function testIsEnabledTrue()
->method('isSetFlag')
->with(
$this->equalTo(OrderCommentIdentity::XML_PATH_EMAIL_ENABLED),
- $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue(true));
@@ -79,7 +79,7 @@ public function testGetEmailCopyTo()
->method('getValue')
->with(
$this->equalTo(OrderCommentIdentity::XML_PATH_EMAIL_COPY_TO),
- $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue('test_value,test_value2'));
@@ -94,7 +94,7 @@ public function testGetEmailCopyToEmptyResult()
->method('getValue')
->with(
$this->equalTo(OrderCommentIdentity::XML_PATH_EMAIL_COPY_TO),
- $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue(null));
@@ -109,7 +109,7 @@ public function testCopyMethod()
->method('getValue')
->with(
$this->equalTo(OrderCommentIdentity::XML_PATH_EMAIL_COPY_METHOD),
- $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue('copy_method'));
@@ -125,7 +125,7 @@ public function testGuestTemplateId()
->method('getValue')
->with(
$this->equalTo(OrderCommentIdentity::XML_PATH_EMAIL_GUEST_TEMPLATE),
- $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue('template_id'));
@@ -141,7 +141,7 @@ public function testTemplateId()
->method('getValue')
->with(
$this->equalTo(OrderCommentIdentity::XML_PATH_EMAIL_TEMPLATE),
- $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue('template_id'));
@@ -188,7 +188,7 @@ public function testGetEmailIdentity()
->method('getValue')
->with(
$this->equalTo(OrderCommentIdentity::XML_PATH_EMAIL_IDENTITY),
- $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue($emailIdentity));
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/OrderIdentityTest.php b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/OrderIdentityTest.php
index 577952abc4e30..42832d4810530 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/OrderIdentityTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/OrderIdentityTest.php
@@ -64,7 +64,7 @@ public function testIsEnabledTrue()
->method('isSetFlag')
->with(
$this->equalTo(OrderIdentity::XML_PATH_EMAIL_ENABLED),
- $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue(true));
@@ -79,7 +79,7 @@ public function testGetEmailCopyTo()
->method('getValue')
->with(
$this->equalTo(OrderIdentity::XML_PATH_EMAIL_COPY_TO),
- $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue('test_value,test_value2'));
@@ -94,7 +94,7 @@ public function testGetEmailCopyToEmptyResult()
->method('getValue')
->with(
$this->equalTo(OrderIdentity::XML_PATH_EMAIL_COPY_TO),
- $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue(null));
@@ -109,7 +109,7 @@ public function testCopyMethod()
->method('getValue')
->with(
$this->equalTo(OrderIdentity::XML_PATH_EMAIL_COPY_METHOD),
- $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue('copy_method'));
@@ -125,7 +125,7 @@ public function testGuestTemplateId()
->method('getValue')
->with(
$this->equalTo(OrderIdentity::XML_PATH_EMAIL_GUEST_TEMPLATE),
- $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue('template_id'));
@@ -141,7 +141,7 @@ public function testTemplateId()
->method('getValue')
->with(
$this->equalTo(OrderIdentity::XML_PATH_EMAIL_TEMPLATE),
- $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue('template_id'));
@@ -188,7 +188,7 @@ public function testGetEmailIdentity()
->method('getValue')
->with(
$this->equalTo(OrderIdentity::XML_PATH_EMAIL_IDENTITY),
- $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue($emailIdentity));
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/ShipmentCommentIdentityTest.php b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/ShipmentCommentIdentityTest.php
index 90a0b371317e5..489a14bef4dfb 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/ShipmentCommentIdentityTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/ShipmentCommentIdentityTest.php
@@ -64,7 +64,7 @@ public function testIsEnabledTrue()
->method('isSetFlag')
->with(
$this->equalTo(ShipmentCommentIdentity::XML_PATH_EMAIL_ENABLED),
- $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue(true));
@@ -79,7 +79,7 @@ public function testGetEmailCopyTo()
->method('getValue')
->with(
$this->equalTo(ShipmentCommentIdentity::XML_PATH_EMAIL_COPY_TO),
- $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue('test_value,test_value2'));
@@ -94,7 +94,7 @@ public function testGetEmailCopyToEmptyResult()
->method('getValue')
->with(
$this->equalTo(ShipmentCommentIdentity::XML_PATH_EMAIL_COPY_TO),
- $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue(null));
@@ -109,7 +109,7 @@ public function testCopyMethod()
->method('getValue')
->with(
$this->equalTo(ShipmentCommentIdentity::XML_PATH_EMAIL_COPY_METHOD),
- $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue('copy_method'));
@@ -125,7 +125,7 @@ public function testGuestTemplateId()
->method('getValue')
->with(
$this->equalTo(ShipmentCommentIdentity::XML_PATH_EMAIL_GUEST_TEMPLATE),
- $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue('template_id'));
@@ -141,7 +141,7 @@ public function testTemplateId()
->method('getValue')
->with(
$this->equalTo(ShipmentCommentIdentity::XML_PATH_EMAIL_TEMPLATE),
- $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue('template_id'));
@@ -188,7 +188,7 @@ public function testGetEmailIdentity()
->method('getValue')
->with(
$this->equalTo(ShipmentCommentIdentity::XML_PATH_EMAIL_IDENTITY),
- $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue($emailIdentity));
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/ShipmentIdentityTest.php b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/ShipmentIdentityTest.php
index 6e75e35666583..4fb9c6f998624 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/ShipmentIdentityTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/ShipmentIdentityTest.php
@@ -64,7 +64,7 @@ public function testIsEnabledTrue()
->method('isSetFlag')
->with(
$this->equalTo(ShipmentIdentity::XML_PATH_EMAIL_ENABLED),
- $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue(true));
@@ -79,7 +79,7 @@ public function testGetEmailCopyTo()
->method('getValue')
->with(
$this->equalTo(ShipmentIdentity::XML_PATH_EMAIL_COPY_TO),
- $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue('test_value,test_value2'));
@@ -94,7 +94,7 @@ public function testGetEmailCopyToEmptyResult()
->method('getValue')
->with(
$this->equalTo(ShipmentIdentity::XML_PATH_EMAIL_COPY_TO),
- $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue(null));
@@ -109,7 +109,7 @@ public function testCopyMethod()
->method('getValue')
->with(
$this->equalTo(ShipmentIdentity::XML_PATH_EMAIL_COPY_METHOD),
- $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue('copy_method'));
@@ -125,7 +125,7 @@ public function testGuestTemplateId()
->method('getValue')
->with(
$this->equalTo(ShipmentIdentity::XML_PATH_EMAIL_GUEST_TEMPLATE),
- $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue('template_id'));
@@ -141,7 +141,7 @@ public function testTemplateId()
->method('getValue')
->with(
$this->equalTo(ShipmentIdentity::XML_PATH_EMAIL_TEMPLATE),
- $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue('template_id'));
@@ -188,7 +188,7 @@ public function testGetEmailIdentity()
->method('getValue')
->with(
$this->equalTo(ShipmentIdentity::XML_PATH_EMAIL_IDENTITY),
- $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue($emailIdentity));
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Invoice/Total/ShippingTest.php b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Invoice/Total/ShippingTest.php
index 42830ceaa2f72..448f0245aec0f 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Invoice/Total/ShippingTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Invoice/Total/ShippingTest.php
@@ -20,7 +20,7 @@ protected function _getInvoiceCollection(array $invoicesData)
{
$className = 'Magento\Sales\Model\Order\Invoice';
$result = new \Magento\Framework\Data\Collection(
- $this->getMock('Magento\Core\Model\EntityFactory', [], [], '', false)
+ $this->getMock('Magento\Framework\Data\Collection\EntityFactory', [], [], '', false)
);
$objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
$arguments = [
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Model/Resource/Order/Status/History/CollectionTest.php b/dev/tests/unit/testsuite/Magento/Sales/Model/Resource/Order/Status/History/CollectionTest.php
index 48e96444c6455..41184fbd9cdde 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Model/Resource/Order/Status/History/CollectionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Model/Resource/Order/Status/History/CollectionTest.php
@@ -44,7 +44,7 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
protected $fetchStrategyMock;
/**
- * @var \Magento\Core\Model\EntityFactory|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Framework\Data\Collection\EntityFactory|\PHPUnit_Framework_MockObject_MockObject
*/
protected $entityFactoryMock;
@@ -72,7 +72,7 @@ public function setUp()
$this->fetchStrategyMock = $this->getMockForAbstractClass(
'Magento\Framework\Data\Collection\Db\FetchStrategyInterface'
);
- $this->entityFactoryMock = $this->getMock('Magento\Core\Model\EntityFactory', [], [], '', false);
+ $this->entityFactoryMock = $this->getMock('Magento\Framework\Data\Collection\EntityFactory', [], [], '', false);
$this->resourceMock->expects($this->any())->method('getReadConnection')->will(
$this->returnValue($this->connectionMock)
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Model/Rss/OrderStatusTest.php b/dev/tests/unit/testsuite/Magento/Sales/Model/Rss/OrderStatusTest.php
index 22a4678239195..6673480ef2018 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Model/Rss/OrderStatusTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Model/Rss/OrderStatusTest.php
@@ -159,7 +159,7 @@ public function testGetData()
public function testIsAllowed()
{
$this->scopeConfigInterface->expects($this->once())->method('getValue')
- ->with('rss/order/status', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
+ ->with('rss/order/status', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)
->will($this->returnValue(true));
$this->assertTrue($this->model->isAllowed());
}
diff --git a/dev/tests/unit/testsuite/Magento/SalesRule/Block/Rss/DiscountsTest.php b/dev/tests/unit/testsuite/Magento/SalesRule/Block/Rss/DiscountsTest.php
index 0628db698dee1..4203a3b3ec1f6 100644
--- a/dev/tests/unit/testsuite/Magento/SalesRule/Block/Rss/DiscountsTest.php
+++ b/dev/tests/unit/testsuite/Magento/SalesRule/Block/Rss/DiscountsTest.php
@@ -24,7 +24,7 @@ class DiscountsTest extends \PHPUnit_Framework_TestCase
protected $objectManagerHelper;
/**
- * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $storeManagerInterface;
@@ -70,7 +70,7 @@ class DiscountsTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->storeManagerInterface = $this->getMock('Magento\Store\Model\StoreManagerInterface');
+ $this->storeManagerInterface = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
$this->requestInterface = $this->getMock('Magento\Framework\App\RequestInterface');
$this->rssBuilderInterface = $this->getMock('Magento\Framework\App\Rss\UrlBuilderInterface');
$this->urlBuilderInterface = $this->getMock('Magento\Framework\UrlInterface');
diff --git a/dev/tests/unit/testsuite/Magento/SalesRule/Helper/CouponTest.php b/dev/tests/unit/testsuite/Magento/SalesRule/Helper/CouponTest.php
index 77848fbbd917b..6b448768f5e7e 100644
--- a/dev/tests/unit/testsuite/Magento/SalesRule/Helper/CouponTest.php
+++ b/dev/tests/unit/testsuite/Magento/SalesRule/Helper/CouponTest.php
@@ -81,7 +81,7 @@ public function testGetDefaultLength()
$defaultLength = 100;
$this->scopeConfig->expects($this->once())
->method('getValue')
- ->with($helper::XML_PATH_SALES_RULE_COUPON_LENGTH, \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
+ ->with($helper::XML_PATH_SALES_RULE_COUPON_LENGTH, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)
->will($this->returnValue($defaultLength));
$this->assertEquals($defaultLength, $helper->getDefaultLength());
@@ -93,7 +93,7 @@ public function testGetDefaultFormat()
$defaultFormat = 'format';
$this->scopeConfig->expects($this->once())
->method('getValue')
- ->with($helper::XML_PATH_SALES_RULE_COUPON_FORMAT, \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
+ ->with($helper::XML_PATH_SALES_RULE_COUPON_FORMAT, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)
->will($this->returnValue($defaultFormat));
$this->assertEquals($defaultFormat, $helper->getDefaultFormat());
@@ -105,7 +105,7 @@ public function testGetDefaultPrefix()
$defaultPrefix = 'prefix';
$this->scopeConfig->expects($this->once())
->method('getValue')
- ->with($helper::XML_PATH_SALES_RULE_COUPON_PREFIX, \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
+ ->with($helper::XML_PATH_SALES_RULE_COUPON_PREFIX, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)
->will($this->returnValue($defaultPrefix));
$this->assertEquals($defaultPrefix, $helper->getDefaultPrefix());
@@ -117,7 +117,7 @@ public function testGetDefaultSuffix()
$defaultSuffix = 'suffix';
$this->scopeConfig->expects($this->once())
->method('getValue')
- ->with($helper::XML_PATH_SALES_RULE_COUPON_SUFFIX, \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
+ ->with($helper::XML_PATH_SALES_RULE_COUPON_SUFFIX, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)
->will($this->returnValue($defaultSuffix));
$this->assertEquals($defaultSuffix, $helper->getDefaultSuffix());
@@ -129,7 +129,10 @@ public function testGetDefaultDashInterval()
$defaultDashInterval = 4;
$this->scopeConfig->expects($this->once())
->method('getValue')
- ->with($helper::XML_PATH_SALES_RULE_COUPON_DASH_INTERVAL, \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
+ ->with(
+ $helper::XML_PATH_SALES_RULE_COUPON_DASH_INTERVAL,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ )
->will($this->returnValue($defaultDashInterval));
$this->assertEquals($defaultDashInterval, $helper->getDefaultDashInterval());
diff --git a/dev/tests/unit/testsuite/Magento/SalesRule/Model/Resource/Report/CollectionTest.php b/dev/tests/unit/testsuite/Magento/SalesRule/Model/Resource/Report/CollectionTest.php
index 08e15499e1418..2e70c8b3034bb 100644
--- a/dev/tests/unit/testsuite/Magento/SalesRule/Model/Resource/Report/CollectionTest.php
+++ b/dev/tests/unit/testsuite/Magento/SalesRule/Model/Resource/Report/CollectionTest.php
@@ -58,7 +58,7 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
$this->entityFactory = $this->getMock(
- 'Magento\Core\Model\EntityFactory',
+ 'Magento\Framework\Data\Collection\EntityFactory',
[],
[],
'',
diff --git a/dev/tests/unit/testsuite/Magento/Shipping/Helper/CarrierTest.php b/dev/tests/unit/testsuite/Magento/Shipping/Helper/CarrierTest.php
index 2c291891ef642..b796111a3c835 100644
--- a/dev/tests/unit/testsuite/Magento/Shipping/Helper/CarrierTest.php
+++ b/dev/tests/unit/testsuite/Magento/Shipping/Helper/CarrierTest.php
@@ -49,7 +49,7 @@ public function testGetOnlineCarrierCodes($result, $carriers)
'getValue'
)->with(
'carriers',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)->will(
$this->returnValue($carriers)
);
@@ -84,7 +84,7 @@ public function testGetCarrierConfigValue()
'getValue'
)->with(
sprintf('carriers/%s/%s', $carrierCode, $configPath),
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)->will(
$this->returnValue($configValue)
);
diff --git a/dev/tests/unit/testsuite/Magento/Sitemap/Helper/DataTest.php b/dev/tests/unit/testsuite/Magento/Sitemap/Helper/DataTest.php
index 90531e21b3ec2..258d6c942457b 100644
--- a/dev/tests/unit/testsuite/Magento/Sitemap/Helper/DataTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sitemap/Helper/DataTest.php
@@ -6,7 +6,7 @@
namespace Magento\Sitemap\Helper;
-use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\Store\ScopeInterface;
use Magento\TestFramework\Helper\ObjectManager;
class DataTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Store/App/Action/Plugin/StoreCheckTest.php b/dev/tests/unit/testsuite/Magento/Store/App/Action/Plugin/StoreCheckTest.php
index 1d37e60cee1d1..93fa00f0d3cce 100644
--- a/dev/tests/unit/testsuite/Magento/Store/App/Action/Plugin/StoreCheckTest.php
+++ b/dev/tests/unit/testsuite/Magento/Store/App/Action/Plugin/StoreCheckTest.php
@@ -42,7 +42,7 @@ class StoreCheckTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->_storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface');
+ $this->_storeManagerMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
$this->_storeMock = $this->getMock('Magento\Store\Model\Store', [], [], '', false);
$this->_storeManagerMock->expects(
$this->any()
diff --git a/dev/tests/unit/testsuite/Magento/Store/App/Response/RedirectTest.php b/dev/tests/unit/testsuite/Magento/Store/App/Response/RedirectTest.php
index 9e1c20d4bdcd4..fbec5b5792df8 100644
--- a/dev/tests/unit/testsuite/Magento/Store/App/Response/RedirectTest.php
+++ b/dev/tests/unit/testsuite/Magento/Store/App/Response/RedirectTest.php
@@ -58,7 +58,7 @@ protected function setUp()
'getCookie'
]
);
- $this->_storeManagerMock = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
+ $this->_storeManagerMock = $this->getMock('\Magento\Framework\Store\StoreManagerInterface');
$this->_urlCoderMock = $this->getMock(
'\Magento\Framework\Encryption\UrlCoder',
[],
diff --git a/dev/tests/unit/testsuite/Magento/Store/Block/SwitcherTest.php b/dev/tests/unit/testsuite/Magento/Store/Block/SwitcherTest.php
index ea22d7f770013..5a35ba020947f 100644
--- a/dev/tests/unit/testsuite/Magento/Store/Block/SwitcherTest.php
+++ b/dev/tests/unit/testsuite/Magento/Store/Block/SwitcherTest.php
@@ -19,12 +19,12 @@ class SwitcherTest extends \PHPUnit_Framework_TestCase
/** @var \Magento\Core\Helper\PostData|\PHPUnit_Framework_MockObject_MockObject */
protected $corePostDataHelper;
- /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
protected $storeManager;
protected function setUp()
{
- $this->storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')->getMock();
+ $this->storeManager = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')->getMock();
$this->context = $this->getMock('Magento\Framework\View\Element\Template\Context', [], [], '', false);
$this->context->expects($this->any())->method('getStoreManager')->will($this->returnValue($this->storeManager));
$this->corePostDataHelper = $this->getMock('Magento\Core\Helper\PostData', [], [], '', false);
diff --git a/dev/tests/unit/testsuite/Magento/Store/Model/App/EmulationTest.php b/dev/tests/unit/testsuite/Magento/Store/Model/App/EmulationTest.php
index 725f6fa510286..76e710f51033e 100644
--- a/dev/tests/unit/testsuite/Magento/Store/Model/App/EmulationTest.php
+++ b/dev/tests/unit/testsuite/Magento/Store/Model/App/EmulationTest.php
@@ -13,7 +13,7 @@
class EmulationTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Store\Model\StoreManagerInterface
+ * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Store\StoreManagerInterface
*/
private $storeManagerMock;
@@ -33,7 +33,7 @@ class EmulationTest extends \PHPUnit_Framework_TestCase
private $localeResolverMock;
/**
- * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Core\Model\Design
+ * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Theme\Model\Design
*/
private $designMock;
@@ -76,10 +76,10 @@ public function setUp()
{
$this->objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
// Mocks
- $this->designMock = $this->getMockBuilder('Magento\Core\Model\Design')
+ $this->designMock = $this->getMockBuilder('Magento\Theme\Model\Design')
->disableOriginalConstructor()
->setMethods([])->getMock();
- $this->storeManagerMock = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
+ $this->storeManagerMock = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
->disableOriginalConstructor()
->setMethods([])->getMock();
$this->translateMock = $this->getMockBuilder('Magento\Framework\TranslateInterface')
diff --git a/dev/tests/unit/testsuite/Magento/Store/Model/Config/Reader/StoreTest.php b/dev/tests/unit/testsuite/Magento/Store/Model/Config/Reader/StoreTest.php
index ae7ed0a039ced..8e50450f2e488 100644
--- a/dev/tests/unit/testsuite/Magento/Store/Model/Config/Reader/StoreTest.php
+++ b/dev/tests/unit/testsuite/Magento/Store/Model/Config/Reader/StoreTest.php
@@ -35,7 +35,7 @@ class StoreTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
$this->_scopePullMock = $this->getMock('Magento\Framework\App\Config\ScopePool', [], [], '', false);
- $this->_storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface');
+ $this->_storeManagerMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
$this->_initialConfigMock = $this->getMock('Magento\Framework\App\Config\Initial', [], [], '', false);
$this->_collectionFactory = $this->getMock(
'Magento\Store\Model\Resource\Config\Collection\ScopedFactory',
diff --git a/dev/tests/unit/testsuite/Magento/Store/Model/Resolver/StoreTest.php b/dev/tests/unit/testsuite/Magento/Store/Model/Resolver/StoreTest.php
index 1112cc695c473..60ebf91b2053c 100644
--- a/dev/tests/unit/testsuite/Magento/Store/Model/Resolver/StoreTest.php
+++ b/dev/tests/unit/testsuite/Magento/Store/Model/Resolver/StoreTest.php
@@ -24,7 +24,7 @@ class StoreTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
$this->_storeManagerMock = $this->getMock(
- 'Magento\Store\Model\StoreManagerInterface',
+ 'Magento\Framework\Store\StoreManagerInterface',
[],
[],
'',
diff --git a/dev/tests/unit/testsuite/Magento/Store/Model/Resolver/WebsiteTest.php b/dev/tests/unit/testsuite/Magento/Store/Model/Resolver/WebsiteTest.php
index a618b5e7096c6..113414dfeb529 100644
--- a/dev/tests/unit/testsuite/Magento/Store/Model/Resolver/WebsiteTest.php
+++ b/dev/tests/unit/testsuite/Magento/Store/Model/Resolver/WebsiteTest.php
@@ -24,7 +24,7 @@ class WebsiteTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
$this->_storeManagerMock = $this->getMock(
- 'Magento\Store\Model\StoreManagerInterface',
+ 'Magento\Framework\Store\StoreManagerInterface',
[],
[],
'',
diff --git a/dev/tests/unit/testsuite/Magento/Store/Model/Storage/DbTest.php b/dev/tests/unit/testsuite/Magento/Store/Model/Storage/DbTest.php
index ac869a0ecaa3f..432026e92e5a9 100644
--- a/dev/tests/unit/testsuite/Magento/Store/Model/Storage/DbTest.php
+++ b/dev/tests/unit/testsuite/Magento/Store/Model/Storage/DbTest.php
@@ -344,7 +344,7 @@ public function testIsSingleStoreMode()
->method('getValue')
->with(
\Magento\Store\Model\StoreManager::XML_PATH_SINGLE_STORE_MODE_ENABLED,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)->will($this->returnValue(true));
$this->assertFalse($this->_model->isSingleStoreMode());
@@ -353,7 +353,7 @@ public function testIsSingleStoreMode()
->method('getValue')
->with(
\Magento\Store\Model\StoreManager::XML_PATH_SINGLE_STORE_MODE_ENABLED,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)->will($this->returnValue(false));
$this->assertFalse($this->_model->isSingleStoreMode());
@@ -362,7 +362,7 @@ public function testIsSingleStoreMode()
->method('getValue')
->with(
\Magento\Store\Model\StoreManager::XML_PATH_SINGLE_STORE_MODE_ENABLED,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)->will($this->returnValue(true));
//set $this->hasSingleStore() to true
$this->prepareMockForReinit();
@@ -374,7 +374,7 @@ public function testIsSingleStoreMode()
->method('getValue')
->with(
\Magento\Store\Model\StoreManager::XML_PATH_SINGLE_STORE_MODE_ENABLED,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)->will($this->returnValue(false));
$this->assertTrue($this->_model->isSingleStoreMode());
}
diff --git a/dev/tests/unit/testsuite/Magento/Store/Model/StorageFactoryTest.php b/dev/tests/unit/testsuite/Magento/Store/Model/StorageFactoryTest.php
index d1b60f61bd714..04042d67ce8d9 100644
--- a/dev/tests/unit/testsuite/Magento/Store/Model/StorageFactoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/Store/Model/StorageFactoryTest.php
@@ -130,7 +130,7 @@ protected function setUp()
$this->helper = new \Magento\TestFramework\Helper\ObjectManager($this);
$this->_appStateMock = $this->getMock('Magento\Framework\App\State', [], [], '', false);
- $this->_storeManager = $this->getMock('Magento\Store\Model\StoreManagerInterface');
+ $this->_storeManager = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
$this->_httpContext = $this->getMock('Magento\Framework\App\Http\Context', [], [], '', false);
$this->_scopeConfig = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
$this->request = $this->getMock('Magento\Framework\App\RequestInterface', [], [], '', false);
@@ -190,7 +190,7 @@ public function testGetModeWithInternalCache()
'isSetFlag'
)->with(
\Magento\Framework\Session\SidResolver::XML_PATH_USE_FRONTEND_SID,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)->will(
$this->returnValue(true)
);
@@ -290,12 +290,12 @@ public function getWithStoresReinitDataProvider()
{
return [
['', '', 21, 11, 'store1'],
- ['11', \Magento\Store\Model\ScopeInterface::SCOPE_GROUP, 21, null, 'store1'],
- ['12', \Magento\Store\Model\ScopeInterface::SCOPE_GROUP, 22, null, null],
- ['11', \Magento\Store\Model\ScopeInterface::SCOPE_GROUP, null, null, null],
- ['website1', \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE, 21, 11, 'store1'],
- ['31', \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE, 22, null, null],
- ['website1', \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE, null, 0, null],
+ ['11', \Magento\Framework\Store\ScopeInterface::SCOPE_GROUP, 21, null, 'store1'],
+ ['12', \Magento\Framework\Store\ScopeInterface::SCOPE_GROUP, 22, null, null],
+ ['11', \Magento\Framework\Store\ScopeInterface::SCOPE_GROUP, null, null, null],
+ ['website1', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE, 21, 11, 'store1'],
+ ['31', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE, 22, null, null],
+ ['website1', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE, null, 0, null],
];
}
@@ -345,9 +345,9 @@ public function testGetFromCookie($scopeCode, $scopeType)
public function getFromCookieDataProvider()
{
return [
- ['website1', \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE],
- ['11', \Magento\Store\Model\ScopeInterface::SCOPE_GROUP],
- ['store1', \Magento\Store\Model\ScopeInterface::SCOPE_STORE],
+ ['website1', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE],
+ ['11', \Magento\Framework\Store\ScopeInterface::SCOPE_GROUP],
+ ['store1', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE],
];
}
diff --git a/dev/tests/unit/testsuite/Magento/Store/Model/StoreManagerTest.php b/dev/tests/unit/testsuite/Magento/Store/Model/StoreManagerTest.php
index aef8fbeab9509..403b10de640cd 100644
--- a/dev/tests/unit/testsuite/Magento/Store/Model/StoreManagerTest.php
+++ b/dev/tests/unit/testsuite/Magento/Store/Model/StoreManagerTest.php
@@ -45,7 +45,7 @@ protected function setUp()
'',
false
);
- $this->_storage = $this->getMock('Magento\Store\Model\StoreManagerInterface');
+ $this->_storage = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
$this->_model = new \Magento\Store\Model\StoreManager(
$this->_factoryMock,
@@ -146,7 +146,7 @@ public function testIsSingleStoreModeWhenSingleStoreModeEnabledAndHasSingleStore
'getValue'
)->with(
\Magento\Store\Model\StoreManager::XML_PATH_SINGLE_STORE_MODE_ENABLED,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)->will(
$this->returnValue(true)
);
@@ -165,7 +165,7 @@ public function testIsSingleStoreModeWhenSingleStoreModeDisabledAndHasSingleStor
'getValue'
)->with(
\Magento\Store\Model\StoreManager::XML_PATH_SINGLE_STORE_MODE_ENABLED,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)->will(
$this->returnValue(false)
);
diff --git a/dev/tests/unit/testsuite/Magento/Store/Model/StoreTest.php b/dev/tests/unit/testsuite/Magento/Store/Model/StoreTest.php
index 86b2436be1fe1..09cd47f8017ed 100644
--- a/dev/tests/unit/testsuite/Magento/Store/Model/StoreTest.php
+++ b/dev/tests/unit/testsuite/Magento/Store/Model/StoreTest.php
@@ -9,6 +9,7 @@
namespace Magento\Store\Model;
use Magento\Framework\App\Config\ReinitableConfigInterface;
+use Magento\Framework\Store\ScopeInterface;
/**
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
@@ -129,7 +130,7 @@ public function testSetWebsite()
*/
public function testGetWebsite($websiteId, $website)
{
- $storeManager = $this->getMockForAbstractClass('\Magento\Store\Model\StoreManagerInterface');
+ $storeManager = $this->getMockForAbstractClass('\Magento\Framework\Store\StoreManagerInterface');
$storeManager->expects($this->any())
->method('getWebsite')
->with($websiteId)
@@ -165,7 +166,7 @@ public function testGetUrl()
->with($this->equalTo('test/route'), $this->equalTo($params))
->will($this->returnValue('http://test/url'));
- $storeManager = $this->getMockForAbstractClass('\Magento\Store\Model\StoreManagerInterface');
+ $storeManager = $this->getMockForAbstractClass('\Magento\Framework\Store\StoreManagerInterface');
$storeManager->expects($this->any())
->method('getStore')
->will($this->returnValue($defaultStore));
@@ -352,7 +353,7 @@ public function testGetCurrentUrl($secure, $url, $expected)
$urlMock->expects($this->any())->method('getUrl')
->will($this->returnValue($url));
- $storeManager = $this->getMockForAbstractClass('\Magento\Store\Model\StoreManagerInterface');
+ $storeManager = $this->getMockForAbstractClass('\Magento\Framework\Store\StoreManagerInterface');
$storeManager->expects($this->any())
->method('getStore')
->will($this->returnValue($defaultStore));
@@ -402,7 +403,7 @@ public function testGetBaseCurrency($priceScope, $currencyCode)
],
[
\Magento\Directory\Model\Currency::XML_PATH_CURRENCY_BASE,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
'scope_code',
'UAH'
],
diff --git a/dev/tests/unit/testsuite/Magento/Store/Model/StoresConfigTest.php b/dev/tests/unit/testsuite/Magento/Store/Model/StoresConfigTest.php
index b99ffd42208e8..3ef527069bd84 100644
--- a/dev/tests/unit/testsuite/Magento/Store/Model/StoresConfigTest.php
+++ b/dev/tests/unit/testsuite/Magento/Store/Model/StoresConfigTest.php
@@ -39,7 +39,7 @@ protected function setUp()
{
$this->_storeOne = $this->getMock('Magento\Store\Model\Store', [], [], '', false);
$this->_storeTwo = $this->getMock('Magento\Store\Model\Store', [], [], '', false);
- $this->_storeManager = $this->getMock('Magento\Store\Model\StoreManagerInterface');
+ $this->_storeManager = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
$this->_config = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
$this->_model = new \Magento\Store\Model\StoresConfig(
diff --git a/dev/tests/unit/testsuite/Magento/Tax/Model/ConfigTest.php b/dev/tests/unit/testsuite/Magento/Tax/Model/ConfigTest.php
index 81a26c41c488c..5ad3bbed4ae67 100644
--- a/dev/tests/unit/testsuite/Magento/Tax/Model/ConfigTest.php
+++ b/dev/tests/unit/testsuite/Magento/Tax/Model/ConfigTest.php
@@ -97,7 +97,7 @@ public function testScopeConfigMethods($method, $path, $configValue, $expectedVa
$scopeConfigMock = $this->getMockForAbstractClass('Magento\Framework\App\Config\ScopeConfigInterface');
$scopeConfigMock->expects($this->once())
->method('getValue')
- ->with($path, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, null)
+ ->with($path, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, null)
->will($this->returnValue($configValue));
/** @var \Magento\Tax\Model\Config */
diff --git a/dev/tests/unit/testsuite/Magento/Tax/Model/Resource/CalculationTest.php b/dev/tests/unit/testsuite/Magento/Tax/Model/Resource/CalculationTest.php
index bf4baed61a356..d2c3690cf75cb 100644
--- a/dev/tests/unit/testsuite/Magento/Tax/Model/Resource/CalculationTest.php
+++ b/dev/tests/unit/testsuite/Magento/Tax/Model/Resource/CalculationTest.php
@@ -20,7 +20,7 @@ public function testCreateSearchPostCodeTemplates($postalCode, $exactPostalcode)
{
// create the mocks
$resource = $this->getMock('Magento\Framework\App\Resource', [], [], '', false);
- $storeManager = $this->getMock('Magento\Store\Model\StoreManagerInterface', [], [], '', false);
+ $storeManager = $this->getMock('Magento\Framework\Store\StoreManagerInterface', [], [], '', false);
$taxData = $this->getMock('Magento\Tax\Helper\Data', ['getPostCodeSubStringLength'], [], '', false);
$taxData
diff --git a/dev/tests/unit/testsuite/Magento/Tax/Model/Sales/Total/Quote/TaxTest.php b/dev/tests/unit/testsuite/Magento/Tax/Model/Sales/Total/Quote/TaxTest.php
index 1e7ff2e174f73..939c00152d344 100644
--- a/dev/tests/unit/testsuite/Magento/Tax/Model/Sales/Total/Quote/TaxTest.php
+++ b/dev/tests/unit/testsuite/Magento/Tax/Model/Sales/Total/Quote/TaxTest.php
@@ -88,7 +88,7 @@ public function testCollect($itemData, $appliedRatesData, $taxDetailsData, $quot
->method('getItems')
->will($this->returnValue($items));
- $storeManager = $this->getMockBuilder('\Magento\Store\Model\StoreManagerInterface')
+ $storeManager = $this->getMockBuilder('\Magento\Framework\Store\StoreManagerInterface')
->disableOriginalConstructor()
->setMethods(['getStore', 'hasSingleStore', 'isSingleStoreMode', 'getStores', 'getWebsite', 'getWebsites',
'reinitStores', 'getDefaultStoreView', 'setIsSingleStoreModeAllowed', 'getGroup', 'getGroups',
diff --git a/dev/tests/unit/testsuite/Magento/Tax/Model/TaxCalculationTest.php b/dev/tests/unit/testsuite/Magento/Tax/Model/TaxCalculationTest.php
index 84d4c2a373842..7ae59cdc2956b 100644
--- a/dev/tests/unit/testsuite/Magento/Tax/Model/TaxCalculationTest.php
+++ b/dev/tests/unit/testsuite/Magento/Tax/Model/TaxCalculationTest.php
@@ -75,7 +75,7 @@ public function setUp()
'',
false
);
- $this->storeManager = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
+ $this->storeManager = $this->getMock('\Magento\Framework\Store\StoreManagerInterface');
$this->taxClassManagementMock = $this->getMock('\Magento\Tax\Api\TaxClassManagementInterface');
$objectManager = new ObjectManager($this);
diff --git a/dev/tests/unit/testsuite/Magento/Tax/Model/TaxRateCollectionTest.php b/dev/tests/unit/testsuite/Magento/Tax/Model/TaxRateCollectionTest.php
index 1170ef3d7c05a..283ea9bbea5ce 100644
--- a/dev/tests/unit/testsuite/Magento/Tax/Model/TaxRateCollectionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Tax/Model/TaxRateCollectionTest.php
@@ -59,7 +59,7 @@ class TaxRateCollectionTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->entityFactoryMock = $this->getMock('Magento\Core\Model\EntityFactory', [], [], '', false);
+ $this->entityFactoryMock = $this->getMock('Magento\Framework\Data\Collection\EntityFactory', [], [], '', false);
$this->filterBuilderMock = $this->getMock('Magento\Framework\Api\FilterBuilder', [], [], '', false);
$this->searchCriteriaBuilderMock =
$this->getMock('Magento\Framework\Api\SearchCriteriaBuilder', [], [], '', false);
diff --git a/dev/tests/unit/testsuite/Magento/Tax/Model/TaxRuleCollectionTest.php b/dev/tests/unit/testsuite/Magento/Tax/Model/TaxRuleCollectionTest.php
index 2228e95b7135c..8c84fbc6819f5 100644
--- a/dev/tests/unit/testsuite/Magento/Tax/Model/TaxRuleCollectionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Tax/Model/TaxRuleCollectionTest.php
@@ -54,7 +54,7 @@ class TaxRuleCollectionTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->entityFactoryMock = $this->getMock('Magento\Core\Model\EntityFactory', [], [], '', false);
+ $this->entityFactoryMock = $this->getMock('Magento\Framework\Data\Collection\EntityFactory', [], [], '', false);
$this->filterBuilderMock = $this->getMock('Magento\Framework\Api\FilterBuilder', [], [], '', false);
$this->searchCriteriaBuilderMock =
$this->getMock('Magento\Framework\Api\SearchCriteriaBuilder', [], [], '', false);
diff --git a/dev/tests/unit/testsuite/Magento/Theme/Block/Adminhtml/System/Design/Theme/Tab/JsTest.php b/dev/tests/unit/testsuite/Magento/Theme/Block/Adminhtml/System/Design/Theme/Tab/JsTest.php
index 2545fdcb8ae0d..41a7aa8cb3f4b 100644
--- a/dev/tests/unit/testsuite/Magento/Theme/Block/Adminhtml/System/Design/Theme/Tab/JsTest.php
+++ b/dev/tests/unit/testsuite/Magento/Theme/Block/Adminhtml/System/Design/Theme/Tab/JsTest.php
@@ -77,7 +77,7 @@ public function testGetJsUploadUrl()
$themeId = 2;
$uploadUrl = 'upload_url';
$themeMock = $this->getMock(
- 'Magento\Core\Model\Theme',
+ 'Magento\Theme\Model\Theme',
['isVirtual', 'getId', '__wakeup'],
[],
'',
diff --git a/dev/tests/unit/testsuite/Magento/Theme/Block/Adminhtml/System/Design/Theme/TabAbstractTest.php b/dev/tests/unit/testsuite/Magento/Theme/Block/Adminhtml/System/Design/Theme/TabAbstractTest.php
index f187b09b0908c..d91aec7994801 100644
--- a/dev/tests/unit/testsuite/Magento/Theme/Block/Adminhtml/System/Design/Theme/TabAbstractTest.php
+++ b/dev/tests/unit/testsuite/Magento/Theme/Block/Adminhtml/System/Design/Theme/TabAbstractTest.php
@@ -51,7 +51,7 @@ public function testGetTabTitle()
public function testCanShowTab($isVirtual, $themeId, $result)
{
$themeMock = $this->getMock(
- 'Magento\Core\Model\Theme',
+ 'Magento\Theme\Model\Theme',
['isVirtual', 'getId', '__wakeup'],
[],
'',
diff --git a/dev/tests/unit/testsuite/Magento/Theme/Controller/Adminhtml/System/Design/Theme/SaveTest.php b/dev/tests/unit/testsuite/Magento/Theme/Controller/Adminhtml/System/Design/Theme/SaveTest.php
index bcde5928d88a0..e2fca5f285f7a 100644
--- a/dev/tests/unit/testsuite/Magento/Theme/Controller/Adminhtml/System/Design/Theme/SaveTest.php
+++ b/dev/tests/unit/testsuite/Magento/Theme/Controller/Adminhtml/System/Design/Theme/SaveTest.php
@@ -51,14 +51,14 @@ public function testSaveAction()
$this->_request->expects($this->once(5))->method('getPost')->will($this->returnValue(true));
$themeMock = $this->getMock(
- 'Magento\Core\Model\Theme',
+ 'Magento\Theme\Model\Theme',
['save', 'load', 'setCustomization', 'getThemeImage', '__wakeup'],
[],
'',
false
);
- $themeImage = $this->getMock('Magento\Core\Model\Theme\Image', [], [], '', false);
+ $themeImage = $this->getMock('Magento\Theme\Model\Theme\Image', [], [], '', false);
$themeMock->expects($this->any())->method('getThemeImage')->will($this->returnValue($themeImage));
$themeFactory = $this->getMock(
diff --git a/dev/tests/unit/testsuite/Magento/Theme/Helper/StorageTest.php b/dev/tests/unit/testsuite/Magento/Theme/Helper/StorageTest.php
index 37091442b424a..1a85f28063222 100644
--- a/dev/tests/unit/testsuite/Magento/Theme/Helper/StorageTest.php
+++ b/dev/tests/unit/testsuite/Magento/Theme/Helper/StorageTest.php
@@ -52,7 +52,7 @@ class StorageTest extends \PHPUnit_Framework_TestCase
protected $contextHelper;
/**
- * @var \Magento\Core\Model\Theme|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Theme\Model\Theme|\PHPUnit_Framework_MockObject_MockObject
*/
protected $theme;
@@ -85,7 +85,7 @@ protected function setUp()
'',
false
);
- $this->theme = $this->getMock('Magento\Core\Model\Theme', [], [], '', false);
+ $this->theme = $this->getMock('Magento\Theme\Model\Theme', [], [], '', false);
$this->customization = $this->getMock(
'Magento\Framework\View\Design\Theme\Customization',
[],
diff --git a/dev/tests/unit/testsuite/Magento/Core/Helper/ThemeTest.php b/dev/tests/unit/testsuite/Magento/Theme/Helper/ThemeTest.php
similarity index 98%
rename from dev/tests/unit/testsuite/Magento/Core/Helper/ThemeTest.php
rename to dev/tests/unit/testsuite/Magento/Theme/Helper/ThemeTest.php
index 49618259aed69..ede7ea083919c 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Helper/ThemeTest.php
+++ b/dev/tests/unit/testsuite/Magento/Theme/Helper/ThemeTest.php
@@ -6,7 +6,7 @@
// @codingStandardsIgnoreFile
-namespace Magento\Core\Helper;
+namespace Magento\Theme\Helper;
class ThemeTest extends \PHPUnit_Framework_TestCase
{
@@ -26,7 +26,7 @@ public function testGetCssAssets($layoutStr, $expectedResult)
$assetRepo->expects($this->any())
->method('createAsset')
->will($this->returnArgument(0));
- $helper = new \Magento\Core\Helper\Theme(
+ $helper = new \Magento\Theme\Helper\Theme(
$this->getMock('Magento\Framework\App\Helper\Context', [], [], '', false),
$layoutMergeFactory,
$assetRepo
diff --git a/dev/tests/unit/testsuite/Magento/Theme/Model/Config/CustomizationTest.php b/dev/tests/unit/testsuite/Magento/Theme/Model/Config/CustomizationTest.php
index a9fd05f625aba..00c5f3f70b44c 100644
--- a/dev/tests/unit/testsuite/Magento/Theme/Model/Config/CustomizationTest.php
+++ b/dev/tests/unit/testsuite/Magento/Theme/Model/Config/CustomizationTest.php
@@ -12,7 +12,7 @@
class CustomizationTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -22,7 +22,7 @@ class CustomizationTest extends \PHPUnit_Framework_TestCase
protected $_designPackage;
/**
- * @var \Magento\Core\Model\Resource\Theme\Collection
+ * @var \Magento\Theme\Model\Resource\Theme\Collection
*/
protected $_themeCollection;
@@ -32,14 +32,14 @@ class CustomizationTest extends \PHPUnit_Framework_TestCase
protected $_model;
/**
- * @var \Magento\Core\Model\Theme\ThemeProvider|\PHPUnit_Framework_MockObject_MockBuilder
+ * @var \Magento\Theme\Model\Theme\ThemeProvider|\PHPUnit_Framework_MockObject_MockBuilder
*/
protected $themeProviderMock;
protected function setUp()
{
$this->_storeManager = $this->getMockForAbstractClass(
- 'Magento\Store\Model\StoreManagerInterface',
+ 'Magento\Framework\Store\StoreManagerInterface',
[],
'',
true,
@@ -57,7 +57,7 @@ protected function setUp()
['getConfigurationDesignTheme']
);
$this->_themeCollection = $this->getMock(
- 'Magento\Core\Model\Resource\Theme\Collection',
+ 'Magento\Theme\Model\Resource\Theme\Collection',
['filterThemeCustomizations', 'load'],
[],
'',
@@ -65,7 +65,7 @@ protected function setUp()
);
$collectionFactory = $this->getMock(
- 'Magento\Core\Model\Resource\Theme\CollectionFactory',
+ 'Magento\Theme\Model\Resource\Theme\CollectionFactory',
['create'],
[],
'',
@@ -75,9 +75,9 @@ protected function setUp()
$collectionFactory->expects($this->any())->method('create')->will($this->returnValue($this->_themeCollection));
$this->themeProviderMock = $this->getMock(
- '\Magento\Core\Model\Theme\ThemeProvider',
+ '\Magento\Theme\Model\Theme\ThemeProvider',
['getThemeCustomizations', 'getThemeByFullPath'],
- [$collectionFactory, $this->getMock('\Magento\Core\Model\ThemeFactory', [], [], '', false)],
+ [$collectionFactory, $this->getMock('\Magento\Theme\Model\ThemeFactory', [], [], '', false)],
'',
false
);
diff --git a/dev/tests/unit/testsuite/Magento/Theme/Model/ConfigTest.php b/dev/tests/unit/testsuite/Magento/Theme/Model/ConfigTest.php
index 428bf670e9085..0a68104437d23 100644
--- a/dev/tests/unit/testsuite/Magento/Theme/Model/ConfigTest.php
+++ b/dev/tests/unit/testsuite/Magento/Theme/Model/ConfigTest.php
@@ -48,10 +48,10 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- /** @var $this->_themeMock \Magento\Core\Model\Theme */
- $this->_themeMock = $this->getMock('Magento\Core\Model\Theme', [], [], '', false);
+ /** @var $this->_themeMock \Magento\Theme\Model\Theme */
+ $this->_themeMock = $this->getMock('Magento\Theme\Model\Theme', [], [], '', false);
$this->_storeManagerMock = $this->getMockForAbstractClass(
- 'Magento\Store\Model\StoreManagerInterface',
+ 'Magento\Framework\Store\StoreManagerInterface',
[],
'',
true,
@@ -119,7 +119,7 @@ public function testAssignToStoreInSingleStoreMode()
'addFieldToFilter'
)->with(
'scope',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORES
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORES
)->will(
$this->returnValue($this->_configData)
);
@@ -170,7 +170,7 @@ public function testAssignToStoreNonSingleStoreMode()
'addFieldToFilter'
)->with(
'scope',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORES
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORES
)->will(
$this->returnValue($this->_configData)
);
diff --git a/dev/tests/unit/testsuite/Magento/Theme/Model/CopyServiceTest.php b/dev/tests/unit/testsuite/Magento/Theme/Model/CopyServiceTest.php
index 605c16c895f06..7f8538a8c619b 100644
--- a/dev/tests/unit/testsuite/Magento/Theme/Model/CopyServiceTest.php
+++ b/dev/tests/unit/testsuite/Magento/Theme/Model/CopyServiceTest.php
@@ -83,7 +83,7 @@ class CopyServiceTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
$sourceFileOne = $this->getMock(
- 'Magento\Core\Model\Theme\File',
+ 'Magento\Theme\Model\Theme\File',
['__wakeup', 'delete'],
[],
'',
@@ -98,7 +98,7 @@ protected function setUp()
]
);
$sourceFileTwo = $this->getMock(
- 'Magento\Core\Model\Theme\File',
+ 'Magento\Theme\Model\Theme\File',
['__wakeup', 'delete'],
[],
'',
@@ -114,7 +114,7 @@ protected function setUp()
);
$this->_sourceFiles = [$sourceFileOne, $sourceFileTwo];
$this->_sourceTheme = $this->getMock(
- 'Magento\Core\Model\Theme',
+ 'Magento\Theme\Model\Theme',
['__wakeup', 'getCustomization'],
[],
'',
@@ -122,11 +122,11 @@ protected function setUp()
);
$this->_targetFiles = [
- $this->getMock('Magento\Core\Model\Theme\File', ['__wakeup', 'delete'], [], '', false),
- $this->getMock('Magento\Core\Model\Theme\File', ['__wakeup', 'delete'], [], '', false),
+ $this->getMock('Magento\Theme\Model\Theme\File', ['__wakeup', 'delete'], [], '', false),
+ $this->getMock('Magento\Theme\Model\Theme\File', ['__wakeup', 'delete'], [], '', false),
];
$this->_targetTheme = $this->getMock(
- 'Magento\Core\Model\Theme',
+ 'Magento\Theme\Model\Theme',
['__wakeup', 'getCustomization'],
[],
'',
@@ -401,14 +401,14 @@ public function testCopyDatabaseCustomization()
}
$newFileOne = $this->getMock(
- 'Magento\Core\Model\Theme\File',
+ 'Magento\Theme\Model\Theme\File',
['__wakeup', 'setData', 'save'],
[],
'',
false
);
$newFileTwo = $this->getMock(
- 'Magento\Core\Model\Theme\File',
+ 'Magento\Theme\Model\Theme\File',
['__wakeup', 'setData', 'save'],
[],
'',
diff --git a/dev/tests/unit/testsuite/Magento/Theme/Model/ObserverTest.php b/dev/tests/unit/testsuite/Magento/Theme/Model/ObserverTest.php
new file mode 100644
index 0000000000000..954a20598b876
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Theme/Model/ObserverTest.php
@@ -0,0 +1,236 @@
+themeCustomization = $this->getMock(
+ 'Magento\Framework\View\Design\Theme\Customization',
+ [],
+ [],
+ '',
+ false
+ );
+ $themeMock = $this->getMock(
+ 'Magento\Theme\Model\Theme',
+ ['__wakeup', 'getCustomization'],
+ [],
+ '',
+ false
+ );
+ $themeMock->expects(
+ $this->any()
+ )->method(
+ 'getCustomization'
+ )->will(
+ $this->returnValue($this->themeCustomization)
+ );
+
+ $designMock = $this->getMock('Magento\Framework\View\DesignInterface');
+ $designMock->expects($this->any())->method('getDesignTheme')->will($this->returnValue($themeMock));
+
+ $this->assetsMock = $this->getMock(
+ 'Magento\Framework\View\Asset\GroupedCollection',
+ [],
+ [],
+ '',
+ false,
+ false
+ );
+ $this->_configMock = $this->getMock(
+ '\Magento\Framework\App\Config\ReinitableConfigInterface',
+ [],
+ [],
+ '',
+ false,
+ false
+ );
+
+ $this->assetRepo = $this->getMock('Magento\Framework\View\Asset\Repository', [], [], '', false);
+
+ $this->themeConfig = $this->getMockBuilder('Magento\Theme\Model\Config\Customization')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->themeImageFactory = $this->getMockBuilder('Magento\Framework\View\Design\Theme\ImageFactory')
+ ->setMethods(['create', 'removePreviewImage'])
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->updateCollection = $this->getMockBuilder('Magento\Core\Model\Resource\Layout\Update\Collection')
+ ->setMethods(['addThemeFilter', 'delete'])
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->eventDispatcher = $this->getMockBuilder('Magento\Framework\Event\ManagerInterface')
+ ->disableOriginalConstructor()
+ ->getMockForAbstractClass();
+
+ $objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
+ $this->themeObserver = $objectManagerHelper->getObject(
+ 'Magento\Theme\Model\Observer',
+ [
+ 'design' => $designMock,
+ 'assets' => $this->assetsMock,
+ 'assetRepo' => $this->assetRepo,
+ 'themeConfig' => $this->themeConfig,
+ 'eventDispatcher' => $this->eventDispatcher,
+ 'themeImageFactory' => $this->themeImageFactory,
+ 'updateCollection' => $this->updateCollection
+ ]
+ );
+ }
+
+ public function testApplyThemeCustomization()
+ {
+ $asset = $this->getMock('\Magento\Framework\View\Asset\File', [], [], '', false);
+ $file = $this->getMock('Magento\Theme\Model\Theme\File', [], [], '', false);
+ $fileService = $this->getMockForAbstractClass(
+ '\Magento\Framework\View\Design\Theme\Customization\FileAssetInterface'
+ );
+ $file->expects($this->any())->method('getCustomizationService')->will($this->returnValue($fileService));
+
+ $this->assetRepo->expects($this->once())
+ ->method('createArbitrary')
+ ->will($this->returnValue($asset));
+
+ $this->themeCustomization->expects($this->once())->method('getFiles')->will($this->returnValue([$file]));
+ $this->assetsMock->expects($this->once())->method('add')->with($this->anything(), $asset);
+
+ $observer = new \Magento\Framework\Event\Observer();
+ $this->themeObserver->applyThemeCustomization($observer);
+ }
+
+ public function testCheckThemeIsAssigned()
+ {
+ $themeMock = $this->getMockBuilder('Magento\Framework\View\Design\ThemeInterface')->getMockForAbstractClass();
+
+ $eventMock = $this->getMockBuilder('Magento\Framework\Event')->disableOriginalConstructor()->getMock();
+ $eventMock->expects($this->any())->method('getData')->with('theme')->willReturn($themeMock);
+
+ $observerMock = $this->getMockBuilder('Magento\Framework\Event\Observer')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $observerMock->expects($this->any())->method('getEvent')->willReturn($eventMock);
+
+ $this->themeConfig->expects($this->any())->method('isThemeAssignedToStore')->with($themeMock)->willReturn(true);
+
+ $this->eventDispatcher
+ ->expects($this->any())
+ ->method('dispatch')
+ ->with('assigned_theme_changed', ['theme' => $themeMock]);
+
+ $this->themeObserver->checkThemeIsAssigned($observerMock);
+ }
+
+ public function testCleanThemeRelatedContent()
+ {
+ $themeMock = $this->getMockBuilder('Magento\Framework\View\Design\ThemeInterface')->getMockForAbstractClass();
+
+ $eventMock = $this->getMockBuilder('Magento\Framework\Event')->disableOriginalConstructor()->getMock();
+ $eventMock->expects($this->any())->method('getData')->with('theme')->willReturn($themeMock);
+
+ $observerMock = $this->getMockBuilder('Magento\Framework\Event\Observer')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $observerMock->expects($this->any())->method('getEvent')->willReturn($eventMock);
+
+ $this->themeConfig
+ ->expects($this->any())
+ ->method('isThemeAssignedToStore')
+ ->with($themeMock)
+ ->willReturn(false);
+
+ $this->themeImageFactory
+ ->expects($this->once())
+ ->method('create')
+ ->with(['theme' => $themeMock])
+ ->willReturnSelf();
+ $this->themeImageFactory->expects($this->once())->method('removePreviewImage');
+
+ $this->updateCollection->expects($this->once())->method('addThemeFilter')->willReturnSelf();
+ $this->updateCollection->expects($this->once())->method('delete');
+
+ $this->themeObserver->cleanThemeRelatedContent($observerMock);
+ }
+
+ public function testCleanThemeRelatedContentException()
+ {
+ $themeMock = $this->getMockBuilder('Magento\Framework\View\Design\ThemeInterface')->getMockForAbstractClass();
+
+ $eventMock = $this->getMockBuilder('Magento\Framework\Event')->disableOriginalConstructor()->getMock();
+ $eventMock->expects($this->any())->method('getData')->with('theme')->willReturn($themeMock);
+
+ $observerMock = $this->getMockBuilder('Magento\Framework\Event\Observer')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $observerMock->expects($this->any())->method('getEvent')->willReturn($eventMock);
+
+ $this->themeConfig->expects($this->any())->method('isThemeAssignedToStore')->with($themeMock)->willReturn(true);
+
+
+ $this->setExpectedException('Magento\Framework\Model\Exception', 'Theme isn\'t deletable.');
+ $this->themeObserver->cleanThemeRelatedContent($observerMock);
+ }
+
+ public function testCleanThemeRelatedContentNonObjectTheme()
+ {
+ $eventMock = $this->getMockBuilder('Magento\Framework\Event')->disableOriginalConstructor()->getMock();
+ $eventMock->expects($this->any())->method('getData')->with('theme')->willReturn('Theme as a string');
+
+ $observerMock = $this->getMockBuilder('Magento\Framework\Event\Observer')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $observerMock->expects($this->any())->method('getEvent')->willReturn($eventMock);
+
+ $this->themeConfig->expects($this->never())->method('isThemeAssignedToStore');
+
+ $this->themeObserver->cleanThemeRelatedContent($observerMock);
+ }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Theme/Domain/PhysicalTest.php b/dev/tests/unit/testsuite/Magento/Theme/Model/Theme/Domain/PhysicalTest.php
similarity index 83%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Theme/Domain/PhysicalTest.php
rename to dev/tests/unit/testsuite/Magento/Theme/Model/Theme/Domain/PhysicalTest.php
index ee27d54fc6a60..f3388301c0bb9 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Theme/Domain/PhysicalTest.php
+++ b/dev/tests/unit/testsuite/Magento/Theme/Model/Theme/Domain/PhysicalTest.php
@@ -7,20 +7,20 @@
/**
* Test theme domain physical model
*/
-namespace Magento\Core\Model\Theme\Domain;
+namespace Magento\Theme\Model\Theme\Domain;
class PhysicalTest extends \PHPUnit_Framework_TestCase
{
public function testCreateVirtualTheme()
{
- $physicalTheme = $this->getMock('Magento\Core\Model\Theme', ['__wakeup'], [], '', false, false);
+ $physicalTheme = $this->getMock('Magento\Theme\Model\Theme', ['__wakeup'], [], '', false, false);
$physicalTheme->setData(['parent_id' => 10, 'theme_title' => 'Test Theme']);
$copyService = $this->getMock('Magento\Theme\Model\CopyService', ['copy'], [], '', false, false);
$copyService->expects($this->once())->method('copy')->will($this->returnValue($copyService));
$virtualTheme = $this->getMock(
- 'Magento\Core\Model\Theme',
+ 'Magento\Theme\Model\Theme',
['__wakeup', 'getThemeImage', 'createPreviewImageCopy', 'save'],
[],
'',
@@ -39,11 +39,11 @@ public function testCreateVirtualTheme()
$virtualTheme->expects($this->once())->method('save')->will($this->returnValue($virtualTheme));
- $themeFactory = $this->getMock('Magento\Core\Model\ThemeFactory', ['create'], [], '', false, false);
+ $themeFactory = $this->getMock('Magento\Theme\Model\ThemeFactory', ['create'], [], '', false, false);
$themeFactory->expects($this->once())->method('create')->will($this->returnValue($virtualTheme));
$themeCollection = $this->getMock(
- 'Magento\Core\Model\Resource\Theme\Collection',
+ 'Magento\Theme\Model\Resource\Theme\Collection',
['addTypeFilter', 'addAreaFilter', 'addFilter', 'count'],
[],
'',
@@ -59,7 +59,7 @@ public function testCreateVirtualTheme()
$themeCollection->expects($this->once())->method('count')->will($this->returnValue(1));
- $domainModel = new \Magento\Core\Model\Theme\Domain\Physical(
+ $domainModel = new \Magento\Theme\Model\Theme\Domain\Physical(
$this->getMock('Magento\Framework\View\Design\ThemeInterface', [], [], '', false, false),
$themeFactory,
$copyService,
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Theme/Domain/StagingTest.php b/dev/tests/unit/testsuite/Magento/Theme/Model/Theme/Domain/StagingTest.php
similarity index 69%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Theme/Domain/StagingTest.php
rename to dev/tests/unit/testsuite/Magento/Theme/Model/Theme/Domain/StagingTest.php
index 4a272233f8a75..606f7d3a125a7 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Theme/Domain/StagingTest.php
+++ b/dev/tests/unit/testsuite/Magento/Theme/Model/Theme/Domain/StagingTest.php
@@ -7,19 +7,19 @@
/**
* Test theme staging model
*/
-namespace Magento\Core\Model\Theme\Domain;
+namespace Magento\Theme\Model\Theme\Domain;
class StagingTest extends \PHPUnit_Framework_TestCase
{
/**
- * @covers \Magento\Core\Model\Theme\Domain\Staging::updateFromStagingTheme
+ * @covers \Magento\Theme\Model\Theme\Domain\Staging::updateFromStagingTheme
*/
public function testUpdateFromStagingTheme()
{
- $parentTheme = $this->getMock('Magento\Core\Model\Theme', [], [], '', false, false);
+ $parentTheme = $this->getMock('Magento\Theme\Model\Theme', [], [], '', false, false);
$theme = $this->getMock(
- 'Magento\Core\Model\Theme',
+ 'Magento\Theme\Model\Theme',
['__wakeup', 'getParentTheme'],
[],
'',
@@ -31,7 +31,7 @@ public function testUpdateFromStagingTheme()
$themeCopyService = $this->getMock('Magento\Theme\Model\CopyService', ['copy'], [], '', false);
$themeCopyService->expects($this->once())->method('copy')->with($theme, $parentTheme);
- $object = new \Magento\Core\Model\Theme\Domain\Staging($theme, $themeCopyService);
+ $object = new \Magento\Theme\Model\Theme\Domain\Staging($theme, $themeCopyService);
$this->assertSame($object, $object->updateFromStagingTheme());
}
}
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Theme/Domain/VirtualTest.php b/dev/tests/unit/testsuite/Magento/Theme/Model/Theme/Domain/VirtualTest.php
similarity index 80%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Theme/Domain/VirtualTest.php
rename to dev/tests/unit/testsuite/Magento/Theme/Model/Theme/Domain/VirtualTest.php
index dd9477d7c90ab..b7fbdb38e9b5f 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Theme/Domain/VirtualTest.php
+++ b/dev/tests/unit/testsuite/Magento/Theme/Model/Theme/Domain/VirtualTest.php
@@ -7,21 +7,21 @@
/**
* Test theme virtual model
*/
-namespace Magento\Core\Model\Theme\Domain;
+namespace Magento\Theme\Model\Theme\Domain;
class VirtualTest extends \PHPUnit_Framework_TestCase
{
/**
* Test get existing staging theme
*
- * @covers \Magento\Core\Model\Theme\Domain\Virtual::getStagingTheme
+ * @covers \Magento\Theme\Model\Theme\Domain\Virtual::getStagingTheme
*/
public function testGetStagingThemeExisting()
{
- $themeStaging = $this->getMock('Magento\Core\Model\Theme', [], [], '', false, false);
+ $themeStaging = $this->getMock('Magento\Theme\Model\Theme', [], [], '', false, false);
$theme = $this->getMock(
- 'Magento\Core\Model\Theme',
+ 'Magento\Theme\Model\Theme',
['__wakeup', 'getStagingVersion'],
[],
'',
@@ -30,7 +30,7 @@ public function testGetStagingThemeExisting()
);
$theme->expects($this->once())->method('getStagingVersion')->will($this->returnValue($themeStaging));
- $themeFactory = $this->getMock('Magento\Core\Model\ThemeFactory', ['create'], [], '', false);
+ $themeFactory = $this->getMock('Magento\Theme\Model\ThemeFactory', ['create'], [], '', false);
$themeFactory->expects($this->never())->method('create');
$themeCopyService = $this->getMock('Magento\Theme\Model\CopyService', ['copy'], [], '', false);
@@ -38,7 +38,7 @@ public function testGetStagingThemeExisting()
$customizationConfig = $this->getMock('Magento\Theme\Model\Config\Customization', [], [], '', false);
- $object = new \Magento\Core\Model\Theme\Domain\Virtual(
+ $object = new \Magento\Theme\Model\Theme\Domain\Virtual(
$theme,
$themeFactory,
$themeCopyService,
@@ -52,12 +52,12 @@ public function testGetStagingThemeExisting()
/**
* Test creating staging theme
*
- * @covers \Magento\Core\Model\Theme\Domain\Virtual::getStagingTheme
+ * @covers \Magento\Theme\Model\Theme\Domain\Virtual::getStagingTheme
*/
public function testGetStagingThemeNew()
{
$theme = $this->getMock(
- 'Magento\Core\Model\Theme',
+ 'Magento\Theme\Model\Theme',
['__wakeup', 'getStagingVersion'],
[],
'',
@@ -67,7 +67,7 @@ public function testGetStagingThemeNew()
$theme->expects($this->once())->method('getStagingVersion')->will($this->returnValue(null));
$appState = $this->getMock('Magento\Framework\App\State', ['getAreaCode'], [], '', false);
$appState->expects($this->any())->method('getAreaCode')->will($this->returnValue('fixture_area'));
- $appStateProperty = new \ReflectionProperty('Magento\Core\Model\Theme', '_appState');
+ $appStateProperty = new \ReflectionProperty('Magento\Theme\Model\Theme', '_appState');
$appStateProperty->setAccessible(true);
/** @var $theme \Magento\Framework\Object */
$theme->setData(
@@ -82,7 +82,7 @@ public function testGetStagingThemeNew()
$appStateProperty->setValue($theme, $appState);
$themeStaging = $this->getMock(
- 'Magento\Core\Model\Theme',
+ 'Magento\Theme\Model\Theme',
['__wakeup', 'setData', 'save'],
[],
'',
@@ -106,7 +106,7 @@ public function testGetStagingThemeNew()
$appStateProperty->setValue($themeStaging, $appState);
$themeStaging->expects($this->at(1))->method('save');
- $themeFactory = $this->getMock('Magento\Core\Model\ThemeFactory', ['create'], [], '', false);
+ $themeFactory = $this->getMock('Magento\Theme\Model\ThemeFactory', ['create'], [], '', false);
$themeFactory->expects($this->once())->method('create')->will($this->returnValue($themeStaging));
$themeCopyService = $this->getMock('Magento\Theme\Model\CopyService', ['copy'], [], '', false);
@@ -114,7 +114,7 @@ public function testGetStagingThemeNew()
$customizationConfig = $this->getMock('Magento\Theme\Model\Config\Customization', [], [], '', false);
- $object = new \Magento\Core\Model\Theme\Domain\Virtual(
+ $object = new \Magento\Theme\Model\Theme\Domain\Virtual(
$theme,
$themeFactory,
$themeCopyService,
@@ -128,7 +128,7 @@ public function testGetStagingThemeNew()
/**
* Test for is assigned method
*
- * @covers \Magento\Core\Model\Theme\Domain\Virtual::isAssigned
+ * @covers \Magento\Theme\Model\Theme\Domain\Virtual::isAssigned
*/
public function testIsAssigned()
{
@@ -140,7 +140,7 @@ public function testIsAssigned()
false
);
$themeMock = $this->getMock(
- 'Magento\Core\Model\Theme',
+ 'Magento\Theme\Model\Theme',
['__wakeup', 'getCollection', 'getId'],
[],
'',
@@ -158,11 +158,11 @@ public function testIsAssigned()
);
$objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
$constructArguments = $objectManagerHelper->getConstructArguments(
- 'Magento\Core\Model\Theme\Domain\Virtual',
+ 'Magento\Theme\Model\Theme\Domain\Virtual',
['theme' => $themeMock, 'customizationConfig' => $customizationConfig]
);
- /** @var $model \Magento\Core\Model\Theme\Domain\Virtual */
- $model = $objectManagerHelper->getObject('Magento\Core\Model\Theme\Domain\Virtual', $constructArguments);
+ /** @var $model \Magento\Theme\Model\Theme\Domain\Virtual */
+ $model = $objectManagerHelper->getObject('Magento\Theme\Model\Theme\Domain\Virtual', $constructArguments);
$this->assertEquals(true, $model->isAssigned());
}
}
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Theme/Image/PathTest.php b/dev/tests/unit/testsuite/Magento/Theme/Model/Theme/Image/PathTest.php
similarity index 85%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Theme/Image/PathTest.php
rename to dev/tests/unit/testsuite/Magento/Theme/Model/Theme/Image/PathTest.php
index 0946f99a44286..b8e60645b9203 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Theme/Image/PathTest.php
+++ b/dev/tests/unit/testsuite/Magento/Theme/Model/Theme/Image/PathTest.php
@@ -9,7 +9,7 @@
/**
* Test of image path model
*/
-namespace Magento\Core\Model\Theme\Image;
+namespace Magento\Theme\Model\Theme\Image;
use Magento\Framework\App\Filesystem\DirectoryList;
use Magento\Framework\View\Design\Theme\Image\PathInterface;
@@ -17,7 +17,7 @@
class PathTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\Core\Model\Theme\Image\Path|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Theme\Model\Theme\Image\Path|\PHPUnit_Framework_MockObject_MockObject
*/
protected $model;
@@ -70,9 +70,9 @@ protected function setUp()
public function testGetPreviewImageUrl()
{
- /** @var $theme \Magento\Core\Model\Theme|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var $theme \Magento\Theme\Model\Theme|\PHPUnit_Framework_MockObject_MockObject */
$theme = $this->getMock(
- 'Magento\Core\Model\Theme',
+ 'Magento\Theme\Model\Theme',
['getPreviewImage', 'isPhysical', '__wakeup'],
[],
'',
@@ -93,9 +93,9 @@ public function testGetPreviewImagePath()
$previewImage = 'preview.jpg';
$expectedPath = 'theme/preview/preview.jpg';
- /** @var $theme \Magento\Core\Model\Theme|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var $theme \Magento\Theme\Model\Theme|\PHPUnit_Framework_MockObject_MockObject */
$theme = $this->getMock(
- 'Magento\Core\Model\Theme',
+ 'Magento\Theme\Model\Theme',
['getPreviewImage', 'isPhysical', '__wakeup'],
[],
'',
@@ -117,17 +117,17 @@ public function testGetPreviewImagePath()
}
/**
- * @covers Magento\Core\Model\Theme\Image\Path::getPreviewImageDefaultUrl
+ * @covers Magento\Theme\Model\Theme\Image\Path::getPreviewImageDefaultUrl
*/
public function testDefaultPreviewImageUrlGetter()
{
$this->_assetRepo->expects($this->once())->method('getUrl')
- ->with(\Magento\Core\Model\Theme\Image\Path::DEFAULT_PREVIEW_IMAGE);
+ ->with(\Magento\Theme\Model\Theme\Image\Path::DEFAULT_PREVIEW_IMAGE);
$this->model->getPreviewImageDefaultUrl();
}
/**
- * @covers \Magento\Core\Model\Theme\Image\Path::getImagePreviewDirectory
+ * @covers \Magento\Theme\Model\Theme\Image\Path::getImagePreviewDirectory
*/
public function testImagePreviewDirectoryGetter()
{
@@ -142,7 +142,7 @@ public function testImagePreviewDirectoryGetter()
}
/**
- * @covers \Magento\Core\Model\Theme\Image\Path::getTemporaryDirectory
+ * @covers \Magento\Theme\Model\Theme\Image\Path::getTemporaryDirectory
*/
public function testTemporaryDirectoryGetter()
{
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Theme/ResolverTest.php b/dev/tests/unit/testsuite/Magento/Theme/Model/Theme/ResolverTest.php
similarity index 93%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Theme/ResolverTest.php
rename to dev/tests/unit/testsuite/Magento/Theme/Model/Theme/ResolverTest.php
index 2fbe77ea04409..ba838b1f4449a 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Theme/ResolverTest.php
+++ b/dev/tests/unit/testsuite/Magento/Theme/Model/Theme/ResolverTest.php
@@ -3,12 +3,12 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Core\Model\Theme;
+namespace Magento\Theme\Model\Theme;
class ResolverTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\Core\Model\Theme\Resolver
+ * @var \Magento\Theme\Model\Theme\Resolver
*/
protected $model;
@@ -18,7 +18,7 @@ class ResolverTest extends \PHPUnit_Framework_TestCase
protected $designMock;
/**
- * @var \Magento\Core\Model\Resource\Theme\CollectionFactory|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Theme\Model\Resource\Theme\CollectionFactory|\PHPUnit_Framework_MockObject_MockObject
*/
protected $themeCollectionFactoryMock;
@@ -28,7 +28,7 @@ class ResolverTest extends \PHPUnit_Framework_TestCase
protected $appStateMock;
/**
- * @var \Magento\Core\Model\Resource\Theme\Collection|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Theme\Model\Resource\Theme\Collection|\PHPUnit_Framework_MockObject_MockObject
*/
protected $themeCollectionMock;
@@ -41,14 +41,14 @@ protected function setUp()
{
$this->designMock = $this->getMockForAbstractClass('Magento\Framework\View\DesignInterface');
$this->themeCollectionFactoryMock = $this->getMock(
- 'Magento\Core\Model\Resource\Theme\CollectionFactory',
+ 'Magento\Theme\Model\Resource\Theme\CollectionFactory',
['create'],
[],
'',
false
);
$this->themeCollectionMock = $this->getMock(
- 'Magento\Core\Model\Resource\Theme\Collection',
+ 'Magento\Theme\Model\Resource\Theme\Collection',
[],
[],
'',
@@ -63,7 +63,7 @@ protected function setUp()
);
$this->themeMock = $this->getMockForAbstractClass('Magento\Framework\View\Design\ThemeInterface');
- $this->model = new \Magento\Core\Model\Theme\Resolver(
+ $this->model = new \Magento\Theme\Model\Theme\Resolver(
$this->appStateMock,
$this->designMock,
$this->themeCollectionFactoryMock
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Theme/ThemeProviderTest.php b/dev/tests/unit/testsuite/Magento/Theme/Model/Theme/ThemeProviderTest.php
similarity index 72%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Theme/ThemeProviderTest.php
rename to dev/tests/unit/testsuite/Magento/Theme/Model/Theme/ThemeProviderTest.php
index 623e12653a5b1..db0083f873633 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Theme/ThemeProviderTest.php
+++ b/dev/tests/unit/testsuite/Magento/Theme/Model/Theme/ThemeProviderTest.php
@@ -3,7 +3,7 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Core\Model\Theme;
+namespace Magento\Theme\Model\Theme;
class ThemeProviderTest extends \PHPUnit_Framework_TestCase
{
@@ -11,13 +11,13 @@ public function testGetByFullPath()
{
$path = 'frontend/Magento/luma';
$collectionFactory = $this->getMock(
- 'Magento\Core\Model\Resource\Theme\CollectionFactory',
+ 'Magento\Theme\Model\Resource\Theme\CollectionFactory',
['create'],
[],
'',
false
);
- $collectionMock = $this->getMock('Magento\Core\Model\Resource\Theme\Collection', [], [], '', false);
+ $collectionMock = $this->getMock('Magento\Theme\Model\Resource\Theme\Collection', [], [], '', false);
$theme = $this->getMock('Magento\Framework\View\Design\ThemeInterface', [], [], '', false);
$collectionMock->expects(
$this->once()
@@ -29,7 +29,7 @@ public function testGetByFullPath()
$this->returnValue($theme)
);
$collectionFactory->expects($this->once())->method('create')->will($this->returnValue($collectionMock));
- $themeFactory = $this->getMock('\Magento\Core\Model\ThemeFactory', [], [], '', false);
+ $themeFactory = $this->getMock('\Magento\Theme\Model\ThemeFactory', [], [], '', false);
$themeProvider = new ThemeProvider($collectionFactory, $themeFactory);
$this->assertSame($theme, $themeProvider->getThemeByFullPath($path));
@@ -39,15 +39,15 @@ public function testGetById()
{
$themeId = 755;
$collectionFactory = $this->getMock(
- 'Magento\Core\Model\Resource\Theme\CollectionFactory',
+ 'Magento\Theme\Model\Resource\Theme\CollectionFactory',
[],
[],
'',
false
);
- $theme = $this->getMock('Magento\Core\Model\Theme', [], [], '', false);
+ $theme = $this->getMock('Magento\Theme\Model\Theme', [], [], '', false);
$theme->expects($this->once())->method('load')->with($themeId)->will($this->returnSelf());
- $themeFactory = $this->getMock('\Magento\Core\Model\ThemeFactory', ['create'], [], '', false);
+ $themeFactory = $this->getMock('\Magento\Theme\Model\ThemeFactory', ['create'], [], '', false);
$themeFactory->expects($this->once())->method('create')->will($this->returnValue($theme));
$themeProvider = new ThemeProvider($collectionFactory, $themeFactory);
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Theme/ValidationTest.php b/dev/tests/unit/testsuite/Magento/Theme/Model/Theme/ValidationTest.php
similarity index 97%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Theme/ValidationTest.php
rename to dev/tests/unit/testsuite/Magento/Theme/Model/Theme/ValidationTest.php
index 5aaea8f25c2c8..963523d7a5aa2 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Theme/ValidationTest.php
+++ b/dev/tests/unit/testsuite/Magento/Theme/Model/Theme/ValidationTest.php
@@ -7,7 +7,7 @@
/**
* Theme data validation
*/
-namespace Magento\Core\Model\Theme;
+namespace Magento\Theme\Model\Theme;
class ValidationTest extends \PHPUnit_Framework_TestCase
{
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/ThemeTest.php b/dev/tests/unit/testsuite/Magento/Theme/Model/ThemeTest.php
similarity index 81%
rename from dev/tests/unit/testsuite/Magento/Core/Model/ThemeTest.php
rename to dev/tests/unit/testsuite/Magento/Theme/Model/ThemeTest.php
index 2b979e159ae60..a8d5f6a7f068d 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/ThemeTest.php
+++ b/dev/tests/unit/testsuite/Magento/Theme/Model/ThemeTest.php
@@ -7,7 +7,7 @@
/**
* Test theme model
*/
-namespace Magento\Core\Model;
+namespace Magento\Theme\Model;
use Magento\Framework\View\Design\ThemeInterface;
use Magento\Framework\App\Filesystem\DirectoryList;
@@ -16,7 +16,7 @@
class ThemeTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\Core\Model\Theme|PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Theme\Model\Theme|PHPUnit_Framework_MockObject_MockObject
*/
protected $_model;
@@ -36,7 +36,7 @@ protected function setUp()
false
);
$resourceCollection = $this->getMock(
- 'Magento\Core\Model\Resource\Theme\Collection',
+ 'Magento\Theme\Model\Resource\Theme\Collection',
[],
[],
'',
@@ -52,7 +52,7 @@ protected function setUp()
$objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
$arguments = $objectManagerHelper->getConstructArguments(
- 'Magento\Core\Model\Theme',
+ 'Magento\Theme\Model\Theme',
[
'customizationFactory' => $customizationFactory,
'customizationConfig' => $customizationConfig,
@@ -61,7 +61,7 @@ protected function setUp()
]
);
- $this->_model = $objectManagerHelper->getObject('Magento\Core\Model\Theme', $arguments);
+ $this->_model = $objectManagerHelper->getObject('Magento\Theme\Model\Theme', $arguments);
}
protected function tearDown()
@@ -70,7 +70,7 @@ protected function tearDown()
}
/**
- * @covers \Magento\Core\Model\Theme::getThemeImage
+ * @covers \Magento\Theme\Model\Theme::getThemeImage
*/
public function testThemeImageGetter()
{
@@ -82,12 +82,12 @@ public function testThemeImageGetter()
* @dataProvider isVirtualDataProvider
* @param int $type
* @param string $isVirtual
- * @covers \Magento\Core\Model\Theme::isVirtual
+ * @covers \Magento\Theme\Model\Theme::isVirtual
*/
public function testIsVirtual($type, $isVirtual)
{
- /** @var $themeModel \Magento\Core\Model\Theme */
- $themeModel = $this->getMock('Magento\Core\Model\Theme', ['__wakeup'], [], '', false);
+ /** @var $themeModel \Magento\Theme\Model\Theme */
+ $themeModel = $this->getMock('Magento\Theme\Model\Theme', ['__wakeup'], [], '', false);
$themeModel->setType($type);
$this->assertEquals($isVirtual, $themeModel->isVirtual());
}
@@ -108,12 +108,12 @@ public function isVirtualDataProvider()
* @dataProvider isPhysicalDataProvider
* @param int $type
* @param string $isPhysical
- * @covers \Magento\Core\Model\Theme::isPhysical
+ * @covers \Magento\Theme\Model\Theme::isPhysical
*/
public function testIsPhysical($type, $isPhysical)
{
- /** @var $themeModel \Magento\Core\Model\Theme */
- $themeModel = $this->getMock('Magento\Core\Model\Theme', ['__wakeup'], [], '', false);
+ /** @var $themeModel \Magento\Theme\Model\Theme */
+ $themeModel = $this->getMock('Magento\Theme\Model\Theme', ['__wakeup'], [], '', false);
$themeModel->setType($type);
$this->assertEquals($isPhysical, $themeModel->isPhysical());
}
@@ -134,12 +134,12 @@ public function isPhysicalDataProvider()
* @dataProvider isVisibleDataProvider
* @param int $type
* @param string $isVisible
- * @covers \Magento\Core\Model\Theme::isVisible
+ * @covers \Magento\Theme\Model\Theme::isVisible
*/
public function testIsVisible($type, $isVisible)
{
- /** @var $themeModel \Magento\Core\Model\Theme */
- $themeModel = $this->getMock('Magento\Core\Model\Theme', ['__wakeup'], [], '', false);
+ /** @var $themeModel \Magento\Theme\Model\Theme */
+ $themeModel = $this->getMock('Magento\Theme\Model\Theme', ['__wakeup'], [], '', false);
$themeModel->setType($type);
$this->assertEquals($isVisible, $themeModel->isVisible());
}
@@ -162,12 +162,12 @@ public function isVisibleDataProvider()
* @dataProvider isDeletableDataProvider
* @param string $themeType
* @param bool $isDeletable
- * @covers \Magento\Core\Model\Theme::isDeletable
+ * @covers \Magento\Theme\Model\Theme::isDeletable
*/
public function testIsDeletable($themeType, $isDeletable)
{
- /** @var $themeModel \Magento\Core\Model\Theme */
- $themeModel = $this->getMock('Magento\Core\Model\Theme', ['getType', '__wakeup'], [], '', false);
+ /** @var $themeModel \Magento\Theme\Model\Theme */
+ $themeModel = $this->getMock('Magento\Theme\Model\Theme', ['getType', '__wakeup'], [], '', false);
$themeModel->expects($this->once())->method('getType')->will($this->returnValue($themeType));
$this->assertEquals($isDeletable, $themeModel->isDeletable());
}
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/View/DesignTest.php b/dev/tests/unit/testsuite/Magento/Theme/Model/View/DesignTest.php
similarity index 89%
rename from dev/tests/unit/testsuite/Magento/Core/Model/View/DesignTest.php
rename to dev/tests/unit/testsuite/Magento/Theme/Model/View/DesignTest.php
index 1d39b20dce769..1e558461a9d45 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/View/DesignTest.php
+++ b/dev/tests/unit/testsuite/Magento/Theme/Model/View/DesignTest.php
@@ -6,7 +6,7 @@
// @codingStandardsIgnoreFile
-namespace Magento\Core\Model\View;
+namespace Magento\Theme\Model\View;
class DesignTest extends \PHPUnit_Framework_TestCase
{
@@ -16,22 +16,22 @@ class DesignTest extends \PHPUnit_Framework_TestCase
private $objectManager;
/**
- * @var \Magento\Core\Model\View\Design::__construct
+ * @var \Magento\Theme\Model\View\Design::__construct
*/
private $model;
protected function setUp()
{
- $storeManager = $this->getMockForAbstractClass('\Magento\Store\Model\StoreManagerInterface');
+ $storeManager = $this->getMockForAbstractClass('\Magento\Framework\Store\StoreManagerInterface');
$flyweightThemeFactory = $this->getMock(
'\Magento\Framework\View\Design\Theme\FlyweightFactory', [], [], '', false
);
$config = $this->getMockForAbstractClass('\Magento\Framework\App\Config\ScopeConfigInterface');
- $themeFactory = $this->getMock('\Magento\Core\Model\ThemeFactory', [], [], '', false);
+ $themeFactory = $this->getMock('\Magento\Theme\Model\ThemeFactory', [], [], '', false);
$this->objectManager = $this->getMockForAbstractClass('\Magento\Framework\ObjectManagerInterface');
$state = $this->getMock('\Magento\Framework\App\State', [], [], '', false);
$themes = [];
- $this->model = new \Magento\Core\Model\View\Design(
+ $this->model = new \Magento\Theme\Model\View\Design(
$storeManager, $flyweightThemeFactory, $config, $themeFactory, $this->objectManager, $state, $themes
);
}
diff --git a/dev/tests/unit/testsuite/Magento/Translation/Model/Inline/ConfigTest.php b/dev/tests/unit/testsuite/Magento/Translation/Model/Inline/ConfigTest.php
index b3a3014567241..3f9b018dfe529 100644
--- a/dev/tests/unit/testsuite/Magento/Translation/Model/Inline/ConfigTest.php
+++ b/dev/tests/unit/testsuite/Magento/Translation/Model/Inline/ConfigTest.php
@@ -43,7 +43,7 @@ public function testIsActive()
'isSetFlag'
)->with(
$this->equalTo('dev/translate_inline/active'),
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$this->equalTo($store)
)->will(
$this->returnValue($result)
diff --git a/dev/tests/unit/testsuite/Magento/Ups/Model/CarrierTest.php b/dev/tests/unit/testsuite/Magento/Ups/Model/CarrierTest.php
index a6cb5067125c0..8b0ac477996c0 100644
--- a/dev/tests/unit/testsuite/Magento/Ups/Model/CarrierTest.php
+++ b/dev/tests/unit/testsuite/Magento/Ups/Model/CarrierTest.php
@@ -60,13 +60,13 @@ public function testGetMethodPrice(
$this->config->expects($this->any())->method('getValue')->will($this->returnValueMap([
[
$path . 'free_method',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
null,
self::FREE_METHOD_NAME,
],
[
$path . 'free_shipping_subtotal',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
null,
$freeShippingSubtotal
],
diff --git a/dev/tests/unit/testsuite/Magento/UrlRewrite/Controller/RouterTest.php b/dev/tests/unit/testsuite/Magento/UrlRewrite/Controller/RouterTest.php
index 850e12421ef6b..9d705dd2acb9f 100644
--- a/dev/tests/unit/testsuite/Magento/UrlRewrite/Controller/RouterTest.php
+++ b/dev/tests/unit/testsuite/Magento/UrlRewrite/Controller/RouterTest.php
@@ -21,7 +21,7 @@ class RouterTest extends \PHPUnit_Framework_TestCase
/** @var \Magento\Framework\UrlInterface|\PHPUnit_Framework_MockObject_MockObject */
protected $url;
- /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
protected $storeManager;
/** @var \Magento\Store\Model\Store|\PHPUnit_Framework_MockObject_MockObject */
@@ -40,7 +40,7 @@ protected function setUp()
{
$this->actionFactory = $this->getMock('Magento\Framework\App\ActionFactory', [], [], '', false);
$this->url = $this->getMock('Magento\Framework\UrlInterface');
- $this->storeManager = $this->getMock('Magento\Store\Model\StoreManagerInterface');
+ $this->storeManager = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
$this->response = $this->getMock('Magento\Framework\App\ResponseInterface', ['setRedirect', 'sendResponse']);
$this->request = $this->getMockBuilder('\Magento\Framework\App\Request\Http')
->disableOriginalConstructor()->getMock();
diff --git a/dev/tests/unit/testsuite/Magento/UrlRewrite/Model/Resource/UrlRewriteCollectionTest.php b/dev/tests/unit/testsuite/Magento/UrlRewrite/Model/Resource/UrlRewriteCollectionTest.php
index 8d0324fe4cb03..4446728a6dcfd 100644
--- a/dev/tests/unit/testsuite/Magento/UrlRewrite/Model/Resource/UrlRewriteCollectionTest.php
+++ b/dev/tests/unit/testsuite/Magento/UrlRewrite/Model/Resource/UrlRewriteCollectionTest.php
@@ -10,7 +10,7 @@
class UrlRewriteCollectionTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $storeManager;
@@ -41,7 +41,7 @@ class UrlRewriteCollectionTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->storeManager = $this->getMock('Magento\Store\Model\StoreManagerInterface');
+ $this->storeManager = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
$this->select = $this->getMock('Zend_Db_Select', ['from', 'where'], [], '', false);
$this->adapter = $this->getMock(
'Magento\Framework\DB\Adapter\Pdo\Mysql',
diff --git a/dev/tests/unit/testsuite/Magento/User/Model/UserTest.php b/dev/tests/unit/testsuite/Magento/User/Model/UserTest.php
index 4b9fa12f7394d..f099ca3793af9 100644
--- a/dev/tests/unit/testsuite/Magento/User/Model/UserTest.php
+++ b/dev/tests/unit/testsuite/Magento/User/Model/UserTest.php
@@ -37,7 +37,7 @@ class UserTest extends \PHPUnit_Framework_TestCase
/** @var \Magento\Framework\Mail\TransportInterface|\PHPUnit_Framework_MockObject_MockObject */
protected $_transportMock;
- /** @var \Magento\Store\Model\StoreManagerInterface|PHPUnit_Framework_MockObject_MockObject */
+ /** @var \Magento\Framework\Store\StoreManagerInterface|PHPUnit_Framework_MockObject_MockObject */
protected $_storeManagerMock;
/** @var \Magento\Store\Model\Store|\PHPUnit_Framework_MockObject_MockObject */
@@ -115,7 +115,7 @@ protected function setUp()
[]
)->getMock();
$this->_storeManagerMock = $this->getMockBuilder(
- '\Magento\Store\Model\StoreManagerInterface'
+ '\Magento\Framework\Store\StoreManagerInterface'
)->disableOriginalConstructor()->setMethods(
[]
)->getMock();
diff --git a/dev/tests/unit/testsuite/Magento/Webapi/Model/Soap/ServerTest.php b/dev/tests/unit/testsuite/Magento/Webapi/Model/Soap/ServerTest.php
index b6ef9b2528e98..09c1e387172c0 100644
--- a/dev/tests/unit/testsuite/Magento/Webapi/Model/Soap/ServerTest.php
+++ b/dev/tests/unit/testsuite/Magento/Webapi/Model/Soap/ServerTest.php
@@ -21,7 +21,7 @@ class ServerTest extends \PHPUnit_Framework_TestCase
/** @var \Magento\Framework\DomDocument\Factory */
protected $_domDocumentFactory;
- /** @var \Magento\Store\Model\StoreManagerInterface */
+ /** @var \Magento\Framework\Store\StoreManagerInterface */
protected $_storeManagerMock;
/** @var \Magento\Webapi\Model\Soap\Server\Factory */
diff --git a/dev/tests/unit/testsuite/Magento/Webapi/Model/Soap/Wsdl/GeneratorTest.php b/dev/tests/unit/testsuite/Magento/Webapi/Model/Soap/Wsdl/GeneratorTest.php
index af5e050ff32a4..b411c829d8a5c 100644
--- a/dev/tests/unit/testsuite/Magento/Webapi/Model/Soap/Wsdl/GeneratorTest.php
+++ b/dev/tests/unit/testsuite/Magento/Webapi/Model/Soap/Wsdl/GeneratorTest.php
@@ -24,7 +24,7 @@ class GeneratorTest extends \PHPUnit_Framework_TestCase
/** @var \Magento\Framework\Reflection\TypeProcessor|\PHPUnit_Framework_MockObject_MockObject */
protected $_typeProcessor;
- /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
protected $storeManagerMock;
protected function setUp()
@@ -73,7 +73,7 @@ protected function setUp()
);
$this->storeManagerMock = $this->getMockBuilder(
- 'Magento\Store\Model\StoreManagerInterface'
+ 'Magento\Framework\Store\StoreManagerInterface'
)->setMethods(['getStore'])->disableOriginalConstructor()->getMockForAbstractClass();
$storeMock = $this->getMockBuilder(
diff --git a/dev/tests/unit/testsuite/Magento/Weee/Model/ConfigTest.php b/dev/tests/unit/testsuite/Magento/Weee/Model/ConfigTest.php
index 4fb0f76897e0f..7510dd47d276b 100644
--- a/dev/tests/unit/testsuite/Magento/Weee/Model/ConfigTest.php
+++ b/dev/tests/unit/testsuite/Magento/Weee/Model/ConfigTest.php
@@ -25,11 +25,11 @@ public function testScopeConfigMethods($method, $path, $configValue, $expectedVa
$scopeConfigMock = $this->getMockForAbstractClass('Magento\Framework\App\Config\ScopeConfigInterface');
$scopeConfigMock->expects($this->any())
->method('getValue')
- ->with($path, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, null)
+ ->with($path, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, null)
->will($this->returnValue($configValue));
$scopeConfigMock->expects($this->any())
->method('isSetFlag')
- ->with($path, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, null)
+ ->with($path, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, null)
->will($this->returnValue($configValue));
$taxData = $this->getMock('Magento\Tax\Helper\Data', [], [], '', false);
diff --git a/dev/tests/unit/testsuite/Magento/Weee/Model/Resource/Attribute/Backend/Weee/TaxTest.php b/dev/tests/unit/testsuite/Magento/Weee/Model/Resource/Attribute/Backend/Weee/TaxTest.php
index 96cdfee93ffa5..28b5a759954ca 100644
--- a/dev/tests/unit/testsuite/Magento/Weee/Model/Resource/Attribute/Backend/Weee/TaxTest.php
+++ b/dev/tests/unit/testsuite/Magento/Weee/Model/Resource/Attribute/Backend/Weee/TaxTest.php
@@ -29,7 +29,7 @@ class TaxTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->storeManagerMock = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
+ $this->storeManagerMock = $this->getMock('\Magento\Framework\Store\StoreManagerInterface');
$this->adapterMock = $this->getMock('\Magento\Framework\DB\Adapter\AdapterInterface');
$this->resourceMock = $this->getMock('\Magento\Framework\App\Resource', [], [], '', false);
diff --git a/dev/tests/unit/testsuite/Magento/Wishlist/Block/Rss/LinkTest.php b/dev/tests/unit/testsuite/Magento/Wishlist/Block/Rss/LinkTest.php
index 67388b2fb66f3..ba6faf6d36d36 100644
--- a/dev/tests/unit/testsuite/Magento/Wishlist/Block/Rss/LinkTest.php
+++ b/dev/tests/unit/testsuite/Magento/Wishlist/Block/Rss/LinkTest.php
@@ -89,7 +89,7 @@ public function testIsRssAllowed()
$this->scopeConfig
->expects($this->atLeastOnce())
->method('isSetFlag')
- ->with('rss/wishlist/active', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
+ ->with('rss/wishlist/active', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)
->will($this->returnValue(true));
$this->assertEquals(true, $this->link->isRssAllowed());
}
diff --git a/dev/tests/unit/testsuite/Magento/Wishlist/Helper/DataTest.php b/dev/tests/unit/testsuite/Magento/Wishlist/Helper/DataTest.php
index 5d897050d4478..b1359573e41c2 100644
--- a/dev/tests/unit/testsuite/Magento/Wishlist/Helper/DataTest.php
+++ b/dev/tests/unit/testsuite/Magento/Wishlist/Helper/DataTest.php
@@ -49,7 +49,7 @@ public function setUp()
->with('wishlist/index/cart', ['item' => '%item%', 'uenc' => $encoded])
->will($this->returnValue($this->url));
- $storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
+ $storeManager = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
->disableOriginalConstructor()
->getMock();
$storeManager->expects($this->any())
diff --git a/dev/tests/unit/testsuite/Magento/Wishlist/Model/ItemTest.php b/dev/tests/unit/testsuite/Magento/Wishlist/Model/ItemTest.php
index d9a1114eafb60..976eb06aa7335 100644
--- a/dev/tests/unit/testsuite/Magento/Wishlist/Model/ItemTest.php
+++ b/dev/tests/unit/testsuite/Magento/Wishlist/Model/ItemTest.php
@@ -37,7 +37,7 @@ class ItemTest extends \PHPUnit_Framework_TestCase
protected $collection;
/**
- * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $storeManager;
@@ -74,7 +74,7 @@ public function setUp()
$this->registry = $this->getMockBuilder('Magento\Framework\Registry')
->disableOriginalConstructor()
->getMock();
- $this->storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
+ $this->storeManager = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
->getMock();
$this->date = $this->getMockBuilder('Magento\Framework\Stdlib\DateTime\DateTime')
->disableOriginalConstructor()
diff --git a/dev/tests/unit/testsuite/Magento/Wishlist/Model/Rss/WishlistTest.php b/dev/tests/unit/testsuite/Magento/Wishlist/Model/Rss/WishlistTest.php
index 5ab6017080d67..570a389149c06 100644
--- a/dev/tests/unit/testsuite/Magento/Wishlist/Model/Rss/WishlistTest.php
+++ b/dev/tests/unit/testsuite/Magento/Wishlist/Model/Rss/WishlistTest.php
@@ -161,13 +161,13 @@ public function testGetRssData()
[
[
'advanced/modules_disable_output/Magento_Rss',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
null,
null,
],
[
\Magento\Core\Helper\Data::XML_PATH_DEFAULT_LOCALE,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
null,
$locale
],
@@ -286,7 +286,7 @@ protected function processWishlistItemDescription($wishlistModelMock, $staticArg
public function testIsAllowed()
{
$this->scopeConfig->expects($this->once())->method('getValue')
- ->with('rss/wishlist/active', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
+ ->with('rss/wishlist/active', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)
->will($this->returnValue(true));
$this->assertTrue($this->model->isAllowed());
}
diff --git a/dev/tests/unit/testsuite/Magento/Wishlist/Model/WishlistTest.php b/dev/tests/unit/testsuite/Magento/Wishlist/Model/WishlistTest.php
index 70cc8df9a6c7f..dd9617c941202 100644
--- a/dev/tests/unit/testsuite/Magento/Wishlist/Model/WishlistTest.php
+++ b/dev/tests/unit/testsuite/Magento/Wishlist/Model/WishlistTest.php
@@ -36,7 +36,7 @@ class WishlistTest extends \PHPUnit_Framework_TestCase
protected $collection;
/**
- * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $storeManager;
@@ -108,7 +108,7 @@ public function setUp()
$this->collection = $this->getMockBuilder('Magento\Wishlist\Model\Resource\Wishlist\Collection')
->disableOriginalConstructor()
->getMock();
- $this->storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
+ $this->storeManager = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
->getMock();
$this->date = $this->getMockBuilder('Magento\Framework\Stdlib\DateTime\DateTime')
->disableOriginalConstructor()
diff --git a/app/code/Magento/Core/Model/EntityFactory.php b/lib/internal/Magento/Framework/Data/Collection/EntityFactory.php
similarity index 90%
rename from app/code/Magento/Core/Model/EntityFactory.php
rename to lib/internal/Magento/Framework/Data/Collection/EntityFactory.php
index a29554f3609d0..3341e32d209d0 100644
--- a/app/code/Magento/Core/Model/EntityFactory.php
+++ b/lib/internal/Magento/Framework/Data/Collection/EntityFactory.php
@@ -3,9 +3,9 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Core\Model;
+namespace Magento\Framework\Data\Collection;
-class EntityFactory implements \Magento\Framework\Data\Collection\EntityFactoryInterface
+class EntityFactory implements EntityFactoryInterface
{
/**
* Object Manager instance
diff --git a/app/code/Magento/Core/Model/Factory.php b/lib/internal/Magento/Framework/Data/Collection/ModelFactory.php
similarity index 94%
rename from app/code/Magento/Core/Model/Factory.php
rename to lib/internal/Magento/Framework/Data/Collection/ModelFactory.php
index 187e56d296853..d0be2cbf6ac30 100644
--- a/app/code/Magento/Core/Model/Factory.php
+++ b/lib/internal/Magento/Framework/Data/Collection/ModelFactory.php
@@ -3,12 +3,12 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Core\Model;
+namespace Magento\Framework\Data\Collection;
/**
* Model object factory
*/
-class Factory
+class ModelFactory
{
/**
* @var \Magento\Framework\ObjectManagerInterface
diff --git a/app/code/Magento/Store/Model/ScopeInterface.php b/lib/internal/Magento/Framework/Store/ScopeInterface.php
similarity index 91%
rename from app/code/Magento/Store/Model/ScopeInterface.php
rename to lib/internal/Magento/Framework/Store/ScopeInterface.php
index 4699d335e8996..0f1cfc677ff6a 100644
--- a/app/code/Magento/Store/Model/ScopeInterface.php
+++ b/lib/internal/Magento/Framework/Store/ScopeInterface.php
@@ -3,7 +3,7 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Store\Model;
+namespace Magento\Framework\Store;
interface ScopeInterface
{
diff --git a/app/code/Magento/Store/Model/StoreManagerInterface.php b/lib/internal/Magento/Framework/Store/StoreManagerInterface.php
similarity index 98%
rename from app/code/Magento/Store/Model/StoreManagerInterface.php
rename to lib/internal/Magento/Framework/Store/StoreManagerInterface.php
index e0f9be67a13a9..44ea779d287f6 100644
--- a/app/code/Magento/Store/Model/StoreManagerInterface.php
+++ b/lib/internal/Magento/Framework/Store/StoreManagerInterface.php
@@ -4,7 +4,7 @@
* See COPYING.txt for license details.
*/
-namespace Magento\Store\Model;
+namespace Magento\Framework\Store;
interface StoreManagerInterface
{
diff --git a/app/code/Magento/Core/Model/Url/RouteParamsResolver.php b/lib/internal/Magento/Framework/Url/RouteParamsResolver.php
similarity index 93%
rename from app/code/Magento/Core/Model/Url/RouteParamsResolver.php
rename to lib/internal/Magento/Framework/Url/RouteParamsResolver.php
index 3cabde3cc42c9..7952aad49013f 100644
--- a/app/code/Magento/Core/Model/Url/RouteParamsResolver.php
+++ b/lib/internal/Magento/Framework/Url/RouteParamsResolver.php
@@ -6,7 +6,7 @@
// @codingStandardsIgnoreFile
-namespace Magento\Core\Model\Url;
+namespace Magento\Framework\Url;
class RouteParamsResolver extends \Magento\Framework\Object implements \Magento\Framework\Url\RouteParamsResolverInterface
{
@@ -21,7 +21,7 @@ class RouteParamsResolver extends \Magento\Framework\Object implements \Magento\
protected $_scopeConfig;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -33,14 +33,14 @@ class RouteParamsResolver extends \Magento\Framework\Object implements \Magento\
/**
* @param \Magento\Framework\App\RequestInterface $request
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\Url\QueryParamsResolverInterface $queryParamsResolver
* @param array $data
*/
public function __construct(
\Magento\Framework\App\RequestInterface $request,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\Url\QueryParamsResolverInterface $queryParamsResolver,
array $data = []
) {
@@ -115,7 +115,7 @@ public function setRouteParams(array $data, $unsetOldParams = true)
$store = $this->getScope() ?: $this->_storeManager->getStore();
if (!$this->_scopeConfig->getValue(
\Magento\Store\Model\Store::XML_PATH_STORE_IN_URL,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
$this->getScope()
) && !$this->_storeManager->hasSingleStore()
) {
diff --git a/app/code/Magento/Core/Model/Url/ScopeResolver.php b/lib/internal/Magento/Framework/Url/ScopeResolver.php
similarity index 78%
rename from app/code/Magento/Core/Model/Url/ScopeResolver.php
rename to lib/internal/Magento/Framework/Url/ScopeResolver.php
index 40532dd71a8bd..2a452d8db19f9 100644
--- a/app/code/Magento/Core/Model/Url/ScopeResolver.php
+++ b/lib/internal/Magento/Framework/Url/ScopeResolver.php
@@ -3,12 +3,12 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Core\Model\Url;
+namespace Magento\Framework\Url;
class ScopeResolver implements \Magento\Framework\Url\ScopeResolverInterface
{
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -18,10 +18,10 @@ class ScopeResolver implements \Magento\Framework\Url\ScopeResolverInterface
protected $_areaCode;
/**
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param string|null $areaCode
*/
- public function __construct(\Magento\Store\Model\StoreManagerInterface $storeManager, $areaCode = null)
+ public function __construct(\Magento\Framework\Store\StoreManagerInterface $storeManager, $areaCode = null)
{
$this->_storeManager = $storeManager;
$this->_areaCode = $areaCode;
diff --git a/app/code/Magento/Core/Model/Url/SecurityInfo.php b/lib/internal/Magento/Framework/Url/SecurityInfo.php
similarity index 94%
rename from app/code/Magento/Core/Model/Url/SecurityInfo.php
rename to lib/internal/Magento/Framework/Url/SecurityInfo.php
index 9f75c4fc2e4a3..873da1c701ca8 100644
--- a/app/code/Magento/Core/Model/Url/SecurityInfo.php
+++ b/lib/internal/Magento/Framework/Url/SecurityInfo.php
@@ -5,7 +5,7 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Core\Model\Url;
+namespace Magento\Framework\Url;
class SecurityInfo implements \Magento\Framework\Url\SecurityInfoInterface
{
@@ -50,7 +50,7 @@ public function isSecure($url)
{
if (!$this->_scopeConfig->getValue(
\Magento\Store\Model\Store::XML_PATH_SECURE_IN_FRONTEND,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)
) {
return false;
diff --git a/lib/internal/Magento/Framework/View/Design/Theme/Image/PathInterface.php b/lib/internal/Magento/Framework/View/Design/Theme/Image/PathInterface.php
index cea416393f16c..93652bf125d38 100644
--- a/lib/internal/Magento/Framework/View/Design/Theme/Image/PathInterface.php
+++ b/lib/internal/Magento/Framework/View/Design/Theme/Image/PathInterface.php
@@ -28,7 +28,7 @@ public function getPreviewImageUrl(ThemeInterface $theme);
/**
* Get path to preview image
*
- * @param \Magento\Core\Model\Theme|ThemeInterface $theme
+ * @param ThemeInterface $theme
* @return string
*/
public function getPreviewImagePath(ThemeInterface $theme);
diff --git a/lib/internal/Magento/Framework/View/Element/AbstractBlock.php b/lib/internal/Magento/Framework/View/Element/AbstractBlock.php
index 73f90325de211..a19115c41dc33 100644
--- a/lib/internal/Magento/Framework/View/Element/AbstractBlock.php
+++ b/lib/internal/Magento/Framework/View/Element/AbstractBlock.php
@@ -622,7 +622,7 @@ public function toHtml()
$this->_eventManager->dispatch('view_block_abstract_to_html_before', ['block' => $this]);
if ($this->_scopeConfig->getValue(
'advanced/modules_disable_output/' . $this->getModuleName(),
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)) {
return '';
}
diff --git a/lib/internal/Magento/Framework/View/Element/Html/Calendar.php b/lib/internal/Magento/Framework/View/Element/Html/Calendar.php
index b9b7b2e4a7dfc..5eecfa73b8621 100644
--- a/lib/internal/Magento/Framework/View/Element/Html/Calendar.php
+++ b/lib/internal/Magento/Framework/View/Element/Html/Calendar.php
@@ -97,7 +97,7 @@ protected function _toHtml()
'firstDay',
(int)$this->_scopeConfig->getValue(
'general/locale/firstday',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)
);
$this->assign(
@@ -105,7 +105,7 @@ protected function _toHtml()
$this->encoder->encode(
(string)$this->_scopeConfig->getValue(
'general/locale/weekend',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
)
)
);
diff --git a/lib/internal/Magento/Framework/View/Element/Template.php b/lib/internal/Magento/Framework/View/Element/Template.php
index fef0c88223d34..5941b61352e9d 100644
--- a/lib/internal/Magento/Framework/View/Element/Template.php
+++ b/lib/internal/Magento/Framework/View/Element/Template.php
@@ -79,7 +79,7 @@ class Template extends AbstractBlock
/**
* Store manager
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -322,7 +322,7 @@ protected function isAllowSymlinks()
if (null === $this->_allowSymlinks) {
$this->_allowSymlinks = $this->_scopeConfig->isSetFlag(
self::XML_PATH_TEMPLATE_ALLOW_SYMLINK,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
}
return $this->_allowSymlinks;
diff --git a/lib/internal/Magento/Framework/View/Element/Template/Context.php b/lib/internal/Magento/Framework/View/Element/Template/Context.php
index fab3a911e20a9..f57017f504f3d 100644
--- a/lib/internal/Magento/Framework/View/Element/Template/Context.php
+++ b/lib/internal/Magento/Framework/View/Element/Template/Context.php
@@ -52,7 +52,7 @@ class Context extends \Magento\Framework\View\Element\Context
/**
* Store manager
*
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var \Magento\Framework\Store\StoreManagerInterface
*/
protected $_storeManager;
@@ -84,7 +84,7 @@ class Context extends \Magento\Framework\View\Element\Context
* @param \Magento\Framework\View\FileSystem $viewFileSystem
* @param \Magento\Framework\View\TemplateEnginePool $enginePool
* @param \Magento\Framework\App\State $appState
- * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\View\Page\Config $pageConfig
*
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
@@ -112,7 +112,7 @@ public function __construct(
\Magento\Framework\View\FileSystem $viewFileSystem,
\Magento\Framework\View\TemplateEnginePool $enginePool,
\Magento\Framework\App\State $appState,
- \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\View\Page\Config $pageConfig
) {
parent::__construct(
@@ -198,7 +198,7 @@ public function getAppState()
/**
* Get store manager
*
- * @return \Magento\Store\Model\StoreManagerInterface
+ * @return \Magento\Framework\Store\StoreManagerInterface
*/
public function getStoreManager()
{
diff --git a/lib/internal/Magento/Framework/View/Page/Config.php b/lib/internal/Magento/Framework/View/Page/Config.php
index 9fe5599d6a992..56a903e20994c 100644
--- a/lib/internal/Magento/Framework/View/Page/Config.php
+++ b/lib/internal/Magento/Framework/View/Page/Config.php
@@ -234,7 +234,7 @@ public function getMediaType()
if (empty($this->metadata['media_type'])) {
$this->metadata['media_type'] = $this->scopeConfig->getValue(
'design/head/default_media_type',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
}
return $this->metadata['media_type'];
@@ -260,7 +260,7 @@ public function getCharset()
if (empty($this->metadata['charset'])) {
$this->metadata['charset'] = $this->scopeConfig->getValue(
'design/head/default_charset',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
}
return $this->metadata['charset'];
@@ -286,7 +286,7 @@ public function getDescription()
if (empty($this->metadata['description'])) {
$this->metadata['description'] = $this->scopeConfig->getValue(
'design/head/default_description',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
}
return $this->metadata['description'];
@@ -312,7 +312,7 @@ public function getKeywords()
if (empty($this->metadata['keywords'])) {
$this->metadata['keywords'] = $this->scopeConfig->getValue(
'design/head/default_keywords',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
}
return $this->metadata['keywords'];
@@ -338,7 +338,7 @@ public function getRobots()
if (empty($this->metadata['robots'])) {
$this->metadata['robots'] = $this->scopeConfig->getValue(
'design/search_engine_robots/default_robots',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
}
return $this->metadata['robots'];
@@ -516,7 +516,7 @@ public function getIncludes()
if (empty($this->includes)) {
$this->includes = $this->scopeConfig->getValue(
'design/head/includes',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
}
return $this->includes;
diff --git a/lib/internal/Magento/Framework/View/Page/Title.php b/lib/internal/Magento/Framework/View/Page/Title.php
index 05540c3607b3f..07a6210ec5307 100644
--- a/lib/internal/Magento/Framework/View/Page/Title.php
+++ b/lib/internal/Magento/Framework/View/Page/Title.php
@@ -92,10 +92,10 @@ protected function addConfigValues($title)
{
$preparedTitle = $this->scopeConfig->getValue(
'design/head/title_prefix',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
) . ' ' . $title . ' ' . $this->scopeConfig->getValue(
'design/head/title_suffix',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
return trim($preparedTitle);
}
@@ -109,7 +109,7 @@ public function getDefault()
{
$defaultTitle = $this->scopeConfig->getValue(
'design/head/default_title',
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
);
return $this->addConfigValues($defaultTitle);
}
diff --git a/app/code/Magento/Core/Model/View/Url/Config.php b/lib/internal/Magento/Framework/View/Url/Config.php
similarity index 83%
rename from app/code/Magento/Core/Model/View/Url/Config.php
rename to lib/internal/Magento/Framework/View/Url/Config.php
index 7b6d0f53eeabf..64d8fa73d1961 100644
--- a/app/code/Magento/Core/Model/View/Url/Config.php
+++ b/lib/internal/Magento/Framework/View/Url/Config.php
@@ -3,7 +3,7 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Core\Model\View\Url;
+namespace Magento\Framework\View\Url;
class Config implements \Magento\Framework\View\Url\ConfigInterface
{
@@ -30,6 +30,6 @@ public function __construct(\Magento\Framework\App\Config\ScopeConfigInterface $
*/
public function getValue($path)
{
- return $this->_scopeConfig->getValue($path, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+ return $this->_scopeConfig->getValue($path, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
}
}