Merge remote-tracking branch 'mainline/develop' into develop

Author: Yu Tang

.php_cs

@@ -15,7 +15,6 @@ $finder = Symfony\CS\Finder\DefaultFinder::create()
     ->exclude('dev/tests/functional/vendor')
     ->exclude('dev/tests/integration/tmp')
     ->exclude('dev/tests/integration/var')
-    ->exclude('lib/internal/Apache')
     ->exclude('lib/internal/CardinalCommerce')
     ->exclude('lib/internal/Cm')
     ->exclude('lib/internal/Credis')

app/code/Magento/AdminNotification/Controller/Adminhtml/System/Message/ListAction.php

@@ -8,24 +8,56 @@
 
 class ListAction extends \Magento\Backend\App\AbstractAction
 {
+    /**
+     * @var \Magento\Framework\Json\Helper\Data
+     */
+    protected $jsonHelper;
+
+    /**
+     * @var \Magento\AdminNotification\Model\Resource\System\Message\Collection
+     */
+    protected $messageCollection;
+
+    /**
+     * Initialize ListAction
+     *
+     * @param \Magento\Backend\App\Action\Context $context
+     * @param \Magento\Framework\Json\Helper\Data $jsonHelper
+     * @param \Magento\AdminNotification\Model\Resource\System\Message\Collection $messageCollection
+     */
+    public function __construct(
+        \Magento\Backend\App\Action\Context $context,
+        \Magento\Framework\Json\Helper\Data $jsonHelper,
+        \Magento\AdminNotification\Model\Resource\System\Message\Collection $messageCollection
+    ) {
+        $this->jsonHelper = $jsonHelper;
+        $this->messageCollection = $messageCollection;
+        parent::__construct($context);
+    }
+
     /**
      * @return void
      */
     public function execute()
     {
         $severity = $this->getRequest()->getParam('severity');
-        $messageCollection = $this->_objectManager->get(
-            'Magento\AdminNotification\Model\Resource\System\Message\Collection'
-        );
         if ($severity) {
-            $messageCollection->setSeverity($severity);
+            $this->messageCollection->setSeverity($severity);
         }
         $result = [];
-        foreach ($messageCollection->getItems() as $item) {
-            $result[] = ['severity' => $item->getSeverity(), 'text' => $item->getText()];
+        foreach ($this->messageCollection->getItems() as $item) {
+            $result[] = [
+                'severity' => $item->getSeverity(),
+                'text' => $item->getText(),
+            ];
+        }
+        if (empty($result)) {
+            $result[] = [
+                'severity' => (string)\Magento\Framework\Notification\MessageInterface::SEVERITY_NOTICE,
+                'text' => 'You have viewed and resolved all recent system notices. '
+                    . 'Please refresh the web page to clear the notice alert.',
+            ];
         }
-        $this->getResponse()->representJson(
-            $this->_objectManager->get('Magento\Framework\Json\Helper\Data')->jsonEncode($result)
-        );
+        $this->getResponse()->representJson($this->jsonHelper->jsonEncode($result));
     }
 }

app/code/Magento/AdminNotification/etc/config.xml

@@ -5,7 +5,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../Core/etc/config.xsd">
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../Store/etc/config.xsd">
     <default>
         <system>
             <adminnotification>

app/code/Magento/AdminNotification/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_AdminNotification" setup_version="2.0.0">
         <sequence>
-            <module name="Magento_Core"/>
             <module name="Magento_Store"/>
         </sequence>
     </module>

app/code/Magento/Authorization/Setup/InstallData.php

@@ -85,5 +85,17 @@ public function install(ModuleDataSetupInterface $setup, ModuleContextInterface
                 $rule->setData('resource_id', 'Magento_Backend::all')->save();
             }
         }
+
+        /**
+         * Delete rows by condition from authorization_rule
+         */
+        $setup->startSetup();
+
+        $tableName = $setup->getTable('authorization_rule');
+        if ($tableName) {
+            $setup->getConnection()->delete($tableName, ['resource_id = ?' => 'admin/system/tools/compiler']);
+        }
+
+        $setup->endSetup();
     }
 }

app/code/Magento/Backend/Block/Widget/Grid/Extended.php

@@ -203,7 +203,11 @@ protected function _prepareLayout()
         $this->setChild(
             'reset_filter_button',
             $this->getLayout()->createBlock('Magento\Backend\Block\Widget\Button')->setData(
-                ['label' => __('Reset Filter'), 'onclick' => $this->getJsObjectName() . '.resetFilter()']
+                [
+                    'label' => __('Reset Filter'),
+                    'onclick' => $this->getJsObjectName() . '.resetFilter()',
+                    'class' => 'action-reset'
+                ]
             )
         );
         $this->setChild(

app/code/Magento/Backend/Test/Unit/Model/Menu/Filter/IteratorTest.php

@@ -12,11 +12,6 @@ class IteratorTest extends \PHPUnit_Framework_TestCase
      */
     protected $_menuModel;
 
-    /**
-     * @var \Magento\Backend\Model\Menu\Filter\Iterator
-     */
-    protected $_filterIteratorModel;
-
     /**
      * @var \Magento\Backend\Model\Menu\Item[]
      */
@@ -42,9 +37,6 @@ protected function setUp()
         $loggerMock = $this->getMock('Psr\Log\LoggerInterface');
 
         $this->_menuModel = new \Magento\Backend\Model\Menu($loggerMock);
-        $this->_filterIteratorModel = new \Magento\Backend\Model\Menu\Filter\Iterator(
-            $this->_menuModel->getIterator()
-        );
     }
 
     public function testLoopWithAllItemsDisabledDoesntIterate()
@@ -54,8 +46,12 @@ public function testLoopWithAllItemsDisabledDoesntIterate()
         $this->_menuModel->add($this->getMock('Magento\Backend\Model\Menu\Item', [], [], '', false));
         $this->_menuModel->add($this->getMock('Magento\Backend\Model\Menu\Item', [], [], '', false));
         $this->_menuModel->add($this->getMock('Magento\Backend\Model\Menu\Item', [], [], '', false));
+        $filterIteratorModel = new \Magento\Backend\Model\Menu\Filter\Iterator(
+            $this->_menuModel->getIterator()
+        );
+
         $items = [];
-        foreach ($this->_filterIteratorModel as $item) {
+        foreach ($filterIteratorModel as $item) {
             $items[] = $item;
         }
         $this->assertCount(0, $items);
@@ -70,9 +66,12 @@ public function testLoopIteratesOnlyValidItems()
 
         $this->_menuModel->add($this->getMock('Magento\Backend\Model\Menu\Item', [], [], '', false));
         $this->_menuModel->add($this->getMock('Magento\Backend\Model\Menu\Item', [], [], '', false));
+        $filterIteratorModel = new \Magento\Backend\Model\Menu\Filter\Iterator(
+            $this->_menuModel->getIterator()
+        );
 
         $items = [];
-        foreach ($this->_filterIteratorModel as $item) {
+        foreach ($filterIteratorModel as $item) {
             $items[] = $item;
         }
         $this->assertCount(1, $items);
@@ -88,9 +87,12 @@ public function testLoopIteratesDosntIterateDisabledItems()
 
         $this->_menuModel->add($this->getMock('Magento\Backend\Model\Menu\Item', [], [], '', false));
         $this->_menuModel->add($this->getMock('Magento\Backend\Model\Menu\Item', [], [], '', false));
+        $filterIteratorModel = new \Magento\Backend\Model\Menu\Filter\Iterator(
+            $this->_menuModel->getIterator()
+        );
 
         $items = [];
-        foreach ($this->_filterIteratorModel as $item) {
+        foreach ($filterIteratorModel as $item) {
             $items[] = $item;
         }
         $this->assertCount(1, $items);
@@ -106,9 +108,12 @@ public function testLoopIteratesDosntIterateNotAllowedItems()
 
         $this->_menuModel->add($this->getMock('Magento\Backend\Model\Menu\Item', [], [], '', false));
         $this->_menuModel->add($this->getMock('Magento\Backend\Model\Menu\Item', [], [], '', false));
+        $filterIteratorModel = new \Magento\Backend\Model\Menu\Filter\Iterator(
+            $this->_menuModel->getIterator()
+        );
 
         $items = [];
-        foreach ($this->_filterIteratorModel as $item) {
+        foreach ($filterIteratorModel as $item) {
             $items[] = $item;
         }
         $this->assertCount(1, $items);
@@ -125,9 +130,12 @@ public function testLoopIteratesMixedItems()
 
         $this->_menuModel->add($this->getMock('Magento\Backend\Model\Menu\Item', [], [], '', false));
         $this->_menuModel->add($this->getMock('Magento\Backend\Model\Menu\Item', [], [], '', false));
+        $filterIteratorModel = new \Magento\Backend\Model\Menu\Filter\Iterator(
+            $this->_menuModel->getIterator()
+        );
 
         $items = [];
-        foreach ($this->_filterIteratorModel as $item) {
+        foreach ($filterIteratorModel as $item) {
             $items[] = $item;
         }
         $this->assertCount(1, $items);

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

@@ -9,7 +9,7 @@
     <menu>
         <add id="Magento_Backend::system_design_schedule" title="Schedule" module="Magento_Backend" sortOrder="30" parent="Magento_Backend::system_design" action="adminhtml/system_design" resource="Magento_Backend::schedule"/>
         <add id="Magento_Backend::system_currency" title="Currency" module="Magento_Backend" sortOrder="30" parent="Magento_Backend::stores" action="adminhtml/system_currency" resource="Magento_CurrencySymbol::system_currency"/>
-        <add id="Magento_Backend::system_store" title="All Stores" module="Magento_Core" sortOrder="10" parent="Magento_Backend::stores_settings" action="adminhtml/system_store/" resource="Magento_Backend::store"/>
+        <add id="Magento_Backend::system_store" title="All Stores" module="Magento_Backend" sortOrder="10" parent="Magento_Backend::stores_settings" action="adminhtml/system_store/" resource="Magento_Backend::store"/>
         <add id="Magento_Backend::dashboard" title="Dashboard" module="Magento_Backend" sortOrder="10" action="adminhtml/dashboard" resource="Magento_Backend::dashboard"/>
         <add id="Magento_Backend::system" title="System" module="Magento_Backend" sortOrder="80" resource="Magento_Backend::system"/>
         <add id="Magento_Backend::system_tools" title="Tools" module="Magento_Backend" sortOrder="50" parent="Magento_Backend::system" resource="Magento_Backend::tools"/>

app/code/Magento/Backend/etc/config.xml

@@ -5,7 +5,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../Core/etc/config.xsd">
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../Store/etc/config.xsd">
     <default>
         <system>
             <media_storage_configuration>

app/code/Magento/Backend/view/adminhtml/templates/media/uploader.phtml

@@ -15,8 +15,8 @@
     </div>
     <div class="clear"></div>
     <script id="<?php echo $block->getHtmlId() ?>-template" type="text/x-magento-template">
-        <div id="<%= data.id %>" class="file-row">
-            <span class="file-info"><%= data.name %> (<%= data.size %>)</span>
+        <div id="<%- data.id %>" class="file-row">
+            <span class="file-info"><%- data.name %> (<%- data.size %>)</span>
             <div class="progressbar-container">
                 <div class="progressbar upload-progress" style="width: 0%;"></div>
             </div>