Merge branch '2.3-develop' into MC-17630

# Conflicts:
#	app/code/Magento/Review/Block/Adminhtml/Grid.php

Author: serhii-balko

CHANGELOG.md

@@ -612,11 +612,11 @@ To get detailed information about changes in Magento 2.3.0, see the [Release Not
 
 2.2.0
 =============
-To get detailed information about changes in Magento 2.2.0, see the [Release Notes](https://devdocs.magento.com/guides/v2.2/release-notes/bk-release-notes.html)
+To get detailed information about changes in Magento 2.2.0, see the [Release Notes](https://devdocs.magento.com/guides/v2.3/release-notes/bk-release-notes.html)
 
 2.1.0
 =============
-To get detailed information about changes in Magento 2.1.0, please visit [Magento Community Edition (CE) Release Notes](https://devdocs.magento.com/guides/v2.1/release-notes/ReleaseNotes2.1.0CE.html "Magento Community Edition (CE) Release Notes")
+To get detailed information about changes in Magento 2.1.0, please visit [Magento Community Edition (CE) Release Notes](https://devdocs.magento.com/guides/v2.3/release-notes/ReleaseNotes2.1.0CE.html "Magento Community Edition (CE) Release Notes")
 
 2.0.0
 =============
@@ -1637,7 +1637,7 @@ Tests:
     * Improved backend menu keyboard accessibility
     * Accessibility improvements: WAI-ARIA in a product item on a category page and related products
     * Checkout flow code can work with a separate DB storage
-    * <a href="https://devdocs.magento.com/guides/v1.0/release-notes/changes.html#change-devrc-unit">Unit tests moved to module directories</a>
+    * Unit tests moved to module directories
     * Addressed naming inconsistencies in REST routes
     * Added Advanced Developer workflow for frontend developers
 * Setup

README.md

@@ -20,10 +20,10 @@ To learn about issues, click [here][2]. To open an issue, click [here][3].
 
 To suggest documentation improvements, click [here][4].
 
-[1]: <https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html>
-[2]: <https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#report>
-[3]: <https://github.com/magento/magento2/issues>
-[4]: <https://devdocs.magento.com>
+[1]: https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html
+[2]: https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#report
+[3]: https://github.com/magento/magento2/issues
+[4]: https://devdocs.magento.com
 
 <h3>Community Maintainers</h3>
 The members of this team have been recognized for their outstanding commitment to maintaining and improving Magento. Magento has granted them permission to accept, merge, and reject pull requests, as well as review issues, and thanks these Community Maintainers for their valuable contributions.

app/code/Magento/AdminNotification/README.md

@@ -1,4 +1,30 @@
-# Admin Notification
+# Magento_AdminNotification module
 
-**Admin Notification** provides the ability to alert administrators via
-system messages and provides a message inbox for surveys and notifications.
+The Magento_AdminNotification module provides the ability to alert administrators via system messages and provides a message inbox for surveys and notifications.
+
+## Installation details
+
+Before disabling or uninstalling this module, note that the Magento_Indexer module depends on this module.
+
+For information about module installation in Magento 2, see [Enable or disable modules](https://devdocs.magento.com/guides/v2.3/install-gde/install/cli/install-cli-subcommands-enable.html).
+
+### Events
+
+This module observes the following events:
+
+ - `controller_action_predispatch` event in `Magento\AdminNotification\Observer\PredispatchAdminActionControllerObserver`
+
+### Layouts
+
+This module introduces the following layouts and layout handles in the `view/adminhtml/layout` directory:
+
+- `adminhtml_notification_index`
+- `adminhtml_notification_block`
+
+For more information about layouts in Magento 2, see the [Layout documentation](https://devdocs.magento.com/guides/v2.3/frontend-dev-guide/layouts/layout-overview.html).
+
+### UI components
+
+You can extend admin notifications using the `view/adminhtml/ui_component/notification_area.xml` configuration file.
+
+For information about UI components in Magento 2, see [Overview of UI components](https://devdocs.magento.com/guides/v2.3/ui_comp_guide/bk-ui_comps.html).

app/code/Magento/AdminNotification/Test/Mftf/Section/AdminSystemMessagesSection.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminSystemMessagesSection">
+        <element name="systemMessagesDropdown" type="button" selector="#system_messages .message-system-action-dropdown"/>
+        <element name="actionMessageLog" type="button" selector="//*[contains(@class, 'message-system-summary')]/a[contains(text(), '{{textMessage}}')]" parameterized="true"/>
+    </section>
+</sections>

app/code/Magento/AdvancedPricingImportExport/README.md

@@ -1 +1,4 @@
-The Magento_AdvancedPricingImportExport module handles the import and export of the advanced pricing.
+# Magento_AdvancedPricingImportExport module
+
+The Magento_AdvancedPricingImportExport module handles the import and export of the advanced pricing.
+

app/code/Magento/Analytics/README.md

@@ -1,6 +1,6 @@
 # Magento_Analytics Module
 
-The Magento_Analytics module integrates your Magento instance with the [Magento Business Intelligence (MBI)](https://magento.com/products/business-intelligence) to use [Advanced Reporting](https://devdocs.magento.com/guides/v2.2/advanced-reporting/modules.html) functionality.
+The Magento_Analytics module integrates your Magento instance with the [Magento Business Intelligence (MBI)](https://magento.com/products/business-intelligence) to use [Advanced Reporting](https://devdocs.magento.com/guides/v2.3/advanced-reporting/modules.html) functionality.
 
 The module implements the following functionality:
 
@@ -16,8 +16,8 @@ The module implements the following functionality:
 
 ## Structure
 
-Beyond the [usual module file structure](https://devdocs.magento.com/guides/v2.2/architecture/archi_perspectives/components/modules/mod_intro.html) the module contains a directory `ReportXml`.
-[Report XML](https://devdocs.magento.com/guides/v2.2/advanced-reporting/report-xml.html) is a markup language used to build reports for Advanced Reporting.
+Beyond the [usual module file structure](https://devdocs.magento.com/guides/v2.3/architecture/archi_perspectives/components/modules/mod_intro.html) the module contains a directory `ReportXml`.
+[Report XML](https://devdocs.magento.com/guides/v2.3/advanced-reporting/report-xml.html) is a markup language used to build reports for Advanced Reporting.
 The language declares SQL queries using XML declaration.
 
 ## Subscription Process

app/code/Magento/Backend/Block/AbstractBlock.php

@@ -27,7 +27,7 @@ class AbstractBlock extends \Magento\Framework\View\Element\AbstractBlock
      */
     public function __construct(\Magento\Backend\Block\Context $context, array $data = [])
     {
-        parent::__construct($context, $data);
         $this->_authorization = $context->getAuthorization();
+        parent::__construct($context, $data);
     }
 }

app/code/Magento/Backend/Test/Mftf/Section/AdminSecondaryGridSection.xml

@@ -14,6 +14,7 @@
         <element name="catalogRuleIdentifierSearch" type="input" selector=".col-name .admin__control-text"/>
         <element name="searchButton" type="input" selector=".admin__filter-actions [title='Search']"/>
         <element name="firstRow" type="block" selector="tr[data-role='row']"/>
+        <element name="rowByName" type="block" selector="//td[contains(text(), '{{searchingName}}')]" parameterized="true" timeout="30"/>
     </section>
 </sections>
 

app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml

@@ -23,7 +23,7 @@ $numColumns = $block->getColumns() !== null ? count($block->getColumns()) : 0;
     <?php if ($block->canDisplayContainer()) : ?>
 <div id="<?= $block->escapeHtml($block->getId()) ?>" data-grid-id="<?= $block->escapeHtml($block->getId()) ?>">
     <?php else : ?>
-    <?= $block->getLayout()->getMessagesBlock()->getGroupedHtml() ?>
+        <?= $block->getLayout()->getMessagesBlock()->getGroupedHtml() ?>
     <?php endif; ?>
 
         <div class="admin__data-grid-header admin__data-grid-toolbar">

app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php

@@ -3,10 +3,18 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tab\Bundle;
 
 use Magento\Framework\Data\Form\Element\AbstractElement;
+use Magento\Store\Model\Store;
 
+/**
+ * Block for rendering option of bundle product
+ *
+ * Class \Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tab\Bundle\Option
+ */
 class Option extends \Magento\Backend\Block\Widget
 {
     /**
@@ -79,6 +87,8 @@ protected function _construct()
     }
 
     /**
+     * Return Field Id
+     *
      * @return string
      */
     public function getFieldId()
@@ -87,6 +97,8 @@ public function getFieldId()
     }
 
     /**
+     * Return Field Name
+     *
      * @return string
      */
     public function getFieldName()
@@ -108,6 +120,8 @@ public function getProduct()
     }
 
     /**
+     * Render
+     *
      * @param AbstractElement $element
      * @return string
      */
@@ -118,6 +132,8 @@ public function render(AbstractElement $element)
     }
 
     /**
+     * Set Element
+     *
      * @param AbstractElement $element
      * @return $this
      */
@@ -128,6 +144,8 @@ public function setElement(AbstractElement $element)
     }
 
     /**
+     * Get Element
+     *
      * @return AbstractElement|null
      */
     public function getElement()
@@ -136,6 +154,8 @@ public function getElement()
     }
 
     /**
+     * Return Is Multi Websites
+     *
      * @return bool
      */
     public function isMultiWebsites()
@@ -144,6 +164,8 @@ public function isMultiWebsites()
     }
 
     /**
+     * Prepare Layout
+     *
      * @return $this
      */
     protected function _prepareLayout()
@@ -184,6 +206,8 @@ protected function _prepareLayout()
     }
 
     /**
+     * Get Add Button Html
+     *
      * @return string
      */
     public function getAddButtonHtml()
@@ -192,6 +216,8 @@ public function getAddButtonHtml()
     }
 
     /**
+     * Get Close Search Button Html
+     *
      * @return string
      */
     public function getCloseSearchButtonHtml()
@@ -200,6 +226,8 @@ public function getCloseSearchButtonHtml()
     }
 
     /**
+     * Get Add Selection Button Html
+     *
      * @return string
      */
     public function getAddSelectionButtonHtml()
@@ -239,6 +267,8 @@ public function getOptions()
     }
 
     /**
+     * Get Add Button Id
+     *
      * @return mixed
      */
     public function getAddButtonId()
@@ -248,6 +278,8 @@ public function getAddButtonId()
     }
 
     /**
+     * Get Options Delete Button Html
+     *
      * @return string
      */
     public function getOptionDeleteButtonHtml()
@@ -256,6 +288,8 @@ public function getOptionDeleteButtonHtml()
     }
 
     /**
+     * Get Selection Html
+     *
      * @return string
      */
     public function getSelectionHtml()
@@ -264,6 +298,8 @@ public function getSelectionHtml()
     }
 
     /**
+     * Get Type Select Html
+     *
      * @return mixed
      */
     public function getTypeSelectHtml()
@@ -286,6 +322,8 @@ public function getTypeSelectHtml()
     }
 
     /**
+     * Get Require Select Html
+     *
      * @return mixed
      */
     public function getRequireSelectHtml()
@@ -304,10 +342,12 @@ public function getRequireSelectHtml()
     }
 
     /**
+     * Return Is Default Store
+     *
      * @return bool
      */
     public function isDefaultStore()
     {
-        return $this->getProduct()->getStoreId() == '0';
+        return $this->getProduct()->getStoreId() == Store::DEFAULT_STORE_ID;
     }
 }