Merge pull request #150 from magento-nord/develop

Data Migration Tool Release 2.1.1
magento · Sep 2, 2016 · edb4e0e · edb4e0e
2 parents f18a9cd + e08afa1
commit edb4e0e
Show file tree

Hide file tree

Showing 88 changed files with 2,562 additions and 470 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,18 @@
+2.1.1
+=============
+* Improvements in migration of Magento 1 CE stores upgraded to 1.6 and later versions from versions earlier than 1.6 version
+* Performance improvements in migration process
+* Added support for migration for the following versions:
+
+    * Magento CE version 2.1.1
+    * Magento EE version 2.1.1
+
+* Fixed bugs:
+    * Fixed an issue with URL Rewrite duplication in CMS Pages and Catalog
+    * [Issue#112](https://github.com/magento/data-migration-tool/issues/112) Errors on EAV step
+    * [Issue#75](https://github.com/magento/data-migration-tool/issues/75) Data Migration hung at Customer Attributes Step
+    * [Issue#64](https://github.com/magento/data-migration-tool/issues/64) Migration does not run on PHP 7 after DI compilation
+
 2.1.0
 =============
 * Added support for migration of Magento 1 CE stores upgraded to 1.6 and later versions from versions earlier than 1.6 version

diff --git a/README.md b/README.md
@@ -81,7 +81,7 @@ To update `composer.json`:
 
 7.	Enter the following command to reference Magento packages in `composer.json`:
 
-		composer config repositories.magento composer http://repo.magento.com
+		composer config repositories.magento composer https://repo.magento.com
 
 8.	Enter the following command to require the current version of the package:
 

diff --git a/composer.json b/composer.json
@@ -1,14 +1,14 @@
 {
     "name": "magento/data-migration-tool",
     "description": "Migration Tool",
-    "version": "2.1.0",
+    "version": "2.1.1",
     "require": {
         "symfony/console": "~2.3",
         "magento/framework": "~100.1",
         "monolog/monolog": "~1.16.0"
     },
     "autoload": {
         "psr-4": {"Migration\\": ["src/Migration", "tests/unit/testsuite/Migration"]},
-        "files" : ["src/Migration/cli_commands.php"]
+        "files" : ["src/Migration/cli_commands.php", "registration.php"]
     }
 }
diff --git a/etc/ce-to-ce/eav-document-groups.xml.dist b/etc/ce-to-ce/eav-document-groups.xml.dist
@@ -15,9 +15,8 @@
         <document>customer_eav_attribute</document>
         <document>eav_entity_type</document>
     </group>
-    <group name="mapped_documents">
+    <group name="documents_attribute_extended">
         <document key="attribute_id">catalog_eav_attribute</document>
         <document key="attribute_id">customer_eav_attribute</document>
-        <document key="entity_type_code">eav_entity_type</document>
     </group>
 </groups>
diff --git a/etc/ce-to-ce/settings.xml.dist b/etc/ce-to-ce/settings.xml.dist
@@ -1039,10 +1039,15 @@
         <ignore>
             <path>system/page_cache/debug</path>
         </ignore>
-        <rename>
+        <ignore>
+            <path>design/theme/template</path>
+        </ignore>
+        <ignore>
+            <path>design/theme/template_ua_regexp</path>
+        </ignore>
+        <ignore>
             <path>admin/security/session_cookie_lifetime</path>
-            <to>admin/security/session_lifetime</to>
-        </rename>
+        </ignore>
         <rename>
             <path>api/config/charset</path>
             <to>webapi/soap/charset</to>
@@ -1179,14 +1184,6 @@
             <path>design/header/logo_src_small</path>
             <to>design/header/logo_src</to>
         </rename>
-        <rename>
-            <path>design/theme/template</path>
-            <to>design/theme/theme_id</to>
-        </rename>
-        <rename>
-            <path>design/theme/template_ua_regexp</path>
-            <to>design/theme/ua_regexp</to>
-        </rename>
         <rename>
             <path>general/store_information/merchant_country</path>
             <to>general/store_information/country_id</to>

diff --git a/etc/ce-to-ee/eav-document-groups.xml.dist b/etc/ce-to-ee/eav-document-groups.xml.dist
@@ -15,9 +15,8 @@
         <document>customer_eav_attribute</document>
         <document>eav_entity_type</document>
     </group>
-    <group name="mapped_documents">
+    <group name="documents_attribute_extended">
         <document key="attribute_id">catalog_eav_attribute</document>
         <document key="attribute_id">customer_eav_attribute</document>
-        <document key="entity_type_code">eav_entity_type</document>
     </group>
 </groups>
diff --git a/etc/ce-to-ee/settings.xml.dist b/etc/ce-to-ee/settings.xml.dist
@@ -1039,10 +1039,15 @@
         <ignore>
             <path>system/page_cache/debug</path>
         </ignore>
-        <rename>
+        <ignore>
+            <path>design/theme/template</path>
+        </ignore>
+        <ignore>
+            <path>design/theme/template_ua_regexp</path>
+        </ignore>
+        <ignore>
             <path>admin/security/session_cookie_lifetime</path>
-            <to>admin/security/session_lifetime</to>
-        </rename>
+        </ignore>
         <rename>
             <path>api/config/charset</path>
             <to>webapi/soap/charset</to>
@@ -1179,14 +1184,6 @@
             <path>design/header/logo_src_small</path>
             <to>design/header/logo_src</to>
         </rename>
-        <rename>
-            <path>design/theme/template</path>
-            <to>design/theme/theme_id</to>
-        </rename>
-        <rename>
-            <path>design/theme/template_ua_regexp</path>
-            <to>design/theme/ua_regexp</to>
-        </rename>
         <rename>
             <path>general/store_information/merchant_country</path>
             <to>general/store_information/country_id</to>

diff --git a/etc/ee-to-ee/1.11.0.0/map.xml.dist b/etc/ee-to-ee/1.11.0.0/map.xml.dist
@@ -2368,6 +2368,10 @@
                     <param name="fieldCopy" value="rule_id"/>
                 </handler>
             </transform>
+            <transform>
+                <field>magento_catalogevent_event.status</field>
+                <handler class="\Migration\Handler\GetEventStatus"/>
+            </transform>
             <ignore>
                 <field>catalog_product_entity_media_gallery_value.entity_id</field>
             </ignore>

diff --git a/etc/ee-to-ee/1.11.0.1/map.xml.dist b/etc/ee-to-ee/1.11.0.1/map.xml.dist
@@ -2368,6 +2368,10 @@
                     <param name="fieldCopy" value="rule_id"/>
                 </handler>
             </transform>
+            <transform>
+                <field>magento_catalogevent_event.status</field>
+                <handler class="\Migration\Handler\GetEventStatus"/>
+            </transform>
             <ignore>
                 <field>catalog_product_entity_media_gallery_value.entity_id</field>
             </ignore>

diff --git a/etc/ee-to-ee/1.11.0.2/map.xml.dist b/etc/ee-to-ee/1.11.0.2/map.xml.dist
@@ -2368,6 +2368,10 @@
                     <param name="fieldCopy" value="rule_id"/>
                 </handler>
             </transform>
+            <transform>
+                <field>magento_catalogevent_event.status</field>
+                <handler class="\Migration\Handler\GetEventStatus"/>
+            </transform>
             <ignore>
                 <field>catalog_product_entity_media_gallery_value.entity_id</field>
             </ignore>

diff --git a/etc/ee-to-ee/1.11.1.0/map.xml.dist b/etc/ee-to-ee/1.11.1.0/map.xml.dist
@@ -2356,6 +2356,10 @@
                     <param name="fieldCopy" value="rule_id"/>
                 </handler>
             </transform>
+            <transform>
+                <field>magento_catalogevent_event.status</field>
+                <handler class="\Migration\Handler\GetEventStatus"/>
+            </transform>
             <ignore>
                 <field>catalog_product_entity_media_gallery_value.entity_id</field>
             </ignore>

diff --git a/etc/ee-to-ee/1.11.2.0/map.xml.dist b/etc/ee-to-ee/1.11.2.0/map.xml.dist
@@ -2356,6 +2356,10 @@
                     <param name="fieldCopy" value="rule_id"/>
                 </handler>
             </transform>
+            <transform>
+                <field>magento_catalogevent_event.status</field>
+                <handler class="\Migration\Handler\GetEventStatus"/>
+            </transform>
             <ignore>
                 <field>catalog_product_entity_media_gallery_value.entity_id</field>
             </ignore>

diff --git a/etc/ee-to-ee/1.12.0.0/map.xml.dist b/etc/ee-to-ee/1.12.0.0/map.xml.dist
@@ -2278,6 +2278,10 @@
                     <param name="fieldCopy" value="rule_id"/>
                 </handler>
             </transform>
+            <transform>
+                <field>magento_catalogevent_event.status</field>
+                <handler class="\Migration\Handler\GetEventStatus"/>
+            </transform>
             <ignore>
                 <field>catalog_product_entity_media_gallery_value.entity_id</field>
             </ignore>

diff --git a/etc/ee-to-ee/1.12.0.1/map.xml.dist b/etc/ee-to-ee/1.12.0.1/map.xml.dist
@@ -2278,6 +2278,10 @@
                     <param name="fieldCopy" value="rule_id"/>
                 </handler>
             </transform>
+            <transform>
+                <field>magento_catalogevent_event.status</field>
+                <handler class="\Migration\Handler\GetEventStatus"/>
+            </transform>
             <ignore>
                 <field>catalog_product_entity_media_gallery_value.entity_id</field>
             </ignore>

diff --git a/etc/ee-to-ee/1.12.0.2/map.xml.dist b/etc/ee-to-ee/1.12.0.2/map.xml.dist
@@ -2278,6 +2278,10 @@
                     <param name="fieldCopy" value="rule_id"/>
                 </handler>
             </transform>
+            <transform>
+                <field>magento_catalogevent_event.status</field>
+                <handler class="\Migration\Handler\GetEventStatus"/>
+            </transform>
             <ignore>
                 <field>catalog_product_entity_media_gallery_value.entity_id</field>
             </ignore>

diff --git a/etc/ee-to-ee/1.13.0.0/map.xml.dist b/etc/ee-to-ee/1.13.0.0/map.xml.dist
@@ -2231,6 +2231,10 @@
                     <param name="fieldCopy" value="rule_id"/>
                 </handler>
             </transform>
+            <transform>
+                <field>magento_catalogevent_event.status</field>
+                <handler class="\Migration\Handler\GetEventStatus"/>
+            </transform>
             <ignore>
                 <field>catalog_product_entity_media_gallery_value.entity_id</field>
             </ignore>

diff --git a/etc/ee-to-ee/1.13.0.1/map.xml.dist b/etc/ee-to-ee/1.13.0.1/map.xml.dist
@@ -2231,6 +2231,10 @@
                     <param name="fieldCopy" value="rule_id"/>
                 </handler>
             </transform>
+            <transform>
+                <field>magento_catalogevent_event.status</field>
+                <handler class="\Migration\Handler\GetEventStatus"/>
+            </transform>
             <ignore>
                 <field>catalog_product_entity_media_gallery_value.entity_id</field>
             </ignore>

diff --git a/etc/ee-to-ee/1.13.0.2/map.xml.dist b/etc/ee-to-ee/1.13.0.2/map.xml.dist
@@ -2231,6 +2231,10 @@
                     <param name="fieldCopy" value="rule_id"/>
                 </handler>
             </transform>
+            <transform>
+                <field>magento_catalogevent_event.status</field>
+                <handler class="\Migration\Handler\GetEventStatus"/>
+            </transform>
             <ignore>
                 <field>catalog_product_entity_media_gallery_value.entity_id</field>
             </ignore>

diff --git a/etc/ee-to-ee/1.13.1.0/map.xml.dist b/etc/ee-to-ee/1.13.1.0/map.xml.dist
@@ -2237,6 +2237,10 @@
                     <param name="fieldCopy" value="rule_id"/>
                 </handler>
             </transform>
+            <transform>
+                <field>magento_catalogevent_event.status</field>
+                <handler class="\Migration\Handler\GetEventStatus"/>
+            </transform>
             <ignore>
                 <field>catalog_product_entity_media_gallery_value.entity_id</field>
             </ignore>

diff --git a/etc/ee-to-ee/1.14.0.0/map.xml.dist b/etc/ee-to-ee/1.14.0.0/map.xml.dist
@@ -2237,6 +2237,10 @@
                     <param name="fieldCopy" value="rule_id"/>
                 </handler>
             </transform>
+            <transform>
+                <field>magento_catalogevent_event.status</field>
+                <handler class="\Migration\Handler\GetEventStatus"/>
+            </transform>
             <ignore>
                 <field>catalog_product_entity_media_gallery_value.entity_id</field>
             </ignore>

diff --git a/etc/ee-to-ee/1.14.0.1/map.xml.dist b/etc/ee-to-ee/1.14.0.1/map.xml.dist
@@ -2237,6 +2237,10 @@
                     <param name="fieldCopy" value="rule_id"/>
                 </handler>
             </transform>
+            <transform>
+                <field>magento_catalogevent_event.status</field>
+                <handler class="\Migration\Handler\GetEventStatus"/>
+            </transform>
             <ignore>
                 <field>catalog_product_entity_media_gallery_value.entity_id</field>
             </ignore>

diff --git a/etc/ee-to-ee/1.14.1.0/map.xml.dist b/etc/ee-to-ee/1.14.1.0/map.xml.dist
@@ -2239,6 +2239,10 @@
                     <param name="fieldCopy" value="rule_id"/>
                 </handler>
             </transform>
+            <transform>
+                <field>magento_catalogevent_event.status</field>
+                <handler class="\Migration\Handler\GetEventStatus"/>
+            </transform>
             <ignore>
                 <field>catalog_product_entity_media_gallery_value.entity_id</field>
             </ignore>

diff --git a/etc/ee-to-ee/1.14.2.0/map.xml.dist b/etc/ee-to-ee/1.14.2.0/map.xml.dist
@@ -2276,6 +2276,10 @@
                     <param name="fieldCopy" value="rule_id"/>
                 </handler>
             </transform>
+            <transform>
+                <field>magento_catalogevent_event.status</field>
+                <handler class="\Migration\Handler\GetEventStatus"/>
+            </transform>
             <ignore>
                 <field>catalog_product_entity_media_gallery_value.entity_id</field>
             </ignore>

diff --git a/etc/ee-to-ee/1.14.2.1/map.xml.dist b/etc/ee-to-ee/1.14.2.1/map.xml.dist
@@ -2282,6 +2282,10 @@
                     <param name="fieldCopy" value="rule_id"/>
                 </handler>
             </transform>
+            <transform>
+                <field>magento_catalogevent_event.status</field>
+                <handler class="\Migration\Handler\GetEventStatus"/>
+            </transform>
             <ignore>
                 <field>catalog_product_entity_media_gallery_value.entity_id</field>
             </ignore>

diff --git a/etc/ee-to-ee/1.14.2.2/map.xml.dist b/etc/ee-to-ee/1.14.2.2/map.xml.dist
@@ -2288,6 +2288,10 @@
                     <param name="fieldCopy" value="rule_id"/>
                 </handler>
             </transform>
+            <transform>
+                <field>magento_catalogevent_event.status</field>
+                <handler class="\Migration\Handler\GetEventStatus"/>
+            </transform>
             <ignore>
                 <field>catalog_product_entity_media_gallery_value.entity_id</field>
             </ignore>

diff --git a/etc/ee-to-ee/1.14.2.3/map.xml.dist b/etc/ee-to-ee/1.14.2.3/map.xml.dist
@@ -2282,6 +2282,10 @@
                     <param name="fieldCopy" value="rule_id"/>
                 </handler>
             </transform>
+            <transform>
+                <field>magento_catalogevent_event.status</field>
+                <handler class="\Migration\Handler\GetEventStatus"/>
+            </transform>
             <ignore>
                 <field>catalog_product_entity_media_gallery_value.entity_id</field>
             </ignore>

diff --git a/etc/ee-to-ee/1.14.2.4/map.xml.dist b/etc/ee-to-ee/1.14.2.4/map.xml.dist
@@ -2282,6 +2282,10 @@
                     <param name="fieldCopy" value="rule_id"/>
                 </handler>
             </transform>
+            <transform>
+                <field>magento_catalogevent_event.status</field>
+                <handler class="\Migration\Handler\GetEventStatus"/>
+            </transform>
             <ignore>
                 <field>catalog_product_entity_media_gallery_value.entity_id</field>
             </ignore>

diff --git a/etc/ee-to-ee/eav-document-groups.xml.dist b/etc/ee-to-ee/eav-document-groups.xml.dist
@@ -16,10 +16,9 @@
         <document>eav_entity_type</document>
         <document>enterprise_rma_item_eav_attribute</document>
     </group>
-    <group name="mapped_documents">
+    <group name="documents_attribute_extended">
         <document key="attribute_id">catalog_eav_attribute</document>
         <document key="attribute_id">customer_eav_attribute</document>
-        <document key="entity_type_code">eav_entity_type</document>
         <document key="attribute_id">enterprise_rma_item_eav_attribute</document>
     </group>
 </groups>