MAGETWO-34447: Pull Request for Sprint 46 stories

 - update resource namespaces and module dependencies

Author: Dale Sikkema

app/code/Magento/Backend/etc/adminhtml/system.xml

@@ -99,7 +99,7 @@
         <section id="design" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
             <label>Design</label>
             <tab>general</tab>
-            <resource>Magento_Backend::config_design</resource>
+            <resource>Magento_Config::config_design</resource>
             <group id="theme" translate="label" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Design Theme</label>
                 <field id="theme_id" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
@@ -236,7 +236,7 @@
         <section id="general" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
             <label>General</label>
             <tab>general</tab>
-            <resource>Magento_Backend::config_general</resource>
+            <resource>Magento_Config::config_general</resource>
             <group id="country" translate="label" type="text" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Country Options</label>
                 <field id="allow" translate="label" type="multiselect" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1">
@@ -321,7 +321,7 @@
             <class>separator-top</class>
             <label>System</label>
             <tab>advanced</tab>
-            <resource>Magento_Backend::config_system</resource>
+            <resource>Magento_Config::config_system</resource>
             <group id="smtp" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Mail Sending Settings</label>
                 <field id="disable" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
@@ -375,7 +375,7 @@
         <section id="admin" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="0" showInStore="0">
             <label>Admin</label>
             <tab>advanced</tab>
-            <resource>Magento_Backend::config_admin</resource>
+            <resource>Magento_Config::config_admin</resource>
             <group id="emails" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0">
                 <label>Admin User Emails</label>
                 <field id="forgot_email_template" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0">

app/code/Magento/Config/Controller/Adminhtml/System/AbstractConfig.php

@@ -60,7 +60,7 @@ public function dispatch(\Magento\Framework\App\RequestInterface $request)
     protected function _isAllowed()
     {
         $sectionId = $this->_request->getParam('section');
-        return $this->_authorization->isAllowed('Magento_Backend::config')
+        return $this->_authorization->isAllowed('Magento_Config::config')
             || $this->_configStructure->getElement($sectionId)->isAllowed();
     }
 

app/code/Magento/Payment/composer.json

@@ -5,7 +5,6 @@
         "php": "~5.5.0|~5.6.0",
         "magento/module-config": "0.42.0-beta9",
         "magento/module-store": "0.42.0-beta9",
-        "magento/module-core": "0.42.0-beta9",
         "magento/module-sales": "0.42.0-beta9",
         "magento/module-centinel": "0.42.0-beta9",
         "magento/module-checkout": "0.42.0-beta9",

app/code/Magento/Payment/etc/module.xml

@@ -8,7 +8,6 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Module/etc/module.xsd">
     <module name="Magento_Payment" schema_version="2.0.0">
         <sequence>
-            <module name="Magento_Core"/>
             <module name="Magento_Store"/>
             <module name="Magento_Catalog"/>
         </sequence>

dev/tests/unit/testsuite/Magento/Backend/Model/Menu/ItemTest.php

@@ -54,7 +54,7 @@ class ItemTest extends \PHPUnit_Framework_TestCase
         'id' => 'item',
         'title' => 'Item Title',
         'action' => '/system/config',
-        'resource' => 'Magento_Backend::config',
+        'resource' => 'Magento_Config::config',
         'dependsOnModule' => 'Magento_Backend',
         'dependsOnConfig' => 'system/config/isEnabled',
         'tooltip' => 'Item tooltip',
@@ -192,7 +192,7 @@ public function testIsAllowedReturnsTrueIfResourceIsAvailable()
         )->method(
             'isAllowed'
         )->with(
-            'Magento_Backend::config'
+            'Magento_Config::config'
         )->will(
             $this->returnValue(true)
         );
@@ -206,7 +206,7 @@ public function testIsAllowedReturnsFalseIfResourceIsNotAvailable()
         )->method(
             'isAllowed'
         )->with(
-            'Magento_Backend::config'
+            'Magento_Config::config'
         )->will(
             $this->throwException(new \Magento\Framework\Exception())
         );