Skip to content

Commit ea10595

Browse files
ihor-svizievihor-sviziev
authored
Merge branch '2.4-develop' into issue-7213
2 parents ac0dea5 + 8d90d12 commit ea10595

File tree

1,143 files changed

+7202
-67704
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,143 files changed

+7202
-67704
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
1010
<table name="admin_analytics_usage_version_log" resource="default" engine="innodb"
1111
comment="Admin Notification Viewer Log Table">
12-
<column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true"
12+
<column xsi:type="int" name="id" unsigned="true" nullable="false" identity="true"
1313
comment="Log ID"/>
1414
<column xsi:type="varchar" name="last_viewed_in_version" nullable="false" length="50"
1515
comment="Viewer last viewed on product version"/>

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@
88
<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
1010
<table name="adminnotification_inbox" resource="default" engine="innodb" comment="Adminnotification Inbox">
11-
<column xsi:type="int" name="notification_id" padding="10" unsigned="true" nullable="false" identity="true"
11+
<column xsi:type="int" name="notification_id" unsigned="true" nullable="false" identity="true"
1212
comment="Notification ID"/>
13-
<column xsi:type="smallint" name="severity" padding="5" unsigned="true" nullable="false" identity="false"
13+
<column xsi:type="smallint" name="severity" unsigned="true" nullable="false" identity="false"
1414
default="0" comment="Problem type"/>
1515
<column xsi:type="timestamp" name="date_added" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
1616
comment="Create date"/>
1717
<column xsi:type="varchar" name="title" nullable="false" length="255" comment="Title"/>
1818
<column xsi:type="text" name="description" nullable="true" comment="Description"/>
1919
<column xsi:type="varchar" name="url" nullable="true" length="255" comment="Url"/>
20-
<column xsi:type="smallint" name="is_read" padding="5" unsigned="true" nullable="false" identity="false"
20+
<column xsi:type="smallint" name="is_read" unsigned="true" nullable="false" identity="false"
2121
default="0" comment="Flag if notification read"/>
22-
<column xsi:type="smallint" name="is_remove" padding="5" unsigned="true" nullable="false" identity="false"
22+
<column xsi:type="smallint" name="is_remove" unsigned="true" nullable="false" identity="false"
2323
default="0" comment="Flag if notification might be removed"/>
2424
<constraint xsi:type="primary" referenceId="PRIMARY">
2525
<column name="notification_id"/>
@@ -36,7 +36,7 @@
3636
</table>
3737
<table name="admin_system_messages" resource="default" engine="innodb" comment="Admin System Messages">
3838
<column xsi:type="varchar" name="identity" nullable="false" length="100" comment="Message ID"/>
39-
<column xsi:type="smallint" name="severity" padding="5" unsigned="true" nullable="false" identity="false"
39+
<column xsi:type="smallint" name="severity" unsigned="true" nullable="false" identity="false"
4040
default="0" comment="Problem type"/>
4141
<column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
4242
comment="Create date"/>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
1010
<table name="catalogsearch_recommendations" resource="default" engine="innodb"
1111
comment="Advanced Search Recommendations">
12-
<column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true" comment="ID"/>
13-
<column xsi:type="int" name="query_id" padding="10" unsigned="true" nullable="false" identity="false"
12+
<column xsi:type="int" name="id" unsigned="true" nullable="false" identity="true" comment="ID"/>
13+
<column xsi:type="int" name="query_id" unsigned="true" nullable="false" identity="false"
1414
default="0" comment="Query ID"/>
15-
<column xsi:type="int" name="relation_id" padding="10" unsigned="true" nullable="false" identity="false"
15+
<column xsi:type="int" name="relation_id" unsigned="true" nullable="false" identity="false"
1616
default="0" comment="Relation ID"/>
1717
<constraint xsi:type="primary" referenceId="PRIMARY">
1818
<column name="id"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class Show extends Action implements HttpGetActionInterface
2727
/**
2828
* @inheritdoc
2929
*/
30-
const ADMIN_RESOURCE = 'Magento_Analytics::analytics_settings';
30+
const ADMIN_RESOURCE = 'Magento_Analytics::advanced_reporting';
3131

3232
/**
3333
* @param Context $context

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,6 @@
149149
<item>Magento_Backend::custom</item>
150150
<item>Magento_Backend::tools</item>
151151
<item>Magento_Backend::cache</item>
152-
<item>Magento_Backend::setup_wizard</item>
153152
<item>Magento_Backup::backup</item>
154153
<item>Magento_Backup::rollback</item>
155154
<item>Magento_Indexer::index</item>

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -163,11 +163,7 @@
163163
<item name="27" xsi:type="string">payment/cashondelivery/active</item>
164164
<item name="28" xsi:type="string">payment/paypal_billing_agreement/title</item>
165165
<item name="29" xsi:type="string">payment/paypal_billing_agreement/active</item>
166-
<item name="30" xsi:type="string">payment/braintree/title</item>
167-
<item name="31" xsi:type="string">payment/braintree/active</item>
168-
<item name="32" xsi:type="string">payment/braintree_paypal/title</item>
169-
<item name="33" xsi:type="string">payment/braintree_paypal/active</item>
170-
<item name="34" xsi:type="string">analytics/general/vertical</item>
166+
<item name="30" xsi:type="string">analytics/general/vertical</item>
171167
</argument>
172168
</arguments>
173169
</type>

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
1010
<table name="magento_bulk" resource="default" engine="innodb"
1111
comment="Bulk entity that represents set of related asynchronous operations">
12-
<column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true"
12+
<column xsi:type="int" name="id" unsigned="true" nullable="false" identity="true"
1313
comment="Bulk Internal ID (must not be exposed)"/>
1414
<column xsi:type="varbinary" name="uuid" nullable="true" length="39"
1515
comment="Bulk UUID (can be exposed to reference bulk entity)"/>
16-
<column xsi:type="int" name="user_id" padding="10" unsigned="true" nullable="true" identity="false"
16+
<column xsi:type="int" name="user_id" unsigned="true" nullable="true" identity="false"
1717
comment="ID of the WebAPI user that performed an action"/>
1818
<column xsi:type="int" name="user_type" nullable="true" comment="Which type of user"/>
1919
<column xsi:type="varchar" name="description" nullable="true" length="255" comment="Bulk Description"/>
20-
<column xsi:type="int" name="operation_count" padding="10" unsigned="true" nullable="false" identity="false"
20+
<column xsi:type="int" name="operation_count" unsigned="true" nullable="false" identity="false"
2121
comment="Total number of operations scheduled within this bulk"/>
2222
<column xsi:type="timestamp" name="start_time" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
2323
comment="Bulk start time"/>
@@ -32,7 +32,7 @@
3232
</index>
3333
</table>
3434
<table name="magento_operation" resource="default" engine="innodb" comment="Operation entity">
35-
<column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true"
35+
<column xsi:type="int" name="id" unsigned="true" nullable="false" identity="true"
3636
comment="Operation ID"/>
3737
<column xsi:type="varbinary" name="bulk_uuid" nullable="true" length="39" comment="Related Bulk UUID"/>
3838
<column xsi:type="varchar" name="topic_name" nullable="true" length="255"
@@ -41,9 +41,9 @@
4141
comment="Data (serialized) required to perform an operation"/>
4242
<column xsi:type="blob" name="result_serialized_data" nullable="true"
4343
comment="Result data (serialized) after perform an operation"/>
44-
<column xsi:type="smallint" name="status" padding="6" unsigned="false" nullable="true" identity="false"
44+
<column xsi:type="smallint" name="status" unsigned="false" nullable="true" identity="false"
4545
default="0" comment="Operation status (OPEN | COMPLETE | RETRIABLY_FAILED | NOT_RETRIABLY_FAILED)"/>
46-
<column xsi:type="smallint" name="error_code" padding="6" unsigned="false" nullable="true" identity="false"
46+
<column xsi:type="smallint" name="error_code" unsigned="false" nullable="true" identity="false"
4747
comment="Code of the error that appeared during operation execution (used to aggregate related failed operations)"/>
4848
<column xsi:type="varchar" name="result_message" nullable="true" length="255"
4949
comment="Operation result message"/>
@@ -59,7 +59,7 @@
5959
</table>
6060
<table name="magento_acknowledged_bulk" resource="default" engine="innodb"
6161
comment="Bulk that was viewed by user from notification area">
62-
<column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true"
62+
<column xsi:type="int" name="id" unsigned="true" nullable="false" identity="true"
6363
comment="Internal ID"/>
6464
<column xsi:type="varbinary" name="bulk_uuid" nullable="true" length="39" comment="Related Bulk UUID"/>
6565
<constraint xsi:type="primary" referenceId="PRIMARY">

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@
88
<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
1010
<table name="authorization_role" resource="default" engine="innodb" comment="Admin Role Table">
11-
<column xsi:type="int" name="role_id" padding="10" unsigned="true" nullable="false" identity="true"
11+
<column xsi:type="int" name="role_id" unsigned="true" nullable="false" identity="true"
1212
comment="Role ID"/>
13-
<column xsi:type="int" name="parent_id" padding="10" unsigned="true" nullable="false" identity="false"
13+
<column xsi:type="int" name="parent_id" unsigned="true" nullable="false" identity="false"
1414
default="0" comment="Parent Role ID"/>
15-
<column xsi:type="smallint" name="tree_level" padding="5" unsigned="true" nullable="false" identity="false"
15+
<column xsi:type="smallint" name="tree_level" unsigned="true" nullable="false" identity="false"
1616
default="0" comment="Role Tree Level"/>
17-
<column xsi:type="smallint" name="sort_order" padding="5" unsigned="true" nullable="false" identity="false"
17+
<column xsi:type="smallint" name="sort_order" unsigned="true" nullable="false" identity="false"
1818
default="0" comment="Role Sort Order"/>
1919
<column xsi:type="varchar" name="role_type" nullable="false" length="1" default="0" comment="Role Type"/>
20-
<column xsi:type="int" name="user_id" padding="10" unsigned="true" nullable="false" identity="false" default="0"
20+
<column xsi:type="int" name="user_id" unsigned="true" nullable="false" identity="false" default="0"
2121
comment="User ID"/>
2222
<column xsi:type="varchar" name="user_type" nullable="true" length="16" comment="User Type"/>
2323
<column xsi:type="varchar" name="role_name" nullable="true" length="50" comment="Role Name"/>
@@ -33,9 +33,9 @@
3333
</index>
3434
</table>
3535
<table name="authorization_rule" resource="default" engine="innodb" comment="Admin Rule Table">
36-
<column xsi:type="int" name="rule_id" padding="10" unsigned="true" nullable="false" identity="true"
36+
<column xsi:type="int" name="rule_id" unsigned="true" nullable="false" identity="true"
3737
comment="Rule ID"/>
38-
<column xsi:type="int" name="role_id" padding="10" unsigned="true" nullable="false" identity="false" default="0"
38+
<column xsi:type="int" name="role_id" unsigned="true" nullable="false" identity="false" default="0"
3939
comment="Role ID"/>
4040
<column xsi:type="varchar" name="resource_id" nullable="true" length="255" comment="Resource ID"/>
4141
<column xsi:type="varchar" name="privileges" nullable="true" length="20" comment="Privileges"/>

‎app/code/Magento/Backend/Model/Setup/MenuBuilder.php

Lines changed: 0 additions & 51 deletions
This file was deleted.

‎app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminFilterLegacyGridActionGroup.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1111
<actionGroup name="AdminFilterLegacyGridActionGroup">
1212
<arguments>
13-
<argument name="fieldSelector" type="string"/>
1413
<argument name="value" type="string"/>
1514
<argument name="button" type="string" defaultValue="{{AdminLegacyDataGridFilterSection.apply}}"/>
1615
</arguments>

‎app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminNavigateToSetupWizardPageActionGroup.xml

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎app/code/Magento/Backend/Test/Mftf/Page/AdminSetupWizardPage.xml

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎app/code/Magento/Backend/Test/Mftf/Test/AdminPersistentShoppingCartSettingsTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<title value="Admin should be able to manage persistent shopping cart settings"/>
1616
<description value="Admin should be able to enable persistent shopping cart in Magento Admin backend and see additional options"/>
1717
<group value="backend"/>
18+
<severity value="MAJOR"/>
1819
</annotations>
1920

2021
<before>

‎app/code/Magento/Backend/Test/Mftf/Test/AdminRedirectToAdminPanelOnLogoClickFromWizardPageTest.xml

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎app/code/Magento/Backend/Test/Unit/Model/MenuBuilderTest.php

Lines changed: 0 additions & 50 deletions
This file was deleted.

‎app/code/Magento/Backend/etc/acl.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@
5353
<resource id="Magento_Backend::flush_static_files" title="Flush Static Files" translate="title" sortOrder="30" />
5454
</resource>
5555
</resource>
56-
<resource id="Magento_Backend::setup_wizard" title="Web Setup Wizard" translate="title" sortOrder="20" />
5756
</resource>
5857
<resource id="Magento_Backend::system_other_settings" title="Other Settings" translate="title" sortOrder="80" />
5958
</resource>

‎app/code/Magento/Backend/etc/adminhtml/di.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,9 +138,6 @@
138138
<argument name="isIncludesAvailable" xsi:type="boolean">false</argument>
139139
</arguments>
140140
</type>
141-
<type name="Magento\Backend\Model\Menu\Builder">
142-
<plugin name="SetupMenuBuilder" type="Magento\Backend\Model\Setup\MenuBuilder" />
143-
</type>
144141
<type name="Magento\Config\Model\Config\Structure\ElementVisibility\ConcealInProduction">
145142
<arguments>
146143
<argument name="configs" xsi:type="array">

0 commit comments

Comments
 (0)