diff --git a/core/modules/block_content/src/Tests/BlockContentCreationTest.php b/core/modules/block_content/src/Tests/BlockContentCreationTest.php index e60b7a4..93704cd 100644 --- a/core/modules/block_content/src/Tests/BlockContentCreationTest.php +++ b/core/modules/block_content/src/Tests/BlockContentCreationTest.php @@ -24,7 +24,7 @@ class BlockContentCreationTest extends BlockContentTestBase { * * @var array */ - public static $modules = array('block_content_test', 'dblog', 'entity'); + public static $modules = array('block_content_test', 'dblog', 'field_ui'); /** * Sets the test up. diff --git a/core/modules/entity/entity.info.yml b/core/modules/entity/entity.info.yml deleted file mode 100644 index bb9f14f..0000000 --- a/core/modules/entity/entity.info.yml +++ /dev/null @@ -1,6 +0,0 @@ -name: Entity -type: module -description: 'Generic entity functionality.' -package: Core -version: VERSION -core: 8.x diff --git a/core/modules/entity/entity.links.action.yml b/core/modules/entity/entity.links.action.yml deleted file mode 100644 index d191791..0000000 --- a/core/modules/entity/entity.links.action.yml +++ /dev/null @@ -1,13 +0,0 @@ -entity.entity_view_mode_add: - route_name: entity.entity_view_mode_add - title: 'Add new view mode' - weight: 1 - appears_on: - - entity.entity_view_mode_list - -entity.entity_form_mode_add: - route_name: entity.entity_form_mode_add - title: 'Add new form mode' - weight: 1 - appears_on: - - entity.entity_form_mode_list diff --git a/core/modules/entity/entity.links.menu.yml b/core/modules/entity/entity.links.menu.yml deleted file mode 100644 index 9a7b6a4..0000000 --- a/core/modules/entity/entity.links.menu.yml +++ /dev/null @@ -1,15 +0,0 @@ -entity.display_mode: - title: 'Display modes' - description: 'Configure what displays are available for your content and forms.' - route_name: entity.display_mode - parent: system.admin_structure -entity.entity_view_mode_list: - title: 'View modes' - description: 'Manage custom view modes.' - route_name: entity.entity_view_mode_list - parent: entity.display_mode -entity.entity_form_mode_list: - title: 'Form modes' - description: 'Manage custom form modes.' - route_name: entity.entity_form_mode_list - parent: entity.display_mode diff --git a/core/modules/entity/entity.links.task.yml b/core/modules/entity/entity.links.task.yml deleted file mode 100644 index fbb5f9b..0000000 --- a/core/modules/entity/entity.links.task.yml +++ /dev/null @@ -1,19 +0,0 @@ -entity.entity_view_mode.edit_form: - title: 'Edit' - route_name: entity.entity_view_mode.edit_form - base_route: entity.entity_view_mode.edit_form - -entity.entity_form_mode.edit_form: - title: 'Edit' - route_name: entity.entity_form_mode.edit_form - base_route: entity.entity_form_mode.edit_form - -entity.entity_view_mode_list: - title: List - route_name: entity.entity_view_mode_list - base_route: entity.entity_view_mode_list - -entity.entity_form_mode_list: - title: List - route_name: entity.entity_form_mode_list - base_route: entity.entity_form_mode_list diff --git a/core/modules/entity/entity.module b/core/modules/entity/entity.module deleted file mode 100644 index b70d4e3..0000000 --- a/core/modules/entity/entity.module +++ /dev/null @@ -1,70 +0,0 @@ -' . t('About') . ''; - $output .= '

' . t('The Entity module manages various types of content and configuration for the website. This information is collectively know as "entities", which are grouped into "entity types" (such as the main site content, comments, custom blocks, taxonomy terms, user accounts, and views configuration). Some entity types are further grouped into sub-types (for example, you could have article and page content types within the main site content entity type, and tag and category vocabularies within the taxonomy term entity type); other entity types, such as user accounts, do not have sub-types.') . '

'; - $output .= '

' . t('Content entity types store most of their text, file, and other information in fields. See the Field module help and the Field UI help pages for general information on fields and how to create and manage them.', array('!field' => \Drupal::url('help.page', array('name' => 'field')), '!field_ui' => \Drupal::url('help.page', array('name' => 'field_ui')))) . '

'; - $output .= '

' . t('Configuration entity types are used to store configuration information for your site, such as individual views in the Views module, and settings for your main site content types. Configuration stored in this way can be exported, imported, and managed using the Configuration Manager module. See the Configuration Manager module help page for more information.', array('!config-help' => \Drupal::url('help.page', array('name' => 'config')))) . '

'; - $output .= '

' . t('For more information, see the online documentation for the Entity module.', array('!entity_documentation' => 'https://drupal.org/documentation/modules/entity')) . '

'; - $output .= '

' . t('Uses') . '

'; - $output .= '
'; - $output .= '
' . t('Managing view modes') . '
'; - $output .= '
' . t('Each content entity can have various "modes" for viewing. For instance, a content item could be viewed in full content mode on its own page, teaser mode in a list, or RSS mode in a feed. You can create, edit the names of, and delete view modes on the View modes page. Once a view mode has been set up, you can choose and format fields for the view mode within each entity sub-type on the Manage display page. See the Field UI module help page for more information.', array('!view-modes' => \Drupal::url('entity.entity_view_mode_list'), '!field_ui' => \Drupal::url('help.page', array('name' => 'field_ui')))) . '
'; - $output .= '
' . t('Managing form modes') . '
'; - $output .= '
' . t('Each content entity can have various editing forms appropriate for different situations, which are known as "form modes". For instance, you might want to define a quick editing mode that allows users to edit the most important fields, and a full editing mode that gives access to all the fields. You can create, edit the names of, and delete form modes on the Manage custom form modes page. Once a form mode has been set up, you can choose which fields are available on that form within each entity sub-type on the Manage form display page. See the Field UI module help page for more information.', array('!form-modes' => \Drupal::url('entity.entity_form_mode_list'), '!field_ui' => \Drupal::url('help.page', array('name' => 'field_ui')))) . '
'; - $output .= '
'; - return $output; - } -} - -/** - * Implements hook_permission(). - */ -function entity_permission() { - return array( - 'administer display modes' => array( - 'title' => t('Add, edit, and delete custom display modes.'), - ), - ); -} - -/** - * Implements hook_entity_type_alter(). - */ -function entity_entity_type_alter(array &$entity_types) { - /** @var $entity_types \Drupal\Core\Entity\EntityTypeInterface[] */ - $form_mode = $entity_types['entity_form_mode']; - $form_mode->setListBuilderClass('Drupal\entity\EntityFormModeListBuilder'); - $form_mode->setFormClass('add', 'Drupal\entity\Form\EntityFormModeAddForm'); - $form_mode->setFormClass('edit', 'Drupal\entity\Form\EntityDisplayModeEditForm'); - $form_mode->setFormClass('delete', 'Drupal\entity\Form\EntityDisplayModeDeleteForm'); - $form_mode->set('admin_permission', 'administer display modes'); - $form_mode->setLinkTemplate('delete-form', 'entity.entity_form_mode.delete_form'); - $form_mode->setLinkTemplate('edit-form', 'entity.entity_form_mode.edit_form'); - - $view_mode = $entity_types['entity_view_mode']; - $view_mode->setListBuilderClass('Drupal\entity\EntityDisplayModeListBuilder'); - $view_mode->setFormClass('add', 'Drupal\entity\Form\EntityDisplayModeAddForm'); - $view_mode->setFormClass('edit', 'Drupal\entity\Form\EntityDisplayModeEditForm'); - $view_mode->setFormClass('delete', 'Drupal\entity\Form\EntityDisplayModeDeleteForm'); - $view_mode->set('admin_permission', 'administer display modes'); - $view_mode->setLinkTemplate('delete-form', 'entity.entity_view_mode.delete_form'); - $view_mode->setLinkTemplate('edit-form', 'entity.entity_view_mode.edit_form'); -} - diff --git a/core/modules/entity/entity.routing.yml b/core/modules/entity/entity.routing.yml deleted file mode 100644 index 2064c0a..0000000 --- a/core/modules/entity/entity.routing.yml +++ /dev/null @@ -1,87 +0,0 @@ -entity.display_mode: - path: '/admin/structure/display-modes' - defaults: - _content: '\Drupal\system\Controller\SystemController::systemAdminMenuBlockPage' - _title: 'Display modes' - requirements: - _permission: 'administer display modes' - -entity.entity_view_mode_list: - path: '/admin/structure/display-modes/view' - defaults: - _entity_list: 'entity_view_mode' - _title: 'View modes' - requirements: - _permission: 'administer display modes' - -entity.entity_view_mode_add: - path: '/admin/structure/display-modes/view/add' - defaults: - _content: '\Drupal\entity\Controller\EntityDisplayModeController::viewModeTypeSelection' - _title: 'Choose view mode entity type' - requirements: - _permission: 'administer display modes' - -entity.entity_view_mode_add_type: - path: '/admin/structure/display-modes/view/add/{entity_type_id}' - defaults: - _entity_form: 'entity_view_mode.add' - _title: 'Add view mode' - requirements: - _permission: 'administer display modes' - -entity.entity_view_mode.edit_form: - path: '/admin/structure/display-modes/view/manage/{entity_view_mode}' - defaults: - _entity_form: 'entity_view_mode.edit' - _title: 'Edit view mode' - requirements: - _entity_access: 'entity_view_mode.update' - -entity.entity_view_mode.delete_form: - path: '/admin/structure/display-modes/view/manage/{entity_view_mode}/delete' - defaults: - _entity_form: 'entity_view_mode.delete' - _title: 'Delete view mode' - requirements: - _entity_access: 'entity_view_mode.delete' - -entity.entity_form_mode_list: - path: '/admin/structure/display-modes/form' - defaults: - _entity_list: 'entity_form_mode' - _title: 'Form modes' - requirements: - _permission: 'administer display modes' - -entity.entity_form_mode_add: - path: '/admin/structure/display-modes/form/add' - defaults: - _content: '\Drupal\entity\Controller\EntityDisplayModeController::formModeTypeSelection' - _title: 'Choose form mode entity type' - requirements: - _permission: 'administer display modes' - -entity.entity_form_mode_add_type: - path: '/admin/structure/display-modes/form/add/{entity_type_id}' - defaults: - _entity_form: 'entity_form_mode.add' - _title: 'Add form mode' - requirements: - _permission: 'administer display modes' - -entity.entity_form_mode.edit_form: - path: '/admin/structure/display-modes/form/manage/{entity_form_mode}' - defaults: - _entity_form: 'entity_form_mode.edit' - _title: 'Edit form mode' - requirements: - _entity_access: 'entity_form_mode.update' - -entity.entity_form_mode.delete_form: - path: '/admin/structure/display-modes/form/manage/{entity_form_mode}/delete' - defaults: - _entity_form: 'entity_form_mode.delete' - _title: 'Delete form mode' - requirements: - _entity_access: 'entity_form_mode.delete' diff --git a/core/modules/field_ui/field_ui.links.action.yml b/core/modules/field_ui/field_ui.links.action.yml new file mode 100644 index 0000000..dae1583 --- /dev/null +++ b/core/modules/field_ui/field_ui.links.action.yml @@ -0,0 +1,13 @@ +field_ui.entity_view_mode_add: + route_name: field_ui.entity_view_mode_add + title: 'Add new view mode' + weight: 1 + appears_on: + - field_ui.entity_view_mode_list + +field_ui.entity_form_mode_add: + route_name: field_ui.entity_form_mode_add + title: 'Add new form mode' + weight: 1 + appears_on: + - field_ui.entity_form_mode_list diff --git a/core/modules/field_ui/field_ui.links.menu.yml b/core/modules/field_ui/field_ui.links.menu.yml index a128f2e..1d3fdb0 100644 --- a/core/modules/field_ui/field_ui.links.menu.yml +++ b/core/modules/field_ui/field_ui.links.menu.yml @@ -3,3 +3,21 @@ field_ui.list: description: 'Overview of fields on all entity types.' route_name: field_ui.list parent: system.admin_reports + +field_ui.display_mode: + title: 'Display modes' + description: 'Configure what displays are available for your content and forms.' + route_name: field_ui.display_mode + parent: system.admin_structure + +field_ui.entity_view_mode_list: + title: 'View modes' + description: 'Manage custom view modes.' + route_name: field_ui.entity_view_mode_list + parent: field_ui.display_mode + +field_ui.entity_form_mode_list: + title: 'Form modes' + description: 'Manage custom form modes.' + route_name: field_ui.entity_form_mode_list + parent: field_ui.display_mode diff --git a/core/modules/field_ui/field_ui.links.task.yml b/core/modules/field_ui/field_ui.links.task.yml index 5f00837..7bb8f54 100644 --- a/core/modules/field_ui/field_ui.links.task.yml +++ b/core/modules/field_ui/field_ui.links.task.yml @@ -2,6 +2,27 @@ field_ui.list: title: Entities route_name: field_ui.list base_route: field_ui.list + field_ui.fields: class: \Drupal\Core\Menu\LocalTaskDefault deriver: \Drupal\field_ui\Plugin\Derivative\FieldUiLocalTask + +field_ui.entity_view_mode.edit_form: + title: 'Edit' + route_name: field_ui.entity_view_mode.edit_form + base_route: field_ui.entity_view_mode.edit_form + +field_ui.entity_form_mode.edit_form: + title: 'Edit' + route_name: field_ui.entity_form_mode.edit_form + base_route: field_ui.entity_form_mode.edit_form + +field_ui.entity_view_mode_list: + title: List + route_name: field_ui.entity_view_mode_list + base_route: field_ui.entity_view_mode_list + +field_ui.entity_form_mode_list: + title: List + route_name: field_ui.entity_form_mode_list + base_route: field_ui.entity_form_mode_list diff --git a/core/modules/field_ui/field_ui.module b/core/modules/field_ui/field_ui.module index 06764d0..9dbcbd2 100644 --- a/core/modules/field_ui/field_ui.module +++ b/core/modules/field_ui/field_ui.module @@ -48,6 +48,10 @@ function field_ui_help($route_name, RouteMatchInterface $route_match) { $output .= '
' . t('Fields on comments') . '
'; $output .= '
' . t('Fields on comments are defined at the content-type level, on the Comment fields tab of the content type edit page (which you can reach from the Content types page). When you add a field for comments, each comment on a content item of that type will have that field added to it. For example, you could add a website field to the comments on forum posts, to allow forum commenters to add a link to their website.', array('@types' => url('admin/structure/types'))) . '
'; $output .= ''; + $output .= '
' . t('Managing view modes') . '
'; + $output .= '
' . t('Each content entity can have various "modes" for viewing. For instance, a content item could be viewed in full content mode on its own page, teaser mode in a list, or RSS mode in a feed. You can create, edit the names of, and delete view modes on the View modes page. Once a view mode has been set up, you can choose and format fields for the view mode within each entity sub-type on the Manage display page. See the Field UI module help page for more information.', array('!view-modes' => \Drupal::url('field_ui.entity_view_mode_list'), '!field_ui' => \Drupal::url('help.page', array('name' => 'field_ui')))) . '
'; + $output .= '
' . t('Managing form modes') . '
'; + $output .= '
' . t('Each content entity can have various editing forms appropriate for different situations, which are known as "form modes". For instance, you might want to define a quick editing mode that allows users to edit the most important fields, and a full editing mode that gives access to all the fields. You can create, edit the names of, and delete form modes on the Manage custom form modes page. Once a form mode has been set up, you can choose which fields are available on that form within each entity sub-type on the Manage form display page. See the Field UI module help page for more information.', array('!form-modes' => \Drupal::url('field_ui.entity_form_mode_list'), '!field_ui' => \Drupal::url('help.page', array('name' => 'field_ui')))) . '
'; return $output; case 'field_ui.list': @@ -78,6 +82,10 @@ function field_ui_permission() { } } + $permissions['administer display modes'] = array( + 'title' => t('Add, edit, and delete custom display modes.'), + ); + return $permissions; } @@ -308,3 +316,27 @@ function field_ui_local_tasks_alter(&$local_tasks) { $local_task = FieldUiLocalTask::create($container, 'field_ui.fields'); $local_task->alterLocalTasks($local_tasks); } + +/** + * Implements hook_entity_type_alter(). + */ +function field_ui_entity_type_alter(array &$entity_types) { + /** @var $entity_types \Drupal\Core\Entity\EntityTypeInterface[] */ + $form_mode = $entity_types['entity_form_mode']; + $form_mode->setListBuilderClass('Drupal\field_ui\EntityFormModeListBuilder'); + $form_mode->setFormClass('add', 'Drupal\field_ui\Form\EntityFormModeAddForm'); + $form_mode->setFormClass('edit', 'Drupal\field_ui\Form\EntityDisplayModeEditForm'); + $form_mode->setFormClass('delete', 'Drupal\field_ui\Form\EntityDisplayModeDeleteForm'); + $form_mode->set('admin_permission', 'administer display modes'); + $form_mode->setLinkTemplate('delete-form', 'field_ui.entity_form_mode.delete_form'); + $form_mode->setLinkTemplate('edit-form', 'field_ui.entity_form_mode.edit_form'); + + $view_mode = $entity_types['entity_view_mode']; + $view_mode->setListBuilderClass('Drupal\field_ui\EntityDisplayModeListBuilder'); + $view_mode->setFormClass('add', 'Drupal\field_ui\Form\EntityDisplayModeAddForm'); + $view_mode->setFormClass('edit', 'Drupal\field_ui\Form\EntityDisplayModeEditForm'); + $view_mode->setFormClass('delete', 'Drupal\field_ui\Form\EntityDisplayModeDeleteForm'); + $view_mode->set('admin_permission', 'administer display modes'); + $view_mode->setLinkTemplate('delete-form', 'field_ui.entity_view_mode.delete_form'); + $view_mode->setLinkTemplate('edit-form', 'field_ui.entity_view_mode.edit_form'); +} diff --git a/core/modules/field_ui/field_ui.routing.yml b/core/modules/field_ui/field_ui.routing.yml index 2b3672f..cc17e94 100644 --- a/core/modules/field_ui/field_ui.routing.yml +++ b/core/modules/field_ui/field_ui.routing.yml @@ -5,3 +5,91 @@ field_ui.list: _title: 'Field list' requirements: _permission: 'administer content types' + +field_ui.display_mode: + path: '/admin/structure/display-modes' + defaults: + _content: '\Drupal\system\Controller\SystemController::systemAdminMenuBlockPage' + _title: 'Display modes' + requirements: + _permission: 'administer display modes' + +field_ui.entity_view_mode_list: + path: '/admin/structure/display-modes/view' + defaults: + _entity_list: 'entity_view_mode' + _title: 'View modes' + requirements: + _permission: 'administer display modes' + +field_ui.entity_view_mode_add: + path: '/admin/structure/display-modes/view/add' + defaults: + _content: '\Drupal\field_ui\Controller\EntityDisplayModeController::viewModeTypeSelection' + _title: 'Choose view mode entity type' + requirements: + _permission: 'administer display modes' + +field_ui.entity_view_mode_add_type: + path: '/admin/structure/display-modes/view/add/{entity_type_id}' + defaults: + _entity_form: 'entity_view_mode.add' + _title: 'Add view mode' + requirements: + _permission: 'administer display modes' + +field_ui.entity_view_mode.edit_form: + path: '/admin/structure/display-modes/view/manage/{entity_view_mode}' + defaults: + _entity_form: 'entity_view_mode.edit' + _title: 'Edit view mode' + requirements: + _entity_access: 'entity_view_mode.update' + +field_ui.entity_view_mode.delete_form: + path: '/admin/structure/display-modes/view/manage/{entity_view_mode}/delete' + defaults: + _entity_form: 'entity_view_mode.delete' + _title: 'Delete view mode' + requirements: + _entity_access: 'entity_view_mode.delete' + +field_ui.entity_form_mode_list: + path: '/admin/structure/display-modes/form' + defaults: + _entity_list: 'entity_form_mode' + _title: 'Form modes' + requirements: + _permission: 'administer display modes' + +field_ui.entity_form_mode_add: + path: '/admin/structure/display-modes/form/add' + defaults: + _content: '\Drupal\field_ui\Controller\EntityDisplayModeController::formModeTypeSelection' + _title: 'Choose form mode entity type' + requirements: + _permission: 'administer display modes' + +field_ui.entity_form_mode_add_type: + path: '/admin/structure/display-modes/form/add/{entity_type_id}' + defaults: + _entity_form: 'entity_form_mode.add' + _title: 'Add form mode' + requirements: + _permission: 'administer display modes' + +field_ui.entity_form_mode.edit_form: + path: '/admin/structure/display-modes/form/manage/{entity_form_mode}' + defaults: + _entity_form: 'entity_form_mode.edit' + _title: 'Edit form mode' + requirements: + _entity_access: 'entity_form_mode.update' + +field_ui.entity_form_mode.delete_form: + path: '/admin/structure/display-modes/form/manage/{entity_form_mode}/delete' + defaults: + _entity_form: 'entity_form_mode.delete' + _title: 'Delete form mode' + requirements: + _entity_access: 'entity_form_mode.delete' diff --git a/core/modules/entity/src/Controller/EntityDisplayModeController.php b/core/modules/field_ui/src/Controller/EntityDisplayModeController.php similarity index 82% rename from core/modules/entity/src/Controller/EntityDisplayModeController.php rename to core/modules/field_ui/src/Controller/EntityDisplayModeController.php index 562a0da..a2e11c9 100644 --- a/core/modules/entity/src/Controller/EntityDisplayModeController.php +++ b/core/modules/field_ui/src/Controller/EntityDisplayModeController.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\entity\Controller\EntityDisplayModeController. + * Contains \Drupal\field_ui\Controller\EntityDisplayModeController. */ -namespace Drupal\entity\Controller; +namespace Drupal\field_ui\Controller; use Drupal\Core\Controller\ControllerBase; use Drupal\Core\Url; @@ -27,7 +27,7 @@ public function viewModeTypeSelection() { if ($entity_type->isFieldable() && $entity_type->hasViewBuilderClass()) { $entity_types[$entity_type_id] = array( 'title' => $entity_type->getLabel(), - 'url' => new Url('entity.entity_view_mode_add_type', array('entity_type_id' => $entity_type_id)), + 'url' => new Url('field_ui.entity_view_mode_add_type', array('entity_type_id' => $entity_type_id)), 'localized_options' => array(), ); } @@ -50,7 +50,7 @@ public function formModeTypeSelection() { if ($entity_type->isFieldable() && $entity_type->hasFormClasses()) { $entity_types[$entity_type_id] = array( 'title' => $entity_type->getLabel(), - 'url' => new Url('entity.entity_form_mode_add_type', array('entity_type_id' => $entity_type_id)), + 'url' => new Url('field_ui.entity_form_mode_add_type', array('entity_type_id' => $entity_type_id)), 'localized_options' => array(), ); } diff --git a/core/modules/entity/src/EntityDisplayModeListBuilder.php b/core/modules/field_ui/src/EntityDisplayModeListBuilder.php similarity index 97% rename from core/modules/entity/src/EntityDisplayModeListBuilder.php rename to core/modules/field_ui/src/EntityDisplayModeListBuilder.php index ccf5635..7e2cad9 100644 --- a/core/modules/entity/src/EntityDisplayModeListBuilder.php +++ b/core/modules/field_ui/src/EntityDisplayModeListBuilder.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\entity\EntityDisplayModeListBuilder. + * Contains \Drupal\field_ui\EntityDisplayModeListBuilder. */ -namespace Drupal\entity; +namespace Drupal\field_ui; use Drupal\Core\Config\Entity\ConfigEntityListBuilder; use Drupal\Core\Entity\EntityInterface; diff --git a/core/modules/entity/src/EntityFormModeListBuilder.php b/core/modules/field_ui/src/EntityFormModeListBuilder.php similarity index 87% rename from core/modules/entity/src/EntityFormModeListBuilder.php rename to core/modules/field_ui/src/EntityFormModeListBuilder.php index 8fcd2a0..8515265 100644 --- a/core/modules/entity/src/EntityFormModeListBuilder.php +++ b/core/modules/field_ui/src/EntityFormModeListBuilder.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\entity\EntityFormModeListBuilder. + * Contains \Drupal\field_ui\EntityFormModeListBuilder. */ -namespace Drupal\entity; +namespace Drupal\field_ui; /** * Defines a class to build a listing of form mode entities. diff --git a/core/modules/entity/src/Form/EntityDisplayModeAddForm.php b/core/modules/field_ui/src/Form/EntityDisplayModeAddForm.php similarity index 94% rename from core/modules/entity/src/Form/EntityDisplayModeAddForm.php rename to core/modules/field_ui/src/Form/EntityDisplayModeAddForm.php index 04c8339..f8075c9 100644 --- a/core/modules/entity/src/Form/EntityDisplayModeAddForm.php +++ b/core/modules/field_ui/src/Form/EntityDisplayModeAddForm.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\entity\Form\EntityDisplayModeAddForm. + * Contains \Drupal\field_ui\Form\EntityDisplayModeAddForm. */ -namespace Drupal\entity\Form; +namespace Drupal\field_ui\Form; use Drupal\Core\Form\FormStateInterface; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; diff --git a/core/modules/entity/src/Form/EntityDisplayModeDeleteForm.php b/core/modules/field_ui/src/Form/EntityDisplayModeDeleteForm.php similarity index 89% rename from core/modules/entity/src/Form/EntityDisplayModeDeleteForm.php rename to core/modules/field_ui/src/Form/EntityDisplayModeDeleteForm.php index e69fda9..315c918 100644 --- a/core/modules/entity/src/Form/EntityDisplayModeDeleteForm.php +++ b/core/modules/field_ui/src/Form/EntityDisplayModeDeleteForm.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\entity\Form\EntityDisplayModeDeleteForm. + * Contains \Drupal\field_ui\Form\EntityDisplayModeDeleteForm. */ -namespace Drupal\entity\Form; +namespace Drupal\field_ui\Form; use Drupal\Core\Entity\EntityConfirmFormBase; use Drupal\Core\Form\FormStateInterface; @@ -20,7 +20,7 @@ class EntityDisplayModeDeleteForm extends EntityConfirmFormBase { * {@inheritdoc} */ public function getCancelUrl() { - return new Url('entity.' . $this->entity->getEntityTypeId() . '_list'); + return new Url('field_ui.' . $this->entity->getEntityTypeId() . '_list'); } /** diff --git a/core/modules/entity/src/Form/EntityDisplayModeEditForm.php b/core/modules/field_ui/src/Form/EntityDisplayModeEditForm.php similarity index 62% rename from core/modules/entity/src/Form/EntityDisplayModeEditForm.php rename to core/modules/field_ui/src/Form/EntityDisplayModeEditForm.php index 47662ba..c1b8af2 100644 --- a/core/modules/entity/src/Form/EntityDisplayModeEditForm.php +++ b/core/modules/field_ui/src/Form/EntityDisplayModeEditForm.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\entity\Form\EntityDisplayModeEditForm. + * Contains \Drupal\field_ui\Form\EntityDisplayModeEditForm. */ -namespace Drupal\entity\Form; +namespace Drupal\field_ui\Form; /** * Provides the edit form for entity display modes. diff --git a/core/modules/entity/src/Form/EntityDisplayModeFormBase.php b/core/modules/field_ui/src/Form/EntityDisplayModeFormBase.php similarity index 94% rename from core/modules/entity/src/Form/EntityDisplayModeFormBase.php rename to core/modules/field_ui/src/Form/EntityDisplayModeFormBase.php index abd8e77..9b7fdd2 100644 --- a/core/modules/entity/src/Form/EntityDisplayModeFormBase.php +++ b/core/modules/field_ui/src/Form/EntityDisplayModeFormBase.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\entity\Form\EntityDisplayModeFormBase. + * Contains \Drupal\field_ui\Form\EntityDisplayModeFormBase. */ -namespace Drupal\entity\Form; +namespace Drupal\field_ui\Form; use Drupal\Core\Entity\EntityForm; use Drupal\Core\Entity\EntityManagerInterface; @@ -125,7 +125,7 @@ public function save(array $form, FormStateInterface $form_state) { drupal_set_message(t('Saved the %label @entity-type.', array('%label' => $this->entity->label(), '@entity-type' => $this->entityType->getLowercaseLabel()))); $this->entity->save(); \Drupal::entityManager()->clearCachedFieldDefinitions(); - $form_state->setRedirect('entity.' . $this->entity->getEntityTypeId() . '_list'); + $form_state->setRedirect('field_ui.' . $this->entity->getEntityTypeId() . '_list'); } } diff --git a/core/modules/entity/src/Form/EntityFormModeAddForm.php b/core/modules/field_ui/src/Form/EntityFormModeAddForm.php similarity index 86% rename from core/modules/entity/src/Form/EntityFormModeAddForm.php rename to core/modules/field_ui/src/Form/EntityFormModeAddForm.php index 4cdece5..b00fb37 100644 --- a/core/modules/entity/src/Form/EntityFormModeAddForm.php +++ b/core/modules/field_ui/src/Form/EntityFormModeAddForm.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\entity\Form\EntityFormModeAddForm. + * Contains \Drupal\field_ui\Form\EntityFormModeAddForm. */ -namespace Drupal\entity\Form; +namespace Drupal\field_ui\Form; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; diff --git a/core/modules/entity/src/Tests/EntityDisplayModeTest.php b/core/modules/field_ui/src/Tests/EntityDisplayModeTest.php similarity index 96% rename from core/modules/entity/src/Tests/EntityDisplayModeTest.php rename to core/modules/field_ui/src/Tests/EntityDisplayModeTest.php index 0034120..87d8518 100644 --- a/core/modules/entity/src/Tests/EntityDisplayModeTest.php +++ b/core/modules/field_ui/src/Tests/EntityDisplayModeTest.php @@ -2,17 +2,17 @@ /** * @file - * Contains \Drupal\entity\Tests\EntityDisplayModeTest. + * Contains \Drupal\field_ui\Tests\EntityDisplayModeTest. */ -namespace Drupal\entity\Tests; +namespace Drupal\field_ui\Tests; use Drupal\simpletest\WebTestBase; /** * Tests the entity display modes UI. * - * @group entity + * @group field_ui */ class EntityDisplayModeTest extends WebTestBase { @@ -21,7 +21,7 @@ class EntityDisplayModeTest extends WebTestBase { * * @var array */ - public static $modules = array('entity_test', 'entity'); + public static $modules = array('entity_test', 'field_ui'); /** * Tests the EntityViewMode user interface. diff --git a/core/modules/entity/src/Tests/EntityDisplayTest.php b/core/modules/field_ui/src/Tests/EntityDisplayTest.php similarity index 98% rename from core/modules/entity/src/Tests/EntityDisplayTest.php rename to core/modules/field_ui/src/Tests/EntityDisplayTest.php index 2e3657d..46fad86 100644 --- a/core/modules/entity/src/Tests/EntityDisplayTest.php +++ b/core/modules/field_ui/src/Tests/EntityDisplayTest.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\entity\Tests\EntityDisplayTest. + * Contains \Drupal\field_ui\Tests\EntityDisplayTest. */ -namespace Drupal\entity\Tests; +namespace Drupal\field_ui\Tests; use Drupal\Core\Entity\Entity\EntityViewMode; use Drupal\simpletest\DrupalUnitTestBase; @@ -13,11 +13,11 @@ /** * Tests the entity display configuration entities. * - * @group entity + * @group field_ui */ class EntityDisplayTest extends DrupalUnitTestBase { - public static $modules = array('entity', 'field', 'entity_test', 'user', 'text', 'field_test', 'node', 'system'); + public static $modules = array('field_ui', 'field', 'entity_test', 'user', 'text', 'field_test', 'node', 'system'); protected function setUp() { parent::setUp(); diff --git a/core/modules/entity/src/Tests/EntityFormDisplayTest.php b/core/modules/field_ui/src/Tests/EntityFormDisplayTest.php similarity index 96% rename from core/modules/entity/src/Tests/EntityFormDisplayTest.php rename to core/modules/field_ui/src/Tests/EntityFormDisplayTest.php index 6723a49..0aa3145 100644 --- a/core/modules/entity/src/Tests/EntityFormDisplayTest.php +++ b/core/modules/field_ui/src/Tests/EntityFormDisplayTest.php @@ -2,22 +2,22 @@ /** * @file - * Contains \Drupal\entity\Tests\EntityFormDisplayTest. + * Contains \Drupal\field_ui\Tests\EntityFormDisplayTest. */ -namespace Drupal\entity\Tests; +namespace Drupal\field_ui\Tests; use Drupal\Core\Entity\Entity\EntityFormMode; -use Drupal\simpletest\DrupalUnitTestBase; +use Drupal\simpletest\KernelTestBase; /** * Tests the entity display configuration entities. * - * @group entity + * @group field_ui */ -class EntityFormDisplayTest extends DrupalUnitTestBase { +class EntityFormDisplayTest extends KernelTestBase { - public static $modules = array('entity', 'field', 'entity_test', 'field_test', 'user', 'text'); + public static $modules = array('field_ui', 'field', 'entity_test', 'field_test', 'user', 'text'); protected function setUp() { parent::setUp(); diff --git a/core/modules/simpletest/src/Tests/KernelTestBaseTest.php b/core/modules/simpletest/src/Tests/KernelTestBaseTest.php index c8a8987..3a6434b 100644 --- a/core/modules/simpletest/src/Tests/KernelTestBaseTest.php +++ b/core/modules/simpletest/src/Tests/KernelTestBaseTest.php @@ -21,7 +21,7 @@ class KernelTestBaseTest extends KernelTestBase { * * @var array */ - public static $modules = array('entity', 'entity_test'); + public static $modules = array('entity_test'); /** * {@inheritdoc} @@ -36,7 +36,7 @@ protected function setUp() { * Tests expected behavior of setUp(). */ function testSetUp() { - $modules = array('entity', 'entity_test'); + $modules = array('entity_test'); $table = 'entity_test'; // Verify that specified $modules have been loaded. @@ -222,7 +222,7 @@ function testEnableModulesFixedList() { $this->assertTrue(TRUE == $entity_manager->getDefinition('entity_test')); // Load some additional modules; entity_test should still exist. - $this->enableModules(array('entity', 'field', 'text', 'entity_test')); + $this->enableModules(array('field', 'text', 'entity_test')); $this->assertEqual($this->container->get('module_handler')->moduleExists('entity_test'), TRUE); $this->assertTrue(TRUE == $entity_manager->getDefinition('entity_test')); @@ -237,7 +237,7 @@ function testEnableModulesFixedList() { $this->assertTrue(TRUE == $entity_manager->getDefinition('entity_test')); // Set the weight of a module; entity_test should still exist. - module_set_weight('entity', -1); + module_set_weight('field', -1); $this->assertEqual($this->container->get('module_handler')->moduleExists('entity_test'), TRUE); $this->assertTrue(TRUE == $entity_manager->getDefinition('entity_test')); diff --git a/core/modules/user/src/Tests/Views/UserUnitTestBase.php b/core/modules/user/src/Tests/Views/UserUnitTestBase.php index 16ba123..672bae7 100644 --- a/core/modules/user/src/Tests/Views/UserUnitTestBase.php +++ b/core/modules/user/src/Tests/Views/UserUnitTestBase.php @@ -20,7 +20,7 @@ * * @var array */ - public static $modules = array('user_test_views', 'user', 'system', 'entity', 'field'); + public static $modules = array('user_test_views', 'user', 'system', 'field'); /** * Users to use during this test. diff --git a/core/profiles/standard/standard.info.yml b/core/profiles/standard/standard.info.yml index 758a6b9..a1c07b2 100644 --- a/core/profiles/standard/standard.info.yml +++ b/core/profiles/standard/standard.info.yml @@ -19,7 +19,6 @@ dependencies: - block_content - quickedit - editor - - entity - entity_reference - help - image