MAGETWO-31484: Resolved merge conflicts and static test failure

Author: Joan He

app/code/Magento/Variable/Controller/Adminhtml/System/Variable/WysiwygPlugin.php

@@ -15,7 +15,8 @@ class WysiwygPlugin extends \Magento\Variable\Controller\Adminhtml\System\Variab
      */
     public function execute()
     {
-        $customVariables = $this->_objectManager->create('Magento\Variable\Model\Variable')->getVariablesOptionArray(true);
+        $customVariables = $this->_objectManager->create('Magento\Variable\Model\Variable')
+            ->getVariablesOptionArray(true);
         $storeContactVariabls = $this->_objectManager->create(
             'Magento\Email\Model\Source\Variables'
         )->toOptionArray(

app/code/Magento/Variable/etc/acl.xml

@@ -8,9 +8,9 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
     <acl>
         <resources>
-            <resource id="Magento_Adminhtml::admin">
-                <resource id="Magento_Adminhtml::system">
-                    <resource id="Magento_Adminhtml::system_other_settings">
+            <resource id="Magento_Backend::admin">
+                <resource id="Magento_Backend::system">
+                    <resource id="Magento_Backend::system_other_settings">
                         <resource id="Magento_Variable::variable" title="Custom Variables"  sortOrder="20" />
                     </resource>
                 </resource>

dev/tests/integration/testsuite/Magento/Variable/Model/VariableTest.php

@@ -30,7 +30,9 @@ public function testLoadByCode()
         $this->_model->setData(['code' => 'test_code', 'name' => 'test_name']);
         $this->_model->save();
 
-        $variable = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Magento\Variable\Model\Variable');
+        $variable = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+            'Magento\Variable\Model\Variable'
+        );
         $variable->loadByCode('test_code');
         $this->assertEquals($this->_model->getName(), $variable->getName());
         $this->_model->delete();

dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php

@@ -1751,13 +1751,34 @@
     ['Magento\Adminhtml\Block\Report\Wishlist', 'Magento\Reports\Block\Adminhtml\Wishlist'],
     ['Magento\Backend\Helper\Addresses'],
     ['Magento\Backend\Controller\Adminhtml\System\Variable', 'Magento\Variable\Controller\Adminhtml\System\Variable'],
-    ['Magento\Backend\Controller\Adminhtml\System\Variable\Delete', 'Magento\Variable\Controller\Adminhtml\System\Variable\Delete'],
-    ['Magento\Backend\Controller\Adminhtml\System\Variable\Edit', 'Magento\Variable\Controller\Adminhtml\System\Variable\Edit'],
-    ['Magento\Backend\Controller\Adminhtml\System\Variable\Index', 'Magento\Variable\Controller\Adminhtml\System\Variable\Index'],
-    ['Magento\Backend\Controller\Adminhtml\System\Variable\NewAction', 'Magento\Variable\Controller\Adminhtml\System\Variable\NewAction'],
-    ['Magento\Backend\Controller\Adminhtml\System\Variable\Save', 'Magento\Variable\Controller\Adminhtml\System\Variable\Save'],
-    ['Magento\Backend\Controller\Adminhtml\System\Variable\Validate', 'Magento\Variable\Controller\Adminhtml\System\Variable\Validate'],
-    ['Magento\Backend\Controller\Adminhtml\System\Variable\WysiwygPlugin', 'Magento\Variable\Controller\Adminhtml\System\Variable\WysiwygPlugin'],
+    [
+        'Magento\Backend\Controller\Adminhtml\System\Variable\Delete',
+        'Magento\Variable\Controller\Adminhtml\System\Variable\Delete'
+    ],
+    [
+        'Magento\Backend\Controller\Adminhtml\System\Variable\Edit',
+        'Magento\Variable\Controller\Adminhtml\System\Variable\Edit'
+    ],
+    [
+        'Magento\Backend\Controller\Adminhtml\System\Variable\Index',
+        'Magento\Variable\Controller\Adminhtml\System\Variable\Index'
+    ],
+    [
+        'Magento\Backend\Controller\Adminhtml\System\Variable\NewAction',
+        'Magento\Variable\Controller\Adminhtml\System\Variable\NewAction'
+    ],
+    [
+        'Magento\Backend\Controller\Adminhtml\System\Variable\Save',
+        'Magento\Variable\Controller\Adminhtml\System\Variable\Save'
+    ],
+    [
+        'Magento\Backend\Controller\Adminhtml\System\Variable\Validate',
+        'Magento\Variable\Controller\Adminhtml\System\Variable\Validate'
+    ],
+    [
+        'Magento\Backend\Controller\Adminhtml\System\Variable\WysiwygPlugin',
+        'Magento\Variable\Controller\Adminhtml\System\Variable\WysiwygPlugin'
+    ],
     ['Magento\Core\Model\Cookie', 'Magento\Framework\Stdlib\Cookie'],
     ['Magento\Core\Model\Logger', 'Psr\Log\LoggerInterface'],
     ['Magento\Core\Block\Template\Context', 'Magento\Framework\View\Element\Template\Context'],