Merge branch '2.4-develop' into fix-27489

Author: ProkopovVitaliy

.github/ISSUE_TEMPLATE/bug_report.md

@@ -11,7 +11,7 @@ Fields marked with (*) are required. Please don't remove the template.
 
 ### Preconditions (*)
 <!---
-Provide the exact Magento version (example: 2.3.2) and any important information on the environment where bug is reproducible.
+Provide the exact Magento version (example: 2.4.0) and any important information on the environment where bug is reproducible.
 -->
 1.
 2.
@@ -32,3 +32,12 @@ Important: Provide a set of clear steps to reproduce this bug. We can not provid
 <!--- Tell us what happened instead. Include error messages and issues. -->
 1. [Screenshots, logs or description]
 2.
+
+---
+Please provide [Severity](https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#backlog) assessment for the Issue as Reporter. This information will help during Confirmation and Issue triage processes.
+
+- [ ] Severity: **S0** _- Affects critical data or functionality and leaves users without workaround._
+- [ ] Severity: **S1** _- Affects critical data or functionality and forces users to employ a workaround._
+- [ ] Severity: **S2** _- Affects non-critical data or functionality and forces users to employ a workaround._
+- [ ] Severity: **S3** _- Affects non-critical data or functionality and does not force users to employ a workaround._
+- [ ] Severity: **S4** _- Affects aesthetics, professional look and feel, “quality” or “usability”._

.github/ISSUE_TEMPLATE/developer-experience-issue.md

@@ -18,3 +18,12 @@ Fields marked with (*) are required. Please don't remove the template.
 
 ### Proposed solution
 <!--- Suggest your potential solutions for this issue. -->
+
+---
+Please provide [Severity](https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#backlog) assessment for the Issue as Reporter. This information will help during Confirmation and Issue triage processes.
+
+- [ ] Severity: **S0** _- Affects critical data or functionality and leaves users with no workaround._
+- [ ] Severity: **S1** _- Affects critical data or functionality and forces users to employ a workaround._
+- [ ] Severity: **S2** _- Affects non-critical data or functionality and forces users to employ a workaround._
+- [ ] Severity: **S3** _- Affects non-critical data or functionality and does not force users to employ a workaround._
+- [ ] Severity: **S4** _- Affects aesthetics, professional look and feel, “quality” or “usability”._

.github/PULL_REQUEST_TEMPLATE.md

@@ -23,7 +23,7 @@
     If relevant, please provide a list of fixed issues in the format magento/magento2#<issue_number>.
     There could be 1 or more issues linked here and it will help us find some more information about the reasoning behind this change.
 -->
-1. magento/magento2#<issue_number>: Issue title
+1. Fixes magento/magento2#<issue_number>
 
 ### Manual testing scenarios (*)
 <!---

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

@@ -9,7 +9,7 @@
         xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="admin_analytics_usage_version_log" resource="default" engine="innodb"
            comment="Admin Notification Viewer Log Table">
-        <column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true"
+        <column xsi:type="int" name="id" unsigned="true" nullable="false" identity="true"
                 comment="Log ID"/>
         <column xsi:type="varchar" name="last_viewed_in_version" nullable="false" length="50"
                 comment="Viewer last viewed on product version"/>

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

@@ -8,18 +8,18 @@
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         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"
+        <column xsi:type="int" name="notification_id" unsigned="true" nullable="false" identity="true"
                 comment="Notification ID"/>
-        <column xsi:type="smallint" name="severity" padding="5" unsigned="true" nullable="false" identity="false"
+        <column xsi:type="smallint" name="severity" 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"
                 comment="Create date"/>
         <column xsi:type="varchar" name="title" nullable="false" length="255" comment="Title"/>
         <column xsi:type="text" name="description" nullable="true" comment="Description"/>
         <column xsi:type="varchar" name="url" nullable="true" length="255" comment="Url"/>
-        <column xsi:type="smallint" name="is_read" padding="5" unsigned="true" nullable="false" identity="false"
+        <column xsi:type="smallint" name="is_read" unsigned="true" nullable="false" identity="false"
                 default="0" comment="Flag if notification read"/>
-        <column xsi:type="smallint" name="is_remove" padding="5" unsigned="true" nullable="false" identity="false"
+        <column xsi:type="smallint" name="is_remove" unsigned="true" nullable="false" identity="false"
                 default="0" comment="Flag if notification might be removed"/>
         <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="notification_id"/>
@@ -36,7 +36,7 @@
     </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="smallint" name="severity" padding="5" unsigned="true" nullable="false" identity="false"
+        <column xsi:type="smallint" name="severity" 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"
                 comment="Create date"/>

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

@@ -9,10 +9,10 @@
         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="query_id" padding="10" unsigned="true" nullable="false" identity="false"
+        <column xsi:type="int" name="id" unsigned="true" nullable="false" identity="true" comment="ID"/>
+        <column xsi:type="int" name="query_id" unsigned="true" nullable="false" identity="false"
                 default="0" comment="Query ID"/>
-        <column xsi:type="int" name="relation_id" padding="10" unsigned="true" nullable="false" identity="false"
+        <column xsi:type="int" name="relation_id" unsigned="true" nullable="false" identity="false"
                 default="0" comment="Relation ID"/>
         <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="id"/>

app/code/Magento/Analytics/Controller/Adminhtml/Reports/Show.php

@@ -27,7 +27,7 @@ class Show extends Action implements HttpGetActionInterface
     /**
      * @inheritdoc
      */
-    const ADMIN_RESOURCE = 'Magento_Analytics::analytics_settings';
+    const ADMIN_RESOURCE = 'Magento_Analytics::advanced_reporting';
 
     /**
      * @param Context $context

app/code/Magento/Analytics/Test/Mftf/Data/UserRoleData.xml

@@ -149,7 +149,6 @@
             <item>Magento_Backend::custom</item>
             <item>Magento_Backend::tools</item>
             <item>Magento_Backend::cache</item>
-            <item>Magento_Backend::setup_wizard</item>
             <item>Magento_Backup::backup</item>
             <item>Magento_Backup::rollback</item>
             <item>Magento_Indexer::index</item>

app/code/Magento/Analytics/etc/di.xml

@@ -163,11 +163,7 @@
                 <item name="27" xsi:type="string">payment/cashondelivery/active</item>
                 <item name="28" xsi:type="string">payment/paypal_billing_agreement/title</item>
                 <item name="29" xsi:type="string">payment/paypal_billing_agreement/active</item>
-                <item name="30" xsi:type="string">payment/braintree/title</item>
-                <item name="31" xsi:type="string">payment/braintree/active</item>
-                <item name="32" xsi:type="string">payment/braintree_paypal/title</item>
-                <item name="33" xsi:type="string">payment/braintree_paypal/active</item>
-                <item name="34" xsi:type="string">analytics/general/vertical</item>
+                <item name="30" xsi:type="string">analytics/general/vertical</item>
             </argument>
         </arguments>
     </type>

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

@@ -9,15 +9,15 @@
         xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="magento_bulk" resource="default" engine="innodb"
            comment="Bulk entity that represents set of related asynchronous operations">
-        <column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true"
+        <column xsi:type="int" name="id" unsigned="true" nullable="false" identity="true"
                 comment="Bulk Internal ID (must not be exposed)"/>
         <column xsi:type="varbinary" name="uuid" nullable="true" length="39"
                 comment="Bulk UUID (can be exposed to reference bulk entity)"/>
-        <column xsi:type="int" name="user_id" padding="10" unsigned="true" nullable="true" identity="false"
+        <column xsi:type="int" name="user_id" unsigned="true" nullable="true" identity="false"
                 comment="ID of the WebAPI user that performed an action"/>
         <column xsi:type="int" name="user_type" nullable="true" comment="Which type of user"/>
         <column xsi:type="varchar" name="description" nullable="true" length="255" comment="Bulk Description"/>
-        <column xsi:type="int" name="operation_count" padding="10" unsigned="true" nullable="false" identity="false"
+        <column xsi:type="int" name="operation_count" unsigned="true" nullable="false" identity="false"
                 comment="Total number of operations scheduled within this bulk"/>
         <column xsi:type="timestamp" name="start_time" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
                 comment="Bulk start time"/>
@@ -32,7 +32,7 @@
         </index>
     </table>
     <table name="magento_operation" resource="default" engine="innodb" comment="Operation entity">
-        <column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true"
+        <column xsi:type="int" name="id" unsigned="true" nullable="false" identity="true"
                 comment="Operation ID"/>
         <column xsi:type="varbinary" name="bulk_uuid" nullable="true" length="39" comment="Related Bulk UUID"/>
         <column xsi:type="varchar" name="topic_name" nullable="true" length="255"
@@ -41,9 +41,9 @@
                 comment="Data (serialized) required to perform an operation"/>
         <column xsi:type="blob" name="result_serialized_data" nullable="true"
                 comment="Result data (serialized) after perform an operation"/>
-        <column xsi:type="smallint" name="status" padding="6" unsigned="false" nullable="true" identity="false"
+        <column xsi:type="smallint" name="status" unsigned="false" nullable="true" identity="false"
                 default="0" comment="Operation status (OPEN | COMPLETE | RETRIABLY_FAILED | NOT_RETRIABLY_FAILED)"/>
-        <column xsi:type="smallint" name="error_code" padding="6" unsigned="false" nullable="true" identity="false"
+        <column xsi:type="smallint" name="error_code" unsigned="false" nullable="true" identity="false"
                 comment="Code of the error that appeared during operation execution (used to aggregate related failed operations)"/>
         <column xsi:type="varchar" name="result_message" nullable="true" length="255"
                 comment="Operation result message"/>
@@ -59,7 +59,7 @@
     </table>
     <table name="magento_acknowledged_bulk" resource="default" engine="innodb"
            comment="Bulk that was viewed by user from notification area">
-        <column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true"
+        <column xsi:type="int" name="id" unsigned="true" nullable="false" identity="true"
                 comment="Internal ID"/>
         <column xsi:type="varbinary" name="bulk_uuid" nullable="true" length="39" comment="Related Bulk UUID"/>
         <constraint xsi:type="primary" referenceId="PRIMARY">

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

@@ -8,16 +8,16 @@
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="authorization_role" resource="default" engine="innodb" comment="Admin Role Table">
-        <column xsi:type="int" name="role_id" padding="10" unsigned="true" nullable="false" identity="true"
+        <column xsi:type="int" name="role_id" unsigned="true" nullable="false" identity="true"
                 comment="Role ID"/>
-        <column xsi:type="int" name="parent_id" padding="10" unsigned="true" nullable="false" identity="false"
+        <column xsi:type="int" name="parent_id" unsigned="true" nullable="false" identity="false"
                 default="0" comment="Parent Role ID"/>
-        <column xsi:type="smallint" name="tree_level" padding="5" unsigned="true" nullable="false" identity="false"
+        <column xsi:type="smallint" name="tree_level" unsigned="true" nullable="false" identity="false"
                 default="0" comment="Role Tree Level"/>
-        <column xsi:type="smallint" name="sort_order" padding="5" unsigned="true" nullable="false" identity="false"
+        <column xsi:type="smallint" name="sort_order" unsigned="true" nullable="false" identity="false"
                 default="0" comment="Role Sort Order"/>
         <column xsi:type="varchar" name="role_type" nullable="false" length="1" default="0" comment="Role Type"/>
-        <column xsi:type="int" name="user_id" padding="10" unsigned="true" nullable="false" identity="false" default="0"
+        <column xsi:type="int" name="user_id" unsigned="true" nullable="false" identity="false" default="0"
                 comment="User ID"/>
         <column xsi:type="varchar" name="user_type" nullable="true" length="16" comment="User Type"/>
         <column xsi:type="varchar" name="role_name" nullable="true" length="50" comment="Role Name"/>
@@ -33,9 +33,9 @@
         </index>
     </table>
     <table name="authorization_rule" resource="default" engine="innodb" comment="Admin Rule Table">
-        <column xsi:type="int" name="rule_id" padding="10" unsigned="true" nullable="false" identity="true"
+        <column xsi:type="int" name="rule_id" unsigned="true" nullable="false" identity="true"
                 comment="Rule ID"/>
-        <column xsi:type="int" name="role_id" padding="10" unsigned="true" nullable="false" identity="false" default="0"
+        <column xsi:type="int" name="role_id" unsigned="true" nullable="false" identity="false" default="0"
                 comment="Role ID"/>
         <column xsi:type="varchar" name="resource_id" nullable="true" length="255" comment="Resource ID"/>
         <column xsi:type="varchar" name="privileges" nullable="true" length="20" comment="Privileges"/>