Skip to content

Commit 619c2c7

Browse files
guz-antonguz-anton
committed
Merge branch 'develop' into MAGETWO-33687
Conflicts: app/code/Magento/Translation/view/adminhtml/templates/translate_inline.phtml app/code/Magento/Translation/view/frontend/templates/translate_inline.phtml
2 parents bdb9a88 + 765f195 commit 619c2c7

File tree

1,185 files changed

+4591
-3897
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,185 files changed

+4591
-3897
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
@@ -21,7 +21,7 @@ class Baseurl implements \Magento\Framework\Notification\MessageInterface
2121
protected $_config;
2222

2323
/**
24-
* @var \Magento\Framework\Store\StoreManagerInterface
24+
* @var \Magento\Store\Model\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\Framework\Store\StoreManagerInterface $storeManager
35+
* @param \Magento\Store\Model\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\Framework\Store\StoreManagerInterface $storeManager,
41+
\Magento\Store\Model\StoreManagerInterface $storeManager,
4242
\Magento\Framework\UrlInterface $urlBuilder,
4343
\Magento\Framework\App\Config\ValueFactory $configValueFactory
4444
) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public function getIdentity()
6969
public function isDisplayed()
7070
{
7171
return $this->_authorization->isAllowed(
72-
'Magento_Adminhtml::cache'
72+
'Magento_Backend::cache'
7373
) && count(
7474
$this->_getCacheTypesForRefresh()
7575
) > 0;

‎app/code/Magento/AdminNotification/etc/acl.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
99
<acl>
1010
<resources>
11-
<resource id="Magento_Adminhtml::admin">
12-
<resource id="Magento_Adminhtml::system">
13-
<resource id="Magento_Adminhtml::system_other_settings">
11+
<resource id="Magento_Backend::admin">
12+
<resource id="Magento_Backend::system">
13+
<resource id="Magento_Backend::system_other_settings">
1414
<resource id="Magento_AdminNotification::adminnotification" title="Notifications" sortOrder="10">
1515
<resource id="Magento_AdminNotification::show_toolbar" title="Show Toolbar" sortOrder="10" />
1616
<resource id="Magento_AdminNotification::show_list" title="Show List" sortOrder="20" />

‎app/code/Magento/AdminNotification/etc/adminhtml/routes.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/App/etc/routes.xsd">
99
<router id="admin">
1010
<route id="adminhtml">
11-
<module name="Magento_AdminNotification" before="Magento_Adminhtml" />
11+
<module name="Magento_AdminNotification" before="Magento_Backend" />
1212
</route>
1313
</router>
1414
</config>

‎app/code/Magento/AdminNotification/view/adminhtml/layout/default.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
99
<head>
10-
<css src="Magento_Core::prototype/magento.css"/>
10+
<css src="Magento_Theme::prototype/magento.css"/>
1111
</head>
1212
<body>
1313
<referenceContainer name="notifications">

‎app/code/Magento/Authorization/data/authorization_setup/data-install-2.0.0.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@
4747
$this->createRules()->setData(
4848
[
4949
'role_id' => $admGroupRole->getId(),
50-
'resource_id' => 'Magento_Adminhtml::all',
50+
'resource_id' => 'Magento_Backend::all',
5151
'privileges' => null,
5252
'permission' => 'allow',
5353
]
5454
)->save();
5555
} else {
5656
/** @var \Magento\Authorization\Model\Rules $rule */
5757
foreach ($rulesCollection as $rule) {
58-
$rule->setData('resource_id', 'Magento_Adminhtml::all')->save();
58+
$rule->setData('resource_id', 'Magento_Backend::all')->save();
5959
}
6060
}

‎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\Framework\Store\StoreManagerInterface $storeManager
56+
* @param \Magento\Store\Model\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\Framework\Store\StoreManagerInterface $storeManager,
73+
\Magento\Store\Model\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\Framework\Store\ScopeInterface::SCOPE_STORE)) {
34+
if ($this->_scopeConfig->getValue(self::XML_PATH_ENABLE_CHARTS, \Magento\Store\Model\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\Framework\Store\ScopeInterface::SCOPE_STORE
213+
\Magento\Store\Model\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\Framework\Store\ScopeInterface::SCOPE_STORE);
83+
return $this->_scopeConfig->getValue('web/browser_capabilities/javascript', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
8484
}
8585
}

0 commit comments

Comments
 (0)