Skip to content

Commit ad734d7

Browse files
author
Dale Sikkema
committed
MAGETWO-33609: resolve merge conflict
 - rename StoreManager to avoid merge conflict
1 parent 18f28d2 commit ad734d7

File tree

493 files changed

+1129
-1129
lines changed

Some content is hidden

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

493 files changed

+1129
-1129
lines changed

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

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

2525
/**
26-
* @var \Magento\Framework\Store\StoreManagerInterface
26+
* @var \Magento\Store\Model\StoreManagerInterface
2727
*/
2828
protected $_storeManager;
2929

@@ -34,13 +34,13 @@ class Baseurl implements \Magento\Framework\Notification\MessageInterface
3434

3535
/**
3636
* @param \Magento\Framework\App\Config\ScopeConfigInterface $config
37-
* @param \Magento\Framework\Store\StoreManagerInterface $storeManager
37+
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
3838
* @param \Magento\Framework\UrlInterface $urlBuilder
3939
* @param \Magento\Framework\App\Config\ValueFactory $configValueFactory
4040
*/
4141
public function __construct(
4242
\Magento\Framework\App\Config\ScopeConfigInterface $config,
43-
\Magento\Framework\Store\StoreManagerInterface $storeManager,
43+
\Magento\Store\Model\StoreManagerInterface $storeManager,
4444
\Magento\Framework\UrlInterface $urlBuilder,
4545
\Magento\Framework\App\Config\ValueFactory $configValueFactory
4646
) {

‎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\Framework\Store\StoreManagerInterface $storeManager
69+
* @param \Magento\Store\Model\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\Framework\Store\StoreManagerInterface $storeManager,
102+
\Magento\Store\Model\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\Framework\Store\StoreManagerInterface
146+
* @return \Magento\Store\Model\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\Framework\Store\StoreManagerInterface $storeManager
52+
* @param \Magento\Store\Model\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\Framework\Store\StoreManagerInterface $storeManager,
87+
\Magento\Store\Model\StoreManagerInterface $storeManager,
8888
\Magento\Framework\View\Page\Config $pageConfig,
8989
\Magento\Framework\AuthorizationInterface $authorization,
9090
\Magento\Backend\Model\Session $backendSession,

‎app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class Currency extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstra
3030
/**
3131
* Application object
3232
*
33-
* @var \Magento\Framework\Store\StoreManagerInterface
33+
* @var \Magento\Store\Model\StoreManagerInterface
3434
*/
3535
protected $_storeManager;
3636

@@ -51,15 +51,15 @@ class Currency extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstra
5151

5252
/**
5353
* @param \Magento\Backend\Block\Context $context
54-
* @param \Magento\Framework\Store\StoreManagerInterface $storeManager
54+
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
5555
* @param \Magento\Directory\Model\Currency\DefaultLocator $currencyLocator
5656
* @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
5757
* @param \Magento\Framework\Locale\CurrencyInterface $localeCurrency
5858
* @param array $data
5959
*/
6060
public function __construct(
6161
\Magento\Backend\Block\Context $context,
62-
\Magento\Framework\Store\StoreManagerInterface $storeManager,
62+
\Magento\Store\Model\StoreManagerInterface $storeManager,
6363
\Magento\Directory\Model\Currency\DefaultLocator $currencyLocator,
6464
\Magento\Directory\Model\CurrencyFactory $currencyFactory,
6565
\Magento\Framework\Locale\CurrencyInterface $localeCurrency,

‎app/code/Magento/Backend/Helper/Dashboard/Data.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,18 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
2828
const INSTALL_DATE = 'install/date';
2929

3030
/**
31-
* @var \Magento\Framework\Store\StoreManagerInterface
31+
* @var \Magento\Store\Model\StoreManagerInterface
3232
*/
3333
private $_storeManager;
3434

3535
/**
3636
* @param \Magento\Framework\App\Helper\Context $context
37-
* @param \Magento\Framework\Store\StoreManagerInterface $storeManager
37+
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
3838
* @param DeploymentConfig $deploymentConfig
3939
*/
4040
public function __construct(
4141
\Magento\Framework\App\Helper\Context $context,
42-
\Magento\Framework\Store\StoreManagerInterface $storeManager,
42+
\Magento\Store\Model\StoreManagerInterface $storeManager,
4343
DeploymentConfig $deploymentConfig
4444
) {
4545
parent::__construct(

‎app/code/Magento/Backend/Helper/Dashboard/Order.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class Order extends \Magento\Backend\Helper\Dashboard\AbstractDashboard
1717

1818
/**
1919
* @param \Magento\Framework\App\Helper\Context $context
20-
* @param \Magento\Framework\Store\StoreManagerInterface $storeManager
20+
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
2121
* @param \Magento\Reports\Model\Resource\Order\Collection $orderCollection
2222
*/
2323
public function __construct(

‎app/code/Magento/Backend/Model/Config.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ class Config extends \Magento\Framework\Object
7171
protected $_configValueFactory;
7272

7373
/**
74-
* @var \Magento\Framework\Store\StoreManagerInterface
74+
* @var \Magento\Store\Model\StoreManagerInterface
7575
*/
7676
protected $_storeManager;
7777

@@ -82,7 +82,7 @@ class Config extends \Magento\Framework\Object
8282
* @param \Magento\Framework\DB\TransactionFactory $transactionFactory
8383
* @param \Magento\Backend\Model\Config\Loader $configLoader
8484
* @param \Magento\Framework\App\Config\ValueFactory $configValueFactory
85-
* @param \Magento\Framework\Store\StoreManagerInterface $storeManager
85+
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
8686
* @param array $data
8787
*/
8888
public function __construct(
@@ -92,7 +92,7 @@ public function __construct(
9292
\Magento\Framework\DB\TransactionFactory $transactionFactory,
9393
\Magento\Backend\Model\Config\Loader $configLoader,
9494
\Magento\Framework\App\Config\ValueFactory $configValueFactory,
95-
\Magento\Framework\Store\StoreManagerInterface $storeManager,
95+
\Magento\Store\Model\StoreManagerInterface $storeManager,
9696
array $data = []
9797
) {
9898
parent::__construct($data);

‎app/code/Magento/Backend/Model/Config/Backend/Admin/Observer.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class Observer
3232
protected $_response;
3333

3434
/**
35-
* @var \Magento\Framework\Store\StoreManagerInterface
35+
* @var \Magento\Store\Model\StoreManagerInterface
3636
*/
3737
protected $_storeManager;
3838

@@ -48,7 +48,7 @@ public function __construct(
4848
\Magento\Framework\Registry $coreRegistry,
4949
\Magento\Backend\Model\Auth\Session $authSession,
5050
\Magento\Framework\App\ResponseInterface $response,
51-
\Magento\Framework\Store\StoreManagerInterface $storeManager
51+
\Magento\Store\Model\StoreManagerInterface $storeManager
5252
) {
5353
$this->_backendData = $backendData;
5454
$this->_coreRegistry = $coreRegistry;

‎app/code/Magento/Backend/Model/Config/Source/Website.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ class Website implements \Magento\Framework\Option\ArrayInterface
1313
protected $_options;
1414

1515
/**
16-
* @var \Magento\Framework\Store\StoreManagerInterface
16+
* @var \Magento\Store\Model\StoreManagerInterface
1717
*/
1818
protected $_storeManager;
1919

2020
/**
21-
* @param \Magento\Framework\Store\StoreManagerInterface $storeManager
21+
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
2222
*/
23-
public function __construct(\Magento\Framework\Store\StoreManagerInterface $storeManager)
23+
public function __construct(\Magento\Store\Model\StoreManagerInterface $storeManager)
2424
{
2525
$this->_storeManager = $storeManager;
2626
}

‎app/code/Magento/Backend/Model/Config/Structure/AbstractElement.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ abstract class AbstractElement implements ElementInterface
2626
/**
2727
* Store manager
2828
*
29-
* @var \Magento\Framework\Store\StoreManagerInterface
29+
* @var \Magento\Store\Model\StoreManagerInterface
3030
*/
3131
protected $_storeManager;
3232

3333
/**
34-
* @param \Magento\Framework\Store\StoreManagerInterface $storeManager
34+
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
3535
*/
3636
public function __construct(StoreManagerInterface $storeManager)
3737
{

0 commit comments

Comments
 (0)