From 96a5013bcd0253e1b6e16b8051c87e1bb228a55a Mon Sep 17 00:00:00 2001 From: Sam Carr Date: Tue, 26 Sep 2017 10:19:07 -0700 Subject: [PATCH 01/11] Bugfix: url duplicates not resolving if urls in mixed case --- src/Migration/Step/UrlRewrite/Version11410to2000.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Migration/Step/UrlRewrite/Version11410to2000.php b/src/Migration/Step/UrlRewrite/Version11410to2000.php index 06f2f7d93..8ab73ea03 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; } } @@ -393,9 +393,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; From 4fd8cad0127c7a4f517a8c4a3fadbcd9c9eedb93 Mon Sep 17 00:00:00 2001 From: Victor Rad Date: Mon, 13 Nov 2017 09:17:17 +0200 Subject: [PATCH 02/11] MAGETWO-81075: permission_block and permission_variable can exists on all Magento version (since patch SUPEE-6788) --- etc/opensource-to-commerce/1.6.0.0/map.xml.dist | 6 ++++++ etc/opensource-to-commerce/1.6.1.0/map.xml.dist | 6 ++++++ etc/opensource-to-commerce/1.6.2.0/map.xml.dist | 6 ++++++ etc/opensource-to-commerce/1.7.0.0/map.xml.dist | 6 ++++++ etc/opensource-to-commerce/1.7.0.1/map.xml.dist | 6 ++++++ etc/opensource-to-commerce/1.7.0.2/map.xml.dist | 6 ++++++ etc/opensource-to-commerce/1.8.0.0/map.xml.dist | 6 ++++++ etc/opensource-to-commerce/1.8.1.0/map.xml.dist | 6 ++++++ etc/opensource-to-commerce/1.9.0.0/map.xml.dist | 6 ++++++ etc/opensource-to-commerce/1.9.0.1/map.xml.dist | 6 ++++++ etc/opensource-to-commerce/1.9.1.0/map.xml.dist | 6 ++++++ etc/opensource-to-commerce/1.9.1.1/map.xml.dist | 6 ++++++ etc/opensource-to-commerce/1.9.2.0/map.xml.dist | 6 ++++++ etc/opensource-to-commerce/1.9.2.1/map.xml.dist | 6 ++++++ etc/opensource-to-opensource/1.6.0.0/map.xml.dist | 6 ++++++ etc/opensource-to-opensource/1.6.1.0/map.xml.dist | 6 ++++++ etc/opensource-to-opensource/1.6.2.0/map.xml.dist | 6 ++++++ etc/opensource-to-opensource/1.7.0.0/map.xml.dist | 6 ++++++ etc/opensource-to-opensource/1.7.0.1/map.xml.dist | 6 ++++++ etc/opensource-to-opensource/1.7.0.2/map.xml.dist | 6 ++++++ etc/opensource-to-opensource/1.8.0.0/map.xml.dist | 6 ++++++ etc/opensource-to-opensource/1.8.1.0/map.xml.dist | 6 ++++++ etc/opensource-to-opensource/1.9.0.0/map.xml.dist | 6 ++++++ etc/opensource-to-opensource/1.9.0.1/map.xml.dist | 6 ++++++ etc/opensource-to-opensource/1.9.1.0/map.xml.dist | 6 ++++++ etc/opensource-to-opensource/1.9.1.1/map.xml.dist | 6 ++++++ etc/opensource-to-opensource/1.9.2.0/map.xml.dist | 6 ++++++ etc/opensource-to-opensource/1.9.2.1/map.xml.dist | 6 ++++++ 28 files changed, 168 insertions(+) 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..2e57baa34 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 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..01b4d023b 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 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..06cc580a0 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 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..f609911ad 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 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..f609911ad 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 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..f609911ad 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 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..f38e123e3 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 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..68e1d89e8 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 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..0a1e6752d 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 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..f38e123e3 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 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..bb0e82e0c 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 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..bb0e82e0c 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 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..2dcd73e6f 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 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..2dcd73e6f 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 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..b3d1a54cf 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 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..e5e8098c0 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 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..7998c1144 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 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..c49182c86 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 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..c49182c86 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 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..c49182c86 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 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..c3140ff10 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 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..6195a67f2 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 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..ab064eea8 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 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..ab064eea8 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 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..08a3f48da 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 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..08a3f48da 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 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..378788c4d 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 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..378788c4d 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 From f430d97fc06266df41958c8e7ca24518018b987d Mon Sep 17 00:00:00 2001 From: Victor Rad Date: Tue, 14 Nov 2017 14:06:09 +0200 Subject: [PATCH 03/11] MAGETWO-80933: [GitHub] Settings step migrates all values of core_config_data table even created by extension #378 --- src/Migration/Step/Settings/Data.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) 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) { From a33d8e9bacac6371492c99e63af8a8f3337e1ff2 Mon Sep 17 00:00:00 2001 From: Victor Rad Date: Thu, 16 Nov 2017 11:01:12 +0200 Subject: [PATCH 04/11] MAGETWO-72093: [GitHub] Integrity check error clarification #355 --- src/Migration/Step/DataIntegrity/Integrity.php | 4 +++- .../Migration/Step/DataIntegrity/IntegrityTest.php | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) 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/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`' ] ] ] From e3c29bec8562ea45fb1b64aedb1eed3c69db0c1b Mon Sep 17 00:00:00 2001 From: Victor Rad Date: Tue, 21 Nov 2017 09:20:37 +0200 Subject: [PATCH 05/11] MAGETWO-81066: After migration eav_attribute_group.attribute_group_code setup product-details for not product entity type entities --- .../EavAttributeGroup/SetGroupCode.php | 39 +++++++++++++++++-- .../Model/Eav/AttributeGroupNameToCodeMap.php | 24 +++++++----- .../Eav/Integrity/AttributeGroupNames.php | 2 +- .../EavAttributeGroup/SetGroupCodeTest.php | 36 +++++++++++++++-- .../Eav/AttributeGroupNameToCodeMapTest.php | 14 ++++--- 5 files changed, 92 insertions(+), 23 deletions(-) diff --git a/src/Migration/Handler/EavAttributeGroup/SetGroupCode.php b/src/Migration/Handler/EavAttributeGroup/SetGroupCode.php index 38bd26317..a843756a4 100644 --- a/src/Migration/Handler/EavAttributeGroup/SetGroupCode.php +++ b/src/Migration/Handler/EavAttributeGroup/SetGroupCode.php @@ -23,22 +23,30 @@ 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 +58,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/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/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'], ]; } } From 417eec1e306c624aa783f67c2c59e8d9bf3d6ac0 Mon Sep 17 00:00:00 2001 From: Victor Rad Date: Mon, 4 Dec 2017 11:33:24 +0200 Subject: [PATCH 06/11] MAGETWO-82347: Customer Attribute step does not remember its position --- src/Migration/Step/Customer/Data.php | 69 +++++++++++++--------------- 1 file changed, 33 insertions(+), 36 deletions(-) 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); } } From c9fc3e44d094defc2f11deea98132665d759739f Mon Sep 17 00:00:00 2001 From: Victor Rad Date: Mon, 11 Dec 2017 08:43:34 +0200 Subject: [PATCH 07/11] MAGETWO-85265: Add a new table release_notification_viewer_log into ignore tag in all map files --- .../1.11.0.0/map.xml.dist | 3 +++ .../1.11.0.1/map.xml.dist | 3 +++ .../1.11.0.2/map.xml.dist | 3 +++ .../1.11.1.0/map.xml.dist | 3 +++ .../1.11.2.0/map.xml.dist | 3 +++ .../1.12.0.0/map.xml.dist | 3 +++ .../1.12.0.1/map.xml.dist | 3 +++ .../1.12.0.2/map.xml.dist | 3 +++ .../1.13.0.0/map.xml.dist | 3 +++ .../1.13.0.1/map.xml.dist | 3 +++ .../1.13.0.2/map.xml.dist | 3 +++ .../1.13.1.0/map.xml.dist | 3 +++ .../1.14.0.0/map.xml.dist | 3 +++ .../1.14.0.1/map.xml.dist | 3 +++ .../1.14.1.0/map.xml.dist | 3 +++ .../1.14.2.0/map.xml.dist | 3 +++ .../1.14.2.1/map.xml.dist | 3 +++ .../1.14.2.2/map.xml.dist | 3 +++ .../1.14.2.3/map.xml.dist | 3 +++ .../1.14.2.4/map.xml.dist | 3 +++ .../1.14.3.0/map.xml.dist | 3 +++ .../1.14.3.1/map.xml.dist | 3 +++ .../1.14.3.2/map.xml.dist | 3 +++ .../1.14.3.3/map.xml.dist | 3 +++ .../1.14.3.4/map.xml.dist | 3 +++ .../1.14.3.6/map.xml.dist | 3 +++ .../1.14.3.7/map.xml.dist | 3 +++ .../1.6.0.0/map.xml.dist | 3 +++ .../1.6.1.0/map.xml.dist | 3 +++ .../1.6.2.0/map.xml.dist | 3 +++ .../1.7.0.0/map.xml.dist | 3 +++ .../1.7.0.1/map.xml.dist | 3 +++ .../1.7.0.2/map.xml.dist | 3 +++ .../1.8.0.0/map.xml.dist | 3 +++ .../1.8.1.0/map.xml.dist | 3 +++ .../1.9.0.0/map.xml.dist | 3 +++ .../1.9.0.1/map.xml.dist | 3 +++ .../1.9.1.0/map.xml.dist | 3 +++ .../1.9.1.1/map.xml.dist | 3 +++ .../1.9.2.0/map.xml.dist | 3 +++ .../1.9.2.1/map.xml.dist | 3 +++ .../1.9.2.2/map.xml.dist | 3 +++ .../1.9.2.3/map.xml.dist | 3 +++ .../1.9.2.4/map.xml.dist | 3 +++ .../1.9.3.0/map.xml.dist | 3 +++ .../1.9.3.1/map.xml.dist | 3 +++ .../1.9.3.2/map.xml.dist | 3 +++ .../1.9.3.3/map.xml.dist | 3 +++ .../1.9.3.4/map.xml.dist | 3 +++ .../1.9.3.6/map.xml.dist | 3 +++ .../1.9.3.7/map.xml.dist | 3 +++ .../1.6.0.0/map.xml.dist | 3 +++ .../1.6.1.0/map.xml.dist | 3 +++ .../1.6.2.0/map.xml.dist | 3 +++ .../1.7.0.0/map.xml.dist | 3 +++ .../1.7.0.1/map.xml.dist | 3 +++ .../1.7.0.2/map.xml.dist | 3 +++ .../1.8.0.0/map.xml.dist | 3 +++ .../1.8.1.0/map.xml.dist | 3 +++ .../1.9.0.0/map.xml.dist | 3 +++ .../1.9.0.1/map.xml.dist | 3 +++ .../1.9.1.0/map.xml.dist | 3 +++ .../1.9.1.1/map.xml.dist | 3 +++ .../1.9.2.0/map.xml.dist | 3 +++ .../1.9.2.1/map.xml.dist | 3 +++ .../1.9.2.2/map.xml.dist | 3 +++ .../1.9.2.3/map.xml.dist | 3 +++ .../1.9.2.4/map.xml.dist | 3 +++ .../1.9.3.0/map.xml.dist | 3 +++ .../1.9.3.1/map.xml.dist | 27 +++++++++++++++++++ .../1.9.3.2/map.xml.dist | 3 +++ .../1.9.3.3/map.xml.dist | 3 +++ .../1.9.3.4/map.xml.dist | 3 +++ .../1.9.3.6/map.xml.dist | 3 +++ .../1.9.3.7/map.xml.dist | 3 +++ 75 files changed, 249 insertions(+) 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 2e57baa34..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 @@ -2051,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 01b4d023b..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 @@ -2060,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 06cc580a0..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 @@ -2060,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 f609911ad..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 @@ -1969,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 f609911ad..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 @@ -1969,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 f609911ad..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 @@ -1969,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 f38e123e3..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 @@ -1969,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 68e1d89e8..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 @@ -1966,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 0a1e6752d..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 @@ -1969,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 f38e123e3..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 @@ -1969,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 bb0e82e0c..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 @@ -1969,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 bb0e82e0c..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 @@ -1969,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 2dcd73e6f..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 @@ -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.1/map.xml.dist b/etc/opensource-to-commerce/1.9.2.1/map.xml.dist index 2dcd73e6f..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 @@ -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.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 b3d1a54cf..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 @@ -1630,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 e5e8098c0..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 @@ -1630,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 7998c1144..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 @@ -1630,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 c49182c86..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 @@ -1551,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 c49182c86..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 @@ -1551,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 c49182c86..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 @@ -1551,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 c3140ff10..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 @@ -1551,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 6195a67f2..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 @@ -1548,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 ab064eea8..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 @@ -1557,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 ab064eea8..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 @@ -1557,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 08a3f48da..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 @@ -1557,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 08a3f48da..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 @@ -1557,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 378788c4d..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 @@ -1571,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 378788c4d..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 @@ -1571,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..e753a80b5 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 + @@ -1900,6 +1903,30 @@ paypal_settlement_report.report_date + + magestore_bannerslider_slider.show_title + + + magestore_bannerslider_slider.position_note + + + magestore_bannerslider_slider.min_item + + + magestore_bannerslider_slider.max_item + + + magestore_bannerslider_banner.style_slide + + + magestore_bannerslider_banner.caption + + + magestore_bannerslider_banner.slider_id + + + magestore_bannerslider_banner.target + 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 + From 68cdd5fd4cc9952074d53323ef97e57f6d7f0206 Mon Sep 17 00:00:00 2001 From: Victor Rad Date: Mon, 11 Dec 2017 11:22:06 +0200 Subject: [PATCH 08/11] MAGETWO-85211: Data Migration Tool Release 2.2.2 --- .../1.9.3.1/map.xml.dist | 24 ------------------- 1 file changed, 24 deletions(-) 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 e753a80b5..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 @@ -1903,30 +1903,6 @@ paypal_settlement_report.report_date - - magestore_bannerslider_slider.show_title - - - magestore_bannerslider_slider.position_note - - - magestore_bannerslider_slider.min_item - - - magestore_bannerslider_slider.max_item - - - magestore_bannerslider_banner.style_slide - - - magestore_bannerslider_banner.caption - - - magestore_bannerslider_banner.slider_id - - - magestore_bannerslider_banner.target - From a976e03a31b837f804bac312b42d90c2fb85fe26 Mon Sep 17 00:00:00 2001 From: Victor Rad Date: Mon, 11 Dec 2017 11:24:16 +0200 Subject: [PATCH 09/11] MAGETWO-85211: Data Migration Tool Release 2.2.2 --- src/Migration/Handler/EavAttributeGroup/SetGroupCode.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Migration/Handler/EavAttributeGroup/SetGroupCode.php b/src/Migration/Handler/EavAttributeGroup/SetGroupCode.php index a843756a4..f9eade1b7 100644 --- a/src/Migration/Handler/EavAttributeGroup/SetGroupCode.php +++ b/src/Migration/Handler/EavAttributeGroup/SetGroupCode.php @@ -35,7 +35,6 @@ class SetGroupCode extends \Migration\Handler\AbstractHandler implements \Migrat */ private $source; - /** * @param Config $config * @param AttributeGroupNameToCodeMap $groupNameToCodeMap From c44d842fbef1297494d4a1fe246faefff39279bf Mon Sep 17 00:00:00 2001 From: Victor Rad Date: Tue, 12 Dec 2017 13:15:59 +0200 Subject: [PATCH 10/11] MAGETWO-85211: Data Migration Tool Release 2.2.2 --- CHANGELOG.md | 14 ++++++++++++++ composer.json | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 062505914..9a22c5b55 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 not product entities + * [Issue #355](https://github.com/magento/data-migration-tool/issues/355): Data integrity check errors did not indicate source where it come from + * [Issue #378](https://github.com/magento/data-migration-tool/issues/378): Settings step threw an error in case additional fields from extensions in `core_config_data` 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", From cfa720b27fed6cd668dd1258827fd16fb2ad419e Mon Sep 17 00:00:00 2001 From: Victor Rad Date: Tue, 12 Dec 2017 15:42:02 +0200 Subject: [PATCH 11/11] MAGETWO-85211: Data Migration Tool Release 2.2.2 --- CHANGELOG.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a22c5b55..f3bf9d4d6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,9 +8,9 @@ * Fixed bugs: * Customer Attribute step did not remember its position - * Wrong value for `eav_attribute_group.attribute_group_code` field was set for not product entities - * [Issue #355](https://github.com/magento/data-migration-tool/issues/355): Data integrity check errors did not indicate source where it come from - * [Issue #378](https://github.com/magento/data-migration-tool/issues/378): Settings step threw an error in case additional fields from extensions in `core_config_data` table + * 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 =============