Merge branch '-2.3-develop' of https://github.com/magento/magento2 into 24151-collapsed-js-issue-fix

Author: sunilit42

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/AdvancedSearch/etc/adminhtml/system.xml

@@ -55,6 +55,7 @@
                     </field>
                     <field id="search_suggestion_count" translate="label" type="text" sortOrder="91" showInDefault="1" showInWebsite="1" showInStore="1">
                         <label>Search Suggestions Count</label>
+                        <validate>validate-digits validate-zero-or-greater</validate>
                         <depends>
                             <field id="search_suggestion_enabled">1</field>
                         </depends>

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/AuthorizenetAcceptjs/Test/Mftf/ActionGroup/ConfigureAuthorizenetAcceptjsActionGroup.xml

@@ -5,9 +5,13 @@
   * See COPYING.txt for license details.
   */
 -->
+
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="ConfigureAuthorizenetAcceptjs" extends="EnableAuthorizenetAcceptjs">
+        <annotations>
+            <description>Sets up the Authorize.net Accept JS configuration setting with a specified Payment action.</description>
+        </annotations>
         <arguments>
             <argument name="paymentAction" type="string"/>
         </arguments>
@@ -23,6 +27,10 @@
     </actionGroup>
 
     <actionGroup name="DisableAuthorizenetAcceptjs">
+        <annotations>
+            <description>Disables the Authorize.net Accept JS configuration setting via the CLI.</description>
+        </annotations>
+
         <magentoCLI stepKey="disableAuthorizenetAcceptjs" command="config:set payment/authorizenet_acceptjs/active 0"/>
     </actionGroup>
 

app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/ActionGroup/FillPaymentInformationActionGroup.xml

@@ -5,9 +5,14 @@
   * See COPYING.txt for license details.
   */
 -->
+
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="FillPaymentInformation">
+        <annotations>
+            <description>Fill Payment Method with Authorize.net</description>
+        </annotations>
+
         <click stepKey="clickOnAuthorizenetToggle" selector="{{AuthorizenetCheckoutSection.selectAuthorizenet}}"/>
         <waitForPageLoad stepKey="waitForCardDataSection"/>
         <fillField stepKey="fillCardNumber" selector="{{AuthorizenetCheckoutSection.cardInput}}" userInput="{{PaymentAndShippingInfo.cardNumber}}"/>
@@ -18,12 +23,16 @@
         <waitForPageLoad stepKey="waitForCheckout"/>
     </actionGroup>
 
-    <!-- Guest checkout Authorizenet fill billing address -->
+    <!-- Guest checkout Authorize.net fill billing address -->
     <actionGroup name="GuestCheckoutAuthorizenetFillBillingAddress">
+        <annotations>
+            <description>Fill Billing Address as Guest with Authorize.net</description>
+        </annotations>
         <arguments>
             <argument name="customer"/>
             <argument name="customerAddress"/>
         </arguments>
+
         <fillField selector="{{GuestAuthorizenetCheckoutSection.firstName}}" userInput="{{customer.firstName}}" stepKey="fillFirstName"/>
         <fillField selector="{{GuestAuthorizenetCheckoutSection.lastName}}" userInput="{{customer.lastName}}" stepKey="fillLastName"/>
         <fillField selector="{{GuestAuthorizenetCheckoutSection.street}}" userInput="{{customerAddress.street[0]}}" stepKey="fillStreet"/>

app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/ActionGroup/ViewAndValidateOrderActionGroup.xml

@@ -5,15 +5,20 @@
   * See COPYING.txt for license details.
   */
 -->
+
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="ViewAndValidateOrderActionGroup">
+        <annotations>
+            <description>Validate the Order is Correct. Then Submit the Invoice.</description>
+        </annotations>
         <arguments>
             <argument name="amount" type="string"/>
             <argument name="status" type="string"/>
             <argument name="captureStatus" type="string"/>
             <argument name="closedStatus" type="string"/>
         </arguments>
+
         <amOnPage url="{{AdminLoginPage.url}}" stepKey="navigateToAdmin"/>
         <click selector="{{AdminMenuSection.sales}}" stepKey="clickSales"/>
         <waitForPageLoad stepKey="waitForSalesSubsection"/>
@@ -39,13 +44,18 @@
         <see userInput="{{closedStatus}}" selector="{{ViewOrderSection.confirmClosed}}" stepKey="seeClosed"/>
         -->
     </actionGroup>
+
     <actionGroup name="ViewAndValidateOrderActionGroupNoSubmit">
+        <annotations>
+            <description>Validate the Order is Correct. Do Not Submit the Invoice.</description>
+        </annotations>
         <arguments>
             <argument name="amount" type="string"/>
             <argument name="status" type="string"/>
             <argument name="captureStatus" type="string"/>
             <argument name="closedStatus" type="string"/>
         </arguments>
+
         <amOnPage url="{{AdminLoginPage.url}}" stepKey="navigateToAdmin"/>
         <click selector="{{AdminMenuSection.sales}}" stepKey="clickSales"/>
         <waitForPageLoad stepKey="waitForSalesSubsection"/>

app/code/Magento/AuthorizenetGraphQl/Model/AuthorizenetDataProvider.php

@@ -11,7 +11,7 @@
 use Magento\Framework\Stdlib\ArrayManager;
 
 /**
- * DataProvider Model for Authorizenet
+ * SetPaymentMethod additional data provider model for Authorizenet payment method
  */
 class AuthorizenetDataProvider implements AdditionalDataProviderInterface
 {
@@ -23,7 +23,6 @@ class AuthorizenetDataProvider implements AdditionalDataProviderInterface
     private $arrayManager;
 
     /**
-     * AuthorizenetDataProvider constructor.
      * @param ArrayManager $arrayManager
      */
     public function __construct(
@@ -42,19 +41,19 @@ public function getData(array $data): array
     {
         $additionalData = $this->arrayManager->get(static::PATH_ADDITIONAL_DATA, $data) ?? [];
         foreach ($additionalData as $key => $value) {
-            $additionalData[$this->snakeCaseToCamelCase($key)] = $value;
+            $additionalData[$this->convertSnakeCaseToCamelCase($key)] = $value;
             unset($additionalData[$key]);
         }
         return $additionalData;
     }
 
     /**
-     * Converts an input string from snake_case to camelCase.
+     * Convert an input string from snake_case to camelCase.
      *
      * @param string $input
      * @return string
      */
-    private function snakeCaseToCamelCase($input)
+    private function convertSnakeCaseToCamelCase($input): string
     {
         return lcfirst(str_replace('_', '', ucwords($input, '_')));
     }

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/ActionGroup/AdminAssertPageTitleActionGroup.xml

@@ -9,9 +9,13 @@
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminAssertPageTitleActionGroup">
+        <annotations>
+            <description>Validate Backend Admin Grid Page Title is present and correct.</description>
+        </annotations>
         <arguments>
             <argument name="title" type="string"/>
         </arguments>
+
         <see selector="{{AdminGridHeaders.title}}" userInput="{{title}}" stepKey="assertPageTitle"/>
     </actionGroup>
 </actionGroups>

app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminNavigateMenuActionGroup.xml

@@ -9,10 +9,14 @@
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminNavigateMenuActionGroup">
+        <annotations>
+            <description>Open Backend Admin side Navigation Menu. Click on Sub-Navigation Menu item.</description>
+        </annotations>
         <arguments>
             <argument name="menuUiId" type="string"/>
             <argument name="submenuUiId" type="string"/>
         </arguments>
+
         <click selector="{{AdminMenuSection.menuItem(menuUiId)}}" stepKey="clickOnMenuItem"/>
         <click selector="{{AdminMenuSection.menuItem(submenuUiId)}}" stepKey="clickOnSubmenuItem"/>
     </actionGroup>

app/code/Magento/Backend/Test/Mftf/ActionGroup/AssertAdminDashboardPageIsVisibleActionGroup.xml

@@ -7,8 +7,12 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AssertAdminDashboardPageIsVisibleActionGroup">
+        <annotations>
+            <description>Validate the Backend Admin Dashboard URI is correct. Validate the Backend Admin Dashboard Title is present and correct.</description>
+        </annotations>
+
         <seeInCurrentUrl url="{{AdminDashboardPage.url}}" stepKey="seeDashboardUrl"/>
         <see userInput="Dashboard" selector="{{AdminHeaderSection.pageTitle}}" stepKey="seeDashboardTitle"/>
     </actionGroup>

app/code/Magento/Backend/Test/Mftf/ActionGroup/AssertAdminPageIsNot404ActionGroup.xml

@@ -7,8 +7,12 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AssertAdminPageIsNot404ActionGroup">
+        <annotations>
+            <description>Validates that the '404 Error' message is present and correct in the Admin Page Header.</description>
+        </annotations>
+
         <dontSee userInput="404 Error" selector="{{AdminHeaderSection.pageHeading}}" stepKey="dontSee404PageHeading"/>
     </actionGroup>
 </actionGroups>

app/code/Magento/Backend/Test/Mftf/ActionGroup/AssertAdminSuccessLoginActionGroup.xml

@@ -9,6 +9,10 @@
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AssertAdminSuccessLoginActionGroup">
-        <waitForElementVisible selector="{{AdminHeaderSection.adminUserAccountText}}" stepKey="waitForAdminAccountTextVisible" />
+        <annotations>
+            <description>Wait for the current Admin Name to appear in the Backend Admin.</description>
+        </annotations>
+
+        <waitForElementVisible selector="{{AdminHeaderSection.adminUserAccountText}}" stepKey="waitForAdminAccountTextVisible"/>
     </actionGroup>
 </actionGroups>

app/code/Magento/Backend/Test/Mftf/ActionGroup/AssertMessageInAdminPanelActionGroup.xml

@@ -9,12 +9,15 @@
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AssertMessageInAdminPanelActionGroup">
+        <annotations>
+            <description>Validates that the provided Message appears in the provided Message Type on an Admin page.</description>
+        </annotations>
         <arguments>
-            <argument name="message" type="string" />
-            <argument name="messageType" type="string" defaultValue="success" />
+            <argument name="message" type="string"/>
+            <argument name="messageType" type="string" defaultValue="success"/>
         </arguments>
 
-        <waitForElementVisible selector="{{AdminMessagesSection.messageByType(messageType)}}" stepKey="waitForMessageVisible" />
-        <see userInput="{{message}}" selector="{{AdminMessagesSection.messageByType(messageType)}}" stepKey="verifyMessage" />
+        <waitForElementVisible selector="{{AdminMessagesSection.messageByType(messageType)}}" stepKey="waitForMessageVisible"/>
+        <see userInput="{{message}}" selector="{{AdminMessagesSection.messageByType(messageType)}}" stepKey="verifyMessage"/>
     </actionGroup>
 </actionGroups>

app/code/Magento/Backend/Test/Mftf/ActionGroup/AssertMessageOnAdminLoginActionGroup.xml

@@ -9,12 +9,15 @@
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AssertMessageOnAdminLoginActionGroup">
+        <annotations>
+            <description>Validate Backend Admin Login status message is present and correct.</description>
+        </annotations>
         <arguments>
-            <argument name="message" type="string" defaultValue="The account sign-in was incorrect or your account is disabled temporarily. Please wait and try again later." />
-            <argument name="messageType" type="string" defaultValue="error" />
+            <argument name="message" type="string" defaultValue="The account sign-in was incorrect or your account is disabled temporarily. Please wait and try again later."/>
+            <argument name="messageType" type="string" defaultValue="error"/>
         </arguments>
 
-        <waitForElementVisible selector="{{AdminLoginMessagesSection.messageByType(messageType)}}" stepKey="waitForAdminLoginFormMessage" />
-        <see userInput="{{message}}" selector="{{AdminLoginMessagesSection.messageByType(messageType)}}" stepKey="verifyMessage" />
+        <waitForElementVisible selector="{{AdminLoginMessagesSection.messageByType(messageType)}}" stepKey="waitForAdminLoginFormMessage"/>
+        <see userInput="{{message}}" selector="{{AdminLoginMessagesSection.messageByType(messageType)}}" stepKey="verifyMessage"/>
     </actionGroup>
 </actionGroups>