diff --git a/core/modules/email/lib/Drupal/email/Plugin/Field/FieldFormatter/MailToFormatter.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/MailToFormatter.php
similarity index 84%
rename from core/modules/email/lib/Drupal/email/Plugin/Field/FieldFormatter/MailToFormatter.php
rename to core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/MailToFormatter.php
index 609d46e..58f6c6b 100644
--- a/core/modules/email/lib/Drupal/email/Plugin/Field/FieldFormatter/MailToFormatter.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/MailToFormatter.php
@@ -2,10 +2,10 @@
/**
* @file
- * Contains \Drupal\email\Plugin\Field\FieldFormatter\MailToFormatter.
+ * Contains \Drupal\Core\Field\Plugin\Field\FieldFormatter\MailToFormatter.
*/
-namespace Drupal\email\Plugin\Field\FieldFormatter;
+namespace Drupal\Core\Field\Plugin\Field\FieldFormatter;
use Drupal\Core\Field\FormatterBase;
use Drupal\Core\Field\FieldItemListInterface;
diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EmailItem.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EmailItem.php
index 7c27fff..94e422b 100644
--- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EmailItem.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EmailItem.php
@@ -18,8 +18,7 @@
* id = "email",
* label = @Translation("E-mail"),
* description = @Translation("An entity field containing an e-mail value."),
- * configurable = FALSE,
- * default_widget = "string",
+ * default_widget = "email_default",
* default_formatter = "string"
* )
*/
diff --git a/core/modules/email/lib/Drupal/email/Plugin/Field/FieldWidget/EmailDefaultWidget.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/EmailDefaultWidget.php
similarity index 92%
rename from core/modules/email/lib/Drupal/email/Plugin/Field/FieldWidget/EmailDefaultWidget.php
rename to core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/EmailDefaultWidget.php
index 62db527..c273bd8 100644
--- a/core/modules/email/lib/Drupal/email/Plugin/Field/FieldWidget/EmailDefaultWidget.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/EmailDefaultWidget.php
@@ -2,10 +2,10 @@
/**
* @file
- * Definition of Drupal\email\Plugin\Field\FieldWidget\EmailDefaultWidget.
+ * Contains \Drupal\Core\Field\Plugin\Field\FieldWidget\EmailDefaultWidget.
*/
-namespace Drupal\email\Plugin\Field\FieldWidget;
+namespace Drupal\Core\Field\Plugin\Field\FieldWidget;
use Drupal\Core\Field\FieldItemListInterface;
use Drupal\Core\Field\WidgetBase;
diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/StringWidget.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/StringWidget.php
index 8d13286..524e89d 100644
--- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/StringWidget.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/StringWidget.php
@@ -17,8 +17,7 @@
* id = "string",
* label = @Translation("String field"),
* field_types = {
- * "string",
- * "email"
+ * "string"
* },
* settings = {
* "size" = "60",
diff --git a/core/modules/email/config/schema/email.schema.yml b/core/modules/email/config/schema/email.schema.yml
deleted file mode 100644
index 6e5a6c8..0000000
--- a/core/modules/email/config/schema/email.schema.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-# Schema for the configuration files of the Email module.
-
-field.email.settings:
- type: sequence
- label: 'E-mail settings'
- sequence:
- - type: string
-
-field.email.instance_settings:
- type: sequence
- label: 'E-mail settings'
- sequence:
- - type: string
- label: 'Setting'
-
-field.email.value:
- type: sequence
- label: 'Default value'
- sequence:
- - type: mapping
- label: 'Default'
- mapping:
- value:
- type: email
- label: 'Value'
diff --git a/core/modules/email/email.info.yml b/core/modules/email/email.info.yml
deleted file mode 100644
index 7a9293e..0000000
--- a/core/modules/email/email.info.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-name: E-mail
-type: module
-description: 'Defines a field type for e-mail addresses.'
-package: Field types
-version: VERSION
-core: 8.x
-dependencies:
- - field
diff --git a/core/modules/email/email.module b/core/modules/email/email.module
deleted file mode 100644
index f15d84d..0000000
--- a/core/modules/email/email.module
+++ /dev/null
@@ -1,37 +0,0 @@
-' . t('About') . '';
- $output .= '' . t('The E-mail module allows you to create fields that contain e-mail addresses. See the Field module help and the Field UI help pages for general information on fields and how to create and manage them. For more information, see the online documentation for the E-mail module.', array('@field' => url('admin/help/field'), '@field_ui' => url('admin/help/field_ui'), '@email_documentation' => 'https://drupal.org/documentation/modules/email')) . '
';
- $output .= '' . t('Uses') . '
';
- $output .= '';
- $output .= '- ' . t('Managing and displaying email fields') . '
';
- $output .= '- ' . t('The settings and the display of the email field can be configured separately. See the Field UI help for more information on how to manage fields and their display.', array('@field_ui' => url('admin/help/field_ui'))) . '
';
- $output .= '- ' . t('Displaying e-mail addresses as links') . '
';
- $output .= '- ' . t('E-mail addresses can be displayed as plain text or as links by choosing the appropriate display format.') . '
';
- $output .= '- ' . t('Validating E-mail addresses') . '
';
- $output .= '- ' . t('E-mail addresses are validated when the content is saved.') . '
';
- $output .= '
';
- return $output;
- }
-}
-
-/**
- * Implements hook_field_info_alter().
- */
-function email_field_info_alter(&$info) {
- $info['email']['configurable'] = TRUE;
- $info['email']['default_widget'] = 'email_default';
- $info['email']['provider'] = 'email';
-}
diff --git a/core/modules/field/config/schema/field.schema.yml b/core/modules/field/config/schema/field.schema.yml
index 66a1444..4ebf007 100644
--- a/core/modules/field/config/schema/field.schema.yml
+++ b/core/modules/field/config/schema/field.schema.yml
@@ -115,3 +115,28 @@ entity_form_display.field.hidden:
sequence:
- type: string
+# Schema for the configuration files of the Email module.
+
+field.email.settings:
+ type: sequence
+ label: 'E-mail settings'
+ sequence:
+ - type: string
+
+field.email.instance_settings:
+ type: sequence
+ label: 'E-mail settings'
+ sequence:
+ - type: string
+ label: 'Setting'
+
+field.email.value:
+ type: sequence
+ label: 'Default value'
+ sequence:
+ - type: mapping
+ label: 'Default'
+ mapping:
+ value:
+ type: email
+ label: 'Value'
diff --git a/core/modules/email/lib/Drupal/email/Tests/EmailFieldTest.php b/core/modules/field/lib/Drupal/field/Tests/EmailFieldTest.php
similarity index 96%
rename from core/modules/email/lib/Drupal/email/Tests/EmailFieldTest.php
rename to core/modules/field/lib/Drupal/field/Tests/EmailFieldTest.php
index 9ae6eb0..eb7303e 100644
--- a/core/modules/email/lib/Drupal/email/Tests/EmailFieldTest.php
+++ b/core/modules/field/lib/Drupal/field/Tests/EmailFieldTest.php
@@ -2,12 +2,11 @@
/**
* @file
- * Definition of Drupal\email\Tests\EmailFieldTest.
+ * Contains \Drupal\field\Tests\EmailFieldTest.
*/
-namespace Drupal\email\Tests;
+namespace Drupal\field\Tests;
-use Drupal\Core\Language\Language;
use Drupal\simpletest\WebTestBase;
/**
diff --git a/core/modules/email/lib/Drupal/email/Tests/EmailItemTest.php b/core/modules/field/lib/Drupal/field/Tests/EmailItemTest.php
similarity index 95%
rename from core/modules/email/lib/Drupal/email/Tests/EmailItemTest.php
rename to core/modules/field/lib/Drupal/field/Tests/EmailItemTest.php
index 7bbd89b..9c6d8a7 100644
--- a/core/modules/email/lib/Drupal/email/Tests/EmailItemTest.php
+++ b/core/modules/field/lib/Drupal/field/Tests/EmailItemTest.php
@@ -2,14 +2,13 @@
/**
* @file
- * Contains \Drupal\email\Tests\EmailItemTest.
+ * Contains \Drupal\field\Tests\EmailItemTest.
*/
-namespace Drupal\email\Tests;
+namespace Drupal\field\Tests;
use Drupal\Core\Field\FieldItemListInterface;
use Drupal\Core\Field\FieldItemInterface;
-use Drupal\field\Tests\FieldUnitTestBase;
/**
* Tests the new entity API for the email field type.