Merge remote-tracking branch 'main-ce/develop' into MAGETWO-34198

Author: Yuri Kovsher

app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php

@@ -13,18 +13,18 @@
 class Actions extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
     /**
-     * @var \Magento\Core\Helper\Url
+     * @var \Magento\Framework\Url\Helper\Data
      */
     protected $_urlHelper;
 
     /**
      * @param \Magento\Backend\Block\Context $context
-     * @param \Magento\Core\Helper\Url $urlHelper
+     * @param \Magento\Framework\Url\Helper\Data $urlHelper
      * @param array $data
      */
     public function __construct(
         \Magento\Backend\Block\Context $context,
-        \Magento\Core\Helper\Url $urlHelper,
+        \Magento\Framework\Url\Helper\Data $urlHelper,
         array $data = []
     ) {
         $this->_urlHelper = $urlHelper;

app/code/Magento/AdminNotification/Block/System/Messages.php

@@ -15,23 +15,23 @@ class Messages extends \Magento\Backend\Block\Template
     protected $_messages;
 
     /**
-     * @var \Magento\Core\Helper\Data
+     * @var \Magento\Framework\Json\Helper\Data
      */
-    protected $_coreHelper;
+    protected $jsonHelper;
 
     /**
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\AdminNotification\Model\Resource\System\Message\Collection\Synchronized $messages
-     * @param \Magento\Core\Helper\Data $coreHelper
+     * @param \Magento\Framework\Json\Helper\Data $jsonHelper
      * @param array $data
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
         \Magento\AdminNotification\Model\Resource\System\Message\Collection\Synchronized $messages,
-        \Magento\Core\Helper\Data $coreHelper,
+        \Magento\Framework\Json\Helper\Data $jsonHelper,
         array $data = []
     ) {
-        $this->_coreHelper = $coreHelper;
+        $this->jsonHelper = $jsonHelper;
         parent::__construct($context, $data);
         $this->_messages = $messages;
     }
@@ -117,7 +117,7 @@ protected function _getMessagesUrl()
      */
     public function getSystemMessageDialogJson()
     {
-        return $this->_coreHelper->jsonEncode(
+        return $this->jsonHelper->jsonEncode(
             [
                 'systemMessageDialog' => [
                     'autoOpen' => false,

app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/AjaxMarkAsRead.php

@@ -31,7 +31,7 @@ public function execute()
             $responseData['success'] = false;
         }
         $this->getResponse()->representJson(
-            $this->_objectManager->create('Magento\Core\Helper\Data')->jsonEncode($responseData)
+            $this->_objectManager->create('Magento\Framework\Json\Helper\Data')->jsonEncode($responseData)
         );
     }
 }

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

@@ -25,7 +25,7 @@ public function execute()
             $result[] = ['severity' => $item->getSeverity(), 'text' => $item->getText()];
         }
         $this->getResponse()->representJson(
-            $this->_objectManager->get('Magento\Core\Helper\Data')->jsonEncode($result)
+            $this->_objectManager->get('Magento\Framework\Json\Helper\Data')->jsonEncode($result)
         );
     }
 }

app/code/Magento/AdminNotification/Setup/InstallSchema.php

@@ -0,0 +1,125 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\AdminNotification\Setup;
+
+use Magento\Framework\Setup\InstallSchemaInterface;
+use Magento\Framework\Setup\ModuleContextInterface;
+use Magento\Framework\Setup\SchemaSetupInterface;
+
+/**
+ * @codeCoverageIgnore
+ */
+class InstallSchema implements InstallSchemaInterface
+{
+    /**
+     * {@inheritdoc}
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
+    {
+        $installer = $setup;
+
+        $installer->startSetup();
+        /**
+         * Create table 'adminnotification_inbox'
+         */
+        $table = $installer->getConnection()->newTable(
+            $installer->getTable('adminnotification_inbox')
+        )->addColumn(
+            'notification_id',
+            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
+            null,
+            ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
+            'Notification id'
+        )->addColumn(
+            'severity',
+            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
+            null,
+            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
+            'Problem type'
+        )->addColumn(
+            'date_added',
+            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
+            null,
+            ['nullable' => false],
+            'Create date'
+        )->addColumn(
+            'title',
+            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+            255,
+            ['nullable' => false],
+            'Title'
+        )->addColumn(
+            'description',
+            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+            '64k',
+            [],
+            'Description'
+        )->addColumn(
+            'url',
+            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+            255,
+            [],
+            'Url'
+        )->addColumn(
+            'is_read',
+            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
+            null,
+            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
+            'Flag if notification read'
+        )->addColumn(
+            'is_remove',
+            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
+            null,
+            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
+            'Flag if notification might be removed'
+        )->addIndex(
+            $installer->getIdxName('adminnotification_inbox', ['severity']),
+            ['severity']
+        )->addIndex(
+            $installer->getIdxName('adminnotification_inbox', ['is_read']),
+            ['is_read']
+        )->addIndex(
+            $installer->getIdxName('adminnotification_inbox', ['is_remove']),
+            ['is_remove']
+        )->setComment(
+            'Adminnotification Inbox'
+        );
+        $installer->getConnection()->createTable($table);
+
+        /**
+         * Create table 'admin_system_messages'
+         */
+        $table = $installer->getConnection()->newTable(
+            $installer->getTable('admin_system_messages')
+        )->addColumn(
+            'identity',
+            \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+            100,
+            ['nullable' => false, 'primary' => true],
+            'Message id'
+        )->addColumn(
+            'severity',
+            \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
+            null,
+            ['unsigned' => true, 'nullable' => false, 'default' => '0'],
+            'Problem type'
+        )->addColumn(
+            'created_at',
+            \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
+            null,
+            ['nullable' => false],
+            'Create date'
+        )->setComment(
+            'Admin System Messages'
+        );
+        $installer->getConnection()->createTable($table);
+
+        $installer->endSetup();
+
+    }
+}

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

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

app/code/Magento/AdminNotification/sql/adminnotification_setup/install-2.0.0.php

@@ -3,15 +3,14 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Authorization\Model\Resource;
+namespace Magento\Authorization\Setup;
 
 /**
  * Resource Setup Model
  *
- * @SuppressWarnings(PHPMD.LongVariable)
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @codeCoverageIgnore
  */
-class Setup extends \Magento\Framework\Module\DataSetup
+class AuthorizationFactory
 {
     /**
      * Role model factory
@@ -42,30 +41,23 @@ class Setup extends \Magento\Framework\Module\DataSetup
     protected $_rulesFactory;
 
     /**
-     * @param \Magento\Framework\Module\Setup\Context $context
-     * @param string $resourceName
+     * Init
+     *
      * @param \Magento\Authorization\Model\Resource\Role\CollectionFactory $roleCollectionFactory
      * @param \Magento\Authorization\Model\Resource\Rules\CollectionFactory $rulesCollectionFactory
      * @param \Magento\Authorization\Model\RoleFactory $roleFactory
      * @param \Magento\Authorization\Model\RulesFactory $rulesFactory
-     * @param string $moduleName
-     * @param string $connectionName
      */
     public function __construct(
-        \Magento\Framework\Module\Setup\Context $context,
-        $resourceName,
         \Magento\Authorization\Model\Resource\Role\CollectionFactory $roleCollectionFactory,
         \Magento\Authorization\Model\Resource\Rules\CollectionFactory $rulesCollectionFactory,
         \Magento\Authorization\Model\RoleFactory $roleFactory,
-        \Magento\Authorization\Model\RulesFactory $rulesFactory,
-        $moduleName = 'Magento_Authorization',
-        $connectionName = \Magento\Framework\Module\Updater\SetupInterface::DEFAULT_SETUP_CONNECTION
+        \Magento\Authorization\Model\RulesFactory $rulesFactory
     ) {
         $this->_roleCollectionFactory = $roleCollectionFactory;
         $this->_rulesCollectionFactory = $rulesCollectionFactory;
         $this->_roleFactory = $roleFactory;
         $this->_rulesFactory = $rulesFactory;
-        parent::__construct($context, $resourceName, $moduleName, $connectionName);
     }
 
     /**