Skip to content

Commit 1107bdd

Browse files
author
Alexander Paliarush
committed
MAGETWO-32354: Move Magento\Core\Model\Url\RouteParamsResolver.php to Framework
- Moved Magento\Store\Model\Store\ScopeInterface to Magento\Framework\Store\ScopeInterface to avoid dependencies on application from the lib
1 parent 19780e2 commit 1107bdd

File tree

388 files changed

+903
-896
lines changed

Some content is hidden

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

388 files changed

+903
-896
lines changed

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

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

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

31-
if ($this->_scopeConfig->getValue(self::XML_PATH_ENABLE_CHARTS, \Magento\Store\Model\ScopeInterface::SCOPE_STORE)) {
31+
if ($this->_scopeConfig->getValue(self::XML_PATH_ENABLE_CHARTS, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)) {
3232
$block = $this->getLayout()->createBlock('Magento\Backend\Block\Dashboard\Diagrams');
3333
} else {
3434
$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
@@ -206,7 +206,7 @@ public function getChartUrl($directUrl = true)
206206

207207
$timezoneLocal = $this->_scopeConfig->getValue(
208208
$this->_localeDate->getDefaultTimezonePath(),
209-
\Magento\Store\Model\ScopeInterface::SCOPE_STORE
209+
\Magento\Framework\Store\ScopeInterface::SCOPE_STORE
210210
);
211211

212212
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
@@ -77,6 +77,6 @@ public function getLogoutLink()
7777
*/
7878
public function displayNoscriptNotice()
7979
{
80-
return $this->_scopeConfig->getValue('web/browser_capabilities/javascript', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
80+
return $this->_scopeConfig->getValue('web/browser_capabilities/javascript', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
8181
}
8282
}

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

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

2626
/**
@@ -30,6 +30,6 @@ public function displayNoscriptNotice()
3030
*/
3131
public function displayDemoNotice()
3232
{
33-
return $this->_scopeConfig->getValue('design/head/demonotice', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
33+
return $this->_scopeConfig->getValue('design/head/demonotice', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
3434
}
3535
}

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/Widget/Grid/Column/Filter/Date.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ protected function _convertDate($date, $locale)
200200
$dateObj->setTimezone(
201201
$this->_scopeConfig->getValue(
202202
$this->_localeDate->getDefaultTimezonePath(),
203-
\Magento\Store\Model\ScopeInterface::SCOPE_STORE
203+
\Magento\Framework\Store\ScopeInterface::SCOPE_STORE
204204
)
205205
);
206206

app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public function getValue($index = null)
4141
$datetimeTo->setTimezone(
4242
$this->_scopeConfig->getValue(
4343
$this->_localeDate->getDefaultTimezonePath(),
44-
\Magento\Store\Model\ScopeInterface::SCOPE_STORE
44+
\Magento\Framework\Store\ScopeInterface::SCOPE_STORE
4545
)
4646
);
4747
$datetimeTo->addDay(1)->subSecond(1);
@@ -67,7 +67,7 @@ protected function _convertDate($date, $locale)
6767
$dateObj->setTimezone(
6868
$this->_scopeConfig->getValue(
6969
$this->_localeDate->getDefaultTimezonePath(),
70-
\Magento\Store\Model\ScopeInterface::SCOPE_STORE
70+
\Magento\Framework\Store\ScopeInterface::SCOPE_STORE
7171
)
7272
);
7373

app/code/Magento/Backend/Model/Config/Backend/Currency/AbstractCurrency.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ protected function _getInstalledCurrencies()
7777
',',
7878
$this->_scopeConfig->getValue(
7979
'system/currency/installed',
80-
\Magento\Store\Model\ScopeInterface::SCOPE_STORE
80+
\Magento\Framework\Store\ScopeInterface::SCOPE_STORE
8181
)
8282
);
8383
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,14 +95,14 @@ public function afterSave()
9595
$scopeName = __('Default scope');
9696
break;
9797

98-
case \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE:
98+
case \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE:
9999
/** @var $website \Magento\Store\Model\Website */
100100
$website = $this->_websiteFactory->create();
101101
$websiteName = $website->load($data->getScopeId())->getName();
102102
$scopeName = __('website(%1) scope', $websiteName);
103103
break;
104104

105-
case \Magento\Store\Model\ScopeInterface::SCOPE_STORE:
105+
case \Magento\Framework\Store\ScopeInterface::SCOPE_STORE:
106106
/** @var $store \Magento\Store\Model\Store */
107107
$store = $this->_storeFactory->create();
108108
$storeName = $store->load($data->getScopeId())->getName();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public function afterSave()
4646
$this->_mutableConfig->setValue(
4747
\Magento\Store\Model\Store::XML_PATH_STORE_IN_URL,
4848
$this->getValue(),
49-
\Magento\Store\Model\ScopeInterface::SCOPE_STORE
49+
\Magento\Framework\Store\ScopeInterface::SCOPE_STORE
5050
);
5151
$this->_cacheManager->clean();
5252
}

0 commit comments

Comments
 (0)