Merge branch '2.4-develop' into performance-inline-translations

magento · May 24, 2020 · d3c9a49 · d3c9a49
2 parents 52432e5 + c8e347f
commit d3c9a49
Show file tree

Hide file tree

Showing 1,077 changed files with 6,271 additions and 67,625 deletions.
diff --git a/app/code/Magento/AdminAnalytics/etc/db_schema.xml b/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"/>

diff --git a/app/code/Magento/AdminNotification/etc/db_schema.xml b/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"/>

diff --git a/app/code/Magento/AdvancedSearch/etc/db_schema.xml b/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"/>

diff --git a/app/code/Magento/Analytics/Controller/Adminhtml/Reports/Show.php b/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

diff --git a/app/code/Magento/Analytics/Test/Mftf/Data/UserRoleData.xml b/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>

diff --git a/app/code/Magento/Analytics/etc/di.xml b/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>

diff --git a/app/code/Magento/AsynchronousOperations/etc/db_schema.xml b/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">

diff --git a/app/code/Magento/Authorization/etc/db_schema.xml b/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"/>

diff --git a/app/code/Magento/Backend/Model/Setup/MenuBuilder.php b/app/code/Magento/Backend/Model/Setup/MenuBuilder.php
diff --git a/app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminNavigateToSetupWizardPageActionGroup.xml b/app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminNavigateToSetupWizardPageActionGroup.xml
diff --git a/app/code/Magento/Backend/Test/Mftf/Page/AdminSetupWizardPage.xml b/app/code/Magento/Backend/Test/Mftf/Page/AdminSetupWizardPage.xml
diff --git a/...Magento/Backend/Test/Mftf/Test/AdminRedirectToAdminPanelOnLogoClickFromWizardPageTest.xml b/...Magento/Backend/Test/Mftf/Test/AdminRedirectToAdminPanelOnLogoClickFromWizardPageTest.xml
diff --git a/app/code/Magento/Backend/Test/Unit/Model/MenuBuilderTest.php b/app/code/Magento/Backend/Test/Unit/Model/MenuBuilderTest.php
diff --git a/app/code/Magento/Backend/etc/acl.xml b/app/code/Magento/Backend/etc/acl.xml
@@ -53,7 +53,6 @@
                                 <resource id="Magento_Backend::flush_static_files" title="Flush Static Files" translate="title" sortOrder="30" />
                             </resource>
                         </resource>
-                        <resource id="Magento_Backend::setup_wizard" title="Web Setup Wizard" translate="title" sortOrder="20" />
                     </resource>
                     <resource id="Magento_Backend::system_other_settings" title="Other Settings" translate="title"  sortOrder="80" />
                 </resource>

diff --git a/app/code/Magento/Backend/etc/adminhtml/di.xml b/app/code/Magento/Backend/etc/adminhtml/di.xml
@@ -138,9 +138,6 @@
             <argument name="isIncludesAvailable" xsi:type="boolean">false</argument>
         </arguments>
     </type>
-    <type name="Magento\Backend\Model\Menu\Builder">
-        <plugin name="SetupMenuBuilder" type="Magento\Backend\Model\Setup\MenuBuilder" />
-    </type>
     <type name="Magento\Config\Model\Config\Structure\ElementVisibility\ConcealInProduction">
         <arguments>
             <argument name="configs" xsi:type="array">

diff --git a/app/code/Magento/Backend/etc/adminhtml/menu.xml b/app/code/Magento/Backend/etc/adminhtml/menu.xml
@@ -27,6 +27,5 @@
         <add id="Magento_Backend::stores_attributes" title="Attributes" translate="title" module="Magento_Backend" sortOrder="40" parent="Magento_Backend::stores" resource="Magento_Backend::stores_attributes"/>
         <add id="Magento_Backend::other_settings" title="Other Settings" translate="title" module="Magento_Backend" sortOrder="50" parent="Magento_Backend::stores" resource="Magento_Backend::stores_other_settings"/>
         <add id="Magento_Backend::system_other_settings" title="Other Settings" translate="title" module="Magento_Backend" sortOrder="80" parent="Magento_Backend::system" resource="Magento_Backend::system_other_settings"/>
-        <add id="Magento_Backend::setup_wizard" action="adminhtml/backendapp/redirect/app/setup" title="Web Setup Wizard" translate="title" module="Magento_Backend" sortOrder="80" parent="Magento_Backend::system_tools" resource="Magento_Backend::setup_wizard"/>
     </menu>
 </config>