diff --git a/CHANGELOG.md b/CHANGELOG.md
index 062505914..f3bf9d4d6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,17 @@
+2.2.2
+=============
+* Added support for versions:
+
+ * Magento Open Source: 2.2.2
+ * Magento Commerce: 2.2.2
+
+* Fixed bugs:
+
+ * Customer Attribute step did not remember its position
+ * Wrong value for `eav_attribute_group.attribute_group_code` field was set for non-product entities
+ * [Issue #355](https://github.com/magento/data-migration-tool/issues/355): Data integrity check errors did not indicate the source of the error
+ * [Issue #378](https://github.com/magento/data-migration-tool/issues/378): Settings step threw an error when additional fields from an extension were added to the `core_config_data` database table
+
2.2.1
=============
* Broken serialized data does not stop migration
diff --git a/composer.json b/composer.json
index d4cf4dd46..ffc593123 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
{
"name": "magento/data-migration-tool",
"description": "Migration Tool",
- "version": "2.2.1",
+ "version": "2.2.2",
"require": {
"symfony/console": "~2.3, !=2.7.0",
"magento/framework": "~101.0.0",
diff --git a/etc/commerce-to-commerce/1.11.0.0/map.xml.dist b/etc/commerce-to-commerce/1.11.0.0/map.xml.dist
index f52122007..6f5839fc1 100644
--- a/etc/commerce-to-commerce/1.11.0.0/map.xml.dist
+++ b/etc/commerce-to-commerce/1.11.0.0/map.xml.dist
@@ -2418,6 +2418,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
admin_user_session
diff --git a/etc/commerce-to-commerce/1.11.0.1/map.xml.dist b/etc/commerce-to-commerce/1.11.0.1/map.xml.dist
index 4c646f23d..364988662 100644
--- a/etc/commerce-to-commerce/1.11.0.1/map.xml.dist
+++ b/etc/commerce-to-commerce/1.11.0.1/map.xml.dist
@@ -2418,6 +2418,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
admin_user_session
diff --git a/etc/commerce-to-commerce/1.11.0.2/map.xml.dist b/etc/commerce-to-commerce/1.11.0.2/map.xml.dist
index f3273b7c7..a8ec97c6e 100644
--- a/etc/commerce-to-commerce/1.11.0.2/map.xml.dist
+++ b/etc/commerce-to-commerce/1.11.0.2/map.xml.dist
@@ -2403,6 +2403,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
admin_user_session
diff --git a/etc/commerce-to-commerce/1.11.1.0/map.xml.dist b/etc/commerce-to-commerce/1.11.1.0/map.xml.dist
index 3c4e46204..0d2339e11 100644
--- a/etc/commerce-to-commerce/1.11.1.0/map.xml.dist
+++ b/etc/commerce-to-commerce/1.11.1.0/map.xml.dist
@@ -2391,6 +2391,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
admin_user_session
diff --git a/etc/commerce-to-commerce/1.11.2.0/map.xml.dist b/etc/commerce-to-commerce/1.11.2.0/map.xml.dist
index 9a73ff971..bc5cd7016 100644
--- a/etc/commerce-to-commerce/1.11.2.0/map.xml.dist
+++ b/etc/commerce-to-commerce/1.11.2.0/map.xml.dist
@@ -2391,6 +2391,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
admin_user_session
diff --git a/etc/commerce-to-commerce/1.12.0.0/map.xml.dist b/etc/commerce-to-commerce/1.12.0.0/map.xml.dist
index cacfd334f..94e75c8b6 100644
--- a/etc/commerce-to-commerce/1.12.0.0/map.xml.dist
+++ b/etc/commerce-to-commerce/1.12.0.0/map.xml.dist
@@ -2313,6 +2313,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
admin_user_session
diff --git a/etc/commerce-to-commerce/1.12.0.1/map.xml.dist b/etc/commerce-to-commerce/1.12.0.1/map.xml.dist
index b4f7e89a1..811ed4116 100644
--- a/etc/commerce-to-commerce/1.12.0.1/map.xml.dist
+++ b/etc/commerce-to-commerce/1.12.0.1/map.xml.dist
@@ -2313,6 +2313,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
admin_user_session
diff --git a/etc/commerce-to-commerce/1.12.0.2/map.xml.dist b/etc/commerce-to-commerce/1.12.0.2/map.xml.dist
index b4f7e89a1..811ed4116 100644
--- a/etc/commerce-to-commerce/1.12.0.2/map.xml.dist
+++ b/etc/commerce-to-commerce/1.12.0.2/map.xml.dist
@@ -2313,6 +2313,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
admin_user_session
diff --git a/etc/commerce-to-commerce/1.13.0.0/map.xml.dist b/etc/commerce-to-commerce/1.13.0.0/map.xml.dist
index b22bd7e34..0ef4cb46a 100644
--- a/etc/commerce-to-commerce/1.13.0.0/map.xml.dist
+++ b/etc/commerce-to-commerce/1.13.0.0/map.xml.dist
@@ -2300,6 +2300,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
admin_user_session
diff --git a/etc/commerce-to-commerce/1.13.0.1/map.xml.dist b/etc/commerce-to-commerce/1.13.0.1/map.xml.dist
index 0e688f706..0d50ca667 100644
--- a/etc/commerce-to-commerce/1.13.0.1/map.xml.dist
+++ b/etc/commerce-to-commerce/1.13.0.1/map.xml.dist
@@ -2300,6 +2300,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
admin_user_session
diff --git a/etc/commerce-to-commerce/1.13.0.2/map.xml.dist b/etc/commerce-to-commerce/1.13.0.2/map.xml.dist
index 0e688f706..0d50ca667 100644
--- a/etc/commerce-to-commerce/1.13.0.2/map.xml.dist
+++ b/etc/commerce-to-commerce/1.13.0.2/map.xml.dist
@@ -2300,6 +2300,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
admin_user_session
diff --git a/etc/commerce-to-commerce/1.13.1.0/map.xml.dist b/etc/commerce-to-commerce/1.13.1.0/map.xml.dist
index e9e834a31..bcb9b035a 100644
--- a/etc/commerce-to-commerce/1.13.1.0/map.xml.dist
+++ b/etc/commerce-to-commerce/1.13.1.0/map.xml.dist
@@ -2306,6 +2306,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
admin_user_session
diff --git a/etc/commerce-to-commerce/1.14.0.0/map.xml.dist b/etc/commerce-to-commerce/1.14.0.0/map.xml.dist
index 8943ab511..1ada55d87 100644
--- a/etc/commerce-to-commerce/1.14.0.0/map.xml.dist
+++ b/etc/commerce-to-commerce/1.14.0.0/map.xml.dist
@@ -2306,6 +2306,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
admin_user_session
diff --git a/etc/commerce-to-commerce/1.14.0.1/map.xml.dist b/etc/commerce-to-commerce/1.14.0.1/map.xml.dist
index 8943ab511..1ada55d87 100644
--- a/etc/commerce-to-commerce/1.14.0.1/map.xml.dist
+++ b/etc/commerce-to-commerce/1.14.0.1/map.xml.dist
@@ -2306,6 +2306,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
admin_user_session
diff --git a/etc/commerce-to-commerce/1.14.1.0/map.xml.dist b/etc/commerce-to-commerce/1.14.1.0/map.xml.dist
index 33e9d2018..fe6c624ae 100644
--- a/etc/commerce-to-commerce/1.14.1.0/map.xml.dist
+++ b/etc/commerce-to-commerce/1.14.1.0/map.xml.dist
@@ -2308,6 +2308,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
admin_user_session
diff --git a/etc/commerce-to-commerce/1.14.2.0/map.xml.dist b/etc/commerce-to-commerce/1.14.2.0/map.xml.dist
index e5ec85dee..e1d2ad24c 100644
--- a/etc/commerce-to-commerce/1.14.2.0/map.xml.dist
+++ b/etc/commerce-to-commerce/1.14.2.0/map.xml.dist
@@ -2345,6 +2345,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
admin_user_session
diff --git a/etc/commerce-to-commerce/1.14.2.1/map.xml.dist b/etc/commerce-to-commerce/1.14.2.1/map.xml.dist
index e5ec85dee..e1d2ad24c 100644
--- a/etc/commerce-to-commerce/1.14.2.1/map.xml.dist
+++ b/etc/commerce-to-commerce/1.14.2.1/map.xml.dist
@@ -2345,6 +2345,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
admin_user_session
diff --git a/etc/commerce-to-commerce/1.14.2.2/map.xml.dist b/etc/commerce-to-commerce/1.14.2.2/map.xml.dist
index 9344ce257..a11ef61dd 100644
--- a/etc/commerce-to-commerce/1.14.2.2/map.xml.dist
+++ b/etc/commerce-to-commerce/1.14.2.2/map.xml.dist
@@ -2351,6 +2351,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
admin_user_session
diff --git a/etc/commerce-to-commerce/1.14.2.3/map.xml.dist b/etc/commerce-to-commerce/1.14.2.3/map.xml.dist
index 9344ce257..a11ef61dd 100644
--- a/etc/commerce-to-commerce/1.14.2.3/map.xml.dist
+++ b/etc/commerce-to-commerce/1.14.2.3/map.xml.dist
@@ -2351,6 +2351,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
admin_user_session
diff --git a/etc/commerce-to-commerce/1.14.2.4/map.xml.dist b/etc/commerce-to-commerce/1.14.2.4/map.xml.dist
index 9344ce257..a11ef61dd 100644
--- a/etc/commerce-to-commerce/1.14.2.4/map.xml.dist
+++ b/etc/commerce-to-commerce/1.14.2.4/map.xml.dist
@@ -2351,6 +2351,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
admin_user_session
diff --git a/etc/commerce-to-commerce/1.14.3.0/map.xml.dist b/etc/commerce-to-commerce/1.14.3.0/map.xml.dist
index 7e72b036e..745239a76 100644
--- a/etc/commerce-to-commerce/1.14.3.0/map.xml.dist
+++ b/etc/commerce-to-commerce/1.14.3.0/map.xml.dist
@@ -2363,6 +2363,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
admin_user_session
diff --git a/etc/commerce-to-commerce/1.14.3.1/map.xml.dist b/etc/commerce-to-commerce/1.14.3.1/map.xml.dist
index a5f17145d..a18319ca5 100644
--- a/etc/commerce-to-commerce/1.14.3.1/map.xml.dist
+++ b/etc/commerce-to-commerce/1.14.3.1/map.xml.dist
@@ -2312,6 +2312,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
admin_user_session
diff --git a/etc/commerce-to-commerce/1.14.3.2/map.xml.dist b/etc/commerce-to-commerce/1.14.3.2/map.xml.dist
index a5f17145d..a18319ca5 100644
--- a/etc/commerce-to-commerce/1.14.3.2/map.xml.dist
+++ b/etc/commerce-to-commerce/1.14.3.2/map.xml.dist
@@ -2312,6 +2312,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
admin_user_session
diff --git a/etc/commerce-to-commerce/1.14.3.3/map.xml.dist b/etc/commerce-to-commerce/1.14.3.3/map.xml.dist
index a5f17145d..a18319ca5 100644
--- a/etc/commerce-to-commerce/1.14.3.3/map.xml.dist
+++ b/etc/commerce-to-commerce/1.14.3.3/map.xml.dist
@@ -2312,6 +2312,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
admin_user_session
diff --git a/etc/commerce-to-commerce/1.14.3.4/map.xml.dist b/etc/commerce-to-commerce/1.14.3.4/map.xml.dist
index fe7b9d0af..2ff24b3b7 100644
--- a/etc/commerce-to-commerce/1.14.3.4/map.xml.dist
+++ b/etc/commerce-to-commerce/1.14.3.4/map.xml.dist
@@ -2479,6 +2479,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
admin_user_session
diff --git a/etc/commerce-to-commerce/1.14.3.6/map.xml.dist b/etc/commerce-to-commerce/1.14.3.6/map.xml.dist
index fe7b9d0af..2ff24b3b7 100644
--- a/etc/commerce-to-commerce/1.14.3.6/map.xml.dist
+++ b/etc/commerce-to-commerce/1.14.3.6/map.xml.dist
@@ -2479,6 +2479,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
admin_user_session
diff --git a/etc/commerce-to-commerce/1.14.3.7/map.xml.dist b/etc/commerce-to-commerce/1.14.3.7/map.xml.dist
index fe7b9d0af..2ff24b3b7 100644
--- a/etc/commerce-to-commerce/1.14.3.7/map.xml.dist
+++ b/etc/commerce-to-commerce/1.14.3.7/map.xml.dist
@@ -2479,6 +2479,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
admin_user_session
diff --git a/etc/opensource-to-commerce/1.6.0.0/map.xml.dist b/etc/opensource-to-commerce/1.6.0.0/map.xml.dist
index a664e5dab..e0a3958b6 100644
--- a/etc/opensource-to-commerce/1.6.0.0/map.xml.dist
+++ b/etc/opensource-to-commerce/1.6.0.0/map.xml.dist
@@ -473,6 +473,12 @@
catalog_product_entity_tier_price
+
+ permission_block
+
+
+ permission_variable
+
find_feed_import_codes
@@ -2045,6 +2051,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
admin_user_session
diff --git a/etc/opensource-to-commerce/1.6.1.0/map.xml.dist b/etc/opensource-to-commerce/1.6.1.0/map.xml.dist
index 9a6d9baf1..8b32811d7 100644
--- a/etc/opensource-to-commerce/1.6.1.0/map.xml.dist
+++ b/etc/opensource-to-commerce/1.6.1.0/map.xml.dist
@@ -473,6 +473,12 @@
catalog_product_entity_tier_price
+
+ permission_block
+
+
+ permission_variable
+
googlebase_attributes
@@ -2054,6 +2060,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
admin_user_session
diff --git a/etc/opensource-to-commerce/1.6.2.0/map.xml.dist b/etc/opensource-to-commerce/1.6.2.0/map.xml.dist
index 3bb1d9363..83746573a 100644
--- a/etc/opensource-to-commerce/1.6.2.0/map.xml.dist
+++ b/etc/opensource-to-commerce/1.6.2.0/map.xml.dist
@@ -473,6 +473,12 @@
catalog_product_entity_tier_price
+
+ permission_block
+
+
+ permission_variable
+
googlebase_attributes
@@ -2054,6 +2060,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
admin_user_session
diff --git a/etc/opensource-to-commerce/1.7.0.0/map.xml.dist b/etc/opensource-to-commerce/1.7.0.0/map.xml.dist
index 3f70eada5..d633f560b 100644
--- a/etc/opensource-to-commerce/1.7.0.0/map.xml.dist
+++ b/etc/opensource-to-commerce/1.7.0.0/map.xml.dist
@@ -464,6 +464,12 @@
catalog_product_entity_tier_price
+
+ permission_block
+
+
+ permission_variable
+
googlebase_attributes
@@ -1963,6 +1969,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
admin_user_session
diff --git a/etc/opensource-to-commerce/1.7.0.1/map.xml.dist b/etc/opensource-to-commerce/1.7.0.1/map.xml.dist
index 3f70eada5..d633f560b 100644
--- a/etc/opensource-to-commerce/1.7.0.1/map.xml.dist
+++ b/etc/opensource-to-commerce/1.7.0.1/map.xml.dist
@@ -464,6 +464,12 @@
catalog_product_entity_tier_price
+
+ permission_block
+
+
+ permission_variable
+
googlebase_attributes
@@ -1963,6 +1969,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
admin_user_session
diff --git a/etc/opensource-to-commerce/1.7.0.2/map.xml.dist b/etc/opensource-to-commerce/1.7.0.2/map.xml.dist
index 3f70eada5..d633f560b 100644
--- a/etc/opensource-to-commerce/1.7.0.2/map.xml.dist
+++ b/etc/opensource-to-commerce/1.7.0.2/map.xml.dist
@@ -464,6 +464,12 @@
catalog_product_entity_tier_price
+
+ permission_block
+
+
+ permission_variable
+
googlebase_attributes
@@ -1963,6 +1969,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
admin_user_session
diff --git a/etc/opensource-to-commerce/1.8.0.0/map.xml.dist b/etc/opensource-to-commerce/1.8.0.0/map.xml.dist
index 6927b337b..cf0555479 100644
--- a/etc/opensource-to-commerce/1.8.0.0/map.xml.dist
+++ b/etc/opensource-to-commerce/1.8.0.0/map.xml.dist
@@ -464,6 +464,12 @@
catalog_product_entity_tier_price
+
+ permission_block
+
+
+ permission_variable
+
googlebase_attributes
@@ -1963,6 +1969,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
admin_user_session
diff --git a/etc/opensource-to-commerce/1.8.1.0/map.xml.dist b/etc/opensource-to-commerce/1.8.1.0/map.xml.dist
index dd9fe73f1..979b153ba 100644
--- a/etc/opensource-to-commerce/1.8.1.0/map.xml.dist
+++ b/etc/opensource-to-commerce/1.8.1.0/map.xml.dist
@@ -461,6 +461,12 @@
catalog_product_entity_tier_price
+
+ permission_block
+
+
+ permission_variable
+
googlebase_attributes
@@ -1960,6 +1966,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
admin_user_session
diff --git a/etc/opensource-to-commerce/1.9.0.0/map.xml.dist b/etc/opensource-to-commerce/1.9.0.0/map.xml.dist
index 11c4e3701..dafeeb9b7 100644
--- a/etc/opensource-to-commerce/1.9.0.0/map.xml.dist
+++ b/etc/opensource-to-commerce/1.9.0.0/map.xml.dist
@@ -464,6 +464,12 @@
catalog_product_entity_tier_price
+
+ permission_block
+
+
+ permission_variable
+
googlebase_attributes
@@ -1963,6 +1969,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
admin_user_session
diff --git a/etc/opensource-to-commerce/1.9.0.1/map.xml.dist b/etc/opensource-to-commerce/1.9.0.1/map.xml.dist
index 6927b337b..cf0555479 100644
--- a/etc/opensource-to-commerce/1.9.0.1/map.xml.dist
+++ b/etc/opensource-to-commerce/1.9.0.1/map.xml.dist
@@ -464,6 +464,12 @@
catalog_product_entity_tier_price
+
+ permission_block
+
+
+ permission_variable
+
googlebase_attributes
@@ -1963,6 +1969,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
admin_user_session
diff --git a/etc/opensource-to-commerce/1.9.1.0/map.xml.dist b/etc/opensource-to-commerce/1.9.1.0/map.xml.dist
index 1d17ac303..1f27ce4e9 100644
--- a/etc/opensource-to-commerce/1.9.1.0/map.xml.dist
+++ b/etc/opensource-to-commerce/1.9.1.0/map.xml.dist
@@ -464,6 +464,12 @@
catalog_product_entity_tier_price
+
+ permission_block
+
+
+ permission_variable
+
googlebase_attributes
@@ -1963,6 +1969,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
admin_user_session
diff --git a/etc/opensource-to-commerce/1.9.1.1/map.xml.dist b/etc/opensource-to-commerce/1.9.1.1/map.xml.dist
index 1d17ac303..1f27ce4e9 100644
--- a/etc/opensource-to-commerce/1.9.1.1/map.xml.dist
+++ b/etc/opensource-to-commerce/1.9.1.1/map.xml.dist
@@ -464,6 +464,12 @@
catalog_product_entity_tier_price
+
+ permission_block
+
+
+ permission_variable
+
googlebase_attributes
@@ -1963,6 +1969,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
admin_user_session
diff --git a/etc/opensource-to-commerce/1.9.2.0/map.xml.dist b/etc/opensource-to-commerce/1.9.2.0/map.xml.dist
index 2e2ae6b09..c34278b57 100644
--- a/etc/opensource-to-commerce/1.9.2.0/map.xml.dist
+++ b/etc/opensource-to-commerce/1.9.2.0/map.xml.dist
@@ -464,6 +464,12 @@
catalog_product_entity_tier_price
+
+ permission_block
+
+
+ permission_variable
+
googlebase_attributes
@@ -1983,6 +1989,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
admin_user_session
diff --git a/etc/opensource-to-commerce/1.9.2.1/map.xml.dist b/etc/opensource-to-commerce/1.9.2.1/map.xml.dist
index 2e2ae6b09..c34278b57 100644
--- a/etc/opensource-to-commerce/1.9.2.1/map.xml.dist
+++ b/etc/opensource-to-commerce/1.9.2.1/map.xml.dist
@@ -464,6 +464,12 @@
catalog_product_entity_tier_price
+
+ permission_block
+
+
+ permission_variable
+
googlebase_attributes
@@ -1983,6 +1989,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
admin_user_session
diff --git a/etc/opensource-to-commerce/1.9.2.2/map.xml.dist b/etc/opensource-to-commerce/1.9.2.2/map.xml.dist
index 2dcd73e6f..c34278b57 100644
--- a/etc/opensource-to-commerce/1.9.2.2/map.xml.dist
+++ b/etc/opensource-to-commerce/1.9.2.2/map.xml.dist
@@ -1989,6 +1989,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
admin_user_session
diff --git a/etc/opensource-to-commerce/1.9.2.3/map.xml.dist b/etc/opensource-to-commerce/1.9.2.3/map.xml.dist
index 2dcd73e6f..c34278b57 100644
--- a/etc/opensource-to-commerce/1.9.2.3/map.xml.dist
+++ b/etc/opensource-to-commerce/1.9.2.3/map.xml.dist
@@ -1989,6 +1989,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
admin_user_session
diff --git a/etc/opensource-to-commerce/1.9.2.4/map.xml.dist b/etc/opensource-to-commerce/1.9.2.4/map.xml.dist
index 2dcd73e6f..c34278b57 100644
--- a/etc/opensource-to-commerce/1.9.2.4/map.xml.dist
+++ b/etc/opensource-to-commerce/1.9.2.4/map.xml.dist
@@ -1989,6 +1989,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
admin_user_session
diff --git a/etc/opensource-to-commerce/1.9.3.0/map.xml.dist b/etc/opensource-to-commerce/1.9.3.0/map.xml.dist
index f0a984168..d57659e14 100644
--- a/etc/opensource-to-commerce/1.9.3.0/map.xml.dist
+++ b/etc/opensource-to-commerce/1.9.3.0/map.xml.dist
@@ -2001,6 +2001,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
admin_user_session
diff --git a/etc/opensource-to-commerce/1.9.3.1/map.xml.dist b/etc/opensource-to-commerce/1.9.3.1/map.xml.dist
index f0a984168..d57659e14 100644
--- a/etc/opensource-to-commerce/1.9.3.1/map.xml.dist
+++ b/etc/opensource-to-commerce/1.9.3.1/map.xml.dist
@@ -2001,6 +2001,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
admin_user_session
diff --git a/etc/opensource-to-commerce/1.9.3.2/map.xml.dist b/etc/opensource-to-commerce/1.9.3.2/map.xml.dist
index f0a984168..d57659e14 100644
--- a/etc/opensource-to-commerce/1.9.3.2/map.xml.dist
+++ b/etc/opensource-to-commerce/1.9.3.2/map.xml.dist
@@ -2001,6 +2001,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
admin_user_session
diff --git a/etc/opensource-to-commerce/1.9.3.3/map.xml.dist b/etc/opensource-to-commerce/1.9.3.3/map.xml.dist
index 99c66bc4b..38222df83 100644
--- a/etc/opensource-to-commerce/1.9.3.3/map.xml.dist
+++ b/etc/opensource-to-commerce/1.9.3.3/map.xml.dist
@@ -1959,6 +1959,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
admin_user_session
diff --git a/etc/opensource-to-commerce/1.9.3.4/map.xml.dist b/etc/opensource-to-commerce/1.9.3.4/map.xml.dist
index 99c66bc4b..38222df83 100644
--- a/etc/opensource-to-commerce/1.9.3.4/map.xml.dist
+++ b/etc/opensource-to-commerce/1.9.3.4/map.xml.dist
@@ -1959,6 +1959,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
admin_user_session
diff --git a/etc/opensource-to-commerce/1.9.3.6/map.xml.dist b/etc/opensource-to-commerce/1.9.3.6/map.xml.dist
index 99c66bc4b..38222df83 100644
--- a/etc/opensource-to-commerce/1.9.3.6/map.xml.dist
+++ b/etc/opensource-to-commerce/1.9.3.6/map.xml.dist
@@ -1959,6 +1959,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
admin_user_session
diff --git a/etc/opensource-to-commerce/1.9.3.7/map.xml.dist b/etc/opensource-to-commerce/1.9.3.7/map.xml.dist
index 99c66bc4b..38222df83 100644
--- a/etc/opensource-to-commerce/1.9.3.7/map.xml.dist
+++ b/etc/opensource-to-commerce/1.9.3.7/map.xml.dist
@@ -1959,6 +1959,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
admin_user_session
diff --git a/etc/opensource-to-opensource/1.6.0.0/map.xml.dist b/etc/opensource-to-opensource/1.6.0.0/map.xml.dist
index ff9648391..7cb0317da 100644
--- a/etc/opensource-to-opensource/1.6.0.0/map.xml.dist
+++ b/etc/opensource-to-opensource/1.6.0.0/map.xml.dist
@@ -467,6 +467,12 @@
catalog_product_entity_tier_price
+
+ permission_block
+
+
+ permission_variable
+
paybox_question_number
@@ -1624,6 +1630,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
diff --git a/etc/opensource-to-opensource/1.6.1.0/map.xml.dist b/etc/opensource-to-opensource/1.6.1.0/map.xml.dist
index 0cc89b073..bbff34ff1 100644
--- a/etc/opensource-to-opensource/1.6.1.0/map.xml.dist
+++ b/etc/opensource-to-opensource/1.6.1.0/map.xml.dist
@@ -455,6 +455,12 @@
catalog_product_entity_tier_price
+
+ permission_block
+
+
+ permission_variable
+
paybox_question_number
@@ -1624,6 +1630,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
diff --git a/etc/opensource-to-opensource/1.6.2.0/map.xml.dist b/etc/opensource-to-opensource/1.6.2.0/map.xml.dist
index 390450f6c..6b1b2bc73 100644
--- a/etc/opensource-to-opensource/1.6.2.0/map.xml.dist
+++ b/etc/opensource-to-opensource/1.6.2.0/map.xml.dist
@@ -455,6 +455,12 @@
catalog_product_entity_tier_price
+
+ permission_block
+
+
+ permission_variable
+
paybox_question_number
@@ -1624,6 +1630,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
diff --git a/etc/opensource-to-opensource/1.7.0.0/map.xml.dist b/etc/opensource-to-opensource/1.7.0.0/map.xml.dist
index da6248619..6dfa07a57 100644
--- a/etc/opensource-to-opensource/1.7.0.0/map.xml.dist
+++ b/etc/opensource-to-opensource/1.7.0.0/map.xml.dist
@@ -464,6 +464,12 @@
catalog_product_entity_tier_price
+
+ permission_block
+
+
+ permission_variable
+
googlebase_attributes
@@ -1545,6 +1551,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
diff --git a/etc/opensource-to-opensource/1.7.0.1/map.xml.dist b/etc/opensource-to-opensource/1.7.0.1/map.xml.dist
index da6248619..6dfa07a57 100644
--- a/etc/opensource-to-opensource/1.7.0.1/map.xml.dist
+++ b/etc/opensource-to-opensource/1.7.0.1/map.xml.dist
@@ -464,6 +464,12 @@
catalog_product_entity_tier_price
+
+ permission_block
+
+
+ permission_variable
+
googlebase_attributes
@@ -1545,6 +1551,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
diff --git a/etc/opensource-to-opensource/1.7.0.2/map.xml.dist b/etc/opensource-to-opensource/1.7.0.2/map.xml.dist
index da6248619..6dfa07a57 100644
--- a/etc/opensource-to-opensource/1.7.0.2/map.xml.dist
+++ b/etc/opensource-to-opensource/1.7.0.2/map.xml.dist
@@ -464,6 +464,12 @@
catalog_product_entity_tier_price
+
+ permission_block
+
+
+ permission_variable
+
googlebase_attributes
@@ -1545,6 +1551,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
diff --git a/etc/opensource-to-opensource/1.8.0.0/map.xml.dist b/etc/opensource-to-opensource/1.8.0.0/map.xml.dist
index f659b137e..05efab9e7 100644
--- a/etc/opensource-to-opensource/1.8.0.0/map.xml.dist
+++ b/etc/opensource-to-opensource/1.8.0.0/map.xml.dist
@@ -464,6 +464,12 @@
catalog_product_entity_tier_price
+
+ permission_block
+
+
+ permission_variable
+
googlebase_attributes
@@ -1545,6 +1551,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
diff --git a/etc/opensource-to-opensource/1.8.1.0/map.xml.dist b/etc/opensource-to-opensource/1.8.1.0/map.xml.dist
index 6fe6cbc62..b4d0d34d5 100644
--- a/etc/opensource-to-opensource/1.8.1.0/map.xml.dist
+++ b/etc/opensource-to-opensource/1.8.1.0/map.xml.dist
@@ -461,6 +461,12 @@
catalog_product_entity_tier_price
+
+ permission_block
+
+
+ permission_variable
+
googlebase_attributes
@@ -1542,6 +1548,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
diff --git a/etc/opensource-to-opensource/1.9.0.0/map.xml.dist b/etc/opensource-to-opensource/1.9.0.0/map.xml.dist
index 0ce59c713..fcbe35fbd 100644
--- a/etc/opensource-to-opensource/1.9.0.0/map.xml.dist
+++ b/etc/opensource-to-opensource/1.9.0.0/map.xml.dist
@@ -464,6 +464,12 @@
catalog_product_entity_tier_price
+
+ permission_block
+
+
+ permission_variable
+
googlebase_attributes
@@ -1551,6 +1557,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
diff --git a/etc/opensource-to-opensource/1.9.0.1/map.xml.dist b/etc/opensource-to-opensource/1.9.0.1/map.xml.dist
index 0ce59c713..fcbe35fbd 100644
--- a/etc/opensource-to-opensource/1.9.0.1/map.xml.dist
+++ b/etc/opensource-to-opensource/1.9.0.1/map.xml.dist
@@ -464,6 +464,12 @@
catalog_product_entity_tier_price
+
+ permission_block
+
+
+ permission_variable
+
googlebase_attributes
@@ -1551,6 +1557,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
diff --git a/etc/opensource-to-opensource/1.9.1.0/map.xml.dist b/etc/opensource-to-opensource/1.9.1.0/map.xml.dist
index 630241e68..37c7df998 100644
--- a/etc/opensource-to-opensource/1.9.1.0/map.xml.dist
+++ b/etc/opensource-to-opensource/1.9.1.0/map.xml.dist
@@ -464,6 +464,12 @@
catalog_product_entity_tier_price
+
+ permission_block
+
+
+ permission_variable
+
googlebase_attributes
@@ -1551,6 +1557,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
diff --git a/etc/opensource-to-opensource/1.9.1.1/map.xml.dist b/etc/opensource-to-opensource/1.9.1.1/map.xml.dist
index 630241e68..37c7df998 100644
--- a/etc/opensource-to-opensource/1.9.1.1/map.xml.dist
+++ b/etc/opensource-to-opensource/1.9.1.1/map.xml.dist
@@ -464,6 +464,12 @@
catalog_product_entity_tier_price
+
+ permission_block
+
+
+ permission_variable
+
googlebase_attributes
@@ -1551,6 +1557,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
diff --git a/etc/opensource-to-opensource/1.9.2.0/map.xml.dist b/etc/opensource-to-opensource/1.9.2.0/map.xml.dist
index 9d9f35626..9bccfeeee 100644
--- a/etc/opensource-to-opensource/1.9.2.0/map.xml.dist
+++ b/etc/opensource-to-opensource/1.9.2.0/map.xml.dist
@@ -464,6 +464,12 @@
catalog_product_entity_tier_price
+
+ permission_block
+
+
+ permission_variable
+
googlebase_attributes
@@ -1565,6 +1571,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
diff --git a/etc/opensource-to-opensource/1.9.2.1/map.xml.dist b/etc/opensource-to-opensource/1.9.2.1/map.xml.dist
index 9d9f35626..9bccfeeee 100644
--- a/etc/opensource-to-opensource/1.9.2.1/map.xml.dist
+++ b/etc/opensource-to-opensource/1.9.2.1/map.xml.dist
@@ -464,6 +464,12 @@
catalog_product_entity_tier_price
+
+ permission_block
+
+
+ permission_variable
+
googlebase_attributes
@@ -1565,6 +1571,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
diff --git a/etc/opensource-to-opensource/1.9.2.2/map.xml.dist b/etc/opensource-to-opensource/1.9.2.2/map.xml.dist
index 378788c4d..9bccfeeee 100644
--- a/etc/opensource-to-opensource/1.9.2.2/map.xml.dist
+++ b/etc/opensource-to-opensource/1.9.2.2/map.xml.dist
@@ -1571,6 +1571,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
diff --git a/etc/opensource-to-opensource/1.9.2.3/map.xml.dist b/etc/opensource-to-opensource/1.9.2.3/map.xml.dist
index 378788c4d..9bccfeeee 100644
--- a/etc/opensource-to-opensource/1.9.2.3/map.xml.dist
+++ b/etc/opensource-to-opensource/1.9.2.3/map.xml.dist
@@ -1571,6 +1571,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
diff --git a/etc/opensource-to-opensource/1.9.2.4/map.xml.dist b/etc/opensource-to-opensource/1.9.2.4/map.xml.dist
index 378788c4d..9bccfeeee 100644
--- a/etc/opensource-to-opensource/1.9.2.4/map.xml.dist
+++ b/etc/opensource-to-opensource/1.9.2.4/map.xml.dist
@@ -1571,6 +1571,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
diff --git a/etc/opensource-to-opensource/1.9.3.0/map.xml.dist b/etc/opensource-to-opensource/1.9.3.0/map.xml.dist
index 519c58687..aa53f35ee 100644
--- a/etc/opensource-to-opensource/1.9.3.0/map.xml.dist
+++ b/etc/opensource-to-opensource/1.9.3.0/map.xml.dist
@@ -1583,6 +1583,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
diff --git a/etc/opensource-to-opensource/1.9.3.1/map.xml.dist b/etc/opensource-to-opensource/1.9.3.1/map.xml.dist
index 519c58687..aa53f35ee 100644
--- a/etc/opensource-to-opensource/1.9.3.1/map.xml.dist
+++ b/etc/opensource-to-opensource/1.9.3.1/map.xml.dist
@@ -1583,6 +1583,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
diff --git a/etc/opensource-to-opensource/1.9.3.2/map.xml.dist b/etc/opensource-to-opensource/1.9.3.2/map.xml.dist
index 5e2ab0077..4a8fdcf57 100644
--- a/etc/opensource-to-opensource/1.9.3.2/map.xml.dist
+++ b/etc/opensource-to-opensource/1.9.3.2/map.xml.dist
@@ -1610,6 +1610,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
diff --git a/etc/opensource-to-opensource/1.9.3.3/map.xml.dist b/etc/opensource-to-opensource/1.9.3.3/map.xml.dist
index 71a9dbd2b..9c1d10a83 100644
--- a/etc/opensource-to-opensource/1.9.3.3/map.xml.dist
+++ b/etc/opensource-to-opensource/1.9.3.3/map.xml.dist
@@ -1610,6 +1610,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
diff --git a/etc/opensource-to-opensource/1.9.3.4/map.xml.dist b/etc/opensource-to-opensource/1.9.3.4/map.xml.dist
index 71a9dbd2b..9c1d10a83 100644
--- a/etc/opensource-to-opensource/1.9.3.4/map.xml.dist
+++ b/etc/opensource-to-opensource/1.9.3.4/map.xml.dist
@@ -1610,6 +1610,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
diff --git a/etc/opensource-to-opensource/1.9.3.6/map.xml.dist b/etc/opensource-to-opensource/1.9.3.6/map.xml.dist
index 71a9dbd2b..9c1d10a83 100644
--- a/etc/opensource-to-opensource/1.9.3.6/map.xml.dist
+++ b/etc/opensource-to-opensource/1.9.3.6/map.xml.dist
@@ -1610,6 +1610,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
diff --git a/etc/opensource-to-opensource/1.9.3.7/map.xml.dist b/etc/opensource-to-opensource/1.9.3.7/map.xml.dist
index 71a9dbd2b..9c1d10a83 100644
--- a/etc/opensource-to-opensource/1.9.3.7/map.xml.dist
+++ b/etc/opensource-to-opensource/1.9.3.7/map.xml.dist
@@ -1610,6 +1610,9 @@
design_config_grid_flat
+
+ release_notification_viewer_log
+
diff --git a/src/Migration/Handler/EavAttributeGroup/SetGroupCode.php b/src/Migration/Handler/EavAttributeGroup/SetGroupCode.php
index 38bd26317..f9eade1b7 100644
--- a/src/Migration/Handler/EavAttributeGroup/SetGroupCode.php
+++ b/src/Migration/Handler/EavAttributeGroup/SetGroupCode.php
@@ -23,22 +23,29 @@ class SetGroupCode extends \Migration\Handler\AbstractHandler implements \Migrat
*
* @var bool
*/
- protected $canStart;
+ private $canStart;
/**
* @var AttributeGroupNameToCodeMap
*/
private $groupNameToCodeMap;
+ /**
+ * @var Source
+ */
+ private $source;
+
/**
* @param Config $config
* @param AttributeGroupNameToCodeMap $groupNameToCodeMap
+ * @param Source $source
* @throws Exception
*/
- public function __construct(Config $config, AttributeGroupNameToCodeMap $groupNameToCodeMap)
+ public function __construct(Config $config, AttributeGroupNameToCodeMap $groupNameToCodeMap, Source $source)
{
$this->groupNameToCodeMap = $groupNameToCodeMap;
$this->canStart = $config->getSource()['type'] == DatabaseStage::SOURCE_TYPE;
+ $this->source = $source;
}
/**
@@ -50,7 +57,32 @@ public function handle(Record $recordToHandle, Record $oppositeRecord)
return;
}
$this->validate($recordToHandle);
- $groupCode = $this->groupNameToCodeMap->getGroupCodeMap($recordToHandle->getValue('attribute_group_name'));
+ $entityType = $this->determineEntityType($recordToHandle->getValue('attribute_set_id'));
+ $groupCode = $this->groupNameToCodeMap->getGroupCodeMap(
+ $recordToHandle->getValue('attribute_group_name'),
+ $entityType
+ );
$recordToHandle->setValue($this->field, $groupCode);
}
+
+ /**
+ * Find entity type by attribute set ID
+ *
+ * @param string $attributeSetId
+ * @return string
+ */
+ private function determineEntityType($attributeSetId)
+ {
+ /** @var Mysql $adapter */
+ $adapter = $this->source->getAdapter();
+ $select = $adapter->getSelect()->from(
+ ['eas' => $this->source->addDocumentPrefix('eav_attribute_set')],
+ []
+ )->join(
+ ['eet' => $this->source->addDocumentPrefix('eav_entity_type')],
+ 'eas.entity_type_id = eet.entity_type_id',
+ ['entity_type_code']
+ )->where('eas.attribute_set_id = ?', $attributeSetId);
+ return $select->getAdapter()->fetchOne($select);
+ }
}
diff --git a/src/Migration/Model/Eav/AttributeGroupNameToCodeMap.php b/src/Migration/Model/Eav/AttributeGroupNameToCodeMap.php
index a40aaed54..bdb895580 100644
--- a/src/Migration/Model/Eav/AttributeGroupNameToCodeMap.php
+++ b/src/Migration/Model/Eav/AttributeGroupNameToCodeMap.php
@@ -13,11 +13,13 @@ class AttributeGroupNameToCodeMap
/**
* @var array
*/
- protected $map = [
- 'General' => 'product-details',
- 'Prices' => 'advanced-pricing',
- 'Design' => 'design',
- 'Images' => 'image-management'
+ private $map = [
+ 'catalog_product' => [
+ 'General' => 'product-details',
+ 'Prices' => 'advanced-pricing',
+ 'Design' => 'design',
+ 'Images' => 'image-management'
+ ]
];
/**
@@ -27,22 +29,26 @@ class AttributeGroupNameToCodeMap
/**
* @param string $groupName
+ * @param string $entityType
* @return array
*/
- public function getGroupCodeMap($groupName)
+ public function getGroupCodeMap($groupName, $entityType)
{
$groupNameOriginal = preg_replace('/^' . $this->attributeGroupNamePrefix . '/', '', $groupName);
- $groupCodeMap = isset($this->map[$groupNameOriginal]) ? $this->map[$groupNameOriginal] : null;
+ $groupCodeMap = isset($this->map[$entityType][$groupNameOriginal])
+ ? $this->map[$entityType][$groupNameOriginal]
+ : null;
$groupCodeTransformed = preg_replace('/[^a-z0-9]+/', '-', strtolower($groupName));
$groupCode = $groupCodeMap ?: $groupCodeTransformed;
return $groupCode;
}
/**
+ * @param string $entityType
* @return array
*/
- public function getMap()
+ public function getMap($entityType)
{
- return $this->map;
+ return isset($this->map[$entityType]) ? $this->map[$entityType] : [];
}
}
diff --git a/src/Migration/Step/Customer/Data.php b/src/Migration/Step/Customer/Data.php
index 254609a67..cb8a482fc 100644
--- a/src/Migration/Step/Customer/Data.php
+++ b/src/Migration/Step/Customer/Data.php
@@ -13,6 +13,7 @@
use Migration\ResourceModel;
use Migration\ResourceModel\Record;
use Migration\App\ProgressBar;
+use Migration\App\Progress;
use Migration\Logger\Manager as LogManager;
use Migration\Logger\Logger;
use Migration\Step\Customer\Model;
@@ -51,6 +52,13 @@ class Data extends \Migration\Step\DatabaseStage implements StageInterface
/**
* @var ProgressBar\LogLevelProcessor
*/
+ private $progressBar;
+
+ /**
+ * Progress instance, saves the state of the process
+ *
+ * @var Progress
+ */
private $progress;
/**
@@ -80,7 +88,8 @@ class Data extends \Migration\Step\DatabaseStage implements StageInterface
/**
* @param \Migration\Config $config
- * @param ProgressBar\LogLevelProcessor $progress
+ * @param ProgressBar\LogLevelProcessor $progressBar
+ * @param Progress $progress
* @param ResourceModel\Source $source
* @param ResourceModel\Destination $destination
* @param ResourceModel\RecordFactory $recordFactory
@@ -96,7 +105,8 @@ class Data extends \Migration\Step\DatabaseStage implements StageInterface
*/
public function __construct(
\Migration\Config $config,
- ProgressBar\LogLevelProcessor $progress,
+ ProgressBar\LogLevelProcessor $progressBar,
+ Progress $progress,
ResourceModel\Source $source,
ResourceModel\Destination $destination,
ResourceModel\RecordFactory $recordFactory,
@@ -113,6 +123,7 @@ public function __construct(
$this->recordFactory = $recordFactory;
$this->recordTransformerFactory = $recordTransformerFactory;
$this->map = $mapFactory->create('customer_map_file');
+ $this->progressBar = $progressBar;
$this->progress = $progress;
$this->readerGroups = $groupsFactory->create('customer_document_groups_file');
$this->logger = $logger;
@@ -127,11 +138,23 @@ public function __construct(
*/
public function perform()
{
+ $stage = 'run';
$sourceDocuments = array_keys($this->readerGroups->getGroup('source_documents'));
- $this->progress->start(count($sourceDocuments), LogManager::LOG_LEVEL_INFO);
- $this->migrateCustomerEntities();
- $this->migrateCustomerData();
- $this->progress->finish(LogManager::LOG_LEVEL_INFO);
+ $sourceEntityDocuments = array_keys($this->readerGroups->getGroup('source_entity_documents'));
+ $sourceDataDocuments = array_diff($sourceDocuments, $sourceEntityDocuments);
+ $skippedAttributes = array_keys($this->attributesDataToSkip->getSkippedAttributes());
+ $processedDocuments = $this->progress->getProcessedEntities($this, $stage);
+ $this->progressBar->start(count($sourceDocuments), LogManager::LOG_LEVEL_INFO);
+ foreach (array_diff($sourceEntityDocuments, $processedDocuments) as $sourceEntityDocument) {
+ $this->transformDocumentRecords($sourceEntityDocument);
+ $this->progress->addProcessedEntity($this, $stage, $sourceEntityDocument);
+ }
+ foreach (array_diff($sourceDataDocuments, $processedDocuments) as $sourceDataDocument) {
+ $this->transformDocumentRecords($sourceDataDocument, $skippedAttributes);
+ $this->progress->addProcessedEntity($this, $stage, $sourceDataDocument);
+ }
+ $this->attributesToStatic->update();
+ $this->progressBar->finish(LogManager::LOG_LEVEL_INFO);
return true;
}
@@ -166,7 +189,7 @@ private function transformDocumentRecords(
$recordTransformer->init();
$pageNumber = 0;
$this->logger->debug('migrating', ['table' => $sourceDocName]);
- $this->progress->start(
+ $this->progressBar->start(
ceil($this->source->getRecordsCount($sourceDocName) / $this->source->getPageSize($sourceDocName)),
LogManager::LOG_LEVEL_DEBUG
);
@@ -192,36 +215,10 @@ private function transformDocumentRecords(
->updateCustomerEntities($sourceDocName, $destinationRecords);
}
$this->source->setLastLoadedRecord($sourceDocName, end($bulk));
- $this->progress->advance(LogManager::LOG_LEVEL_DEBUG);
+ $this->progressBar->advance(LogManager::LOG_LEVEL_DEBUG);
$this->destination->saveRecords($destinationName, $destinationRecords);
}
- $this->progress->advance(LogManager::LOG_LEVEL_INFO);
- $this->progress->finish(LogManager::LOG_LEVEL_DEBUG);
- }
-
- /**
- * Migrate customer entity tables
- */
- private function migrateCustomerEntities()
- {
- $sourceEntityDocuments = array_keys($this->readerGroups->getGroup('source_entity_documents'));
- foreach ($sourceEntityDocuments as $sourceEntityDocument) {
- $this->transformDocumentRecords($sourceEntityDocument);
- }
- $this->attributesToStatic->update();
- }
-
- /**
- * Migrate data of customers
- */
- private function migrateCustomerData()
- {
- $skippedAttributes = array_keys($this->attributesDataToSkip->getSkippedAttributes());
- $sourceDocuments = array_keys($this->readerGroups->getGroup('source_documents'));
- $sourceEntityDocuments = array_keys($this->readerGroups->getGroup('source_entity_documents'));
- $sourceDataDocuments = array_diff($sourceDocuments, $sourceEntityDocuments);
- foreach ($sourceDataDocuments as $sourceDataDocument) {
- $this->transformDocumentRecords($sourceDataDocument, $skippedAttributes);
- }
+ $this->progressBar->advance(LogManager::LOG_LEVEL_INFO);
+ $this->progressBar->finish(LogManager::LOG_LEVEL_DEBUG);
}
}
diff --git a/src/Migration/Step/DataIntegrity/Integrity.php b/src/Migration/Step/DataIntegrity/Integrity.php
index ca4bee39c..933c4ed45 100644
--- a/src/Migration/Step/DataIntegrity/Integrity.php
+++ b/src/Migration/Step/DataIntegrity/Integrity.php
@@ -114,8 +114,10 @@ protected function getDocumentList()
*/
private function buildLogMessage(OrphanRecordsChecker $checker)
{
+ $message = 'Foreign key (%s) constraint fails on source database.'
+ . ' Orphan records id: %s from `%s`.`%s` has no referenced records in `%s`';
return sprintf(
- 'Foreign key (%s) constraint fails. Orphan records id: %s from `%s`.`%s` has no referenced records in `%s`',
+ $message,
$checker->getKeyName(),
implode(',', $checker->getOrphanRecordsIds()),
$checker->getChildTable(),
diff --git a/src/Migration/Step/Eav/Integrity/AttributeGroupNames.php b/src/Migration/Step/Eav/Integrity/AttributeGroupNames.php
index ea4cae4fd..94020c216 100644
--- a/src/Migration/Step/Eav/Integrity/AttributeGroupNames.php
+++ b/src/Migration/Step/Eav/Integrity/AttributeGroupNames.php
@@ -80,7 +80,7 @@ public function checkAttributeGroupNames()
protected function checkForErrors(array $attributeGroupsOfCatalogProduct, array $attributeSetsOfCatalogProduct)
{
$incompatibleDocumentFieldsData = [];
- $groupNamesToValidate = array_keys($this->groupNameToCodeMap->getMap());
+ $groupNamesToValidate = array_keys($this->groupNameToCodeMap->getMap('catalog_product'));
foreach ($attributeGroupsOfCatalogProduct as $attributeSetId => $groupNames) {
if (!empty(array_diff($groupNamesToValidate, $groupNames))) {
$error = 'The product attribute set "%s" does not contain all required attribute group names "%s"';
diff --git a/src/Migration/Step/Settings/Data.php b/src/Migration/Step/Settings/Data.php
index 935dc5f40..7b6fc8bac 100644
--- a/src/Migration/Step/Settings/Data.php
+++ b/src/Migration/Step/Settings/Data.php
@@ -30,6 +30,17 @@ class Data implements StageInterface
const CONFIG_FIELD_PATH = 'path';
const CONFIG_FIELD_VALUE = 'value';
+ /**
+ * @var array
+ */
+ protected $configTableSchema = [
+ self::CONFIG_FIELD_CONFIG_ID,
+ self::CONFIG_FIELD_SCOPE,
+ self::CONFIG_FIELD_SCOPE_ID,
+ self::CONFIG_FIELD_PATH,
+ self::CONFIG_FIELD_VALUE
+ ];
+
/**
* @var Destination
*/
@@ -113,6 +124,7 @@ public function perform()
);
foreach ($sourceRecords as $sourceRecord) {
$this->progress->advance();
+ $sourceRecord = array_intersect_key($sourceRecord, array_flip($this->configTableSchema));
if (!$this->readerSettings->isNodeIgnored($sourceRecord[self::CONFIG_FIELD_PATH])) {
$sourceRecordPathMapped = $this->readerSettings->getNodeMap($sourceRecord[self::CONFIG_FIELD_PATH]);
foreach ($destinationRecords as &$destinationRecord) {
diff --git a/src/Migration/Step/UrlRewrite/Version11410to2000.php b/src/Migration/Step/UrlRewrite/Version11410to2000.php
index 7670be431..5dc66b1f2 100644
--- a/src/Migration/Step/UrlRewrite/Version11410to2000.php
+++ b/src/Migration/Step/UrlRewrite/Version11410to2000.php
@@ -278,7 +278,7 @@ protected function data()
&& empty($this->duplicateIndex)
) {
foreach ($duplicates as $row) {
- $this->duplicateIndex[$row['request_path']][] = $row;
+ $this->duplicateIndex[strtolower($row['request_path'])][] = $row;
}
}
@@ -391,9 +391,11 @@ protected function migrateRewrites($source, $destination)
$destinationRecord->setValue('entity_id', 0);
}
- if (!empty($this->duplicateIndex[$sourceRecord->getValue('request_path')])) {
+ $normalizedRequestPath = strtolower($sourceRecord->getValue('request_path'));
+ if (!empty($this->duplicateIndex[$normalizedRequestPath])) {
$shouldResolve = false;
- foreach ($this->duplicateIndex[$sourceRecord->getValue('request_path')] as &$duplicate) {
+
+ foreach ($this->duplicateIndex[$normalizedRequestPath] as &$duplicate) {
$onStore = $duplicate['store_id'] == $sourceRecord->getValue('store_id');
if ($onStore && empty($duplicate['used'])) {
$duplicate['used'] = true;
diff --git a/tests/integration/testsuite/Migration/Step/DataIntegrity/IntegrityTest.php b/tests/integration/testsuite/Migration/Step/DataIntegrity/IntegrityTest.php
index 4b898e121..d11d6c4b0 100644
--- a/tests/integration/testsuite/Migration/Step/DataIntegrity/IntegrityTest.php
+++ b/tests/integration/testsuite/Migration/Step/DataIntegrity/IntegrityTest.php
@@ -106,9 +106,9 @@ public function documentsDataProvider()
'result' => false,
'messages' => [
\Monolog\Logger::ERROR => [
- 'Foreign key (FK_EAV_ATTR_SET_ENTT_TYPE_ID_EAV_ENTT_TYPE_ENTT_TYPE_ID) constraint fails. ' .
- 'Orphan records id: 2,3 from `eav_attribute_set`.`entity_type_id` has no referenced records ' .
- 'in `eav_entity_type`'
+ 'Foreign key (FK_EAV_ATTR_SET_ENTT_TYPE_ID_EAV_ENTT_TYPE_ENTT_TYPE_ID) constraint fails ' .
+ 'on source database. Orphan records id: 2,3 from `eav_attribute_set`.`entity_type_id` '.
+ 'has no referenced records in `eav_entity_type`'
]
]
]
diff --git a/tests/unit/testsuite/Migration/Handler/EavAttributeGroup/SetGroupCodeTest.php b/tests/unit/testsuite/Migration/Handler/EavAttributeGroup/SetGroupCodeTest.php
index 93ef8151b..ede3cce48 100644
--- a/tests/unit/testsuite/Migration/Handler/EavAttributeGroup/SetGroupCodeTest.php
+++ b/tests/unit/testsuite/Migration/Handler/EavAttributeGroup/SetGroupCodeTest.php
@@ -22,6 +22,8 @@ public function testHandle()
$groupName = 'Migration General';
$groupCode = 'migration-general';
$fieldName = 'fieldname';
+ $entityType = 'catalog_product';
+ $attributeSetId = '4';
/** @var \Migration\ResourceModel\Record|\PHPUnit_Framework_MockObject_MockObject $recordToHandle */
$recordToHandle = $this->getMockBuilder(\Migration\ResourceModel\Record::class)
->setMethods(['getValue', 'setValue', 'getFields'])
@@ -39,16 +41,42 @@ public function testHandle()
->getMock();
$attributeGroupNameToCodeMap->expects($this->once())
->method('getGroupCodeMap')
- ->with($groupName)
+ ->with($groupName, $entityType)
->willReturn($groupCode);
$recordToHandle->expects($this->once())->method('getFields')->will($this->returnValue([$fieldName]));
- $recordToHandle->expects($this->once())->method('getValue')->with('attribute_group_name')
- ->willReturn($groupName);
+ $recordToHandle->expects($this->any())->method('getValue')->willReturnMap(
+ [
+ ['attribute_group_name', $groupName],
+ ['attribute_set_id', $attributeSetId]
+ ]
+ );
$recordToHandle->expects($this->once())->method('setValue')->with($fieldName, $groupCode);
$config = $this->getMockBuilder(\Migration\Config::class)
->disableOriginalConstructor()->setMethods(['getSource'])->getMock();
$config->expects($this->once())->method('getSource')->willReturn(['type' => DatabaseStage::SOURCE_TYPE]);
- $handler = new SetGroupCode($config, $attributeGroupNameToCodeMap);
+
+ $source = $this->getMockBuilder(\Migration\ResourceModel\Source::class)
+ ->setMethods(['getAdapter', 'addDocumentPrefix'])
+ ->disableOriginalConstructor()
+ ->getMock();
+ $mySqlAdapter = $this->createPartialMock(
+ \Migration\ResourceModel\Adapter\Mysql::class,
+ ['getSelect', 'fetchOne']
+ );
+ $dbSelect = $this->createPartialMock(
+ \Magento\Framework\DB\Select::class,
+ ['from', 'where', 'join', 'getAdapter']
+ );
+ $mySqlAdapter->expects($this->any())->method('getSelect')->willReturn($dbSelect);
+ $source->expects($this->any())->method('getAdapter')->willReturn($mySqlAdapter);
+ $source->expects($this->any())->method('addDocumentPrefix')->willReturnArgument(0);
+ $dbSelect->expects($this->any())->method('from')->willReturnSelf();
+ $dbSelect->expects($this->any())->method('where')->willReturnSelf();
+ $dbSelect->expects($this->any())->method('join')->willReturnSelf();
+ $dbSelect->expects($this->any())->method('getAdapter')->willReturn($mySqlAdapter);
+ $mySqlAdapter->expects($this->once())->method('fetchOne')->willReturn($entityType);
+
+ $handler = new SetGroupCode($config, $attributeGroupNameToCodeMap, $source);
$handler->setField($fieldName);
$handler->handle($recordToHandle, $oppositeRecord);
}
diff --git a/tests/unit/testsuite/Migration/Model/Eav/AttributeGroupNameToCodeMapTest.php b/tests/unit/testsuite/Migration/Model/Eav/AttributeGroupNameToCodeMapTest.php
index 5ef5422b6..d437f999d 100644
--- a/tests/unit/testsuite/Migration/Model/Eav/AttributeGroupNameToCodeMapTest.php
+++ b/tests/unit/testsuite/Migration/Model/Eav/AttributeGroupNameToCodeMapTest.php
@@ -29,12 +29,13 @@ protected function setUp()
/**
* @dataProvider getGroupsData()
* @param string $groupName
+ * @param string $entityType
* @param string $groupCode
* @return void
*/
- public function testGetGroupCodeMap($groupName, $groupCode)
+ public function testGetGroupCodeMap($groupName, $entityType, $groupCode)
{
- $result = $this->model->getGroupCodeMap($groupName);
+ $result = $this->model->getGroupCodeMap($groupName, $entityType);
$this->assertEquals($result, $groupCode);
}
@@ -44,10 +45,11 @@ public function testGetGroupCodeMap($groupName, $groupCode)
public function getGroupsData()
{
return [
- ['Migration_General', 'product-details'],
- ['Migration_Prices', 'advanced-pricing'],
- ['Migration_Design', 'design'],
- ['Migration_Something', 'migration-something'],
+ ['Migration_General', 'catalog_product', 'product-details'],
+ ['Migration_Prices', 'catalog_product', 'advanced-pricing'],
+ ['Migration_Design', 'catalog_product', 'design'],
+ ['Migration_Something', 'catalog_product', 'migration-something'],
+ ['Migration_General', 'catalog_category', 'migration-general'],
];
}
}