Skip to content

Commit e07ed62

Browse files
victor-v-radvictor-v-rad
authored
Merge pull request #835 from magento/2.4-develop
Data Migration Tool Release 2.4.0
2 parents af40def + b4fe120 commit e07ed62

File tree

105 files changed

+4003
-14
lines changed

Some content is hidden

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

105 files changed

+4003
-14
lines changed

‎CHANGELOG.md

+14
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
2.4.0
2+
=============
3+
* Added support for versions:
4+
5+
* Magento Open Source: 2.4.0
6+
* Magento Commerce: 2.4.0
7+
8+
* Fixed bugs:
9+
10+
* Independent set ssl_ca, ssl_cert, and ssl_key in config.xml
11+
* Integrity constraint violation exception on EAV step
12+
* Error Duplicate entry 31-Images during migration on EAV Step
13+
* Error if no custom entity attributes exist on EAV Step
14+
115
2.3.5
216
=============
317
* Merge of EAV Structure of Magento 1 with Magento 2

‎README.md

+11-11
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@ We're pleased you're considering moving from the world's #1 eCommerce platform
44
Magento 2 migration involves four components: data, extensions and custom code, themes, and customizations.
55

66
### Data
7-
We've developed the **Magento 2 Data Migration Tool** to help you efficiently move all of your products, customers, and order data, store configurations, promotions and more to Magento 2. See the <a href="https://devdocs.magento.com/guides/v2.3/migration/bk-migration-guide.html" target="_blank">Magento Migration Guide</a> for details.
7+
We've developed the **Magento 2 Data Migration Tool** to help you efficiently move all of your products, customers, and order data, store configurations, promotions and more to Magento 2. See the <a href="https://devdocs.magento.com/guides/v2.4/migration/bk-migration-guide.html" target="_blank">Magento Migration Guide</a> for details.
88

99
### Extensions and custom code
1010
We've been working hard with the development community to help you use your Magento 1 extensions in Magento 2. Now we're proud to present the <a href="https://marketplace.magento.com/" target="_blank">Magento Marketplace</a>, where you can download or purchase the latest versions of your favourite extensions.
1111

1212
Also, we have developed the <a href="https://github.com/magento/code-migration" target="_blank">Code Migration Toolkit</a>, which will help to port extensions and your custom code to Magento 2, significantly reducing your porting efforts.
1313

14-
More information on developing extensions for Magento 2 is available in the <a href="http://devdocs.magento.com/guides/v2.3/extension-dev-guide/bk-extension-dev-guide.html" target="_blank">Magento 2 Extension Developer Guide</a>.
14+
More information on developing extensions for Magento 2 is available in the <a href="http://devdocs.magento.com/guides/v2.4/extension-dev-guide/bk-extension-dev-guide.html" target="_blank">Magento 2 Extension Developer Guide</a>.
1515

1616
### Themes and Customizations
17-
Magento 2 uses new approaches and technologies that give merchants an unmatched ability to create innovative shopping experiences and scale to new levels. To take advantage of these advances, developers will need to make changes to their themes and customizations. Documentation is available online for creating Magento 2 <a href="http://devdocs.magento.com/guides/v2.3/frontend-dev-guide/themes/theme-general.html" target="_blank">themes</a>, <a href="http://devdocs.magento.com/guides/v2.3/frontend-dev-guide/layouts/layout-overview.html" target="_blank">layouts</a>, and <a href="http://devdocs.magento.com/guides/v2.3/frontend-dev-guide/layouts/xml-manage.html" target="_blank">customizations</a>.
17+
Magento 2 uses new approaches and technologies that give merchants an unmatched ability to create innovative shopping experiences and scale to new levels. To take advantage of these advances, developers will need to make changes to their themes and customizations. Documentation is available online for creating Magento 2 <a href="http://devdocs.magento.com/guides/v2.4/frontend-dev-guide/themes/theme-general.html" target="_blank">themes</a>, <a href="http://devdocs.magento.com/guides/v2.4/frontend-dev-guide/layouts/layout-overview.html" target="_blank">layouts</a>, and <a href="http://devdocs.magento.com/guides/v2.4/frontend-dev-guide/layouts/xml-manage.html" target="_blank">customizations</a>.
1818

1919
### Supported versions
2020
This edition of tool supports the following versions for migration:
@@ -34,7 +34,7 @@ Contributions like Pull Requests are welcome and we will process/merge it
3434
## Prerequisites
3535
Before you start your migration, you must do all of the following:
3636

37-
* Set up a Magento 2 system that meets our <a href="http://devdocs.magento.com/guides/v2.3/install-gde/system-requirements.html">system requirements</a>.
37+
* Set up a Magento 2 system that meets our <a href="http://devdocs.magento.com/guides/v2.4/install-gde/system-requirements.html">system requirements</a>.
3838

3939
Set up your system using a topology and design that at least matches your existing Magento 1.x system.
4040

@@ -53,19 +53,19 @@ Before you start your migration, you must do all of the following:
5353
## Install the Data Migration Tool
5454
This section discusses how to install the Magento Data Migration Tool. You can install it from either repo.magento.com or from a GitHub repository.
5555

56-
**Note**: The versions of both the migration tool and the Magento 2 code must be identical (for example, 2.3.0). To find the version of either package, open `composer.json` and find the value of `"version"`.
56+
**Note**: The versions of both the migration tool and the Magento 2 code must be identical (for example, 2.4.0). To find the version of either package, open `composer.json` and find the value of `"version"`.
5757

5858
### Install the tool from GitHub
5959
To install the migration tool from GitHub, use the following steps:
6060

61-
1. Log in to your Magento 2 server as a user with privileges to write to the Magento 2 file system or <a href="http://devdocs.magento.com/guides/v2.3/install-gde/install/prepare-install.html#install-update-depend-apache">switch to the web server user</a>.
61+
1. Log in to your Magento 2 server as a user with privileges to write to the Magento 2 file system or <a href="http://devdocs.magento.com/guides/v2.4/install-gde/install/prepare-install.html#install-update-depend-apache">switch to the web server user</a>.
6262
2. Go to Magento 2 root directory.
6363
3. Enter the following commands:
6464

6565
composer config repositories.data-migration-tool git https://github.com/magento/data-migration-tool
6666
composer require magento/data-migration-tool:<version>
6767

68-
where `<version>` is release version (e.g. 2.3.0)
68+
where `<version>` is release version (e.g. 2.4.0)
6969

7070
3. Wait while dependencies are updated.
7171

@@ -82,7 +82,7 @@ To install the migration tool, you must:
8282

8383
To update `composer.json`:
8484

85-
1. Log in to your Magento server as the <a href="http://devdocs.magento.com/guides/v2.3/install-gde/install/prepare-install.html#install-update-depend-apacheweb">web server user</a> or as a user with `root` privileges.
85+
1. Log in to your Magento server as the <a href="http://devdocs.magento.com/guides/v2.4/install-gde/install/prepare-install.html#install-update-depend-apacheweb">web server user</a> or as a user with `root` privileges.
8686

8787
2. Change to your Magento installation directory.
8888

@@ -98,13 +98,13 @@ To update `composer.json`:
9898

9999
Exact version example:
100100

101-
composer require magento/data-migration-tool:2.3.0
101+
composer require magento/data-migration-tool:2.4.0
102102

103103
Next significant release example:
104104

105-
composer require magento/data-migration-tool:~2.3
105+
composer require magento/data-migration-tool:~2.4
106106

107107
5. Wait while dependencies are installed.
108108

109109
## More details
110-
See the <a href="http://devdocs.magento.com/guides/v2.3/migration/bk-migration-guide.html">Migration Guide</a> for the detailed help with your data migration process.
110+
See the <a href="http://devdocs.magento.com/guides/v2.4/migration/bk-migration-guide.html">Migration Guide</a> for the detailed help with your data migration process.

‎composer.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"name": "magento/data-migration-tool",
33
"description": "Migration Tool",
4-
"version": "2.3.5",
4+
"version": "2.4.0",
55
"require": {
6-
"symfony/console": "~4.1.0||~4.2.0||~4.3.0||~4.4.0",
6+
"symfony/console": "~4.4.0",
77
"magento/framework": "*",
88
"monolog/monolog": "^1.17"
99
},
1010
"require-dev": {
11-
"phpunit/phpunit": "^6.5.0"
11+
"phpunit/phpunit": "^9"
1212
},
1313
"autoload": {
1414
"psr-4": {"Migration\\": "src/Migration"},

‎etc/commerce-to-commerce/1.11.0.0/map.xml.dist

+39
Original file line numberDiff line numberDiff line change
@@ -1905,6 +1905,9 @@
19051905
<ignore>
19061906
<datatype>salesrule_coupon.expiration_date</datatype>
19071907
</ignore>
1908+
<ignore>
1909+
<datatype>sales_flat_quote.customer_note</datatype>
1910+
</ignore>
19081911
<ignore>
19091912
<datatype>oauth_token.callback_url</datatype>
19101913
</ignore>
@@ -2425,6 +2428,12 @@
24252428
<ignore>
24262429
<document>msp_tfa_user_config</document>
24272430
</ignore>
2431+
<ignore>
2432+
<document>login_as_customer</document>
2433+
</ignore>
2434+
<ignore>
2435+
<document>magento_login_as_customer_log</document>
2436+
</ignore>
24282437
<ignore>
24292438
<document>queue_poison_pill</document>
24302439
</ignore>
@@ -2449,6 +2458,9 @@
24492458
<ignore>
24502459
<document>media_gallery_keyword</document>
24512460
</ignore>
2461+
<ignore>
2462+
<document>media_content_asset</document>
2463+
</ignore>
24522464
<ignore>
24532465
<document>adobe_stock_asset</document>
24542466
</ignore>
@@ -2470,6 +2482,9 @@
24702482
<ignore>
24712483
<document>admin_passwords</document>
24722484
</ignore>
2485+
<ignore>
2486+
<document>admin_user_expiration</document>
2487+
</ignore>
24732488
<ignore>
24742489
<document>oauth_token_request_log</document>
24752490
</ignore>
@@ -2785,6 +2800,21 @@
27852800
<ignore>
27862801
<document>inventory_geoname</document>
27872802
</ignore>
2803+
<ignore>
2804+
<document>inventory_order_notification</document>
2805+
</ignore>
2806+
<ignore>
2807+
<document>inventory_pickup_location_order</document>
2808+
</ignore>
2809+
<ignore>
2810+
<document>inventory_pickup_location_quote_address</document>
2811+
</ignore>
2812+
<ignore>
2813+
<document>braintree_credit_prices</document>
2814+
</ignore>
2815+
<ignore>
2816+
<document>braintree_transaction_details</document>
2817+
</ignore>
27882818
<ignore>
27892819
<document>admin_analytics_usage_version_log</document>
27902820
</ignore>
@@ -2812,6 +2842,12 @@
28122842
<ignore>
28132843
<document>pagebuilder_template</document>
28142844
</ignore>
2845+
<ignore>
2846+
<document>tfa_country_codes</document>
2847+
</ignore>
2848+
<ignore>
2849+
<document>tfa_user_config</document>
2850+
</ignore>
28152851
<ignore>
28162852
<document>email_coupon_attribute</document>
28172853
</ignore>
@@ -3363,6 +3399,9 @@
33633399
<ignore>
33643400
<datatype>salesrule_coupon.expiration_date</datatype>
33653401
</ignore>
3402+
<ignore>
3403+
<datatype>quote.customer_note</datatype>
3404+
</ignore>
33663405
<ignore>
33673406
<datatype>quote_payment.cc_exp_month</datatype>
33683407
</ignore>

‎etc/commerce-to-commerce/1.11.0.1/map.xml.dist

+39
Original file line numberDiff line numberDiff line change
@@ -1905,6 +1905,9 @@
19051905
<ignore>
19061906
<datatype>salesrule_coupon.expiration_date</datatype>
19071907
</ignore>
1908+
<ignore>
1909+
<datatype>sales_flat_quote.customer_note</datatype>
1910+
</ignore>
19081911
<ignore>
19091912
<datatype>oauth_token.callback_url</datatype>
19101913
</ignore>
@@ -2425,6 +2428,12 @@
24252428
<ignore>
24262429
<document>msp_tfa_user_config</document>
24272430
</ignore>
2431+
<ignore>
2432+
<document>login_as_customer</document>
2433+
</ignore>
2434+
<ignore>
2435+
<document>magento_login_as_customer_log</document>
2436+
</ignore>
24282437
<ignore>
24292438
<document>queue_poison_pill</document>
24302439
</ignore>
@@ -2449,6 +2458,9 @@
24492458
<ignore>
24502459
<document>media_gallery_keyword</document>
24512460
</ignore>
2461+
<ignore>
2462+
<document>media_content_asset</document>
2463+
</ignore>
24522464
<ignore>
24532465
<document>adobe_stock_asset</document>
24542466
</ignore>
@@ -2470,6 +2482,9 @@
24702482
<ignore>
24712483
<document>admin_passwords</document>
24722484
</ignore>
2485+
<ignore>
2486+
<document>admin_user_expiration</document>
2487+
</ignore>
24732488
<ignore>
24742489
<document>oauth_token_request_log</document>
24752490
</ignore>
@@ -2785,6 +2800,21 @@
27852800
<ignore>
27862801
<document>inventory_geoname</document>
27872802
</ignore>
2803+
<ignore>
2804+
<document>inventory_order_notification</document>
2805+
</ignore>
2806+
<ignore>
2807+
<document>inventory_pickup_location_order</document>
2808+
</ignore>
2809+
<ignore>
2810+
<document>inventory_pickup_location_quote_address</document>
2811+
</ignore>
2812+
<ignore>
2813+
<document>braintree_credit_prices</document>
2814+
</ignore>
2815+
<ignore>
2816+
<document>braintree_transaction_details</document>
2817+
</ignore>
27882818
<ignore>
27892819
<document>admin_analytics_usage_version_log</document>
27902820
</ignore>
@@ -2812,6 +2842,12 @@
28122842
<ignore>
28132843
<document>pagebuilder_template</document>
28142844
</ignore>
2845+
<ignore>
2846+
<document>tfa_country_codes</document>
2847+
</ignore>
2848+
<ignore>
2849+
<document>tfa_user_config</document>
2850+
</ignore>
28152851
<ignore>
28162852
<document>email_coupon_attribute</document>
28172853
</ignore>
@@ -3366,6 +3402,9 @@
33663402
<ignore>
33673403
<datatype>salesrule_coupon.expiration_date</datatype>
33683404
</ignore>
3405+
<ignore>
3406+
<datatype>quote.customer_note</datatype>
3407+
</ignore>
33693408
<ignore>
33703409
<datatype>quote_payment.cc_exp_month</datatype>
33713410
</ignore>

‎etc/commerce-to-commerce/1.11.0.2/map.xml.dist

+39
Original file line numberDiff line numberDiff line change
@@ -1905,6 +1905,9 @@
19051905
<ignore>
19061906
<datatype>salesrule_coupon.expiration_date</datatype>
19071907
</ignore>
1908+
<ignore>
1909+
<datatype>sales_flat_quote.customer_note</datatype>
1910+
</ignore>
19081911
<ignore>
19091912
<datatype>oauth_token.callback_url</datatype>
19101913
</ignore>
@@ -2413,6 +2416,12 @@
24132416
<ignore>
24142417
<document>msp_tfa_user_config</document>
24152418
</ignore>
2419+
<ignore>
2420+
<document>login_as_customer</document>
2421+
</ignore>
2422+
<ignore>
2423+
<document>magento_login_as_customer_log</document>
2424+
</ignore>
24162425
<ignore>
24172426
<document>queue_poison_pill</document>
24182427
</ignore>
@@ -2437,6 +2446,9 @@
24372446
<ignore>
24382447
<document>media_gallery_keyword</document>
24392448
</ignore>
2449+
<ignore>
2450+
<document>media_content_asset</document>
2451+
</ignore>
24402452
<ignore>
24412453
<document>adobe_stock_asset</document>
24422454
</ignore>
@@ -2458,6 +2470,9 @@
24582470
<ignore>
24592471
<document>admin_passwords</document>
24602472
</ignore>
2473+
<ignore>
2474+
<document>admin_user_expiration</document>
2475+
</ignore>
24612476
<ignore>
24622477
<document>oauth_token_request_log</document>
24632478
</ignore>
@@ -2773,6 +2788,21 @@
27732788
<ignore>
27742789
<document>inventory_geoname</document>
27752790
</ignore>
2791+
<ignore>
2792+
<document>inventory_order_notification</document>
2793+
</ignore>
2794+
<ignore>
2795+
<document>inventory_pickup_location_order</document>
2796+
</ignore>
2797+
<ignore>
2798+
<document>inventory_pickup_location_quote_address</document>
2799+
</ignore>
2800+
<ignore>
2801+
<document>braintree_credit_prices</document>
2802+
</ignore>
2803+
<ignore>
2804+
<document>braintree_transaction_details</document>
2805+
</ignore>
27762806
<ignore>
27772807
<document>admin_analytics_usage_version_log</document>
27782808
</ignore>
@@ -2800,6 +2830,12 @@
28002830
<ignore>
28012831
<document>pagebuilder_template</document>
28022832
</ignore>
2833+
<ignore>
2834+
<document>tfa_country_codes</document>
2835+
</ignore>
2836+
<ignore>
2837+
<document>tfa_user_config</document>
2838+
</ignore>
28032839
<ignore>
28042840
<document>email_coupon_attribute</document>
28052841
</ignore>
@@ -3354,6 +3390,9 @@
33543390
<ignore>
33553391
<datatype>salesrule_coupon.expiration_date</datatype>
33563392
</ignore>
3393+
<ignore>
3394+
<datatype>quote.customer_note</datatype>
3395+
</ignore>
33573396
<ignore>
33583397
<datatype>quote_payment.cc_exp_month</datatype>
33593398
</ignore>

0 commit comments

Comments
 (0)