merge magento/2.3-develop into magento-epam/EPAM-PR-69

Author: magento-cicd2

app/code/Magento/AdvancedSearch/README.md

@@ -1 +1,38 @@
-AdvancedSearch module introduces advanced search functionality and provides interfaces that allow to implement this functionality by 3rd party search engines
+# Magento_AdvancedSearch module
+The Magento_AdvancedSearch module introduces advanced search functionality and provides interfaces that allow third-party search engines to implement this functionality.
+
+## Installation details
+
+Before disabling or uninstalling this module, note that the following modules depends on this module:
+- Magento_Elasticsearch
+- Magento_Elasticsearch6
+
+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).
+
+## Extensibility
+
+Extension developers can interact with the Magento_AdvancedSearch 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_AdvancedSearch module.
+
+### Events
+
+This module observes the following event:
+
+ - `catalogsearch_query_save_after` in the `Magento\AdvancedSearch\Model\Recommendations\SaveSearchQueryRelationsObserver` file. 
+
+For information about an event in Magento 2, see [Events and observers](http://devdocs.magento.com/guides/v2.3/extension-dev-guide/events-and-observers.html#events).
+
+### Layouts
+
+The module interacts with the following layout handles in the `view/adminhtml/layout` directory:
+
+- `catalog_search_block`
+- `catalog_search_edit`
+- `catalog_search_relatedgrid`
+
+The module interacts with the following layout handles in the `view/frontend/layout` directory:
+
+- `catalogsearch_result_index`
+
+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).

app/code/Magento/Authorization/README.md

@@ -1,4 +1,20 @@
-# Authorization
+# Magento_Authorization module
 
-**Authorization** enables management of access control list roles and
-rules in the application.
+The Magento_Authorization module enables management of access control list roles and rules in the application.
+
+## Installation details
+
+The Magento_AdminNotification module creates the following tables in the database:
+
+- `authorization_role`
+- `authorization_rule`
+
+Before disabling or uninstalling this module, note that the Magento_GraphQl 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).
+
+## Extensibility
+
+Extension developers can interact with the Magento_Authorization 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_Authorization module.

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

@@ -145,7 +145,9 @@
                 <field id="allow_symlink" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Allow Symlinks</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                    <comment>Warning! Enabling this feature is not recommended on production environments because it represents a potential security risk.</comment>
+                    <comment>
+                        <![CDATA[<strong style="color:red">Warning!</strong> Enabling this feature is not recommended on production environments because it represents a potential security risk.]]>
+                    </comment>
                 </field>
                 <field id="minify_html" translate="label comment" type="select" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Minify Html</label>
@@ -435,7 +437,7 @@
                     <label>Admin Session Lifetime (seconds)</label>
                     <comment>Please enter at least 60 and at most 31536000 (one year).</comment>
                     <backend_model>Magento\Backend\Model\Config\SessionLifetime\BackendModel</backend_model>
-                    <validate>validate-digits</validate>
+                    <validate>validate-digits validate-digits-range digits-range-60-31536000</validate>
                 </field>
             </group>
             <group id="dashboard" translate="label" sortOrder="40" showInDefault="1" showInWebsite="0" showInStore="0">

app/code/Magento/Backend/i18n/en_US.csv

@@ -333,7 +333,7 @@ Debug,Debug
 "Add Block Names to Hints","Add Block Names to Hints"
 "Template Settings","Template Settings"
 "Allow Symlinks","Allow Symlinks"
-"Warning! Enabling this feature is not recommended on production environments because it represents a potential security risk.","Warning! Enabling this feature is not recommended on production environments because it represents a potential security risk."
+"<strong style=""color:red"">Warning!</strong> Enabling this feature is not recommended on production environments because it represents a potential security risk.","<strong style=""color:red"">Warning!</strong> Enabling this feature is not recommended on production environments because it represents a potential security risk."
 "Minify Html","Minify Html"
 "Minification is not applied in developer mode.","Minification is not applied in developer mode."
 "Translate Inline","Translate Inline"

app/code/Magento/Backend/view/adminhtml/templates/admin/access_denied.phtml

@@ -21,10 +21,10 @@
         <li>
             <span><?= $block->escapeHtml(__('Return to ')) ?>
                 <?php if (isset($_SERVER['HTTP_REFERER'])) : ?>
-                    <a href="<?= $block->escapeUrl(__($_SERVER['HTTP_REFERER'])) ?>">
+                    <a href="<?= $block->escapeUrl($_SERVER['HTTP_REFERER']) ?>">
                         <?= $block->escapeHtml(__('previous page')) ?></a><?= $block->escapeHtml(__('.')) ?>
                 <?php else : ?>
-                    <a href="<?= $block->escapeHtmlAttr(__('javascript:history.back()')) ?>">
+                    <a href="<?= $block->escapeHtmlAttr('javascript:history.back()') ?>">
                         <?= $block->escapeHtml(__('previous page')) ?></a><?= $block->escapeHtml(__('.')) ?>
                 <?php endif ?>
             </span>

app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/Full.php

@@ -152,7 +152,7 @@ private function switchTables(): void
      *
      * @return $this
      */
-    public function execute(): self
+    public function execute(): Full
     {
         $this->createTables();
         $this->clearReplicaTables();

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

@@ -43,6 +43,7 @@
                 </field>
                 <field id="timeout" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0">
                     <label>Connection Timeout in Seconds</label>
+                    <validate>validate-zero-or-greater validate-number</validate>
                 </field>
             </group>
             <group id="currencyconverterapi" translate="label" sortOrder="45" showInDefault="1" showInWebsite="0" showInStore="0">
@@ -54,6 +55,7 @@
                 </field>
                 <field id="timeout" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0">
                     <label>Connection Timeout in Seconds</label>
+                    <validate>validate-zero-or-greater validate-number</validate>
                 </field>
             </group>
             <group id="import" translate="label" type="text" sortOrder="50" showInDefault="1" showInWebsite="0" showInStore="0">

app/code/Magento/Eav/Model/Attribute/Data/Text.php

@@ -75,6 +75,8 @@ public function validateValue($value)
         if (empty($value) && $value !== '0' && $attribute->getDefaultValue() === null) {
             $label = __($attribute->getStoreLabel());
             $errors[] = __('"%1" is a required value.', $label);
+
+            return $errors;
         }
 
         $validateLengthResult = $this->validateLength($attribute, $value);

app/code/Magento/ImportExport/i18n/en_US.csv

@@ -123,3 +123,5 @@ Summary,Summary
 "New product data is added to existing product data entries in the database. All fields except SKU can be updated.","New product data is added to existing product data entries in the database. All fields except SKU can be updated."
 "All existing product data is replaced with the imported new data. <b>Exercise caution when replacing data. All existing product data will be completely cleared and all references in the system will be lost.</b>","All existing product data is replaced with the imported new data. <b>Exercise caution when replacing data. All existing product data will be completely cleared and all references in the system will be lost.</b>"
 "Any entities in the import data that match existing entities in the database are deleted from the database.","Any entities in the import data that match existing entities in the database are deleted from the database."
+"Invalid data","Invalid data"
+"Invalid response","Invalid response"

app/code/Magento/ImportExport/view/adminhtml/templates/export/form/before.phtml

@@ -89,7 +89,7 @@ require([
             form.action   = oldAction;
         } else {
             alert({
-                content: 'Invalid data'
+                content: '<?= $block->escapeHtml(__('Invalid data')); ?>'
             });
         }
     };