Skip to content

Commit 5f9c32d

Browse files
author
Maxim Medinskiy
committed
MAGETWO-33076: Prepare pull request
- fixed merge conflicts
2 parents aad74ae + f52e5db commit 5f9c32d

File tree

1,233 files changed

+4350
-3768
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,233 files changed

+4350
-3768
lines changed

‎app/code/Magento/AdminNotification/Model/Resource/System/Message/Collection.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
2222
protected $_countBySeverity = [];
2323

2424
/**
25-
* @param \Magento\Core\Model\EntityFactory $entityFactory
25+
* @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
2626
* @param \Psr\Log\LoggerInterface $logger
2727
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
2828
* @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -31,7 +31,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
3131
* @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource
3232
*/
3333
public function __construct(
34-
\Magento\Core\Model\EntityFactory $entityFactory,
34+
\Magento\Framework\Data\Collection\EntityFactory $entityFactory,
3535
\Psr\Log\LoggerInterface $logger,
3636
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
3737
\Magento\Framework\Event\ManagerInterface $eventManager,

‎app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class Baseurl implements \Magento\Framework\Notification\MessageInterface
2121
protected $_config;
2222

2323
/**
24-
* @var \Magento\Store\Model\StoreManagerInterface
24+
* @var \Magento\Framework\Store\StoreManagerInterface
2525
*/
2626
protected $_storeManager;
2727

@@ -32,13 +32,13 @@ class Baseurl implements \Magento\Framework\Notification\MessageInterface
3232

3333
/**
3434
* @param \Magento\Framework\App\Config\ScopeConfigInterface $config
35-
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
35+
* @param \Magento\Framework\Store\StoreManagerInterface $storeManager
3636
* @param \Magento\Framework\UrlInterface $urlBuilder
3737
* @param \Magento\Framework\App\Config\ValueFactory $configValueFactory
3838
*/
3939
public function __construct(
4040
\Magento\Framework\App\Config\ScopeConfigInterface $config,
41-
\Magento\Store\Model\StoreManagerInterface $storeManager,
41+
\Magento\Framework\Store\StoreManagerInterface $storeManager,
4242
\Magento\Framework\UrlInterface $urlBuilder,
4343
\Magento\Framework\App\Config\ValueFactory $configValueFactory
4444
) {

‎app/code/Magento/Backend/App/Router.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class Router extends \Magento\Core\App\Router\Base
5353
* @param \Magento\Framework\App\ResponseFactory $responseFactory
5454
* @param \Magento\Framework\App\Route\ConfigInterface $routeConfig
5555
* @param \Magento\Framework\UrlInterface $url
56-
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
56+
* @param \Magento\Framework\Store\StoreManagerInterface $storeManager
5757
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
5858
* @param \Magento\Framework\Url\SecurityInfoInterface $urlSecurityInfo
5959
* @param string $routerId
@@ -70,7 +70,7 @@ public function __construct(
7070
\Magento\Framework\App\ResponseFactory $responseFactory,
7171
\Magento\Framework\App\Route\ConfigInterface $routeConfig,
7272
\Magento\Framework\UrlInterface $url,
73-
\Magento\Store\Model\StoreManagerInterface $storeManager,
73+
\Magento\Framework\Store\StoreManagerInterface $storeManager,
7474
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
7575
\Magento\Framework\Url\SecurityInfoInterface $urlSecurityInfo,
7676
$routerId,

‎app/code/Magento/Backend/Block/Dashboard.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ protected function _prepareLayout()
3131

3232
$this->addChild('sales', 'Magento\Backend\Block\Dashboard\Sales');
3333

34-
if ($this->_scopeConfig->getValue(self::XML_PATH_ENABLE_CHARTS, \Magento\Store\Model\ScopeInterface::SCOPE_STORE)) {
34+
if ($this->_scopeConfig->getValue(self::XML_PATH_ENABLE_CHARTS, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)) {
3535
$block = $this->getLayout()->createBlock('Magento\Backend\Block\Dashboard\Diagrams');
3636
} else {
3737
$block = $this->getLayout()->createBlock(

‎app/code/Magento/Backend/Block/Dashboard/Graph.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ public function getChartUrl($directUrl = true)
210210

211211
$timezoneLocal = $this->_scopeConfig->getValue(
212212
$this->_localeDate->getDefaultTimezonePath(),
213-
\Magento\Store\Model\ScopeInterface::SCOPE_STORE
213+
\Magento\Framework\Store\ScopeInterface::SCOPE_STORE
214214
);
215215

216216
list($dateStart, $dateEnd) = $this->_collectionFactory->create()->getDateRange(

‎app/code/Magento/Backend/Block/Page/Header.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,6 @@ public function getLogoutLink()
8080
*/
8181
public function displayNoscriptNotice()
8282
{
83-
return $this->_scopeConfig->getValue('web/browser_capabilities/javascript', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
83+
return $this->_scopeConfig->getValue('web/browser_capabilities/javascript', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
8484
}
8585
}

‎app/code/Magento/Backend/Block/Page/Notices.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class Notices extends \Magento\Backend\Block\Template
2222
*/
2323
public function displayNoscriptNotice()
2424
{
25-
return $this->_scopeConfig->getValue('web/browser_capabilities/javascript', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
25+
return $this->_scopeConfig->getValue('web/browser_capabilities/javascript', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
2626
}
2727

2828
/**
@@ -32,6 +32,6 @@ public function displayNoscriptNotice()
3232
*/
3333
public function displayDemoNotice()
3434
{
35-
return $this->_scopeConfig->getValue('design/head/demonotice', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
35+
return $this->_scopeConfig->getValue('design/head/demonotice', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
3636
}
3737
}

‎app/code/Magento/Backend/Block/Template.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public function isOutputEnabled($moduleName = null)
7979

8080
return !$this->_scopeConfig->isSetFlag(
8181
'advanced/modules_disable_output/' . $moduleName,
82-
\Magento\Store\Model\ScopeInterface::SCOPE_STORE
82+
\Magento\Framework\Store\ScopeInterface::SCOPE_STORE
8383
);
8484
}
8585

‎app/code/Magento/Backend/Block/Template/Context.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ class Context extends \Magento\Framework\View\Element\Template\Context
6666
* @param \Magento\Framework\View\FileSystem $viewFileSystem
6767
* @param \Magento\Framework\View\TemplateEnginePool $enginePool
6868
* @param \Magento\Framework\App\State $appState
69-
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
69+
* @param \Magento\Framework\Store\StoreManagerInterface $storeManager
7070
* @param \Magento\Framework\View\Page\Config $pageConfig
7171
* @param \Magento\Framework\AuthorizationInterface $authorization
7272
* @param \Magento\Backend\Model\Session $backendSession
@@ -99,7 +99,7 @@ public function __construct(
9999
\Magento\Framework\View\FileSystem $viewFileSystem,
100100
\Magento\Framework\View\TemplateEnginePool $enginePool,
101101
\Magento\Framework\App\State $appState,
102-
\Magento\Store\Model\StoreManagerInterface $storeManager,
102+
\Magento\Framework\Store\StoreManagerInterface $storeManager,
103103
\Magento\Framework\View\Page\Config $pageConfig,
104104
\Magento\Framework\AuthorizationInterface $authorization,
105105
\Magento\Backend\Model\Session $backendSession,
@@ -143,7 +143,7 @@ public function __construct(
143143
/**
144144
* Get store manager
145145
*
146-
* @return \Magento\Store\Model\StoreManagerInterface
146+
* @return \Magento\Framework\Store\StoreManagerInterface
147147
*/
148148
public function getStoreManager()
149149
{

‎app/code/Magento/Backend/Block/Widget/Context.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class Context extends \Magento\Backend\Block\Template\Context
4949
* @param \Magento\Framework\View\FileSystem $viewFileSystem
5050
* @param \Magento\Framework\View\TemplateEnginePool $enginePool
5151
* @param \Magento\Framework\App\State $appState
52-
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
52+
* @param \Magento\Framework\Store\StoreManagerInterface $storeManager
5353
* @param \Magento\Framework\AuthorizationInterface $authorization
5454
* @param \Magento\Backend\Model\Session $backendSession
5555
* @param \Magento\Framework\Math\Random $mathRandom
@@ -84,7 +84,7 @@ public function __construct(
8484
\Magento\Framework\View\FileSystem $viewFileSystem,
8585
\Magento\Framework\View\TemplateEnginePool $enginePool,
8686
\Magento\Framework\App\State $appState,
87-
\Magento\Store\Model\StoreManagerInterface $storeManager,
87+
\Magento\Framework\Store\StoreManagerInterface $storeManager,
8888
\Magento\Framework\View\Page\Config $pageConfig,
8989
\Magento\Framework\AuthorizationInterface $authorization,
9090
\Magento\Backend\Model\Session $backendSession,

0 commit comments

Comments
 (0)