diff -u b/core/lib/Drupal/Core/Field/Plugin/migrate/field/Email.php b/core/lib/Drupal/Core/Field/Plugin/migrate/field/Email.php --- b/core/lib/Drupal/Core/Field/Plugin/migrate/field/Email.php +++ b/core/lib/Drupal/Core/Field/Plugin/migrate/field/Email.php @@ -8,7 +8,7 @@ /** * @MigrateField( * id = "email", - * core = {6,7} + * core = {6,7}, * type_map = { * "email" = "email" * } @@ -49,7 +49,7 @@ [ 'plugin' => 'skip_on_empty', 'method' => 'process', - 'source' => 'email' + 'source' => 'email', ], ], ] @@ -59,2 +59,3 @@ + } only in patch2: unchanged: --- a/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldTest.php +++ b/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldTest.php @@ -70,6 +70,10 @@ public function testFields() { $this->assertIdentical('1.2', $field_storage->getSetting('allowed_values')['1.2'], t('First allowed value is set to 1.2')); $this->assertIdentical('2.1', $field_storage->getSetting('allowed_values')['2.1'], t('Second allowed value is set to 1.2')); + // Email field. + $field_storage = FieldStorageConfig::load('node.field_test_email'); + $this->assertSame("email", $field_storage->getType(), t('Field type is @fieldtype. It should be email.', ['@fieldtype' => $field_storage->getType()])); + // Float field with a single checkbox. $field_storage = FieldStorageConfig::load('node.field_test_float_single_checkbox'); $this->assertIdentical("boolean", $field_storage->getType(), t('Field type is @fieldtype. It should be boolean.', ['@fieldtype' => $field_storage->getType()])); only in patch2: unchanged: --- a/core/modules/migrate_drupal/tests/fixtures/drupal6.php +++ b/core/modules/migrate_drupal/tests/fixtures/drupal6.php @@ -3292,7 +3292,7 @@ 'field_test_date_value' => NULL, 'field_test_datestamp_value' => NULL, 'field_test_datetime_value' => NULL, - 'field_test_email_email' => NULL, + 'field_test_email_email' => 'PrincessRuwenne@castle.com', 'field_test_filefield_fid' => '5', 'field_test_filefield_list' => '1', 'field_test_filefield_data' => 'a:1:{s:11:"description";s:4:"desc";}', @@ -3321,7 +3321,7 @@ 'field_test_date_value' => NULL, 'field_test_datestamp_value' => NULL, 'field_test_datetime_value' => NULL, - 'field_test_email_email' => NULL, + 'field_test_email_email' => 'PrincessRuwenne@castle.com', 'field_test_filefield_fid' => NULL, 'field_test_filefield_list' => NULL, 'field_test_filefield_data' => NULL, only in patch2: unchanged: --- a/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeTest.php +++ b/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeTest.php @@ -81,6 +81,9 @@ public function testNode() { $this->assertIdentical('desc', $node->field_test_filefield->description); $this->assertIdentical('4', $node->field_test_filefield->target_id); + // Test that an email field is migrated. + $this->assertSame('PrincessRuwenne@castle.com', $node->field_test_email->value); + $node = Node::load(2); $this->assertIdentical('Test title rev 3', $node->getTitle()); $this->assertIdentical('test rev 3', $node->body->value); only in patch2: unchanged: --- a/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTest.php +++ b/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTest.php @@ -149,6 +149,9 @@ public function testNode() { $this->assertIdentical('93', $node->field_images->height); $this->assertIdentical('http://google.com', $node->field_link->uri); $this->assertIdentical('Click Here', $node->field_link->title); + // Test that an email field is migrated. + $this->assertSame('default@example.com', $node->field_email->value); + $this->assertSame('another@example.com', $node->field_email[1]->value); $node = Node::load(2); $this->assertSame('en', $node->langcode->value);