diff --git a/app/code/Magento/AdminNotification/Model/System/Message/CacheOutdated.php b/app/code/Magento/AdminNotification/Model/System/Message/CacheOutdated.php index 26287c1db12fc..016508fef7d78 100644 --- a/app/code/Magento/AdminNotification/Model/System/Message/CacheOutdated.php +++ b/app/code/Magento/AdminNotification/Model/System/Message/CacheOutdated.php @@ -69,7 +69,7 @@ public function getIdentity() public function isDisplayed() { return $this->_authorization->isAllowed( - 'Magento_Adminhtml::cache' + 'Magento_Backend::cache' ) && count( $this->_getCacheTypesForRefresh() ) > 0; diff --git a/app/code/Magento/AdminNotification/etc/acl.xml b/app/code/Magento/AdminNotification/etc/acl.xml index cd908639d98c9..01ae3b6da6fbb 100644 --- a/app/code/Magento/AdminNotification/etc/acl.xml +++ b/app/code/Magento/AdminNotification/etc/acl.xml @@ -8,9 +8,9 @@ - - - + + + diff --git a/app/code/Magento/AdminNotification/etc/adminhtml/routes.xml b/app/code/Magento/AdminNotification/etc/adminhtml/routes.xml index 712232289da96..19c3fc2200c66 100644 --- a/app/code/Magento/AdminNotification/etc/adminhtml/routes.xml +++ b/app/code/Magento/AdminNotification/etc/adminhtml/routes.xml @@ -8,7 +8,7 @@ - + diff --git a/app/code/Magento/Authorization/data/authorization_setup/data-install-2.0.0.php b/app/code/Magento/Authorization/data/authorization_setup/data-install-2.0.0.php index 1e2f7b53f31a6..cfc55b8747621 100644 --- a/app/code/Magento/Authorization/data/authorization_setup/data-install-2.0.0.php +++ b/app/code/Magento/Authorization/data/authorization_setup/data-install-2.0.0.php @@ -47,7 +47,7 @@ $this->createRules()->setData( [ 'role_id' => $admGroupRole->getId(), - 'resource_id' => 'Magento_Adminhtml::all', + 'resource_id' => 'Magento_Backend::all', 'privileges' => null, 'permission' => 'allow', ] @@ -55,6 +55,6 @@ } else { /** @var \Magento\Authorization\Model\Rules $rule */ foreach ($rulesCollection as $rule) { - $rule->setData('resource_id', 'Magento_Adminhtml::all')->save(); + $rule->setData('resource_id', 'Magento_Backend::all')->save(); } } diff --git a/app/code/Magento/Backend/Block/System/Config/Form/Fieldset/Modules/DisableOutput.php b/app/code/Magento/Backend/Block/System/Config/Form/Fieldset/Modules/DisableOutput.php index 5a345204f462a..54b2695b8624e 100644 --- a/app/code/Magento/Backend/Block/System/Config/Form/Fieldset/Modules/DisableOutput.php +++ b/app/code/Magento/Backend/Block/System/Config/Form/Fieldset/Modules/DisableOutput.php @@ -69,7 +69,7 @@ public function render(\Magento\Framework\Data\Form\Element\AbstractElement $ele sort($modules); foreach ($modules as $moduleName) { - if ($moduleName === 'Magento_Adminhtml' || $moduleName === 'Magento_Backend') { + if ($moduleName === 'Magento_Backend') { continue; } $html .= $this->_getFieldHtml($element, $moduleName); diff --git a/app/code/Magento/Backend/Block/System/Store/Store.php b/app/code/Magento/Backend/Block/System/Store/Store.php index 21d35b35aad2c..5a984389aedc7 100644 --- a/app/code/Magento/Backend/Block/System/Store/Store.php +++ b/app/code/Magento/Backend/Block/System/Store/Store.php @@ -15,7 +15,7 @@ class Store extends \Magento\Backend\Block\Widget\Grid\Container /** * @var string */ - protected $_blockGroup = 'Magento_Adminhtml'; + protected $_blockGroup = 'Magento_Backend'; /** * @return void diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache.php index b3f9c969d7295..6d7cd7a7c9926 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Cache.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache.php @@ -85,6 +85,6 @@ protected function _validateTypes(array $types) */ protected function _isAllowed() { - return $this->_authorization->isAllowed('Magento_Adminhtml::cache'); + return $this->_authorization->isAllowed('Magento_Backend::cache'); } } diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard.php b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard.php index 9d8a1fcddd094..a4c41fde49a92 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard.php @@ -18,6 +18,6 @@ class Dashboard extends \Magento\Backend\App\Action */ protected function _isAllowed() { - return $this->_authorization->isAllowed('Magento_Adminhtml::dashboard'); + return $this->_authorization->isAllowed('Magento_Backend::dashboard'); } } diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Index/GlobalSearch.php b/app/code/Magento/Backend/Controller/Adminhtml/Index/GlobalSearch.php index 1d003b0a130c4..c0017958a0bc8 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Index/GlobalSearch.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Index/GlobalSearch.php @@ -44,7 +44,7 @@ public function execute() { $items = []; - if (!$this->_authorization->isAllowed('Magento_Adminhtml::global_search')) { + if (!$this->_authorization->isAllowed('Magento_Backend::global_search')) { $items[] = [ 'id' => 'error', 'type' => __('Error'), diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System.php b/app/code/Magento/Backend/Controller/Adminhtml/System.php index 7eaa017356909..5ce34283afccf 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/System.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/System.php @@ -19,6 +19,6 @@ class System extends AbstractAction */ protected function _isAllowed() { - return $this->_authorization->isAllowed('Magento_Adminhtml::system'); + return $this->_authorization->isAllowed('Magento_Backend::system'); } } diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/AbstractConfig.php b/app/code/Magento/Backend/Controller/Adminhtml/System/AbstractConfig.php index 9345cb672d8da..aeb025007f6b5 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/System/AbstractConfig.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/System/AbstractConfig.php @@ -58,7 +58,7 @@ public function dispatch(\Magento\Framework\App\RequestInterface $request) protected function _isAllowed() { $sectionId = $this->_request->getParam('section'); - return $this->_authorization->isAllowed('Magento_Adminhtml::config') + return $this->_authorization->isAllowed('Magento_Backend::config') || $this->_configStructure->getElement($sectionId)->isAllowed(); } diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Account.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Account.php index 62bbfe91fee20..166951742d8f3 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/System/Account.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Account.php @@ -19,6 +19,6 @@ class Account extends Action */ protected function _isAllowed() { - return $this->_authorization->isAllowed('Magento_Adminhtml::myaccount'); + return $this->_authorization->isAllowed('Magento_Backend::myaccount'); } } diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Design.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Design.php index 8fae2b6ed7ef3..66e2b5739f615 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/System/Design.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Design.php @@ -73,6 +73,6 @@ public function __construct( */ protected function _isAllowed() { - return $this->_authorization->isAllowed('Magento_Adminhtml::design'); + return $this->_authorization->isAllowed('Magento_Backend::design'); } } diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Index.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Index.php index bf6a5d36a52d1..4af63776d2482 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/System/Index.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Index.php @@ -32,7 +32,7 @@ public function execute() { /** @var \Magento\Backend\Model\View\Result\Page $resultPage */ $resultPage = $this->resultPageFactory->create(); - $resultPage->setActiveMenu('Magento_Adminhtml::system'); + $resultPage->setActiveMenu('Magento_Backend::system'); $resultPage->addBreadcrumb(__('System'), __('System')); return $resultPage; } diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store.php index 9a9d2a4a6d620..4ed6e97af4265 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store.php @@ -90,7 +90,7 @@ protected function createPage() */ protected function _isAllowed() { - return $this->_authorization->isAllowed('Magento_Adminhtml::store'); + return $this->_authorization->isAllowed('Magento_Backend::store'); } /** diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Variable.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Variable.php index 8dd35c33673ff..f133ce599b39d 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/System/Variable.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Variable.php @@ -112,6 +112,6 @@ protected function _initVariable() */ protected function _isAllowed() { - return $this->_authorization->isAllowed('Magento_Adminhtml::variable'); + return $this->_authorization->isAllowed('Magento_Backend::variable'); } } diff --git a/app/code/Magento/Backend/etc/acl.xml b/app/code/Magento/Backend/etc/acl.xml index 016251c8c070b..b488fc8dc3376 100644 --- a/app/code/Magento/Backend/etc/acl.xml +++ b/app/code/Magento/Backend/etc/acl.xml @@ -8,51 +8,51 @@ - - - - - - - - + + + + + + + + - - - - + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - + + - - - - - + + + + + - - + + - - + + diff --git a/app/code/Magento/Backend/etc/adminhtml/menu.xml b/app/code/Magento/Backend/etc/adminhtml/menu.xml index 4a17367d3cb81..8d9fa29167bbc 100644 --- a/app/code/Magento/Backend/etc/adminhtml/menu.xml +++ b/app/code/Magento/Backend/etc/adminhtml/menu.xml @@ -7,27 +7,27 @@ --> - + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/app/code/Magento/Backend/etc/adminhtml/system.xml b/app/code/Magento/Backend/etc/adminhtml/system.xml index 6f85251da52ed..905b74e2fe544 100644 --- a/app/code/Magento/Backend/etc/adminhtml/system.xml +++ b/app/code/Magento/Backend/etc/adminhtml/system.xml @@ -19,7 +19,7 @@
advanced - Magento_Adminhtml::advanced + Magento_Backend::advanced Magento\Backend\Block\System\Config\Form\Fieldset\Modules\DisableOutput @@ -29,7 +29,7 @@ separator-top general - Magento_Adminhtml::trans_email + Magento_Backend::trans_email @@ -99,7 +99,7 @@
general - Magento_Adminhtml::config_design + Magento_Backend::config_design @@ -153,7 +153,7 @@
advanced - Magento_Adminhtml::dev + Magento_Backend::dev @@ -236,7 +236,7 @@
general - Magento_Adminhtml::config_general + Magento_Backend::config_general @@ -321,7 +321,7 @@ separator-top advanced - Magento_Adminhtml::config_system + Magento_Backend::config_system @@ -375,7 +375,7 @@
advanced - Magento_Adminhtml::config_admin + Magento_Backend::config_admin @@ -458,7 +458,7 @@
general - Magento_Adminhtml::web + Magento_Backend::web diff --git a/app/code/Magento/Backend/etc/di.xml b/app/code/Magento/Backend/etc/di.xml index 4d5f28658fb33..6521f80cb911d 100644 --- a/app/code/Magento/Backend/etc/di.xml +++ b/app/code/Magento/Backend/etc/di.xml @@ -108,7 +108,7 @@ - Magento_Adminhtml::all + Magento_Backend::all diff --git a/app/code/Magento/Backend/etc/webapi.xml b/app/code/Magento/Backend/etc/webapi.xml index 1188507e93082..8d6b69d864e59 100644 --- a/app/code/Magento/Backend/etc/webapi.xml +++ b/app/code/Magento/Backend/etc/webapi.xml @@ -10,7 +10,7 @@ - + diff --git a/app/code/Magento/Backend/view/adminhtml/layout/default.xml b/app/code/Magento/Backend/view/adminhtml/layout/default.xml index 977282aa8d3a8..67fa7c2c76c76 100644 --- a/app/code/Magento/Backend/view/adminhtml/layout/default.xml +++ b/app/code/Magento/Backend/view/adminhtml/layout/default.xml @@ -28,7 +28,7 @@ Community Edition - + user diff --git a/app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml b/app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml index 285a25ad27d31..f7635da3c5804 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml @@ -19,7 +19,7 @@ escapeHtml($block->getUser()->getUsername()); ?>
    - getAuthorization()->isAllowed('Magento_Adminhtml::myaccount')): ?> + getAuthorization()->isAllowed('Magento_Backend::myaccount')): ?>
  • getUiId('user', 'account', 'settings')?> title=""> escapeHtml($block->getUser()->getUsername()); ?>
    • diff --git a/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml b/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml index edc512b99c823..09ef80cdfa899 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml @@ -113,7 +113,7 @@ - getShowManageStoresLink() && $block->getAuthorization()->isAllowed('Magento_Adminhtml::store')): ?> + getShowManageStoresLink() && $block->getAuthorization()->isAllowed('Magento_Backend::store')): ?>
    • diff --git a/app/code/Magento/Backend/view/adminhtml/templates/system/config/switcher.phtml b/app/code/Magento/Backend/view/adminhtml/templates/system/config/switcher.phtml index dc25a1e7945f6..4cec327329db0 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/system/config/switcher.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/system/config/switcher.phtml @@ -28,7 +28,7 @@ getHintHtml() ?> - getAuthorization()->isAllowed('Magento_Adminhtml::store')): ?> + getAuthorization()->isAllowed('Magento_Backend::store')): ?>
    diff --git a/app/code/Magento/Backup/etc/acl.xml b/app/code/Magento/Backup/etc/acl.xml index 03b48f04cd91c..6b9dda6244e7d 100644 --- a/app/code/Magento/Backup/etc/acl.xml +++ b/app/code/Magento/Backup/etc/acl.xml @@ -8,9 +8,9 @@ - - - + + + diff --git a/app/code/Magento/Backup/etc/adminhtml/routes.xml b/app/code/Magento/Backup/etc/adminhtml/routes.xml index d59acc42ae494..8993bc033dc68 100644 --- a/app/code/Magento/Backup/etc/adminhtml/routes.xml +++ b/app/code/Magento/Backup/etc/adminhtml/routes.xml @@ -8,7 +8,7 @@ - + diff --git a/app/code/Magento/Bundle/etc/adminhtml/routes.xml b/app/code/Magento/Bundle/etc/adminhtml/routes.xml index be8fd1bfecb7f..ee8835be1a680 100644 --- a/app/code/Magento/Bundle/etc/adminhtml/routes.xml +++ b/app/code/Magento/Bundle/etc/adminhtml/routes.xml @@ -8,7 +8,7 @@ - + diff --git a/app/code/Magento/Catalog/etc/acl.xml b/app/code/Magento/Catalog/etc/acl.xml index 0b2c33c4242a0..f43fc32b97bb6 100644 --- a/app/code/Magento/Catalog/etc/acl.xml +++ b/app/code/Magento/Catalog/etc/acl.xml @@ -8,20 +8,20 @@ - + - - - + + + - + diff --git a/app/code/Magento/Catalog/etc/adminhtml/routes.xml b/app/code/Magento/Catalog/etc/adminhtml/routes.xml index 39679652290e4..0c690d80e4ce1 100644 --- a/app/code/Magento/Catalog/etc/adminhtml/routes.xml +++ b/app/code/Magento/Catalog/etc/adminhtml/routes.xml @@ -8,7 +8,7 @@ - + diff --git a/app/code/Magento/CatalogInventory/etc/acl.xml b/app/code/Magento/CatalogInventory/etc/acl.xml index dd120ed5a0ac2..278e6b650b55b 100644 --- a/app/code/Magento/CatalogInventory/etc/acl.xml +++ b/app/code/Magento/CatalogInventory/etc/acl.xml @@ -8,10 +8,10 @@ - - - - + + + + diff --git a/app/code/Magento/CatalogRule/etc/acl.xml b/app/code/Magento/CatalogRule/etc/acl.xml index b8de10ca8bc21..c5216b6f58560 100644 --- a/app/code/Magento/CatalogRule/etc/acl.xml +++ b/app/code/Magento/CatalogRule/etc/acl.xml @@ -8,8 +8,8 @@ - - + + diff --git a/app/code/Magento/CatalogRule/etc/adminhtml/routes.xml b/app/code/Magento/CatalogRule/etc/adminhtml/routes.xml index 550edbd358b9a..b085941c0c111 100644 --- a/app/code/Magento/CatalogRule/etc/adminhtml/routes.xml +++ b/app/code/Magento/CatalogRule/etc/adminhtml/routes.xml @@ -8,7 +8,7 @@ - + diff --git a/app/code/Magento/CatalogWidget/etc/adminhtml/routes.xml b/app/code/Magento/CatalogWidget/etc/adminhtml/routes.xml index 708f09d1f0d72..870b1cabec0be 100644 --- a/app/code/Magento/CatalogWidget/etc/adminhtml/routes.xml +++ b/app/code/Magento/CatalogWidget/etc/adminhtml/routes.xml @@ -8,7 +8,7 @@ - + diff --git a/app/code/Magento/Centinel/etc/adminhtml/routes.xml b/app/code/Magento/Centinel/etc/adminhtml/routes.xml index dd23e109265de..2ff9c2bc4715a 100644 --- a/app/code/Magento/Centinel/etc/adminhtml/routes.xml +++ b/app/code/Magento/Centinel/etc/adminhtml/routes.xml @@ -8,7 +8,7 @@ - + diff --git a/app/code/Magento/CheckoutAgreements/etc/acl.xml b/app/code/Magento/CheckoutAgreements/etc/acl.xml index 585c65a89cfc7..d3ae7b6338cbd 100644 --- a/app/code/Magento/CheckoutAgreements/etc/acl.xml +++ b/app/code/Magento/CheckoutAgreements/etc/acl.xml @@ -8,9 +8,9 @@ - - - + + + diff --git a/app/code/Magento/CheckoutAgreements/etc/adminhtml/routes.xml b/app/code/Magento/CheckoutAgreements/etc/adminhtml/routes.xml index 6bde15b5e437a..5d1ee9a70e415 100644 --- a/app/code/Magento/CheckoutAgreements/etc/adminhtml/routes.xml +++ b/app/code/Magento/CheckoutAgreements/etc/adminhtml/routes.xml @@ -8,7 +8,7 @@ - + diff --git a/app/code/Magento/Cms/etc/acl.xml b/app/code/Magento/Cms/etc/acl.xml index 84509ce0f46f8..2e6b7a2c5e208 100644 --- a/app/code/Magento/Cms/etc/acl.xml +++ b/app/code/Magento/Cms/etc/acl.xml @@ -8,9 +8,9 @@ - - - + + + @@ -19,9 +19,9 @@ - - - + + + diff --git a/app/code/Magento/Cms/etc/adminhtml/routes.xml b/app/code/Magento/Cms/etc/adminhtml/routes.xml index fbfc4ca010ef6..b0ddbbf93e31c 100644 --- a/app/code/Magento/Cms/etc/adminhtml/routes.xml +++ b/app/code/Magento/Cms/etc/adminhtml/routes.xml @@ -8,7 +8,7 @@ - + diff --git a/app/code/Magento/Contact/etc/acl.xml b/app/code/Magento/Contact/etc/acl.xml index adcb100513a93..363ab6f81ad82 100644 --- a/app/code/Magento/Contact/etc/acl.xml +++ b/app/code/Magento/Contact/etc/acl.xml @@ -8,10 +8,10 @@ - - - - + + + + diff --git a/app/code/Magento/CurrencySymbol/etc/acl.xml b/app/code/Magento/CurrencySymbol/etc/acl.xml index 60b154659bbb4..98eba2a12defc 100644 --- a/app/code/Magento/CurrencySymbol/etc/acl.xml +++ b/app/code/Magento/CurrencySymbol/etc/acl.xml @@ -8,8 +8,8 @@ - - + + diff --git a/app/code/Magento/Customer/etc/acl.xml b/app/code/Magento/Customer/etc/acl.xml index 1390534d48247..1b9e7facbefcc 100644 --- a/app/code/Magento/Customer/etc/acl.xml +++ b/app/code/Magento/Customer/etc/acl.xml @@ -8,17 +8,17 @@ - + - - - + + + - + diff --git a/app/code/Magento/DesignEditor/etc/acl.xml b/app/code/Magento/DesignEditor/etc/acl.xml index 785ba266c94d3..ac1ca9d5a54e7 100644 --- a/app/code/Magento/DesignEditor/etc/acl.xml +++ b/app/code/Magento/DesignEditor/etc/acl.xml @@ -8,9 +8,9 @@ - - - + + + diff --git a/app/code/Magento/DesignEditor/etc/adminhtml/routes.xml b/app/code/Magento/DesignEditor/etc/adminhtml/routes.xml index 6e63320b28c7e..742c284617623 100644 --- a/app/code/Magento/DesignEditor/etc/adminhtml/routes.xml +++ b/app/code/Magento/DesignEditor/etc/adminhtml/routes.xml @@ -8,7 +8,7 @@ - + diff --git a/app/code/Magento/Directory/etc/adminhtml/routes.xml b/app/code/Magento/Directory/etc/adminhtml/routes.xml index d192fd983744e..3659f78c7e838 100644 --- a/app/code/Magento/Directory/etc/adminhtml/routes.xml +++ b/app/code/Magento/Directory/etc/adminhtml/routes.xml @@ -8,7 +8,7 @@ - + diff --git a/app/code/Magento/Directory/etc/adminhtml/system.xml b/app/code/Magento/Directory/etc/adminhtml/system.xml index 251a33ec635f5..0bd0e0eb90359 100644 --- a/app/code/Magento/Directory/etc/adminhtml/system.xml +++ b/app/code/Magento/Directory/etc/adminhtml/system.xml @@ -10,7 +10,7 @@
    general - Magento_Adminhtml::currency + Magento_Backend::currency diff --git a/app/code/Magento/Downloadable/etc/acl.xml b/app/code/Magento/Downloadable/etc/acl.xml index 6ba91097d5dfc..0602ba9835628 100644 --- a/app/code/Magento/Downloadable/etc/acl.xml +++ b/app/code/Magento/Downloadable/etc/acl.xml @@ -8,10 +8,10 @@ - - - - + + + + diff --git a/app/code/Magento/Downloadable/etc/adminhtml/routes.xml b/app/code/Magento/Downloadable/etc/adminhtml/routes.xml index e52d15b879599..11aec011d1343 100644 --- a/app/code/Magento/Downloadable/etc/adminhtml/routes.xml +++ b/app/code/Magento/Downloadable/etc/adminhtml/routes.xml @@ -8,7 +8,7 @@ - + diff --git a/app/code/Magento/Email/etc/acl.xml b/app/code/Magento/Email/etc/acl.xml index c9e8fc65bda5c..43c654d5b6e23 100644 --- a/app/code/Magento/Email/etc/acl.xml +++ b/app/code/Magento/Email/etc/acl.xml @@ -8,9 +8,9 @@ - - - + + + diff --git a/app/code/Magento/Email/etc/adminhtml/routes.xml b/app/code/Magento/Email/etc/adminhtml/routes.xml index 0d88127a9e075..e09e11132fce3 100644 --- a/app/code/Magento/Email/etc/adminhtml/routes.xml +++ b/app/code/Magento/Email/etc/adminhtml/routes.xml @@ -8,7 +8,7 @@ - + diff --git a/app/code/Magento/GoogleAnalytics/etc/acl.xml b/app/code/Magento/GoogleAnalytics/etc/acl.xml index 15685bce0c57e..8263667164d50 100644 --- a/app/code/Magento/GoogleAnalytics/etc/acl.xml +++ b/app/code/Magento/GoogleAnalytics/etc/acl.xml @@ -8,10 +8,10 @@ - - - - + + + + diff --git a/app/code/Magento/GoogleShopping/etc/acl.xml b/app/code/Magento/GoogleShopping/etc/acl.xml index 263ba2cebff76..8391a7ff774cc 100644 --- a/app/code/Magento/GoogleShopping/etc/acl.xml +++ b/app/code/Magento/GoogleShopping/etc/acl.xml @@ -8,7 +8,7 @@ - + diff --git a/app/code/Magento/GoogleShopping/etc/adminhtml/routes.xml b/app/code/Magento/GoogleShopping/etc/adminhtml/routes.xml index c4c968ce5e21a..a1e9f6e6c9fda 100644 --- a/app/code/Magento/GoogleShopping/etc/adminhtml/routes.xml +++ b/app/code/Magento/GoogleShopping/etc/adminhtml/routes.xml @@ -8,7 +8,7 @@ - + diff --git a/app/code/Magento/ImportExport/etc/acl.xml b/app/code/Magento/ImportExport/etc/acl.xml index 7b2e4a03c3639..20d76086a0502 100644 --- a/app/code/Magento/ImportExport/etc/acl.xml +++ b/app/code/Magento/ImportExport/etc/acl.xml @@ -8,9 +8,9 @@ - - - + + + diff --git a/app/code/Magento/ImportExport/etc/adminhtml/routes.xml b/app/code/Magento/ImportExport/etc/adminhtml/routes.xml index da01c87a4ab24..34c4c0dfdd7da 100644 --- a/app/code/Magento/ImportExport/etc/adminhtml/routes.xml +++ b/app/code/Magento/ImportExport/etc/adminhtml/routes.xml @@ -8,7 +8,7 @@ - + diff --git a/app/code/Magento/Indexer/etc/acl.xml b/app/code/Magento/Indexer/etc/acl.xml index d072048ba0118..bc1801d89cf83 100644 --- a/app/code/Magento/Indexer/etc/acl.xml +++ b/app/code/Magento/Indexer/etc/acl.xml @@ -8,9 +8,9 @@ - - - + + + diff --git a/app/code/Magento/Integration/etc/adminhtml/routes.xml b/app/code/Magento/Integration/etc/adminhtml/routes.xml index 8713db0e27e04..6547865b6865e 100644 --- a/app/code/Magento/Integration/etc/adminhtml/routes.xml +++ b/app/code/Magento/Integration/etc/adminhtml/routes.xml @@ -8,7 +8,7 @@ - + diff --git a/app/code/Magento/Log/etc/acl.xml b/app/code/Magento/Log/etc/acl.xml index 65893d1bcc639..626a8d7d04431 100644 --- a/app/code/Magento/Log/etc/acl.xml +++ b/app/code/Magento/Log/etc/acl.xml @@ -8,7 +8,7 @@ - + diff --git a/app/code/Magento/Multishipping/etc/acl.xml b/app/code/Magento/Multishipping/etc/acl.xml index 2563dd54b9236..477af62823cba 100644 --- a/app/code/Magento/Multishipping/etc/acl.xml +++ b/app/code/Magento/Multishipping/etc/acl.xml @@ -8,10 +8,10 @@ - - - - + + + + diff --git a/app/code/Magento/Newsletter/etc/acl.xml b/app/code/Magento/Newsletter/etc/acl.xml index 333c73272cf23..05e452828724a 100644 --- a/app/code/Magento/Newsletter/etc/acl.xml +++ b/app/code/Magento/Newsletter/etc/acl.xml @@ -8,9 +8,9 @@ - - - + + + @@ -21,9 +21,9 @@ - - - + + + diff --git a/app/code/Magento/PageCache/etc/adminhtml/routes.xml b/app/code/Magento/PageCache/etc/adminhtml/routes.xml index 3479efeeaaec5..384b2f4df3a43 100644 --- a/app/code/Magento/PageCache/etc/adminhtml/routes.xml +++ b/app/code/Magento/PageCache/etc/adminhtml/routes.xml @@ -8,7 +8,7 @@ - + diff --git a/app/code/Magento/Payment/etc/acl.xml b/app/code/Magento/Payment/etc/acl.xml index 36d1497d07035..3f3e5dd65fc12 100644 --- a/app/code/Magento/Payment/etc/acl.xml +++ b/app/code/Magento/Payment/etc/acl.xml @@ -8,10 +8,10 @@ - - - - + + + + diff --git a/app/code/Magento/Persistent/etc/acl.xml b/app/code/Magento/Persistent/etc/acl.xml index 37a1d36736278..cf8102fcb3ff4 100644 --- a/app/code/Magento/Persistent/etc/acl.xml +++ b/app/code/Magento/Persistent/etc/acl.xml @@ -8,10 +8,10 @@ - - - - + + + + diff --git a/app/code/Magento/Reports/etc/acl.xml b/app/code/Magento/Reports/etc/acl.xml index 04576d0b1cea0..8d159bc4ea74e 100644 --- a/app/code/Magento/Reports/etc/acl.xml +++ b/app/code/Magento/Reports/etc/acl.xml @@ -8,7 +8,7 @@ - + @@ -45,9 +45,9 @@ - - - + + + diff --git a/app/code/Magento/Review/etc/acl.xml b/app/code/Magento/Review/etc/acl.xml index c4ccbf934a13f..cee078f9e9bac 100644 --- a/app/code/Magento/Review/etc/acl.xml +++ b/app/code/Magento/Review/etc/acl.xml @@ -8,14 +8,14 @@ - - - + + + - - + + diff --git a/app/code/Magento/Rss/etc/acl.xml b/app/code/Magento/Rss/etc/acl.xml index f95f1a905057f..db722e153bb2e 100644 --- a/app/code/Magento/Rss/etc/acl.xml +++ b/app/code/Magento/Rss/etc/acl.xml @@ -8,10 +8,10 @@ - - - - + + + + diff --git a/app/code/Magento/Rss/etc/adminhtml/routes.xml b/app/code/Magento/Rss/etc/adminhtml/routes.xml index 3e3eec5048e4d..ccb2f2ebc18e0 100644 --- a/app/code/Magento/Rss/etc/adminhtml/routes.xml +++ b/app/code/Magento/Rss/etc/adminhtml/routes.xml @@ -8,7 +8,7 @@ - + diff --git a/app/code/Magento/Sales/etc/acl.xml b/app/code/Magento/Sales/etc/acl.xml index dc3657bebc27f..9d1911d695cbc 100644 --- a/app/code/Magento/Sales/etc/acl.xml +++ b/app/code/Magento/Sales/etc/acl.xml @@ -8,7 +8,7 @@ - + @@ -38,10 +38,10 @@ - - + + - + diff --git a/app/code/Magento/Sales/etc/adminhtml/routes.xml b/app/code/Magento/Sales/etc/adminhtml/routes.xml index b7c900daea3a4..8e9b6be88593d 100644 --- a/app/code/Magento/Sales/etc/adminhtml/routes.xml +++ b/app/code/Magento/Sales/etc/adminhtml/routes.xml @@ -8,7 +8,7 @@ - + diff --git a/app/code/Magento/SalesRule/etc/acl.xml b/app/code/Magento/SalesRule/etc/acl.xml index eae627c320854..af385c56d4cba 100644 --- a/app/code/Magento/SalesRule/etc/acl.xml +++ b/app/code/Magento/SalesRule/etc/acl.xml @@ -8,15 +8,15 @@ - - + + - - - + + + diff --git a/app/code/Magento/SalesRule/etc/adminhtml/routes.xml b/app/code/Magento/SalesRule/etc/adminhtml/routes.xml index daf9ef1b8586c..6de4f577cd2d9 100644 --- a/app/code/Magento/SalesRule/etc/adminhtml/routes.xml +++ b/app/code/Magento/SalesRule/etc/adminhtml/routes.xml @@ -8,7 +8,7 @@ - + diff --git a/app/code/Magento/Search/etc/acl.xml b/app/code/Magento/Search/etc/acl.xml index 176d259a61afd..6280c716af0a3 100644 --- a/app/code/Magento/Search/etc/acl.xml +++ b/app/code/Magento/Search/etc/acl.xml @@ -8,9 +8,9 @@ - - - + + + diff --git a/app/code/Magento/Search/etc/adminhtml/routes.xml b/app/code/Magento/Search/etc/adminhtml/routes.xml index 2a7f9cd6312e8..bdeee326f35c5 100644 --- a/app/code/Magento/Search/etc/adminhtml/routes.xml +++ b/app/code/Magento/Search/etc/adminhtml/routes.xml @@ -8,7 +8,7 @@ - + \ No newline at end of file diff --git a/app/code/Magento/Sendfriend/etc/adminhtml/system.xml b/app/code/Magento/Sendfriend/etc/adminhtml/system.xml index 5d86402c57b1a..5b59675f2aff5 100644 --- a/app/code/Magento/Sendfriend/etc/adminhtml/system.xml +++ b/app/code/Magento/Sendfriend/etc/adminhtml/system.xml @@ -10,7 +10,7 @@
    catalog - Magento_Adminhtml::sendfriend + Magento_Backend::sendfriend diff --git a/app/code/Magento/Shipping/etc/acl.xml b/app/code/Magento/Shipping/etc/acl.xml index 688f440c72ff2..33ba4f281af93 100644 --- a/app/code/Magento/Shipping/etc/acl.xml +++ b/app/code/Magento/Shipping/etc/acl.xml @@ -8,10 +8,10 @@ - - - - + + + + diff --git a/app/code/Magento/Shipping/etc/adminhtml/routes.xml b/app/code/Magento/Shipping/etc/adminhtml/routes.xml index 3386f25e42796..84ec0473a9dd4 100644 --- a/app/code/Magento/Shipping/etc/adminhtml/routes.xml +++ b/app/code/Magento/Shipping/etc/adminhtml/routes.xml @@ -8,7 +8,7 @@ - + diff --git a/app/code/Magento/Sitemap/etc/acl.xml b/app/code/Magento/Sitemap/etc/acl.xml index a56ca7b98979d..f1435275d08de 100644 --- a/app/code/Magento/Sitemap/etc/acl.xml +++ b/app/code/Magento/Sitemap/etc/acl.xml @@ -8,15 +8,15 @@ - - - + + + - - - + + + diff --git a/app/code/Magento/Sitemap/etc/adminhtml/routes.xml b/app/code/Magento/Sitemap/etc/adminhtml/routes.xml index e1184e5afa519..1ed9664209599 100644 --- a/app/code/Magento/Sitemap/etc/adminhtml/routes.xml +++ b/app/code/Magento/Sitemap/etc/adminhtml/routes.xml @@ -8,7 +8,7 @@ - + diff --git a/app/code/Magento/Tax/etc/acl.xml b/app/code/Magento/Tax/etc/acl.xml index cb6de9574885e..e84396889f4dc 100644 --- a/app/code/Magento/Tax/etc/acl.xml +++ b/app/code/Magento/Tax/etc/acl.xml @@ -8,11 +8,11 @@ - - + + - - + + diff --git a/app/code/Magento/TaxImportExport/etc/acl.xml b/app/code/Magento/TaxImportExport/etc/acl.xml index a5edf66dac851..6a5ea83cbcb19 100644 --- a/app/code/Magento/TaxImportExport/etc/acl.xml +++ b/app/code/Magento/TaxImportExport/etc/acl.xml @@ -8,9 +8,9 @@ - - - + + + diff --git a/app/code/Magento/Theme/etc/acl.xml b/app/code/Magento/Theme/etc/acl.xml index eea2ab2debd56..d2f3368a23312 100644 --- a/app/code/Magento/Theme/etc/acl.xml +++ b/app/code/Magento/Theme/etc/acl.xml @@ -8,9 +8,9 @@ - - - + + + diff --git a/app/code/Magento/Ui/etc/adminhtml/routes.xml b/app/code/Magento/Ui/etc/adminhtml/routes.xml index b8709c0996f4c..5bf72e1b3a1f6 100644 --- a/app/code/Magento/Ui/etc/adminhtml/routes.xml +++ b/app/code/Magento/Ui/etc/adminhtml/routes.xml @@ -8,7 +8,7 @@ - + diff --git a/app/code/Magento/UrlRewrite/etc/adminhtml/acl.xml b/app/code/Magento/UrlRewrite/etc/adminhtml/acl.xml index 8ca263630f4e9..89c9f80c44cdd 100644 --- a/app/code/Magento/UrlRewrite/etc/adminhtml/acl.xml +++ b/app/code/Magento/UrlRewrite/etc/adminhtml/acl.xml @@ -8,9 +8,9 @@ - - - + + + diff --git a/app/code/Magento/UrlRewrite/etc/adminhtml/routes.xml b/app/code/Magento/UrlRewrite/etc/adminhtml/routes.xml index 87715c984cd7e..848ef0869d9e8 100644 --- a/app/code/Magento/UrlRewrite/etc/adminhtml/routes.xml +++ b/app/code/Magento/UrlRewrite/etc/adminhtml/routes.xml @@ -8,7 +8,7 @@ - + diff --git a/app/code/Magento/User/etc/acl.xml b/app/code/Magento/User/etc/acl.xml index 2d30e0c2670ee..502b706e13856 100644 --- a/app/code/Magento/User/etc/acl.xml +++ b/app/code/Magento/User/etc/acl.xml @@ -8,8 +8,8 @@ - - + + diff --git a/app/code/Magento/Webapi/Block/Adminhtml/Integration/Activate/Permissions/Tab/Webapi.php b/app/code/Magento/Webapi/Block/Adminhtml/Integration/Activate/Permissions/Tab/Webapi.php index b6e3b1fe2913d..5c4d8056bc398 100644 --- a/app/code/Magento/Webapi/Block/Adminhtml/Integration/Activate/Permissions/Tab/Webapi.php +++ b/app/code/Magento/Webapi/Block/Adminhtml/Integration/Activate/Permissions/Tab/Webapi.php @@ -68,7 +68,7 @@ public function __construct( /** * Set the selected resources, which is an array of resource ids. If everything is allowed, the - * array will contain just the root resource id, which is "Magento_Adminhtml::all". + * array will contain just the root resource id, which is "Magento_Backend::all". * * @return void */ @@ -139,7 +139,7 @@ public function getResourcesTreeJson() /** * Return an array of selected resource ids. If everything is allowed then iterate through all * available resources to generate a comprehensive array of all resource ids, rather than just - * returning "Magento_Adminhtml::all". + * returning "Magento_Backend::all". * * @return string */ diff --git a/app/code/Magento/Widget/etc/acl.xml b/app/code/Magento/Widget/etc/acl.xml index 493c0633ad436..25ca84c0203c2 100644 --- a/app/code/Magento/Widget/etc/acl.xml +++ b/app/code/Magento/Widget/etc/acl.xml @@ -8,9 +8,9 @@ - - - + + + diff --git a/app/code/Magento/Widget/etc/adminhtml/routes.xml b/app/code/Magento/Widget/etc/adminhtml/routes.xml index b250370038238..4c9134c080366 100644 --- a/app/code/Magento/Widget/etc/adminhtml/routes.xml +++ b/app/code/Magento/Widget/etc/adminhtml/routes.xml @@ -8,7 +8,7 @@ - + diff --git a/app/code/Magento/Wishlist/etc/acl.xml b/app/code/Magento/Wishlist/etc/acl.xml index fa928acbe59ff..a3bf442d6da72 100644 --- a/app/code/Magento/Wishlist/etc/acl.xml +++ b/app/code/Magento/Wishlist/etc/acl.xml @@ -8,10 +8,10 @@ - - - - + + + + diff --git a/dev/tests/api-functional/_files/Magento/TestModule1/etc/acl.xml b/dev/tests/api-functional/_files/Magento/TestModule1/etc/acl.xml index 13a6a24cf6a50..848e3a8f36a28 100644 --- a/dev/tests/api-functional/_files/Magento/TestModule1/etc/acl.xml +++ b/dev/tests/api-functional/_files/Magento/TestModule1/etc/acl.xml @@ -8,7 +8,7 @@ - + diff --git a/dev/tests/api-functional/_files/Magento/TestModule2/etc/acl.xml b/dev/tests/api-functional/_files/Magento/TestModule2/etc/acl.xml index 3903f959b007c..5b34b73575eb5 100644 --- a/dev/tests/api-functional/_files/Magento/TestModule2/etc/acl.xml +++ b/dev/tests/api-functional/_files/Magento/TestModule2/etc/acl.xml @@ -8,7 +8,7 @@ - + diff --git a/dev/tests/api-functional/_files/Magento/TestModule3/etc/acl.xml b/dev/tests/api-functional/_files/Magento/TestModule3/etc/acl.xml index 214aef766e954..18b20140d5d66 100644 --- a/dev/tests/api-functional/_files/Magento/TestModule3/etc/acl.xml +++ b/dev/tests/api-functional/_files/Magento/TestModule3/etc/acl.xml @@ -8,7 +8,7 @@ - + diff --git a/dev/tests/api-functional/_files/Magento/TestModule4/etc/acl.xml b/dev/tests/api-functional/_files/Magento/TestModule4/etc/acl.xml index c9ddd19a89bf1..a33f6a119464d 100644 --- a/dev/tests/api-functional/_files/Magento/TestModule4/etc/acl.xml +++ b/dev/tests/api-functional/_files/Magento/TestModule4/etc/acl.xml @@ -8,7 +8,7 @@ - + diff --git a/dev/tests/api-functional/_files/Magento/TestModule5/etc/acl.xml b/dev/tests/api-functional/_files/Magento/TestModule5/etc/acl.xml index 55d512c6c148a..13985075d96f2 100644 --- a/dev/tests/api-functional/_files/Magento/TestModule5/etc/acl.xml +++ b/dev/tests/api-functional/_files/Magento/TestModule5/etc/acl.xml @@ -8,7 +8,7 @@ - + diff --git a/dev/tests/api-functional/_files/Magento/TestModuleMSC/etc/acl.xml b/dev/tests/api-functional/_files/Magento/TestModuleMSC/etc/acl.xml index d78741690573d..556e568f1a61c 100644 --- a/dev/tests/api-functional/_files/Magento/TestModuleMSC/etc/acl.xml +++ b/dev/tests/api-functional/_files/Magento/TestModuleMSC/etc/acl.xml @@ -8,7 +8,7 @@ - + diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/Resource.php b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/Resource.php index d9e1c4638eea0..89e81d3e7b73d 100644 --- a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/Resource.php +++ b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/Resource.php @@ -20,7 +20,7 @@ class Resource extends DataFixture * @var array */ protected $resources = [ - 'Magento_Adminhtml::dashboard' => null, + 'Magento_Backend::dashboard' => null, 'Magento_Sales::sales' => null, 'Magento_Sales::sales_operation' => 'Magento_Sales::sales', 'Magento_Sales::sales_order' => 'Magento_Sales::sales_operation', diff --git a/dev/tests/integration/testsuite/Magento/Authorization/Model/RulesTest.php b/dev/tests/integration/testsuite/Magento/Authorization/Model/RulesTest.php index 53b69bf15c0f6..cc9f6456e586c 100644 --- a/dev/tests/integration/testsuite/Magento/Authorization/Model/RulesTest.php +++ b/dev/tests/integration/testsuite/Magento/Authorization/Model/RulesTest.php @@ -29,7 +29,7 @@ public function testCRUD() { $this->_model ->setRoleType('G') - ->setResourceId('Magento_Adminhtml::all') + ->setResourceId('Magento_Backend::all') ->setPrivileges("") ->setAssertId(0) ->setRoleId(1) @@ -44,7 +44,7 @@ public function testCRUD() */ public function testInitialUserPermissions() { - $expectedDefaultPermissions = ['Magento_Adminhtml::all']; + $expectedDefaultPermissions = ['Magento_Backend::all']; $this->_checkExistingPermissions($expectedDefaultPermissions); } @@ -54,9 +54,9 @@ public function testInitialUserPermissions() */ public function testSetAllowForAllResources() { - $resources = ['Magento_Adminhtml::all']; + $resources = ['Magento_Backend::all']; $this->_model->setRoleId(1)->setResources($resources)->saveRel(); - $expectedPermissions = ['Magento_Adminhtml::all']; + $expectedPermissions = ['Magento_Backend::all']; $this->_checkExistingPermissions($expectedPermissions); } diff --git a/dev/tests/integration/testsuite/Magento/Integration/Service/V1/AuthorizationServiceTest.php b/dev/tests/integration/testsuite/Magento/Integration/Service/V1/AuthorizationServiceTest.php index 9553a4a858d2d..5f801e0110921 100644 --- a/dev/tests/integration/testsuite/Magento/Integration/Service/V1/AuthorizationServiceTest.php +++ b/dev/tests/integration/testsuite/Magento/Integration/Service/V1/AuthorizationServiceTest.php @@ -56,7 +56,7 @@ protected function setUp() public function testGrantPermissions() { $integrationId = rand(1, 1000); - $resources = ['Magento_Sales::create', 'Magento_Cms::page', 'Magento_Adminhtml::dashboard']; + $resources = ['Magento_Sales::create', 'Magento_Cms::page', 'Magento_Backend::dashboard']; /** Preconditions check */ $this->_ensurePermissionsAreNotGranted($integrationId, $resources); @@ -92,7 +92,7 @@ public function changePermissionsProvider() return [ 'integration' => [ 'integrationId' => rand(1, 1000), - 'initialResources' => ['Magento_Cms::page', 'Magento_Adminhtml::dashboard'], + 'initialResources' => ['Magento_Cms::page', 'Magento_Backend::dashboard'], 'newResources' => ['Magento_Sales::cancel', 'Magento_Cms::page_delete'], ], 'integration clear permissions' => [ @@ -110,7 +110,7 @@ public function testGrantAllPermissions() { $integrationId = rand(1, 1000); $this->_service->grantAllPermissions($integrationId); - $this->_ensurePermissionsAreGranted($integrationId, ['Magento_Adminhtml::all']); + $this->_ensurePermissionsAreGranted($integrationId, ['Magento_Backend::all']); } /** 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 520ca3b468242..75ce1ac848d62 100644 --- a/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/BlockInstantiationTest.php +++ b/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/BlockInstantiationTest.php @@ -111,7 +111,7 @@ protected function _getBlocksToSkip() private function _addBlock($module, $blockClass, $class, $templateBlocks) { $area = 'frontend'; - if ($module == 'Magento_Adminhtml' || strpos( + if ($module == 'Magento_Backend' || strpos( $blockClass, '\\Adminhtml\\' ) || strpos( 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 b5551a59d44eb..2736ba110852d 100644 --- a/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/TemplateFilesTest.php +++ b/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/TemplateFilesTest.php @@ -68,7 +68,7 @@ public function allTemplatesDataProvider() } $area = 'frontend'; - if ($module == 'Magento_Adminhtml' || strpos( + if ($module == 'Magento_Backend' || strpos( $blockClass, '\\Adminhtml\\' ) || strpos( diff --git a/dev/tests/integration/testsuite/Magento/User/Block/Role/Tab/EditTest.php b/dev/tests/integration/testsuite/Magento/User/Block/Role/Tab/EditTest.php index 718225e6c1cdc..45d3cd2244034 100644 --- a/dev/tests/integration/testsuite/Magento/User/Block/Role/Tab/EditTest.php +++ b/dev/tests/integration/testsuite/Magento/User/Block/Role/Tab/EditTest.php @@ -35,7 +35,7 @@ protected function setUp() public function testConstructor() { $this->assertNotEmpty($this->_block->getSelectedResources()); - $this->assertContains('Magento_Adminhtml::all', $this->_block->getSelectedResources()); + $this->assertContains('Magento_Backend::all', $this->_block->getSelectedResources()); } public function testGetTree() diff --git a/dev/tests/integration/testsuite/Magento/User/_files/user_with_role.php b/dev/tests/integration/testsuite/Magento/User/_files/user_with_role.php index 591ee5153ba50..e5668373aa5f0 100644 --- a/dev/tests/integration/testsuite/Magento/User/_files/user_with_role.php +++ b/dev/tests/integration/testsuite/Magento/User/_files/user_with_role.php @@ -16,7 +16,7 @@ ->setPassword(\Magento\TestFramework\Bootstrap::ADMIN_PASSWORD) ->setEmail('adminUser@example.com') ->setRoleType('G') - ->setResourceId('Magento_Adminhtml::all') + ->setResourceId('Magento_Backend::all') ->setPrivileges("") ->setAssertId(0) ->setRoleId(1) 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 07767f5c8d8cd..2e0f3fee3d11c 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 @@ -4,10 +4,10 @@ * See COPYING.txt for license details. */ return [ - 'admin_assert' => 'Magento_Adminhtml', + 'admin_assert' => 'Magento_Backend', 'authorization_role' => 'Magento_Authorization', 'authorization_rule' => 'Magento_Authorization', - 'admin_user' => 'Magento_Adminhtml', + 'admin_user' => 'Magento_Backend', 'adminnotification_inbox' => 'Magento_AdminNotification', 'catalog_category_entity_datetime' => 'Magento_Catalog', 'catalog_category_entity_decimal' => 'Magento_Catalog', diff --git a/dev/tests/unit/testsuite/Magento/Authorization/Model/Acl/AclRetrieverTest.php b/dev/tests/unit/testsuite/Magento/Authorization/Model/Acl/AclRetrieverTest.php index 12514a57463d9..f9687b8ef551f 100644 --- a/dev/tests/unit/testsuite/Magento/Authorization/Model/Acl/AclRetrieverTest.php +++ b/dev/tests/unit/testsuite/Magento/Authorization/Model/Acl/AclRetrieverTest.php @@ -66,7 +66,7 @@ public function testGetAllowedResourcesByUserRoleNotFound() public function testGetAllowedResourcesByUser() { $this->roleMock->expects($this->any())->method('getId')->will($this->returnValue(1)); - $expectedResources = ['Magento_Adminhtml::dashboard', 'Magento_Cms::page']; + $expectedResources = ['Magento_Backend::dashboard', 'Magento_Cms::page']; $this->assertEquals( $expectedResources, $this->aclRetriever->getAllowedResourcesByUser(UserContextInterface::USER_TYPE_INTEGRATION, 1) @@ -115,7 +115,7 @@ protected function createAclRetriever() false ); $rulesMock1->expects($this->any())->method('getResourceId')->will( - $this->returnValue('Magento_Adminhtml::dashboard') + $this->returnValue('Magento_Backend::dashboard') ); /** @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Authorization\Model\Rules $rulesMock1 */ $rulesMock2 = $this->getMock( diff --git a/dev/tests/unit/testsuite/Magento/Authorization/Model/Acl/Loader/RuleTest.php b/dev/tests/unit/testsuite/Magento/Authorization/Model/Acl/Loader/RuleTest.php index 2f2d9d64db6c3..ad2ea32befc80 100644 --- a/dev/tests/unit/testsuite/Magento/Authorization/Model/Acl/Loader/RuleTest.php +++ b/dev/tests/unit/testsuite/Magento/Authorization/Model/Acl/Loader/RuleTest.php @@ -25,7 +25,7 @@ class RuleTest extends \PHPUnit_Framework_TestCase protected function setUp() { $this->_resourceMock = $this->getMock('Magento\Framework\App\Resource', [], [], '', false, false); - $this->_rootResourceMock = new \Magento\Framework\Acl\RootResource('Magento_Adminhtml::all'); + $this->_rootResourceMock = new \Magento\Framework\Acl\RootResource('Magento_Backend::all'); $this->_model = new \Magento\Authorization\Model\Acl\Loader\Rule( $this->_rootResourceMock, $this->_resourceMock @@ -48,7 +48,7 @@ public function testPopulateAcl() )->will( $this->returnValue( [ - ['role_id' => 1, 'resource_id' => 'Magento_Adminhtml::all', 'permission' => 'allow'], + ['role_id' => 1, 'resource_id' => 'Magento_Backend::all', 'permission' => 'allow'], ['role_id' => 2, 'resource_id' => 1, 'permission' => 'allow'], ['role_id' => 3, 'resource_id' => 1, 'permission' => 'deny'], ] @@ -60,7 +60,7 @@ public function testPopulateAcl() $aclMock = $this->getMock('Magento\Framework\Acl'); $aclMock->expects($this->any())->method('has')->will($this->returnValue(true)); $aclMock->expects($this->at(1))->method('allow')->with('1', null, null); - $aclMock->expects($this->at(2))->method('allow')->with('1', 'Magento_Adminhtml::all', null); + $aclMock->expects($this->at(2))->method('allow')->with('1', 'Magento_Backend::all', null); $aclMock->expects($this->at(4))->method('allow')->with('2', 1, null); $aclMock->expects($this->at(6))->method('deny')->with('3', 1, null); diff --git a/dev/tests/unit/testsuite/Magento/Backend/Model/Config/Structure/Element/SectionTest.php b/dev/tests/unit/testsuite/Magento/Backend/Model/Config/Structure/Element/SectionTest.php index dfb1f51660154..a8973f0050b66 100644 --- a/dev/tests/unit/testsuite/Magento/Backend/Model/Config/Structure/Element/SectionTest.php +++ b/dev/tests/unit/testsuite/Magento/Backend/Model/Config/Structure/Element/SectionTest.php @@ -85,7 +85,7 @@ public function testIsVisibleProceedsWithVisibilityCheckIfSectionIsAllowed() { $this->_authorizationMock->expects($this->any())->method('isAllowed')->will($this->returnValue(true)); $this->_storeManagerMock->expects($this->once())->method('isSingleStoreMode')->will($this->returnValue(true)); - $this->_model->setData(['resource' => 'Magento_Adminhtml::all'], 'scope'); + $this->_model->setData(['resource' => 'Magento_Backend::all'], 'scope'); $this->_model->isVisible(); } } diff --git a/dev/tests/unit/testsuite/Magento/Backend/Model/UrlTest.php b/dev/tests/unit/testsuite/Magento/Backend/Model/UrlTest.php index 0108acedf986a..d0383a4eda34e 100644 --- a/dev/tests/unit/testsuite/Magento/Backend/Model/UrlTest.php +++ b/dev/tests/unit/testsuite/Magento/Backend/Model/UrlTest.php @@ -102,7 +102,7 @@ protected function setUp() )->method( 'getId' )->will( - $this->returnValue('Magento_Adminhtml::system_acl_roles') + $this->returnValue('Magento_Backend::system_acl_roles') ); $mockItem->expects($this->any())->method('getAction')->will($this->returnValue('adminhtml/user_role')); @@ -111,7 +111,7 @@ protected function setUp() )->method( 'get' )->with( - $this->equalTo('Magento_Adminhtml::system_acl_roles') + $this->equalTo('Magento_Backend::system_acl_roles') )->will( $this->returnValue($mockItem) ); @@ -132,7 +132,7 @@ protected function setUp() )->with( \Magento\Backend\Model\Url::XML_PATH_STARTUP_MENU_ITEM )->will( - $this->returnValue('Magento_Adminhtml::system_acl_roles') + $this->returnValue('Magento_Backend::system_acl_roles') ); $this->_coreDataMock = $this->getMock('Magento\Core\Helper\Data', ['getHash'], [], '', false); diff --git a/dev/tests/unit/testsuite/Magento/Backend/Model/_files/acl.xml b/dev/tests/unit/testsuite/Magento/Backend/Model/_files/acl.xml index f89c58f0dffdd..d5f11c7fb1a4c 100644 --- a/dev/tests/unit/testsuite/Magento/Backend/Model/_files/acl.xml +++ b/dev/tests/unit/testsuite/Magento/Backend/Model/_files/acl.xml @@ -8,11 +8,11 @@ - - - - - + + + + + diff --git a/dev/tests/unit/testsuite/Magento/Tools/Di/_files/app/code/Magento/SomeModule/etc/adminhtml/system.xml b/dev/tests/unit/testsuite/Magento/Tools/Di/_files/app/code/Magento/SomeModule/etc/adminhtml/system.xml index 3207b4a1666c6..deda396f9b3a7 100644 --- a/dev/tests/unit/testsuite/Magento/Tools/Di/_files/app/code/Magento/SomeModule/etc/adminhtml/system.xml +++ b/dev/tests/unit/testsuite/Magento/Tools/Di/_files/app/code/Magento/SomeModule/etc/adminhtml/system.xml @@ -10,7 +10,7 @@
    advanced - Magento_Adminhtml::advanced + Magento_Backend::advanced Magento\Backend\Block\System\Config\Form\Fieldset\Modules\DisableOutput\Proxy diff --git a/dev/tests/unit/testsuite/Magento/Tools/Migration/System/Configuration/_files/convertedConfiguration.xml b/dev/tests/unit/testsuite/Magento/Tools/Migration/System/Configuration/_files/convertedConfiguration.xml index 3c69a92286af4..5b2a7df2bb212 100644 --- a/dev/tests/unit/testsuite/Magento/Tools/Migration/System/Configuration/_files/convertedConfiguration.xml +++ b/dev/tests/unit/testsuite/Magento/Tools/Migration/System/Configuration/_files/convertedConfiguration.xml @@ -13,7 +13,7 @@
    css class - Magento_Adminhtml::acl + Magento_Backend::acl some css class tab_1 diff --git a/dev/tests/unit/testsuite/Magento/Tools/Migration/System/Configuration/_files/mappedConfiguration.php b/dev/tests/unit/testsuite/Magento/Tools/Migration/System/Configuration/_files/mappedConfiguration.php index 7b4b77196cafe..15257c6ceb0a4 100644 --- a/dev/tests/unit/testsuite/Magento/Tools/Migration/System/Configuration/_files/mappedConfiguration.php +++ b/dev/tests/unit/testsuite/Magento/Tools/Migration/System/Configuration/_files/mappedConfiguration.php @@ -18,7 +18,7 @@ 'parameters' => [ ['name' => 'class', '#text' => 'css class'], ['name' => 'label', '#text' => 'section label'], - ['name' => 'resource', '#text' => 'Magento_Adminhtml::acl'], + ['name' => 'resource', '#text' => 'Magento_Backend::acl'], ['name' => 'header_css', '#text' => 'some css class'], ['name' => 'tab', '#text' => 'tab_1'], ],