Merge remote-tracking branch 'remotes/origin/2.3-develop' into MC-18821

Author: MorozovaNP

README.md

@@ -11,6 +11,10 @@ Welcome to Magento 2 installation! We're glad you chose to install Magento 2, a
 
 *	[Installation Guide](https://devdocs.magento.com/guides/v2.3/install-gde/bk-install-guide.html).
 
+## Learn More About GraphQL in Magento 2
+
+* [GraphQL Developer Guide](https://devdocs.magento.com/guides/v2.3/graphql/index.html)
+
 <h2>Contributing to the Magento 2 Code Base</h2>
 Contributions can take the form of new components or features, changes to existing features, tests, documentation (such as developer guides, user guides, examples, or specifications), bug fixes, optimizations, or just good suggestions.
 

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

@@ -9,7 +9,7 @@
         xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="adminnotification_inbox" resource="default" engine="innodb" comment="Adminnotification Inbox">
         <column xsi:type="int" name="notification_id" padding="10" unsigned="true" nullable="false" identity="true"
-                comment="Notification id"/>
+                comment="Notification ID"/>
         <column xsi:type="smallint" name="severity" padding="5" unsigned="true" nullable="false" identity="false"
                 default="0" comment="Problem type"/>
         <column xsi:type="timestamp" name="date_added" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
@@ -35,7 +35,7 @@
         </index>
     </table>
     <table name="admin_system_messages" resource="default" engine="innodb" comment="Admin System Messages">
-        <column xsi:type="varchar" name="identity" nullable="false" length="100" comment="Message id"/>
+        <column xsi:type="varchar" name="identity" nullable="false" length="100" comment="Message ID"/>
         <column xsi:type="smallint" name="severity" padding="5" unsigned="true" nullable="false" identity="false"
                 default="0" comment="Problem type"/>
         <column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"

app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php

@@ -5,11 +5,11 @@
  */
 namespace Magento\AdvancedPricingImportExport\Model\Export;
 
-use Magento\ImportExport\Model\Export;
-use Magento\Store\Model\Store;
-use Magento\CatalogImportExport\Model\Import\Product as ImportProduct;
 use Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing as ImportAdvancedPricing;
 use Magento\Catalog\Model\Product as CatalogProduct;
+use Magento\CatalogImportExport\Model\Import\Product as ImportProduct;
+use Magento\ImportExport\Model\Export;
+use Magento\Store\Model\Store;
 
 /**
  * Export Advanced Pricing
@@ -150,6 +150,8 @@ public function __construct(
     }
 
     /**
+     * Init type models
+     *
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
      */
@@ -172,7 +174,9 @@ protected function initTypeModels()
             }
             if ($model->isSuitable()) {
                 $this->_productTypeModels[$productTypeName] = $model;
+                // phpcs:ignore Magento2.Performance.ForeachArrayMerge
                 $this->_disabledAttrs = array_merge($this->_disabledAttrs, $model->getDisabledAttrs());
+                // phpcs:ignore Magento2.Performance.ForeachArrayMerge
                 $this->_indexValueAttributes = array_merge(
                     $this->_indexValueAttributes,
                     $model->getIndexValueAttributes()
@@ -197,6 +201,7 @@ protected function initTypeModels()
     public function export()
     {
         //Execution time may be very long
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
         set_time_limit(0);
 
         $writer = $this->getWriter();
@@ -234,16 +239,6 @@ public function filterAttributeCollection(\Magento\Eav\Model\ResourceModel\Entit
 
         foreach ($collection as $attribute) {
             if (in_array($attribute->getAttributeCode(), $this->_disabledAttrs)) {
-                if (isset($this->_parameters[\Magento\ImportExport\Model\Export::FILTER_ELEMENT_SKIP])) {
-                    if ($attribute->getAttributeCode() == ImportAdvancedPricing::COL_TIER_PRICE
-                        && in_array(
-                            $attribute->getId(),
-                            $this->_parameters[\Magento\ImportExport\Model\Export::FILTER_ELEMENT_SKIP]
-                        )
-                    ) {
-                        $this->_passTierPrice = 1;
-                    }
-                }
                 $collection->removeItemByKey($attribute->getId());
             }
         }
@@ -363,6 +358,7 @@ private function prepareExportData(
         $linkedTierPricesData = [];
         foreach ($tierPricesData as $tierPriceData) {
             $sku = $productLinkIdToSkuMap[$tierPriceData['product_link_id']];
+            // phpcs:ignore Magento2.Performance.ForeachArrayMerge
             $linkedTierPricesData[] = array_merge(
                 $tierPriceData,
                 [ImportAdvancedPricing::COL_SKU => $sku]
@@ -471,7 +467,7 @@ private function fetchTierPrices(array $productIds): array
             ImportAdvancedPricing::COL_TIER_PRICE_QTY => 'ap.qty',
             ImportAdvancedPricing::COL_TIER_PRICE => 'ap.value',
             ImportAdvancedPricing::COL_TIER_PRICE_PERCENTAGE_VALUE => 'ap.percentage_value',
-            'product_link_id' => 'ap.' .$productEntityLinkField,
+            'product_link_id' => 'ap.' . $productEntityLinkField,
         ];
         if ($exportFilter && array_key_exists('tier_price', $exportFilter)) {
             if (!empty($exportFilter['tier_price'][0])) {
@@ -488,7 +484,7 @@ private function fetchTierPrices(array $productIds): array
                 $selectFields
             )
             ->where(
-                'ap.'.$productEntityLinkField.' IN (?)',
+                'ap.' . $productEntityLinkField . ' IN (?)',
                 $productIds
             );
 
@@ -602,7 +598,7 @@ protected function _getWebsiteCode(int $websiteId): string
             }
 
             if ($storeName && $currencyCode) {
-                $code = $storeName.' ['.$currencyCode.']';
+                $code = $storeName . ' [' . $currencyCode . ']';
             } else {
                 $code = $storeName;
             }

app/code/Magento/AdvancedSearch/etc/db_schema.xml

@@ -9,11 +9,11 @@
         xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="catalogsearch_recommendations" resource="default" engine="innodb"
            comment="Advanced Search Recommendations">
-        <column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true" comment="Id"/>
+        <column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true" comment="ID"/>
         <column xsi:type="int" name="query_id" padding="10" unsigned="true" nullable="false" identity="false"
-                default="0" comment="Query Id"/>
+                default="0" comment="Query ID"/>
         <column xsi:type="int" name="relation_id" padding="10" unsigned="true" nullable="false" identity="false"
-                default="0" comment="Relation Id"/>
+                default="0" comment="Relation ID"/>
         <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="id"/>
         </constraint>

app/code/Magento/Analytics/README.md

@@ -1,18 +1,27 @@
-# Magento_Analytics Module
+# 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.3/advanced-reporting/modules.html) functionality.
 
 The module implements the following functionality:
 
-* enabling subscription to the MBI and automatic re-subscription
-* changing the base URL with the same MBI account remained
-* declaring the configuration schemas for report data collection
-* collecting the Magento instance data as reports for the MBI
-* introducing API that provides the collected data
-* extending Magento configuration with the module parameters:
-    * subscription status (enabled/disabled)
-    * industry (a business area in which the instance website works)
-    * time of data collection (time of the day when the module collects data)
+- Enabling subscription to Magento Business Intelligence (MBI) and automatic re-subscription
+- Declaring the configuration schemas for report data collection
+- Collecting the Magento instance data as reports for MBI
+- Introducing API that provides the collected data
+- Extending Magento configuration with the module parameters:
+    - Subscription status (enabled/disabled)
+    - Industry (a business area in which the instance website works)
+    - Time of data collection (time of the day when the module collects data)
+
+## Installation details
+
+Before disabling or uninstalling this module, note that the following modules depends on this module:
+- Magento_CatalogAnalytics
+- Magento_CustomerAnalytics
+- Magento_QuoteAnalytics
+- Magento_ReviewAnalytics
+- Magento_SalesAnalytics
+- Magento_WishlistAnalytics
 
 ## Structure
 
@@ -29,12 +38,12 @@ The subscription to the MBI service is enabled during the installation process o
 Configuration settings for the Analytics module can be modified in the Admin Panel on the Stores > Configuration page under the General > Advanced Reporting tab.
 
 The following options can be adjusted:
-* Advanced Reporting Service (Enabled/Disabled)
-    * Alters the status of the Advanced Reporting subscription
-* Time of day to send data (Hour/Minute/Second in the store's time zone)
-    * Defines when the data collection process for the Advanced Reporting service occurs
-* Industry
-    * Defines the industry of the store in order to create a personalized Advanced Reporting experience
+- Advanced Reporting Service (Enabled/Disabled)
+    - Alters the status of the Advanced Reporting subscription
+- Time of day to send data (Hour/Minute/Second in the store's time zone)
+    - Defines when the data collection process for the Advanced Reporting service occurs
+- Industry
+    - Defines the industry of the store in order to create a personalized Advanced Reporting experience
 
 ## Extensibility
 

app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationTimeToSendDataTest.xml

@@ -25,9 +25,9 @@
         <amOnPage url="{{AdminConfigGeneralAnalyticsPage.url}}" stepKey="amOnAdminConfig"/>
         <selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingService}}" userInput="Enable" stepKey="selectAdvancedReportingServiceEnabled"/>
         <selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingIndustry}}" userInput="Apps and Games" stepKey="selectAdvancedReportingIndustry"/>
-        <selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingHour}}" userInput="11" stepKey="selectAdvancedReportingHour"/>
-        <selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingMinute}}" userInput="11" stepKey="selectAdvancedReportingMinute"/>
-        <selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingSeconds}}" userInput="00" stepKey="selectAdvancedReportingSeconds"/>
+        <selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingHour}}" userInput="23" stepKey="selectAdvancedReportingHour"/>
+        <selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingMinute}}" userInput="59" stepKey="selectAdvancedReportingMinute"/>
+        <selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingSeconds}}" userInput="59" stepKey="selectAdvancedReportingSeconds"/>
         <click selector="{{AdminMainActionsSection.save}}" stepKey="clickSaveConfigButton"/>
         <see selector="{{AdminMessagesSection.success}}" userInput="You saved the configuration." stepKey="seeSuccess"/>
     </test>

app/code/Magento/AsynchronousOperations/etc/adminhtml/system.xml

@@ -13,6 +13,7 @@
                 <label>Bulk Actions</label>
                 <field id="lifetime" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0">
                     <label>Days Saved in Log</label>
+                     <validate>validate-zero-or-greater validate-digits</validate>
                 </field>
             </group>
         </section>

app/code/Magento/Backend/README.md

@@ -1,3 +1,112 @@
-The Backend module contains common infrastructure and assets for other modules to be defined and used in their
-administration user interface (UI). It does not contain anything specific to other modules. Among many things it
-handles the logic of authenticating and authorizing users.
+# Magento_Backend module
+
+The Magento_Backend module contains common infrastructure and assets for other modules to be defined and used in their
+administration user interface (UI).
+
+The Magento_Backend module does not contain anything specific to other modules. Among many things it handles the logic of authenticating and authorizing users.
+
+## Installation details
+
+Before disabling or uninstalling this module, note that the following modules depends on this module:
+
+- Magento_Analytics
+- Magento_Authorization
+- Magento_NewRelicReporting
+- Magento_ProductVideo
+- Magento_ReleaseNotification
+- Magento_Search
+- Magento_Security
+- Magento_Signifyd
+- Magento_Swatches
+- Magento_Ui
+- Magento_User
+- Magento_Webapi
+
+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).
+
+## Structure
+
+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 `Service/V1`.
+
+`Service/V1` - contains logic to provide a list of modules installed in Magento.
+
+For information about typical file structure of a module in Magento 2, see [Module file structure](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/build/module-file-structure.html#module-file-structure).
+
+## Extensibility
+
+Extension developers can interact with the Magento_Backend module. For more information about the Magento extension mechanism, see [Magento plug-ins](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/plugins.html).
+
+[The Magento dependency injection mechanism](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/depend-inj.html) enables you to override the functionality of the Magento_Backend module.
+
+### Events
+
+The module dispatches the following events:
+
+ - `adminhtml_block_html_before` event in the `\Magento\Backend\Block\Template::_toHtml()` method. Parameters:
+   - `block` is the backend block template (this) (`\Magento\Backend\Block\Template` class).
+ - `adminhtml_store_edit_form_prepare_form` event in the `\Magento\Backend\Block\System\Store\Edit\AbstractForm::_prepareForm()` method. Parameters:
+   - `block` is the AbstractForm block (this) (`\Magento\Backend\Block\System\Store\Edit\AbstractForm` class).
+ - `backend_block_widget_grid_prepare_grid_before` event in the `\Magento\Backend\Block\Widget\Grid::_prepareGrid()` method. Parameters:
+    - `grid` is the widget grid block (this) (`\Magento\Backend\Block\Widget\Grid` class)
+    - `collection` is the grid collection (`\Magento\Framework\Data\Collection` class).
+ - `adminhtml_cache_flush_system` event in the `\Magento\Backend\Console\Command\CacheCleanCommand::performAction()` method.
+ - `adminhtml_cache_flush_all` event in the `\Magento\Backend\Console\Command\CacheFlushCommand::performAction()` method.
+ - `clean_catalog_images_cache_after` event in the `\Magento\Backend\Controller\Adminhtml\Cache\CleanImages::execute()` method.
+ - `clean_media_cache_after` event in the `\Magento\Backend\Controller\Adminhtml\Cache\CleanMedia::execute()` method.
+ - `clean_static_files_cache_after` event in the `\Magento\Backend\Controller\Adminhtml\Cache\CleanStaticFiles::execute()` method.
+ - `adminhtml_cache_flush_all` event in the `\Magento\Backend\Controller\Adminhtml\Cache\FlushAll::execute()` method.
+ - `adminhtml_cache_flush_system` event in the `\Magento\Backend\Controller\Adminhtml\Cache\FlushSystem::execute()` method.
+ - `theme_save_after` event in the `\Magento\Backend\Controller\Adminhtml\System\Design\Save::execute()` method.
+ - `backend_auth_user_login_success` event in the `\Magento\Backend\Model\Auth::login()` method. Parameters:
+    - `user` is the credential storage object (`null | \Magento\Backend\Model\Auth\Credential\StorageInterface`)
+ - `backend_auth_user_login_failed` event in the `\Magento\Backend\Model\Auth::login()` method. Parameters:
+    - `user_name` is username extracted from the credential storage object (`null | \Magento\Backend\Model\Auth\Credential\StorageInterface`)
+    - `exception` any exception generated (`\Magento\Framework\Exception\LocalizedException | \Magento\Framework\Exception\Plugin\AuthenticationException`)
+
+For information about an event in Magento 2, see [Events and observers](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/events-and-observers.html#events).
+
+### Layouts
+
+This module introduces the following layouts and layout handles in the `view/adminhtml/layout` directory:
+
+- `admin_login`
+- `adminhtml_auth_login`
+- `adminhtml_cache_block`
+- `adminhtml_cache_index`
+- `adminhtml_dashboard_customersmost`
+- `adminhtml_dashboard_customersnewest`
+- `adminhtml_dashboard_index`
+- `adminhtml_dashboard_productsviewed`
+- `adminhtml_denied`
+- `adminhtml_noroute`
+- `adminhtml_system_account_index`
+- `adminhtml_system_design_edit`
+- `adminhtml_system_design_grid`
+- `adminhtml_system_design_grid_block`
+- `adminhtml_system_design_index`
+- `adminhtml_system_store_deletestore`
+- `adminhtml_system_store_editstore`
+- `adminhtml_system_store_grid_block`
+- `adminhtml_system_store_index`
+- `default`
+- `editor`
+- `empty`
+- `formkey`
+- `overlay_popup`
+- `popup`
+
+
+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 Magento_Backend module using the following configuration files:
+
+- `view/adminhtml/ui_component/design_config_form.xml`
+- `view/adminhtml/ui_component/design_config_listing.xml`
+
+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).
+
+## Additional information
+
+For information about significant changes in patch releases, see [2.3.x Release information](https://devdocs.magento.com/guides/v2.3/release-notes/bk-release-notes.html).

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

@@ -11,6 +11,9 @@
     <section name="LocaleOptionsSection">
         <element name="sectionHeader" type="text" selector="#general_locale-head"/>
         <element name="timezone" type="select" selector="#general_locale_timezone"/>
+        <element name="locale" type="select" selector="#general_locale_code"/>
+        <element name="localeEnabled" type="select" selector="#general_locale_code:enabled"/>
+        <element name="localeDisabled" type="select" selector="#general_locale_code[disabled=disabled]"/>
         <element name="useDefault" type="checkbox" selector="#general_locale_timezone_inherit"/>
     </section>
 </sections>